From 363c05639bd038d046b96426baf796ea57bbe053 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 13 May 2025 15:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=87=E9=A2=98=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detailed/dirtyAreas/index.vue             |  2 +-
 .../components/provinceDetails.vue            | 16 +++++++-------
 .../detailed/harmonicStatistics/index.vue     | 21 +++++++++----------
 .../detailed/overLabelDetails/index.vue       |  4 ++--
 .../detailed/regionalStatistics/index.vue     | 16 +++++++-------
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
index b8149fd4..8f06244a 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
@@ -18,7 +18,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-DataAnalysis" @click="rankingClick(null, true)">
-                        排名前10监测点
+                        污染最大10个监测点
                     </el-button>
                 </el-form-item>
             </template>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
index 1405d3ed..4120e2a4 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
@@ -11,7 +11,7 @@
             >
                 <div v-if="!voltageLevelFlag">
                     <vxe-column field="name" title="名称" min-width="150"></vxe-column>
-                    <vxe-column field="onlineCount" title="在线监测点数" min-width="120">
+                    <vxe-column field="onlineCount" title="在运监测点数" min-width="120">
                         <template #default="scope">
                             {{ scope.row.onlineCount == 3.14159 ? '暂无数据' : scope.row.onlineCount }}
                         </template>
@@ -21,16 +21,16 @@
                             {{ scope.row.overLineCount == 3.14159 ? '暂无数据' : scope.row.overLineCount }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="averageOverDay" min-width="120" title="平均超标天数">
-                        <template #default="scope">
-                            {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay }}
-                        </template>
-                    </vxe-column>
-                    <vxe-column field="ratio" title="超标占比(%)">
+                    <vxe-column field="ratio" title="超标测点占比(%)">
                         <template #default="scope">
                             {{ scope.row.ratio == 3.14159 ? '暂无数据' : scope.row.ratio }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="averageOverDay" min-width="120" title="平均超标天数(天/点)">
+                        <template #default="scope">
+                            {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay }}
+                        </template>
+                    </vxe-column>
                     <vxe-column field="warningFreq" title="告警频次">
                         <template #default="scope">
                             {{ scope.row.warningFreq == 3.14159 ? '暂无数据' : scope.row.warningFreq }}
@@ -39,7 +39,7 @@
                 </div>
                 <div v-else>
                     <vxe-column field="name" title="名称" min-width="150"></vxe-column>
-                    <vxe-column field="overDays" title="超标天数"></vxe-column>
+                    <vxe-column field="overDays" title="平均超标天数"></vxe-column>
                     <vxe-colgroup title="各指标超标次数">
                         <vxe-column field="overThreeTimes" title="3次">
                             <template #default="scope">
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index ac78b39e..399f80e1 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -51,8 +51,6 @@
                                                 <span>{{ item.name }}</span>
                                             </div>
 
-
-
                                         </template>
                                         <div class="card-content">
                                             <div class="card-item" v-for="(item1, index1) in item.children"
@@ -105,26 +103,27 @@
                     <div class="tall">
                         <vxe-table height="auto" auto-resize :data="dataList" v-bind="defaultAttribute">
                             <vxe-column field="name" title="名称"></vxe-column>
-                            <vxe-column field="onlineCount" title="在线监测点数(个)">
+                            <vxe-column field="onlineCount" title="在运监测点数(个)">
                                 <template #default="scope">
-                                    {{ scope.row.onlineCount == 3.14159 ? '暂无数据' : scope.row.onlineCount == 0 ? '/' : scope.row.onlineCount }} 
+                                    {{ scope.row.onlineCount == 3.14159 ? '暂无数据' : scope.row.onlineCount }}
                                 </template>
                             </vxe-column>
                             <vxe-column field="overLineCount" title="超标监测点数(个)">
                                 <template #default="scope">
-                                    {{ scope.row.overLineCount == 3.14159 ? '暂无数据' : scope.row.overLineCount == 0 ? '/': scope.row.overLineCount }}
-                                </template>
-                            </vxe-column>
-                            <vxe-column field="averageOverDay" title="平均超标天数(天)">
-                                <template #default="scope">
-                                    {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay == 0 ?'/' : scope.row.averageOverDay }}
+                                    {{ scope.row.overLineCount == 3.14159 ? '暂无数据' : scope.row.overLineCount }}
                                 </template>
                             </vxe-column>
                             <vxe-column field="ratio" title="监测点超标占比(%)">
                                 <template #default="scope">
-                                    {{ scope.row.ratio == 3.14159 ? '暂无数据' : scope.row.ratio == 0 ? '/' : scope.row.ratio }}
+                                    {{ scope.row.lineRatio == 3.14159 ? '暂无数据' : scope.row.lineRatio }}
                                 </template>
                             </vxe-column>
+                            <vxe-column field="averageOverDay" title="平均超标天数(天/点)">
+                                <template #default="scope">
+                                    {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay }}
+                                </template>
+                            </vxe-column>
+
 
                         </vxe-table>
                     </div>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue b/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
index b7a4daf1..7323fe4a 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue
@@ -77,7 +77,7 @@ const tableStore = new TableStore({
         { field: 'harmVolOverDay', title: '谐波电压超标天数', minWidth: "180px", },
         { field: 'harmCurOverDay', title: '谐波电流超标天数', minWidth: "180px", },
         {
-            title: '各次谐波电压含有率(%)',
+            title: '各次谐波电压含有率超标天数',
             children: [
                 { field: 'overVolThreeTimes', title: '3次', minWidth: "80px", },
                 { field: 'overVolFiveTimes', title: '5次', minWidth: "80px", },
@@ -91,7 +91,7 @@ const tableStore = new TableStore({
             ],
         },
         {
-            title: '各次谐波电流幅值(A)',
+            title: '各次谐波电流幅值超标天数',
             children: [
                 { field: 'overCurThreeTimes', title: '3次', minWidth: "80px", },
                 { field: 'overCurFiveTimes', title: '5次', minWidth: "80px", },
diff --git a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
index 42aed9b7..ec11395c 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -70,7 +70,7 @@ const tableStore = new TableStore({
         {
             title: '频率偏差超标情况',
             children: [
-                { field: 'frequencyMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'frequencyMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'frequencyBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'frequencyOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -78,7 +78,7 @@ const tableStore = new TableStore({
         {
             title: '电压偏差超标情况',
             children: [
-                { field: 'voltageMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'voltageMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'voltageBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'voltageOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -86,7 +86,7 @@ const tableStore = new TableStore({
         {
             title: '谐波电压超标情况',
             children: [
-                { field: 'harmonicVoltageMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'harmonicVoltageMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'harmonicVoltageBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'harmonicVoltageOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -94,7 +94,7 @@ const tableStore = new TableStore({
         {
             title: '谐波电流超标情况',
             children: [
-                { field: 'harmonicCurrentMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'harmonicCurrentMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'harmonicCurrentBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'harmonicCurrentOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -102,7 +102,7 @@ const tableStore = new TableStore({
         {
             title: '三相电压不平衡度超标情况',
             children: [
-                { field: 'threePhaseVoltageMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'threePhaseVoltageMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'threePhaseVoltageBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'threePhaseVoltageOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -110,7 +110,7 @@ const tableStore = new TableStore({
         {
             title: '闪变超标情况',
             children: [
-                { field: 'flickerMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'flickerMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'flickerBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'flickerOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -118,7 +118,7 @@ const tableStore = new TableStore({
         {
             title: '负序电流超标情况',
             children: [
-                { field: 'negativeMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'negativeMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'negativeBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'negativeOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],
@@ -126,7 +126,7 @@ const tableStore = new TableStore({
         {
             title: '间谐波电压超标情况',
             children: [
-                { field: 'interHarmonicMonitorNumber', title: '超标点数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
+                { field: 'interHarmonicMonitorNumber', title: '超标点数(个)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'interHarmonicBiLi', title: '超标占比(%)', minWidth: '120px', formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
                 { field: 'interHarmonicOverDayBiLi', title: '平均超标天数(天/点)', minWidth: "200px", formatter: (row: any) => { return row.cellValue == -1 ? '/' : row.cellValue } },
             ],