From c1e36440e7aa13a5be07e8fe5f2441bc2451d977 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Fri, 9 Jan 2026 10:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../area/powerAssessment/index.vue            | 343 +++++++++++-------
 .../monitoringPoint/online/index.vue          |   9 +-
 src/views/system/auth/role/popupForm.vue      |   2 +-
 3 files changed, 214 insertions(+), 140 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
index 0078d493..030584c1 100644
--- a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
@@ -12,81 +12,118 @@
         <div v-loading="tableStore.table.loading" class="pr10">
             <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>
-                    <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>
-                    <span style="color: #ffcc33;" class="text">:合格--(3,4]</span>
-                    <el-tag style="background: #ff9900;" class="tag" size="small">2级</el-tag>
-                    <span style="color: #ff9900;" class="text">:较差--(2,3]</span>
-                    <el-tag style="background: #A52a2a;" class="tag" size="small">1级</el-tag>
-                    <span style="color: #A52a2a;" class="text">:极差--[1,2]</span>
+                    <el-tag style="background: #339966" class="tag" size="small">5级</el-tag>
+                    <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>
+                    <span style="color: #ffcc33" class="text">:合格--(3,4]</span>
+                    <el-tag style="background: #ff9900" class="tag" size="small">2级</el-tag>
+                    <span style="color: #ff9900" class="text">:较差--(2,3]</span>
+                    <el-tag style="background: #a52a2a" class="tag" size="small">1级</el-tag>
+                    <span style="color: #a52a2a" class="text">:极差--[1,2]</span>
                     <div :style="{ height: layout.height }" style="overflow-y: auto" class="mt10">
-                        <div class=" cardBox">
+                        <div class="cardBox">
                             <el-card v-for="(item, index) in tableStore.table.data" :key="index">
                                 <template #header>
-                                    <div style="cursor: pointer;">
-                                        <el-tag v-if="item.data == 3.14159 || item.data == 0"
-                                            style="background: #ccc; color: #fff" size="small">
+                                    <div style="cursor: pointer">
+                                        <el-tag
+                                            v-if="item.data == 3.14159 || item.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
-                                            style="background: #339966; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
-                                            style="background: #3399ff; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
-                                            style="background: #ff9900; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span>{{ item.name }}</span>
                                     </div>
-
-
-
                                 </template>
                                 <div class="card-content">
                                     <div class="card-item" v-for="(item1, index1) in item.children" :key="index1">
-                                        <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
-                                            style="background: #ccc; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="item1.data == 3.14159 || item1.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
-                                            style="background: #339966; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
-                                            style="background: #3399ff; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
-                                            style="background: #ff9900; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             2级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                        <el-tag
+                                            v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span class="xdf">
-                                            <el-tooltip :show-arrow="false" :offset="-0" :content="item1.name"
-                                                popper-class="atooltip" placement="bottom-start">
-
+                                            <el-tooltip
+                                                :show-arrow="false"
+                                                :offset="-0"
+                                                :content="item1.name"
+                                                popper-class="atooltip"
+                                                placement="bottom-start"
+                                            >
                                                 <div class="tooltipText">
                                                     {{ item1.name }}
                                                 </div>
@@ -102,30 +139,22 @@
                     <my-echart class="tall" :options="echartList" />
                     <div class="tall">
                         <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
-
                             <vxe-column field="name" title="名称"></vxe-column>
                             <vxe-column field="zc" title="综合评估值">
                                 <template #default="scope">
-                                    <span v-if="scope.row.data == 3.14159" style="color: #000;">
-                                        暂无数据
-                                    </span>
-                                    <span v-if="scope.row.data !== 3.14159" style="color: #000;">
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无数据</span>
+                                    <span v-if="scope.row.data !== 3.14159" style="color: #000">
                                         {{ scope.row.data }}
                                     </span>
                                 </template>
                             </vxe-column>
                             <vxe-column field="monitors" title="监测点个数(个)"></vxe-column>
-                            <vxe-column field="level" title="评估等级">
-
-                            </vxe-column>
+                            <vxe-column field="level" title="评估等级"></vxe-column>
                         </vxe-table>
                     </div>
-
                 </el-col>
             </el-row>
         </div>
-
-
     </div>
 </template>
 <script setup lang="ts">
@@ -145,7 +174,14 @@ const dictData = useDictData()
 const echartList = ref({})
 const sign = dictData.getBasicData('power_flag')
 const header = ref()
-const options = dictData.getBasicData('Pollution_Statis', ['I_Neg', 'V_Inharm', 'V_Dev', 'V_Unbalance', 'Plt', 'Freq_Dev'])
+const options = dictData.getBasicData('Pollution_Statis', [
+    'I_Neg',
+    'V_Inharm',
+    'V_Dev',
+    'V_Unbalance',
+    'Plt',
+    'Freq_Dev'
+])
 const tableStore = new TableStore({
     url: '/harmonic-boot/comAccess/getComAccessData',
     method: 'POST',
@@ -153,10 +189,6 @@ const tableStore = new TableStore({
     loadCallback: () => {
         histogram(tableStore.table.data)
         header.value.areaRef.change()
-        
-
-
-
     }
 })
 provide('tableStore', tableStore)
@@ -167,26 +199,23 @@ tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 
 tableStore.table.params.statisticalType = {}
 
-
 // 柱状图数据处理
 const histogram = (res: any) => {
- 
-
     echartList.value = {
         title: {
             text: '区域'
         },
-      
+
         legend: {
-                show: false
-            },
+            show: false
+        },
 
         xAxis: {
             name: '区域',
             data: res.map((item: any) => item.name)
         },
         yAxis: {
-            name: '等级',// 给X轴加单位
+            name: '等级', // 给X轴加单位
             min: 0,
             max: 5,
             splitLine: {
@@ -208,11 +237,10 @@ const histogram = (res: any) => {
                         texts.push('4级')
                     } else if (value == 5) {
                         texts.push('5级')
-
                     }
                     return texts
                 }
-            },
+            }
         },
 
         options: {
@@ -222,10 +250,10 @@ const histogram = (res: any) => {
                     name: '评估值',
                     type: 'bar',
                     data: res.map((item: any) => {
-                        return item.data == 3.14159 ? 0.14159 : item.data
+                        return item.data == 3.14159 ? 0.14159 : item.data == 0 ? 0.14158 : item.data
                     }),
                     barMaxWidth: 30,
-
+                    barMinHeight: 10,
                     itemStyle: {
                         normal: {
                             // 随机显示
@@ -234,44 +262,106 @@ const histogram = (res: any) => {
                             // 定制显示（按顺序）
                             color: function (params) {
                                 if (4.5 < params.value && params.value <= 5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: '#339966',
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#339966'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (4 < params.value && params.value <= 4.5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: '#3399FF'
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#3399FF'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (3 < params.value && params.value <= 4 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: '#FFCC33'
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FFCC33'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (2 < params.value && params.value <= 3 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: '#FF9900'
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FF9900'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value >= 1 && params.value <= 2 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: '#A52a2a'
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#A52a2a'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value == 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                                        {
-                                            offset: 1,
-                                            color: "#999999"
-                                        }], false)
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value == 0.14158) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
                                 }
                             }
-                        },
+                        }
                     },
                     markLine: {
                         silent: false,
@@ -283,90 +373,81 @@ const histogram = (res: any) => {
                         emphasis: {
                             lineStyle: {
                                 width: 1
-                            },
+                            }
                         },
                         data: [
-
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 1,
                                 lineStyle: {
-                                    color: '#A52a2a',
+                                    color: '#A52a2a'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#A52a2a',
-
-
+                                        color: '#A52a2a'
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 2,
                                 lineStyle: {
-                                    color: '#FF9900',
-
+                                    color: '#FF9900'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FF9900',
-
+                                        color: '#FF9900'
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 3,
                                 lineStyle: {
-                                    color: '#FFCC33',
+                                    color: '#FFCC33'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FFCC33',
-
+                                        color: '#FFCC33'
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 4,
                                 lineStyle: {
-                                    color: '#3399FF',
+                                    color: '#3399FF'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#3399FF',
-
+                                        color: '#3399FF'
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 5,
                                 lineStyle: {
-                                    color: '#339966',
+                                    color: '#339966'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#339966',
-
+                                        color: '#339966'
                                     }
                                 }
-                            },
+                            }
                         ]
-                    },
-
+                    }
                 }
             ]
         }
@@ -397,7 +478,6 @@ const layout1 = mainHeight(93) as any
 }
 
 :deep(.cardBox) {
-
     box-sizing: border-box;
     overflow: auto;
     display: grid;
@@ -410,8 +490,6 @@ const layout1 = mainHeight(93) as any
         background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
         font-weight: bold;
 
-
-
         .el-card__header {
             padding: 10px !important;
             color: #fff;
@@ -420,7 +498,6 @@ const layout1 = mainHeight(93) as any
                 display: flex;
                 justify-content: space-between;
             }
-
         }
 
         .el-card__body {
@@ -440,7 +517,6 @@ const layout1 = mainHeight(93) as any
                 width: 50%;
                 display: flex;
                 cursor: pointer;
-
             }
 
             .xdf {
@@ -456,11 +532,8 @@ const layout1 = mainHeight(93) as any
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 margin-left: 5px;
-
             }
-
         }
     }
-
 }
 </style>
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
index 5b8b135d..c3e267ae 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
@@ -15,7 +15,7 @@
                 ></PointTree>
             </pane>
             <pane>
-                <div style="position: relative; height: 100%;width: 100%;">
+                <div style="position: relative; height: 100%; width: 100%">
                     <el-tabs
                         v-model="activeName"
                         type="border-card"
@@ -41,9 +41,9 @@
                         <el-tab-pane label="监测点运行状态" name="6" lazy v-if="!isReload">
                             <Yunxingzhuangtai v-if="activeName == '6'" />
                         </el-tab-pane>
-                        <!-- <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG">
+                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG && !VITE_FLAG1">
                             <Shishishuju v-if="activeName == '7'" />
-                        </el-tab-pane> -->
+                        </el-tab-pane>
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">
                             <StatisticalReport v-if="activeName == '8'" />
                         </el-tab-pane>
@@ -76,6 +76,7 @@ import Shishishuju from './shishishuju/index.vue'
 import { useRoute } from 'vue-router'
 import StatisticalReport from './statisticalReport/index.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG1 = import.meta.env.VITE_NAME == 'hainan'
 import router from '@/router'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { id } from 'element-plus/es/locale'
@@ -175,7 +176,7 @@ const findNodeByTreeId = (treeData: any, id: any) => {
 const getTargetNode = () => {
     const targetId = '9b7adecf588b4110acb7018f297592a7'
     const node = findNodeByTreeId(treeData.value, targetId)
-   // console.log('Vue中找到的节点：', node)
+    // console.log('Vue中找到的节点：', node)
 }
 const changeTab = (e: string) => {
     activeName.value = e
diff --git a/src/views/system/auth/role/popupForm.vue b/src/views/system/auth/role/popupForm.vue
index ad66d533..83e9fd8a 100644
--- a/src/views/system/auth/role/popupForm.vue
+++ b/src/views/system/auth/role/popupForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable class="cn-operate-dialog" width="500px" v-model="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="角色名称" prop="name">