From d6e440dedb4f40fafa78ec0a91d8ea668844aa26 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 28 Jul 2025 13:25:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../database/standard/components/addTree.vue | 2 +-
.../area/getIntegrityData/index.vue | 132 +++++++++++++-----
.../area/onlinerate/index.vue | 2 +-
.../voltageSags/report/eventReports/index.vue | 5 +-
4 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/src/views/pqs/database/standard/components/addTree.vue b/src/views/pqs/database/standard/components/addTree.vue
index 910cff82..b30023e6 100644
--- a/src/views/pqs/database/standard/components/addTree.vue
+++ b/src/views/pqs/database/standard/components/addTree.vue
@@ -13,7 +13,7 @@
checkStrictly :props="cascaderProps" @change="change" />
-
+
diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
index 0e384ac9..d137a18d 100644
--- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
@@ -110,13 +110,13 @@
-
+
@@ -217,7 +217,6 @@ const tableStore = new TableStore({
showPage: false,
url: '/device-boot/LineIntegrityData/getLineIntegrityData',
method: 'POST',
-
column: [
{
title: formData.value.statisticalType.name,
@@ -230,17 +229,6 @@ const tableStore = new TableStore({
return row.cellValue ? row.cellValue : '/'
}
},
- {
- title: formData.value.statisticalType.name,
- field: 'name',
- align: 'left',
- type: 'html',
- treeNode: true,
- width: 350,
- formatter: function (row) {
- return row.cellValue ? row.cellValue : '/'
- }
- },
{
title: '网络参数',
field: 'ip',
@@ -336,6 +324,7 @@ const tableStore = new TableStore({
loadCallback: () => {
tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
tableStore.table.column[0].title = formData.value.statisticalType.name
+
chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
setTimeout(() => {
activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -450,23 +439,6 @@ watch(
deep: true
}
)
-
-watch(
- () => tableStore.table,
- (val) => {
- if(val.data.length > 0){
- tableStore.table.column[0].visible = true
- tableStore.table.column[1].visible = false
- }else{
- tableStore.table.column[0].visible = false
- tableStore.table.column[1].visible = true
- }
- },
- {
- immediate: true,
- deep: true
- }
-)
diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
index b0c74831..977fd8ff 100644
--- a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
@@ -198,7 +198,7 @@ const tableStore = new TableStore({
},
{
title: '网络参数',
- field: 'networkParam',
+ field: 'ip',
align: 'center',
formatter: function (row) {
return row.cellValue ? row.cellValue : '/'
diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue
index 407936a9..d46c1727 100644
--- a/src/views/pqs/voltageSags/report/eventReports/index.vue
+++ b/src/views/pqs/voltageSags/report/eventReports/index.vue
@@ -70,7 +70,10 @@ const tableStore = new TableStore({
{
field: 'startTime',
title: '暂态事件发生时刻',
- width: '180'
+ width: '180',
+ formatter: (row: any) => {
+ return row.cellValue ? row.cellValue.replace('T', ' ') : '/'
+ }
},
{ field: 'gdName', title: '供电公司' },
{ field: 'subName', title: '变电站' },