diff --git a/src/api/device-boot/terminalTree.ts b/src/api/device-boot/terminalTree.ts
index d2968750..8ba4fab7 100644
--- a/src/api/device-boot/terminalTree.ts
+++ b/src/api/device-boot/terminalTree.ts
@@ -1,10 +1,17 @@
import request from '@/utils/request'
// 获取区域中断终端
-export function getTerminalTreeForFive(data:any) {
+export function getTerminalTreeForFive(data: any) {
return request({
url: '/device-boot/terminalTree/getTerminalTreeForFive',
method: 'post',
- data: data,
+ data: data
})
-}
\ No newline at end of file
+}
+// 台账变更推送
+export function ledgerChangePush() {
+ return request({
+ url: '/device-boot/device/ledgerChangePush',
+ method: 'post'
+ })
+}
diff --git a/src/views/pqs/business/log/TerminalLog/index.vue b/src/views/pqs/business/log/TerminalLog/index.vue
index 9b2e29d1..5d618a52 100644
--- a/src/views/pqs/business/log/TerminalLog/index.vue
+++ b/src/views/pqs/business/log/TerminalLog/index.vue
@@ -11,6 +11,9 @@
+
+ 台账变更推送
+
@@ -22,6 +25,8 @@ import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { useDictData } from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ledgerChangePush } from '@/api/device-boot/terminalTree'
defineOptions({
name: 'BusinessAdministrator/LogManagement/TerminalLog'
})
@@ -41,11 +46,14 @@ const tableStore = new TableStore({
}
},
// { title: '名称', field: 'name', width: '200' },
- { title: '日志类型', field: 'logsType', width: '250',
+ {
+ title: '日志类型',
+ field: 'logsType',
+ width: '250',
formatter: (row: any) => {
return fontdveoption.find((item: any) => item.id == row.cellValue)?.name
}
- },
+ },
{
title: '更改人员',
@@ -62,6 +70,21 @@ const tableStore = new TableStore({
],
beforeSearchFun: () => {}
})
+// 变更推送
+const changePush = () => {
+ ElMessageBox.confirm('当前操作会把存在变动的装置测点推送至前置,是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ ledgerChangePush().then(res => {
+ ElMessage.success(res.message)
+ tableStore.index()
+ })
+ })
+}
+const tableRef = ref()
+provide('tableRef', tableRef)
tableStore.table.params.type = ''
tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
diff --git a/src/views/pqs/business/terminal/TerminalManagement/index.vue b/src/views/pqs/business/terminal/TerminalManagement/index.vue
index 8888bd0e..403c6b42 100644
--- a/src/views/pqs/business/terminal/TerminalManagement/index.vue
+++ b/src/views/pqs/business/terminal/TerminalManagement/index.vue
@@ -124,7 +124,6 @@
正常
-
+
+
+
onDragOver(index)"
+ @dragend="onDragEnd"
+ :class="{ dragging: draggingIndex === index }"
+ >
+ {{ item.name }}
+
+
+
+
+
+
+ tdDragStart(index, i, e)"
+ @dragover.prevent="e => tdDragOver(index, i, e)"
+ @dragleave="e => tdDragleave(index, i, e)"
+ @dragend="e => tdDragend(index, i, e)"
+ :draggable="v && v.draggable"
+ :style="{
+ 'background-color': v ? v.color : '#fff',
+ width: '150px',
+ cursor: 'grab'
+ }"
+ >
+
+
+ {{ v ? v.name : '' }}
+
+ remove(index, i)">+
+
+ |
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index.vue
index 0ed72662..15d853a6 100644
--- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index.vue
@@ -8,6 +8,9 @@
+
@@ -18,6 +21,7 @@ import { onMounted, reactive, ref, getCurrentInstance } from 'vue'
import { mainHeight } from '@/utils/layout'
import Table from './components/table.vue'
import Echart from './components/echart.vue'
+import aaa from './components/123.vue'
defineOptions({
name: 'harmonic-boot/area/OnlineRate'
})
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
index 8f0a8119..1d613e44 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
@@ -75,7 +75,7 @@ const tableStore = new TableStore({
field: 'testRunState',
title: '试运行状态',
minWidth: 100,
- render: 'tag',
+ render: 'tag',
custom: {
0: 'primary',
2: 'success',
diff --git a/src/views/pqs/voltageSags/Region/components/Compatibility.vue b/src/views/pqs/voltageSags/Region/components/Compatibility.vue
index 891d0e79..6dae96af 100644
--- a/src/views/pqs/voltageSags/Region/components/Compatibility.vue
+++ b/src/views/pqs/voltageSags/Region/components/Compatibility.vue
@@ -12,7 +12,7 @@
{{ item.name }}
@@ -30,7 +30,7 @@
{{ item.name }}
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
index 1a79fdcc..2920171b 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
@@ -1,98 +1,122 @@
-
-
-
-
-

+
+
+
+
变电站
-
-

+
+
热备用
-
-

+
+
停运
-
投运
-
+
投运
+
通讯正常
-
-

+
+
有暂降
-
-

+
+
无暂降
-
+
通讯异常
-
-

+
+
有暂降
-
-

+
+
无暂降
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
- {{ infoWindowPoint.gdName }}
- {{ infoWindowPoint.subName }}
- {{ infoWindowPoint.voltageName }}
-
+
+
+
+ {{ infoWindowPoint.gdName }}
+ {{ infoWindowPoint.subName }}
+ {{ infoWindowPoint.voltageName }}
+
{{ infoWindowPoint.ip }}
- {{ infoWindowPoint.pt2 }}
- {{ infoWindowPoint.ct2 }}
-
+ {{ infoWindowPoint.pt2 }}
+ {{ infoWindowPoint.ct2 }}
+
{{ infoWindowPoint.manufacturer }}
-
+
{{
infoWindowPoint.runFlag == 0 ? '投运' : infoWindowPoint.runFlag == 1 ? '热备用' : '停运'
}}
-
+
{{ infoWindowPoint.comFlag == 0 ? '中断' : '正常' }}
- 事件统计
- 事件分析
- 运行情况
+ 事件统计
+ 事件分析
+ 运行情况
-
+
-
-