添加填报人

src/layouts/admin/index.vue

@@ -24,6 +24,7 @@ import { getRouteMenu, dictDataCache } from '@/api/auth'
 import { getAreaList, areaSelect } from '@/api/common'
 import { BasicDictData } from '@/stores/interface'
 import { getUserById } from '@/api/user-boot/user'
+import { getUserSimpleList } from '@/api/user-boot/user'
 
 defineOptions({
     components: { Default, Classic, Streamline, Double }
@@ -51,9 +52,10 @@ onBeforeMount(() => {
 })
 
 const init = async () => {
-    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect()]).then(res => {
+    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect(),getUserSimpleList()]).then(res => {
         dictData.state.area = res[0].data
         dictData.state.basic = res[1].data
+        dictData.state.userList=res[4].data
         adminInfo.dataFill(res[2].data)
         dictData.state.areaTree = res[3].data
     })

src/stores/dictData.ts

@@ -9,7 +9,8 @@ export const useDictData = defineStore(
         const state: DictData = reactive({
             basic: [],
             area: [],
-            areaTree: []
+            areaTree: [],
+            userList: []
             // 其他接口获取的字典，比如区域
         })
         const getBasicData = (code: string, arr?: string[]) => {

src/stores/interface/index.ts

@@ -80,6 +80,7 @@ export interface DictData {
     basic: BasicDictData[]
     area: BasicDictData[]
     areaTree: BasicDictData[]
+    userList: string[]
 }
 
 export interface BasicDictData {

src/views/pqs/supervise/electricalEnergy/components1/complaints.vue

@@ -70,6 +70,14 @@ const tableStore = new TableStore({
                 return row.cellValue == '0' ? '否' : '是'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             width: '180',

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -26,7 +26,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import { ValueType } from 'exceljs'
-import {handleWarningAlarmFlag} from '@/api/process-boot/electricitymanagement.ts'
+import { handleWarningAlarmFlag } from '@/api/process-boot/electricitymanagement'
 // Steady_Statis
 const dictData = useDictData()
 //字典获取超标指标
@@ -101,8 +101,8 @@ const tableStore = new TableStore({
                         title: '请确认发起告警单!'
                     },
                     click: row => {
-                        handleWarningAlarmFlag(row).then((res)=>{
+                        handleWarningAlarmFlag(row).then(res => {
-                            console.log(res);
+                            console.log(res)
                             ElMessage.success('发起告警单成功！')
                             tableStore.index()
                         })
@@ -125,8 +125,8 @@ const tableStore = new TableStore({
                     },
 
                     click: row => {
-                        handleWarningAlarmFlag(row).then((res)=>{
+                        handleWarningAlarmFlag(row).then(res => {
-                            console.log(res);
+                            console.log(res)
                             ElMessage.success('发起预警单成功！')
                             tableStore.index()
                         })

src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue

@@ -1,19 +1,16 @@
 <template>
     <!--     <div> 普测结果 发起预告警单</div> -->
-    <TableHeader datePicker ref='TableHeaderRef'>
+    <TableHeader datePicker ref="TableHeaderRef">
         <template v-slot:select>
-        <el-form-item label='计划名称'>
+            <el-form-item label="计划名称">
-          <el-input
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入计划名称"></el-input>
-              v-model='tableStore.table.params.searchValue'
-              placeholder='请输入计划名称'
-          ></el-input>
             </el-form-item>
         </template>
     </TableHeader>
-    <Table ref='tableRef' />
+    <Table ref="tableRef" />
-    <testQuestionsForm ref='testQuestionsFormRef' />
+    <testQuestionsForm ref="testQuestionsFormRef" />
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -22,12 +19,13 @@ import testQuestionsForm from './form/testQuestionsForm.vue'
 import { initiateWarningLeaflet } from '@/api/supervision-boot/survey/test'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
 const { push } = useRouter()
 const router = useRouter() // 路由对象
 const tableRef = ref()
 const TableHeaderRef = ref()
 const testQuestionsFormRef = ref()
-
 const tableStore = new TableStore({
     url: '/supervision-boot/surveyTest/pageProblemSurvey',
     publicHeight: 65,
@@ -49,6 +47,14 @@ const tableStore = new TableStore({
         { field: 'planEndTime', title: '计划结束时间', minWidth: 100 },
         { field: 'completeTime', title: '实际完成时间', minWidth: 100 },
         { field: 'completeBy', title: '测试负责人', minWidth: 120 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: '180',
@@ -86,7 +92,7 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         router.push({
-                              name:'supervision/supervision/manage'
+                            name: 'supervision/supervision/manage'
                         })
                     }
                 }
@@ -116,4 +122,4 @@ const initiateAlarm = async (id: string) => {
 }
 </script>
 
-<style scoped lang='scss'></style>
+<style scoped lang="scss"></style>

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

@@ -35,6 +35,8 @@ import planAdd from './planAdd.vue'
 import { useRouter } from 'vue-router'
 import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
 import { getUserByRoleType } from '@/api/user-boot/user'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
 const { push, options, currentRoute } = useRouter()
 const dialogVisible = ref(false)
 const tableRef = ref()
@@ -90,6 +92,14 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             width: '180',

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -38,7 +38,6 @@ import { getUserByRoleType } from '@/api/user-boot/user'
 
 const { push } = useRouter()
 const tableRef = ref()
-
 import { useDictData } from '@/stores/dictData'
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
@@ -99,6 +98,14 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 180,

src/views/pqs/supervise/interfere/components/normal.vue

@@ -86,7 +86,14 @@ const tableStore = new TableStore({
                 return istatusList.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
-
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             width: '180',

src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -56,10 +56,13 @@ import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { getUserReportById } from '@/api/supervision-boot/userReport/form'
 import BpmUserReportDetail from '../../components/undocumented/detail.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
 const dictData = useDictData()
 const areaOptionList = dictData.getBasicData('jibei_area')
 const statusSelect = dictData.statusSelect()
-
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+console.log(adminInfo.$state.roleCode, '++++++++++++++++')
 const { push } = useRouter()
 const TableHeaderRef = ref()
 const tableStore = new TableStore({
@@ -124,7 +127,14 @@ const tableStore = new TableStore({
                 }
             ]
         },
-
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 180,
@@ -137,6 +147,16 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
+                    disabled: row => {
+                        return (
+                            adminInfo.$state.roleCode.filter(item => {
+                                return item == 'jb_pl'
+                            }) ||
+                            adminInfo.$state.roleCode.filter(item => {
+                                return item == 'jb_dky'
+                            })
+                        )
+                    },
                     click: row => {
                         toFangAn(row, 0)
                     }
@@ -147,6 +167,16 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
+                    disabled: row => {
+                        return (
+                            adminInfo.$state.roleCode.filter(item => {
+                                return item != 'jb_pl'
+                            }) ||
+                            adminInfo.$state.roleCode.filter(item => {
+                                return item == 'jb_dky'
+                            })
+                        )
+                    },
                     click: row => {
                         toFangAn(row, 1)
                     }

src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue

@@ -115,6 +115,14 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         { field: 'createTime', title: '创建时间', minWidth: 100 },
         {
             title: '操作',

src/views/pqs/supervise/interfere/components/undocumented/index.vue

@@ -133,6 +133,14 @@ const tableStore = new TableStore({
             }
         },
         { field: 'createTime', title: '开始时间', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 150,

src/views/pqs/supervise/plan/components/effectProblem/index.vue

@@ -128,6 +128,14 @@ const effectTableStore = new TableStore({
             }
         },
         { field: 'remark', title: '备注', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 150,

src/views/pqs/supervise/plan/index.vue

@@ -161,6 +161,14 @@ const tableStore = new TableStore({
                 return row.cellValue == '1' ? '在运站' : '新（改、扩）建站'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 300,

src/views/pqs/supervise/retire/monitor.vue

@@ -100,7 +100,14 @@ const tableStore = new TableStore({
       }
     },
     { field: 'createTime', title: '开始时间', minWidth: 170 },
-
+    {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
     {
       title: '操作',
       align: 'center',

src/views/pqs/supervise/retire/terminal.vue

@@ -123,7 +123,14 @@ const tableStore = new TableStore({
             }
         },
         { field: 'createTime', title: '开始时间', minWidth: 170 },
-
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             align: 'center',

src/views/pqs/supervise/technology/components/alarm.vue

@@ -21,6 +21,8 @@ import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
 import { useRouter } from 'vue-router'
 import { cancelFeedback } from '@/api/supervision-boot/leaflet'
 import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const { push } = useRouter()
@@ -82,6 +84,14 @@ const tableStore = new TableStore({
             }
         },
         { field: 'createTime', title: '创建时间', minWidth: '150' },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: '220',

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -19,6 +19,8 @@ import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
 import { useRouter } from 'vue-router'
 import { cancelFeedback } from '@/api/supervision-boot/leaflet'
 import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const { push } = useRouter()
@@ -75,6 +77,14 @@ const tableStore = new TableStore({
             }
         },
         { field: 'createTime', title: '创建时间', minWidth: '150' },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: '220',

src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue

@@ -56,8 +56,15 @@ const tableStore = new TableStore({
         { field: 'devType', title: '终端型号', minWidth: 100 },
 
         { field: 'ip', title: '装置网络参数', minWidth: 100 },
-        { field: 'port', title: '端口号', minWidth: 100 }
+        { field: 'port', title: '端口号', minWidth: 100 },
-
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
 
         /*   {
                title: '操作',

src/views/pqs/supervise/terminal/components/interferenceUserTable.vue

@@ -78,7 +78,14 @@ const tableStore = new TableStore({
             }
         },
         { field: 'substation', title: '变电站', minWidth: 100 },
-
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
 
         {
             title: '操作',

src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue

@@ -81,7 +81,15 @@ const tableStore = new TableStore({
             field: 'uvoltageDev',
             title: '电压偏差下限(%)',
             minWidth: 120
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
             }
+        },
 
         /*   {
                title: '操作',

src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue

@@ -101,6 +101,14 @@ const tableStore = new TableStore({
                 return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 150,

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -43,12 +43,8 @@ const { push, options, currentRoute } = useRouter()
 const flag = ref(false)
 const TableHeaderRef = ref()
 const tableRef = ref()
-const areaOptionList = dictData.getBasicData('jibei_area')
 const statusSelect = dictData.statusSelect()
 
-const ruleFormRef = ref()
-const show: any = ref(false)
-const fileList = ref([])
 
 const tableStore = new TableStore({
     url: '/supervision-boot/tempLinedebug/list',
@@ -76,6 +72,14 @@ const tableStore = new TableStore({
         { field: 'lineId', title: '监测点编号', minWidth: 170 },
         // { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
         { field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             field: 'status',
             title: '审核状态',

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -68,7 +68,14 @@ const tableStore = new TableStore({
         { field: 'monitoringTerminalName', title: '所属装置', minWidth: 170 },
         { field: 'lineName', title: '监测点名称', minWidth: 150 },
         { field: 'reportDate', title: '填报日期', minWidth: 150 },
-        { field: 'reporter', title: '填报人', minWidth: 80 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             field: 'status',
             title: '审核状态',
@@ -111,9 +118,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return (
+                        return row.createBy != adminInfo.$state.id || row.status != 3
-                            row.createBy != adminInfo.$state.id || row.status !=3
-                        )
                     },
                     click: row => {
                         addForms.value.open({
@@ -129,7 +134,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status !=1
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue

@@ -40,7 +40,6 @@ import { useAdminInfo } from '@/stores/adminInfo'
 const adminInfo = useAdminInfo()
 const dictData = useDictData()
 const { push, options, currentRoute } = useRouter()
-
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')
@@ -76,7 +75,14 @@ const tableStore = new TableStore({
         { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
         { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
         { field: 'reportDate', title: '填报日期', minWidth: 170 },
-        { field: 'reporter', title: '填报人', minWidth: 80 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             field: 'status',
             title: '审核状态',

src/views/pqs/supervise/testRun/index.vue

@@ -116,6 +116,14 @@ const tableStore = new TableStore({
                 9: '/'
             }
         },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
         {
             title: '操作',
             minWidth: 170,