diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
index 66f2facc..d37fec01 100644
--- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
@@ -2,9 +2,6 @@
-
-
-
+
+
+
+
@@ -114,7 +115,7 @@ const tableStore = new TableStore({
}
})
-const runFlagList = [{id:0,name:'投运'},{id:1,name:'检修'},{id:2,name:'停运'}]
+const runFlagList = [{id:0,name:'运行'},{id:1,name:'检修'},{id:2,name:'停运'},{id:3,name:'调试'},{id:4,name:'退运'}]
provide('tableStore', tableStore)
diff --git a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
index b1e27bee..e72f27df 100644
--- a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
@@ -2,10 +2,22 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -70,6 +82,20 @@ const tableStore = new TableStore({
},
/* { field: 'comFlag', title: '通讯状态 ', minWidth: 120 },*/
{ field: 'id', title: '监测点序号', minWidth: 90 },
+ {
+ field: 'runFlag',
+ title: '运行状态',
+ minWidth: 80,
+ render: 'tag',
+ custom: {
+ '投运': 'success',
+ '停运': 'danger',
+ '检修': 'warning',
+ '调试': 'warning',
+ '退运': 'danger',
+
+ },
+ },
{ field: 'devName', title: '监测终端编号 ', minWidth: 140 },
{ field: 'ptType', title: '监测终端接线方式', minWidth: 140 },
{
@@ -82,14 +108,7 @@ const tableStore = new TableStore({
title: '电压偏差下限(%)',
minWidth: 120
},
- {
- field: 'createBy',
- title: '填报人',
- minWidth: 80,
- formatter: (row: any) => {
- return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
- }
- },
+
/* {
title: '操作',
@@ -113,7 +132,11 @@ const tableStore = new TableStore({
beforeSearchFun: () => {
tableStore.table.params.serverName = 'harmonic-boot'
- tableStore.table.params.runFlag = [0, 1, 2]
+
+ tableStore.table.params.runFlag = []
+ if(tableStore.table.params.runF!=null){
+ tableStore.table.params.runFlag = [tableStore.table.params.runF]
+ }
tableStore.table.params.comFlag = [0, 1]
tableStore.table.params.statisticalType = {
name: '电网拓扑',
@@ -122,6 +145,8 @@ const tableStore = new TableStore({
}
})
+const runFlagList = [{id:0,name:'运行'},{id:1,name:'检修'},{id:2,name:'停运'},{id:3,name:'调试'},{id:4,name:'退运'}]
+
provide('tableStore', tableStore)
onMounted(() => {
tableStore.index()