From b874da9f965c6da2f9def52e81274d3e8cd702a3 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Fri, 25 Jul 2025 16:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=8D=97=E6=9B=B2=E9=9D=96=E5=BE=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../area/getIntegrityData/index.vue           | 29 ++++++++++++++++++-
 .../runManage/runEvaluate/components/map.vue  |  3 +-
 .../monitoringPoint/online/navigation/map.vue |  4 +--
 src/views/pqs/voltageSags/overview/index.vue  |  4 +--
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
index 31f0fb4f..2b8a5b38 100644
--- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
@@ -228,6 +228,17 @@ const tableStore = new TableStore({
             formatter: function (row) {
                 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: '网络参数',
@@ -324,7 +335,6 @@ const tableStore = new TableStore({
     loadCallback: () => {
         tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
         tableStore.table.column[0].title = formData.value.statisticalType.name
-        tableStore.table.column[0].type = "html"
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
         setTimeout(() => {
             activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -439,6 +449,23 @@ 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
+    }
+)
 </script>
 <style lang="scss" scoped>
 
diff --git a/src/views/pqs/runManage/runEvaluate/components/map.vue b/src/views/pqs/runManage/runEvaluate/components/map.vue
index 46be19f1..fd433499 100644
--- a/src/views/pqs/runManage/runEvaluate/components/map.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/map.vue
@@ -497,8 +497,7 @@ const lookPoint = (e: any) => {
 }
 // 搜索
 const DeviceQ = () => {
-    console.log(12313, QueryList.value)
-
+    
     showCollapse.value = true
     if (inputQuery.value.length == 0) return
 
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
index 611d8655..0286b552 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
@@ -90,8 +90,8 @@
                         <el-descriptions-item label="网络参数">
                             {{ infoWindowPoint.ip }}
                         </el-descriptions-item>
-                        <el-descriptions-item label="PT变比">{{ infoWindowPoint.pt2 }}</el-descriptions-item>
-                        <el-descriptions-item label="CT变比">{{ infoWindowPoint.ct2 }}</el-descriptions-item>
+                        <el-descriptions-item label="PT变比">{{ infoWindowPoint.pt1 / infoWindowPoint.pt2 }}</el-descriptions-item>
+                        <el-descriptions-item label="CT变比">{{ infoWindowPoint.ct1 / infoWindowPoint.ct2 }}</el-descriptions-item>
                         <el-descriptions-item label="生产厂家">
                             {{ infoWindowPoint.manufacturer }}
                         </el-descriptions-item>
diff --git a/src/views/pqs/voltageSags/overview/index.vue b/src/views/pqs/voltageSags/overview/index.vue
index 890147fc..fbbd5a3c 100644
--- a/src/views/pqs/voltageSags/overview/index.vue
+++ b/src/views/pqs/voltageSags/overview/index.vue
@@ -107,8 +107,8 @@
                             <el-descriptions-item label="网络参数">
                                 {{ infoWindowPoint.ip }}
                             </el-descriptions-item>
-                            <el-descriptions-item label="PT变比">{{ infoWindowPoint.pt2 }}</el-descriptions-item>
-                            <el-descriptions-item label="CT变比">{{ infoWindowPoint.ct2 }}</el-descriptions-item>
+                            <el-descriptions-item label="PT变比">{{ infoWindowPoint.pt1 / infoWindowPoint.pt2 }}</el-descriptions-item>
+                            <el-descriptions-item label="CT变比">{{ infoWindowPoint.ct1 / infoWindowPoint.ct2 }}</el-descriptions-item>
                             <el-descriptions-item label="生产厂家">
                                 {{ infoWindowPoint.manufacturer }}
                             </el-descriptions-item>