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 @@
- 排名前10监测点
+ 污染最大10个监测点
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 @@
>
-
+
- {{ scope.row.onlineCount == 3.14159 ? '暂无数据' : scope.row.onlineCount == 0 ? '/' : scope.row.onlineCount }}
+ {{ scope.row.onlineCount == 3.14159 ? '暂无数据' : scope.row.onlineCount }}
- {{ scope.row.overLineCount == 3.14159 ? '暂无数据' : scope.row.overLineCount == 0 ? '/': scope.row.overLineCount }}
-
-
-
-
- {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay == 0 ?'/' : scope.row.averageOverDay }}
+ {{ scope.row.overLineCount == 3.14159 ? '暂无数据' : scope.row.overLineCount }}
- {{ scope.row.ratio == 3.14159 ? '暂无数据' : scope.row.ratio == 0 ? '/' : scope.row.ratio }}
+ {{ scope.row.lineRatio == 3.14159 ? '暂无数据' : scope.row.lineRatio }}
+
+
+ {{ scope.row.averageOverDay == 3.14159 ? '暂无数据' : scope.row.averageOverDay }}
+
+
+
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 } },
],