From e666784f2dfbc7fcbe2ae7d610145a087e11bcf8 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 22 May 2024 19:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E7=9B=91=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=A1=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../normalizationManager/detail.vue           |  2 +-
 .../components/monitorpoint/index.vue         | 43 +++----------------
 .../components/terminainal/index.vue          |  5 ++-
 src/views/pqs/supervise/testRun/index.vue     |  8 ++--
 4 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
index 7eedf5c8..c27d883c 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="default-main">
+    <div >
         <el-divider style="" content-position="left">干扰源用户信息</el-divider>
         <el-descriptions :column="2" border>
             <el-descriptions-item label="工程预期投产日期">
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 130dee94..ff7237e8 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -50,8 +50,12 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
+        { field: 'lineName', title: '监测点名称' , minWidth: 150 },
+        { field: 'connectedBus', title: '关联母线' , minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '所属装置' , minWidth: 170 },
+        { field: 'powerSubstationName', title: '电网侧电站' , minWidth: 170 },
         { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
-        { field: 'reportDate', title: '填报日期', minWidth: 170},
+        { field: 'reportDate', title: '填报日期', minWidth: 150},
         { field: 'reporter', title: '填报人', minWidth: 80 },
         {
             field: 'status',
@@ -71,43 +75,6 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
-        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
-        // { field: 'substation', title: '所属变电站', minWidth: 170 },
-        // {
-        //     field: 'userType',
-        //     title: '用户性质',
-        //     minWidth: 150,
-        //     formatter: (obj: any) => {
-        //         const userType = obj.row.userType
-        //         return getUserTypeName(userType)
-        //     }
-        // },
-
-        // { field: 'informationSecurityTestReport', title: '信息安全检测报告', minWidth: 170 },
-        // { field: 'otherAttachments', title: '其他附件', minWidth: 170 },
-        // { field: 'orgName', title: '填报部门名称'},
-        // { field: 'performanceTestReport', title: '性能检测报告', minWidth: 170 },
-        
-        // {
-        //     field: 'userStatus',
-        //     title: '用户状态',
-        //     minWidth: 100,
-        //     render: 'tag',
-        //     custom: {
-        //         0: 'primary',
-        //         1: 'primary',
-        //         2: 'success',
-        //         3: 'warning'
-        //     },
-        //     replaceValue: {
-        //         0: '可研',
-        //         1: '建设',
-        //         2: '运行',
-        //         3: '退运'
-        //     }
-        // },
-        // { field: 'substation', title: '变电站', minWidth: 100 },
-        // { field: 'createTime', title: '开始时间', minWidth: 170 },
         {
             title: '操作',
             minWidth: 150,
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 07a1a32f..96bb200f 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -50,6 +50,9 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
+        { field: 'substation', title: '所属变电站', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
         { field: 'orgName', title: '填报部门名称' , minWidth: 170 },
         { field: 'reportDate', title: '填报日期', minWidth: 170},
         { field: 'reporter', title: '填报人', minWidth: 80 },
@@ -71,7 +74,7 @@ const tableStore = new TableStore({
                 4: '已取消'
             }
         },
-        // { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
+
         // { field: 'substation', title: '所属变电站', minWidth: 170 },
         // {
         //     field: 'userType',
diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue
index 9a01ccf5..f98874f2 100644
--- a/src/views/pqs/supervise/testRun/index.vue
+++ b/src/views/pqs/supervise/testRun/index.vue
@@ -142,8 +142,6 @@ onMounted(() => {
     tableStore.index()
 })
 
-const dateValue = ref([])
-
 
 /** 处理审批按钮 */
 const handleAudit = (instanceId: any) => {
@@ -156,8 +154,9 @@ const handleAudit = (instanceId: any) => {
 }
 //试运行
 let monitorIds: any = []
-let flag = true
+
 const startRunTest = () => {
+    let flag = true
     if (tableStore.table.selection.length === 0) {
         return ElMessage({
             message: '请至少选择一个监测点进行试运行',
@@ -211,10 +210,11 @@ const runTestSubmit = () => {
     }
     addRunTest(data).then((res: any) => {
         if (res.code === 'A0000') {
-            return ElMessage({
+            ElMessage({
                 message: '发起试运行成功',
                 type: 'success'
             })
+            tableStore.index()
         }
     })
 }