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 @@
-
+
+
+
@@ -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 },
{