From 32f097c951e5fa302ea989b9ee731a091679d3d4 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Thu, 16 May 2024 13:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pqs/supervise/interfere/index.vue               | 6 ++++--
 .../supervise/terminal/components/deviceLedgerTable.vue   | 2 +-
 .../terminal/components/interferenceUserTable.vue         | 6 +++---
 .../supervise/terminal/components/monitorLedgerTable.vue  | 8 +++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index a6e2d870..d4db3923 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -5,7 +5,9 @@
                 <undocumented v-if="activeName == '1'" />
             </el-tab-pane>
             <!--            <el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>-->
-            <el-tab-pane label="常态化干扰源用户管理" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
+            <el-tab-pane label="常态化干扰源用户管理" name="3">
+                <interferenceUserTable v-if="activeName == '3'" />
+            </el-tab-pane>
             <!--            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>-->
             <el-tab-pane label="终端入网检测" name="5">
               <terminalNetworkDetection v-if="activeName == '5'"></terminalNetworkDetection>
@@ -18,7 +20,7 @@
 import { onMounted, reactive, ref, provide } from 'vue'
 import undocumented from './components/undocumented/index.vue'
 import network from './components/network/index.vue'
-import normal from './components/normal.vue'
+import interferenceUserTable from '../terminal/components/interferenceUserTable.vue'
 import report from './components/report.vue'
 import { mainHeight } from '@/utils/layout'
 import terminalNetworkDetection from './components/terminalNetworkDetection/index.vue'
diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
index 9cc5d087..008231b9 100644
--- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
@@ -53,7 +53,7 @@ const tableStore = new TableStore({
             title: '厂家',
             minWidth: 100
         },
-        { field: 'devType', title: '装作型号', minWidth: 100 },
+        { field: 'devType', title: '终端型号', minWidth: 100 },
 
         { field: 'ip', title: '装置网络参数', minWidth: 100 },
         { field: 'port', title: '端口号', minWidth: 100 }
diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
index 90c86124..4a650d54 100644
--- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
@@ -78,7 +78,7 @@ const tableStore = new TableStore({
         { field: 'substation', title: '变电站', minWidth: 100 },
 
 
-     /*   {
+        {
             title: '操作',
             minWidth: 150,
             fixed: 'right',
@@ -86,7 +86,7 @@ const tableStore = new TableStore({
             buttons: [
                 {
                     name: 'productSetting',
-                    title: '流程详情',
+                    title: '详细信息',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
@@ -95,7 +95,7 @@ const tableStore = new TableStore({
                     }
                 }
             ]
-        }*/
+        }
     ],
 
     beforeSearchFun: () => {
diff --git a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
index c14f176d..25636862 100644
--- a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
@@ -41,15 +41,17 @@ const tableStore = new TableStore({
             title: '省公司',
             minWidth: 100
         },
-        { field: 'gdName', title: '市公司', minWidth: 150 },
-        { field: 'lineName', title: '监测点名称', minWidth: 130 },
-        { field: 'scale', title: '监测点电压等级', minWidth: 120 },
 
+        { field: 'gdName', title: '市公司', minWidth: 150 },
         {
             field: 'bdName',
             title: '所属变电站',
             minWidth: 150
         },
+        { field: 'lineName', title: '监测点名称', minWidth: 130 },
+        { field: 'scale', title: '监测点电压等级', minWidth: 120 },
+
+
         { field: 'loadType', title: '干扰源类型', minWidth: 120 },
         { field: 'objName', title: '监测对象名称', minWidth: 180 },
         {