From 2a6b9a37d260d54fc5d026fac1476708c1978761 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 22 May 2025 11:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=88=E7=AB=AF=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E8=AF=84=E4=BB=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../area/powerAssessment/index.vue            |  2 +-
 .../dirtyAreas/components/ranking.vue         |  2 +-
 .../detailed/dirtyAreas/index.vue             | 10 +++----
 .../detailed/harmonicStatistics/index.vue     | 27 +++++++++++++++----
 src/views/pqs/runManage/runEvaluate/index.vue |  8 +++---
 5 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
index 5fdac43f..5326a5b2 100644
--- a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
@@ -13,7 +13,7 @@
             <el-row>
                 <el-col :span="12" class="pd10">
                     <el-tag style="background: #339966;" class="tag" size="small">5级</el-tag>
-                    <span style="color: #339966;" class="text">::优秀--(4.5,5]</span>
+                    <span style="color: #339966;" class="text">:优秀--(4.5,5]</span>
                     <el-tag style="background: #3399ff;" class="tag" size="small">4级</el-tag>
                     <span style="color: #3399ff;" class="text">:良好--(4,4.5]</span>
                     <el-tag style="background: #ffcc33;" class="tag" size="small">3级</el-tag>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/components/ranking.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/components/ranking.vue
index ac8252a9..f612fc04 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/components/ranking.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/components/ranking.vue
@@ -29,7 +29,7 @@ const open = (row: any,) => {
                     var tips = ''
                     for (var i = 0; i < params.length; i++) {
                         tips += params[i].name + '</br/>'
-                        tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + (params[i].value == 0.14159 ? '暂无数据' : params[i].value) + '</br/>'
+                        tips += '污染值' + ':' + '&nbsp' + '&nbsp' + (params[i].value == 0.14159 ? '暂无数据' : params[i].value) + '</br/>'
                     }
                     return tips
                 }
diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
index 0b7f0abe..26d12e6d 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
@@ -28,7 +28,7 @@
                 <el-col :span="12" class="pd10" style="position: relative">
                     <div class="legend">
                         <el-tag style="background: #339966" class="tag" size="small">1级</el-tag>
-                        <span style="color: #339966" class="text">:无污染(0,1]</span>
+                        <span style="color: #339966" class="text">:无污染[0,1]</span>
                         <el-tag style="background: #3399ff" class="tag" size="small">2级</el-tag>
                         <span style="color: #3399ff" class="text">:轻微污染(1,1.2]</span>
                         <el-tag style="background: #ffcc33" class="tag" size="small">3级</el-tag>
@@ -46,14 +46,14 @@
                                         <template #header>
                                             <div style="cursor: pointer" @click="queryline(item, false)">
                                                 <el-tag
-                                                    v-if="item.data == 3.14159 || item.data == 0"
+                                                    v-if="item.data == 3.14159"
                                                     style="background: #ccc; color: #fff"
                                                     size="small"
                                                 >
                                                     无
                                                 </el-tag>
                                                 <el-tag
-                                                    v-if="0 < item.data && item.data < 1 && item.data !== 3.14159"
+                                                    v-if="0 <= item.data && item.data < 1 && item.data !== 3.14159"
                                                     style="background: #339966; color: #fff"
                                                     size="small"
                                                 >
@@ -98,14 +98,14 @@
                                                 @click="queryline(item1, true)"
                                             >
                                                 <el-tag
-                                                    v-if="item1.data == 3.14159 || item1.data == 0"
+                                                    v-if="item1.data == 3.14159 "
                                                     style="background: #ccc; color: #fff"
                                                     size="small"
                                                 >
                                                     无
                                                 </el-tag>
                                                 <el-tag
-                                                    v-if="0 < item1.data && item1.data < 1 && item1.data !== 3.14159"
+                                                    v-if="0 <= item1.data && item1.data < 1 && item1.data !== 3.14159"
                                                     style="background: #339966; color: #fff"
                                                     size="small"
                                                 >
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index 399f80e1..6eea0f5b 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -32,7 +32,7 @@
                                     <el-card v-for="(item, index) in tableStore.table.data" :key="index">
                                         <template #header>
                                             <div style="cursor: pointer;" @click="queryline(item, false)">
-                                                <el-tag v-if="item.data < 60 && item.data > 0"
+                                                <el-tag v-if="item.data < 60 && item.data >= 0"
                                                     style="color: #fff; background: #339966" size="small">
                                                     优
                                                 </el-tag>
@@ -44,7 +44,7 @@
                                                     style="color: #fff; background: #cc0000" size="small">
                                                     差
                                                 </el-tag>
-                                                <el-tag v-if="item.data == 3.14159 || item.data == 0"
+                                                <el-tag v-if="item.data == 3.14159 "
                                                     style="color: #fff; background: #ccc" size="small">
                                                     无
                                                 </el-tag>
@@ -55,7 +55,24 @@
                                         <div class="card-content">
                                             <div class="card-item" v-for="(item1, index1) in item.children"
                                                 :key="index1" @click="queryline(item1, true)">
-                                                <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
+
+                                                <el-tag v-if="item1.data < 60 && item1.data >= 0"
+                                                    style="color: #fff; background: #339966" size="small">
+                                                    优
+                                                </el-tag>
+                                                <el-tag v-if="60 <= item1.data && item1.data < 90"
+                                                    style="color: #fff; background: #ffcc33" size="small">
+                                                    良
+                                                </el-tag>
+                                                <el-tag v-if="90 <= item1.data && item1.data"
+                                                    style="color: #fff; background: #cc0000" size="small">
+                                                    差
+                                                </el-tag>
+                                                <el-tag v-if="item1.data == 3.14159 "
+                                                    style="color: #fff; background: #ccc" size="small">
+                                                    无
+                                                </el-tag>
+                                                <!-- <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
                                                     style="background: #ccc; color: #fff" size="small">
                                                     无
                                                 </el-tag>
@@ -82,7 +99,7 @@
                                                 <el-tag v-if="2 <= item1.data && item1.data && item1.data !== 3.14159"
                                                     style="background: #cc0000; color: #fff" size="small">
                                                     5级
-                                                </el-tag>
+                                                </el-tag> -->
                                                 <span class="xdf">
                                                     <el-tooltip :show-arrow="false" :offset="-0" :content="item1.name"
                                                         popper-class="atooltip" placement="bottom-start">
@@ -252,7 +269,7 @@ const histogram = (res: any) => {
 
                             // 定制显示（按顺序）
                             color: function (params) {
-                                if (params.value == 0 || params.value == 0.14159) {
+                                if ( params.value == 0.14159) {
                                     return '#ccc'
                                 } else if (params.value >= 90) {
                                     return new echarts.graphic.LinearGradient(
diff --git a/src/views/pqs/runManage/runEvaluate/index.vue b/src/views/pqs/runManage/runEvaluate/index.vue
index 14dcd24f..82cd9053 100644
--- a/src/views/pqs/runManage/runEvaluate/index.vue
+++ b/src/views/pqs/runManage/runEvaluate/index.vue
@@ -82,19 +82,19 @@
                             <div class="em1">评价标准：</div>
                             <div class="em2">
                                 <span style="color: #00b07d">优秀</span>
-                                　完整性 ≥ 98%
+                                　合格率 ≥ 98%
                             </div>
                             <div class="em2">
                                 <span style="color: #2b7fd3">良好</span>
-                                　95% ≤ 完整性 < 98%
+                                　95% ≤ 合格率 < 98%
                             </div>
                             <div class="em2">
                                 <span style="color: #ff8c00">一般</span>
-                                　90% ≤ 完整性 < 95%
+                                　90% ≤ 合格率 < 95%
                             </div>
                             <div class="em2">
                                 <span style="color: #c00">较差</span>
-                                　完整性 < 90%
+                                　合格率 < 90%
                             </div>
                             <div class="mt10">综合评价方法</div>
                             <div class="em1">权重分配:根据各维度的重要性，分配不同的权重。例如:</div>