From 5722259cc15a5138dae65f42f375e4824d0fed68 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Thu, 6 Jun 2024 20:42:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminal/components/deviceLedgerTable.vue |  9 ++--
 .../components/monitorLedgerTable.vue         | 47 ++++++++++++++-----
 2 files changed, 41 insertions(+), 15 deletions(-)

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 @@
     <div>
         <TableHeader area ref='TableHeaderRef'>
             <template #select>
-                <el-form-item label='信息查询'>
-                    <el-input  style="width:200px;" placeholder="电站信息，装置编号，型号" v-model='tableStore.table.params.searchValue' clearable></el-input>
-                </el-form-item>
                 <el-form-item label='运行状态'>
                     <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态">
                         <el-option
@@ -15,6 +12,10 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label='信息查询'>
+                    <el-input  style="width:200px;" placeholder="电站信息，装置编号，型号" v-model='tableStore.table.params.searchValue' clearable></el-input>
+                </el-form-item>
+
             </template>
             <template #operation>
                 <!-- <el-button icon='el-icon-Download' type='primary'>导出</el-button> -->
@@ -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 @@
     <div>
         <TableHeader area ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="信息查询">
-                    <el-input  style="width:200px;" placeholder="请输入信息查询" v-model="tableStore.table.params.searchValue" clearable></el-input>
+                <el-form-item label='运行状态'>
+                    <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
+                <el-form-item label="信息查询">
+                    <el-input  style="width:210px;" placeholder="电站名称，装置编号，监测点名称" v-model="tableStore.table.params.searchValue" clearable></el-input>
+                </el-form-item>
+
             </template>
+
             <template #operation>
                 <!-- <el-button icon="el-icon-Download" type="primary">导出</el-button> -->
             </template>
@@ -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()