From a66734a9f914b4b5eaf445dfdb25857bd4a16809 Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Wed, 5 Jun 2024 15:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A1=AB=E6=8A=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/admin/index.vue | 4 +- src/stores/dictData.ts | 3 +- src/stores/interface/index.ts | 1 + .../components1/complaints.vue | 8 ++++ .../electricalEnergy/components1/online.vue | 10 ++--- .../components1/testQuestions.vue | 38 +++++++++++-------- .../harmonicSurvey/components/planManage.vue | 10 +++++ .../harmonicSurvey/components/testManage.vue | 9 ++++- .../supervise/interfere/components/normal.vue | 9 ++++- .../interferenceUserTable.vue | 34 ++++++++++++++++- .../normalizationManager/programReview.vue | 8 ++++ .../components/undocumented/index.vue | 8 ++++ .../plan/components/effectProblem/index.vue | 8 ++++ src/views/pqs/supervise/plan/index.vue | 8 ++++ src/views/pqs/supervise/retire/monitor.vue | 9 ++++- src/views/pqs/supervise/retire/terminal.vue | 9 ++++- .../supervise/technology/components/alarm.vue | 10 +++++ .../technology/components/earlyWarn.vue | 10 +++++ .../terminal/components/deviceLedgerTable.vue | 11 +++++- .../components/interferenceUserTable.vue | 9 ++++- .../components/monitorLedgerTable.vue | 10 ++++- .../components/sensitiveUserTable.vue | 8 ++++ .../components/jointDebugList/index.vue | 12 ++++-- .../components/monitorpoint/index.vue | 15 +++++--- .../components/terminainal/index.vue | 10 ++++- src/views/pqs/supervise/testRun/index.vue | 8 ++++ 26 files changed, 235 insertions(+), 44 deletions(-) diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue index e95cef4f..03f69b8e 100644 --- a/src/layouts/admin/index.vue +++ b/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 }) diff --git a/src/stores/dictData.ts b/src/stores/dictData.ts index 280a3775..d901201f 100644 --- a/src/stores/dictData.ts +++ b/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[]) => { diff --git a/src/stores/interface/index.ts b/src/stores/interface/index.ts index aa3c7619..bbefa1b2 100644 --- a/src/stores/interface/index.ts +++ b/src/stores/interface/index.ts @@ -80,6 +80,7 @@ export interface DictData { basic: BasicDictData[] area: BasicDictData[] areaTree: BasicDictData[] + userList: string[] } export interface BasicDictData { diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue index 273dc43a..668049a0 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue +++ b/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', diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue index bff87f72..0da0c610 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue +++ b/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)=>{ - console.log(res); + handleWarningAlarmFlag(row).then(res => { + console.log(res) ElMessage.success('发起告警单成功！') tableStore.index() }) @@ -125,8 +125,8 @@ const tableStore = new TableStore({ }, click: row => { - handleWarningAlarmFlag(row).then((res)=>{ - console.log(res); + handleWarningAlarmFlag(row).then(res => { + console.log(res) ElMessage.success('发起预警单成功！') tableStore.index() }) diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue index 9f77f208..e0cdeeab 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue @@ -1,19 +1,16 @@ - - + diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue index 281b19f1..32efb6f5 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue +++ b/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', diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue index 224d5ff2..e1db5fe3 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue +++ b/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, diff --git a/src/views/pqs/supervise/interfere/components/normal.vue b/src/views/pqs/supervise/interfere/components/normal.vue index a757b677..96dc7996 100644 --- a/src/views/pqs/supervise/interfere/components/normal.vue +++ b/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', diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue index 69096a9a..ebda3d7b 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue +++ b/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) } diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index 5c2eee92..89414d90 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/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: '操作', diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index d5b7d625..47877791 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/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, diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue index fa714640..c53d90ab 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue +++ b/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, diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue index 1bfc2b4a..8ca55b52 100644 --- a/src/views/pqs/supervise/plan/index.vue +++ b/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, diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue index 16766a19..2cc8bdca 100644 --- a/src/views/pqs/supervise/retire/monitor.vue +++ b/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', diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue index e1a033ca..f043b34d 100644 --- a/src/views/pqs/supervise/retire/terminal.vue +++ b/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', diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index 6147b8b9..d1b37c82 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/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', diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index f6f5f9bf..d697cf90 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/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', diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue index f04bbbc0..7672a2e5 100644 --- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue +++ b/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: '操作', diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue index 11fb5d75..50bc9746 100644 --- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue +++ b/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: '操作', diff --git a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue index 9a191669..db4324e5 100644 --- a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue +++ b/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: '操作', diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue index 0c4327ef..be2f9b96 100644 --- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue +++ b/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, diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue index 0f506e88..b1d32979 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue +++ b/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: '审核状态', diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue index 19ae9f0e..44071a76 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue +++ b/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 ( - row.createBy != adminInfo.$state.id || row.status !=3 - ) + return 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) diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue index f40aab84..66712ad9 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue +++ b/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: '审核状态', diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue index 36b6f5fb..6d11c9b7 100644 --- a/src/views/pqs/supervise/testRun/index.vue +++ b/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,