diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index 4d14b729..c00e7c4b 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -57,6 +57,8 @@ const tableStore = new TableStore({ method: 'POST', column: [ { title: '序号', type: 'seq', width: 80 }, + { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 }, + { field: 'substation', title: '变电站', minWidth: 100 }, { field: 'projectName', title: '工程名称', minWidth: 170 }, { field: 'userType', @@ -68,7 +70,6 @@ const tableStore = new TableStore({ } }, { field: 'city', title: '所属地市', minWidth: 80 }, - { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 }, { field: 'userStatus', title: '用户状态', @@ -87,7 +88,6 @@ const tableStore = new TableStore({ 3: '退运' } }, - { field: 'substation', title: '变电站', minWidth: 100 }, { field: 'status', title: '审核状态', diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue index 6abb4680..179550db 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue @@ -49,6 +49,14 @@ const tableStore = new TableStore({ method: 'POST', column: [ { title: '序号', type: 'seq', width: 80 }, + { + field: 'powerSubstationName', + title: '电网侧变电站', + minWidth: 170, + formatter: (row: any) => { + return row.cellValue ? row.cellValue : '/' + } + }, { field: 'lineName', title: '监测点名称', minWidth: 170 }, { field: 'status', @@ -66,14 +74,20 @@ const tableStore = new TableStore({ 2: '审批通过', 3: '审批不通过', 4: '已取消', - null:'/' + null: '/' + } + }, + { + field: 'reason', + title: '调试原因', + minWidth: 170, + formatter: (row: any) => { + return row.cellValue ? row.cellValue : '/' } }, - { field: 'reason', title: '调试原因', minWidth: 170 }, { field: 'lineId', title: '监测点编号', minWidth: 170 }, { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 }, { field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 }, - { field: 'powerSubstationName', title: '电网侧变电站', minWidth: 170 }, { title: '操作', minWidth: 150, @@ -90,7 +104,7 @@ const tableStore = new TableStore({ handleAudit(row.processInstanceId) }, disabled: row => { - return !row.processInstanceId; + return !row.processInstanceId } }, { @@ -103,7 +117,7 @@ const tableStore = new TableStore({ handleDebug(row) }, disabled: row => { - return row.reason; + return row.reason } } ] diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue index abc4b6fd..62f7b5d0 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue @@ -20,290 +20,307 @@ label-position="right" class="form-two" > - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +