From da7cb2cb9030619415b8a35b3c74e761faa131ce Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Thu, 20 Nov 2025 10:59:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/overLimitDetails.vue           | 35 ++++++++++---------
 .../components/harmonicRatio‌.vue              |  2 +-
 .../components/overLimitDetails.vue           |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue
index 74ecb38..9fb2560 100644
--- a/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue
+++ b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue
@@ -23,7 +23,7 @@
             <Table ref="tableRef" @cell-click="cellClickEvent" isGroup :height="height"></Table>
         </el-dialog>
         <!-- 谐波电流、谐波电压占有率 -->
-        <HarmonicRatio‌ ref="harmonicRatio‌Ref" @close="onHarmonicRatioClose" :TrendList="TrendList" />
+        <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" />
     </div>
 </template>
 <script setup lang="ts">
@@ -32,7 +32,7 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import { mainHeight } from '@/utils/layout'
-import HarmonicRatio‌ from '@/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue'
+import HarmonicRatio‌ from '@/components/cockpit/gridSideStatistics/components/harmonicRatio‌.vue'
 import { cslineList } from '@/api/harmonic-boot/cockpit/cockpit'
 
 const dialogVisible: any = ref(false)
@@ -41,7 +41,7 @@ const harmonicRatio‌Ref: any = ref(null)
 const options = ref()
 const height = mainHeight(0, 2).height as any
 const tableHeaderRef = ref()
-const TrendList = ref([{lineType:1}])
+const dialogFlag = ref(false)
 const loop50 = (key: string) => {
     let list: any[] = []
     for (let i = 2; i < 26; i++) {
@@ -58,11 +58,11 @@ const loop50 = (key: string) => {
     return list
 }
 const tableStore: any = new TableStore({
-    url: '/harmonic-boot/mainLine/statLimitRateDetails',
+    url: '/harmonic-boot/totalLimitStatistics/details',
     method: 'POST',
     publicHeight: 30,
     showPage: false,
-    exportName: '主要监测点列表',
+    exportName: '每日越限占比统计',
     column: [
         {
             field: 'index',
@@ -84,7 +84,7 @@ const tableStore: any = new TableStore({
             width: '150'
         },
         {
-            title: '闪变越限(分钟)',
+            title: '闪变越限(%)',
             field: 'flickerOvertime',
             width: '80',
             render: 'customTemplate',
@@ -93,15 +93,15 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '谐波电压越限(分钟)',
+            title: '谐波电压越限(%)',
             children: loop50('uharm')
         },
         {
-            title: '谐波电流越限(分钟)',
+            title: '谐波电流越限(%)',
             children: loop50('iharm')
         },
         {
-            title: '三相不平衡度越限(分钟)',
+            title: '三相不平衡度越限(%)',
             field: 'ubalanceOvertime',
             width: '100',
             render: 'customTemplate',
@@ -110,8 +110,8 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '电压偏差越限(分钟)',
-            field: 'uaberranceOvertime',
+            title: '电压偏差越限(%)',
+            field: 'voltageDevOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {
@@ -119,7 +119,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '频率偏差越限(分钟)',
+            title: '频率偏差越限(%)',
             field: 'freqDevOvertime',
             width: '100',
             render: 'customTemplate',
@@ -155,17 +155,18 @@ const open = async (row: any,searchBeginTime:any,searchEndTime:any) => {
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     if (column.field != 'name' && column.field != 'time') {
+        dialogFlag.value = true
         dialogVisible.value = false
-        // if(column.title && column.title=='闪变越限(分钟)'){
-        //     column.title = '1次'
-        // }
-        // harmonicRatio‌Ref.value.openDialog(row,column.title.replace(/次/g, ""))
-        harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        nextTick(() => {
+            harmonicRatio‌Ref.value.openDialog(row,column.field,column.title.replace(/次/g, ""))
+        })
+
     }
 }
 
 // 谐波弹窗关闭时的回调
 const onHarmonicRatioClose = () => {
+     dialogFlag.value = false
     // 重新打开指标越限详情弹窗
     nextTick(() => {
         dialogVisible.value = true
diff --git a/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue b/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
index 3626456..3461579 100644
--- a/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
+++ b/src/components/cockpit/overLimitStatistics/components/harmonicRatio‌.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable title="谐波电压/电流含有率" v-model="dialogVisible" append-to-body width="70%">
+    <el-dialog draggable title="趋势图" v-model="dialogVisible" append-to-body width="70%">
         <!-- 总体指标占比详情谐波含有率 -->
         <div>
             <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
diff --git a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
index f77b3e4..61380a5 100644
--- a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
+++ b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue
@@ -111,7 +111,7 @@ const tableStore: any = new TableStore({
         },
         {
             title: '电压偏差越限(%)',
-            field: 'uaberranceOvertime',
+            field: 'voltageDevOvertime',
             width: '100',
             render: 'customTemplate',
             customTemplate: (row: any) => {