From 57360ea3a78a5618b72742cd54020df80b7f71e5 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 9 Apr 2025 10:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E5=8A=9F=E7=8E=87=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tree/pqs/pointTree.vue         | 14 ++-
 .../LN/newEnergy/highAndLowPressure/index.vue |  5 +-
 .../newEnergyAnalysis/components/detail.vue   |  6 +-
 .../LN/newEnergy/newEnergyAnalysis/index.vue  |  2 +-
 .../runManage/cleaning/components/alarm.vue   |  2 +-
 .../runEvaluate/components/region.vue         | 99 +++++++++++++------
 src/views/pqs/runManage/runEvaluate/index.vue | 16 +--
 7 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/src/components/tree/pqs/pointTree.vue b/src/components/tree/pqs/pointTree.vue
index 20b53d11..fd132082 100644
--- a/src/components/tree/pqs/pointTree.vue
+++ b/src/components/tree/pqs/pointTree.vue
@@ -88,8 +88,8 @@ const loadData = () => {
                         item4.color = config.getColorVal('elementUiPrimary')
                         item4.children.forEach((item5: anyObj) => {
                             if (item5.level == 7) {
-                                  item5.icon = 'el-icon-DataAnalysis'
-                                  item5.color = config.getColorVal('elementUiPrimary')
+                                item5.icon = 'el-icon-DataAnalysis'
+                                item5.color = config.getColorVal('elementUiPrimary')
                                 item5.children.forEach((item6: anyObj) => {
                                     item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
                                     item6.pid = item4.id
@@ -122,8 +122,14 @@ const loadData = () => {
             })
         })
 
-        nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
-        emit('init', res.data[0].children[0].children[0].children[0].children[0])
+        nodeKey =
+            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+            res.data[0].children[0].children[0].children[0].children[0]?.id
+        emit(
+            'init',
+            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+                res.data[0].children[0].children[0].children[0].children[0]
+        )
 
         tree.value = res.data
         if (nodeKey) {
diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue
index 2f64472e..bf7b0cb0 100644
--- a/src/views/LN/newEnergy/highAndLowPressure/index.vue
+++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue
@@ -111,6 +111,7 @@ defineOptions({
 const EchartMap = ref()
 const dictData = useDictData()
 const reason = dictData.getBasicData('Event_Reason')
+const triggerType = dictData.getBasicData('Event_Statis')
 const echartMapList: any = ref({})
 const header = ref()
 const distributionData: any = ref([])
@@ -294,11 +295,13 @@ const clickMap = (e: any) => {
 }
 // 表格数据处理
 const tabulation = (e: any) => {
+    console.log();
+    
     loading.value = true
     voltageRideThroughEventQueryPage({
         ...tableStore.table.params,
         areaId: e.data.id,
-        frequencyType: e.seriesName == '高压' ? 'Voltage_Rise' : 'Voltage_Dip'
+        frequencyType: e.seriesName == '高压' ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
     })
         .then(res => {
             distributionData.value = res.data
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
index a64c77f5..2a1977cb 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/detail.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="dialogVisible" :title="title" width="1200" draggable>
-        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData">
+        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData" v-loading="loading">
             <vxe-colgroup field="anotherName" title="指标" width="180" />
             <!-- <vxe-colgroup field="unit" title="单位" /> -->
             <vxe-colgroup title="最小值">
@@ -240,11 +240,12 @@ import { getTargetByTime } from '@/api/harmonic-boot/pollution'
 const dialogVisible = ref(false)
 const title = ref('')
 const anotherName = ref('')
+const loading = ref(false)
 const tableData: any = ref([])
 const open = (row: any) => {
     title.value = row.title + ' - ' + row.row.time + ' - 越限详情'
     anotherName.value = row.title
-    console.log('🚀 ~ detailClick ~ row:', row)
+    loading.value = true
     getTargetByTime({
         field: row.field,
         lineId: row.lineId,
@@ -254,6 +255,7 @@ const open = (row: any) => {
         code: row.key == '2' ? '' : row.key == '3' ? '' : row.key == '4' ? '' : row.key //row.key
     }).then((res: any) => {
         tableData.value = res.data
+        loading.value = false
     })
     dialogVisible.value = true
 }
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
index e52766d1..7cc90537 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
@@ -393,7 +393,7 @@ const powerList2: any = ref([
     },
     {
         label: '90%~100%',
-        quantity: '20',
+        quantity: '0',
         percentage: '10%',
         crossTheLine: '越限',
         value: '90%~100%'
diff --git a/src/views/pqs/runManage/cleaning/components/alarm.vue b/src/views/pqs/runManage/cleaning/components/alarm.vue
index ab40761c..2aa926d1 100644
--- a/src/views/pqs/runManage/cleaning/components/alarm.vue
+++ b/src/views/pqs/runManage/cleaning/components/alarm.vue
@@ -304,7 +304,7 @@ const echart = () => {
                 {
                     name: '告警占比',
                     type: 'bar',
-                    barWidth: 12,
+                    barWidth: 13,
                     data: [
                         ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100) == 0
                             ? ''
diff --git a/src/views/pqs/runManage/runEvaluate/components/region.vue b/src/views/pqs/runManage/runEvaluate/components/region.vue
index 78bfc20c..ac7ad5c1 100644
--- a/src/views/pqs/runManage/runEvaluate/components/region.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/region.vue
@@ -19,34 +19,13 @@ const height = mainHeight(300, 1.5)
 const options = ref({})
 const info = () => {
     let dataSource = [
-        { value: '90',  name: '张家口' },
-        { value: '80',  name: '廊坊' },
-        { value: '70',  name: '秦皇岛' },
-        { value: '60',  name: '唐山' },
-        { value: '50',  name: '承德' },
-    
+        { value: '90', name: '张家口' },
+        { value: '80', name: '廊坊' },
+        { value: '70', name: '秦皇岛' },
+        { value: '60', name: '唐山' },
+        { value: '50', name: '承德' }
     ]
     options.value = {
-        xAxis: {
-            type: 'value',
-            data:[10,100,200,300,400,500,600,700,800,900,1000],
-            axisLabel: {
-                show: true,
-                textStyle: {
-                    color: '#FFF'
-                }
-            },
-            splitLine: {
-                show: false
-            },
-            axisTick: {
-                show: false
-            },
-            axisLine: {
-                show: true
-            },
-           
-        },
         grid: {
             top: '10'
         },
@@ -62,8 +41,27 @@ const info = () => {
                 },
                 splitLine: {
                     show: false
+                }
+            },
+            xAxis: {
+                type: 'value',
+                data: [1, 2, 3, 4],
+                axisLabel: {
+                    show: true,
+                    textStyle: {
+                        color: '#FFF'
+                    },
+                    formatter: function (value) {}
                 },
-                
+                splitLine: {
+                    show: false
+                },
+                axisTick: {
+                    show: false
+                },
+                axisLine: {
+                    show: true
+                }
             },
             dataZoom: null,
             series: [
@@ -80,7 +78,48 @@ const info = () => {
                                 : '#CC0000'
                         }
                     },
-
+                    markLine: {
+                        silent: false,
+                        symbol: 'circle',
+                        data: [
+                            {
+                                name: '',
+                                yAxis: 100,
+                                lineStyle: {
+                                    color: '#009900'
+                                },
+                                label: {
+                                    show: true,
+                                    formatter: '优质',
+                                    color: '#009900'
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 90,
+                                lineStyle: {
+                                    color: '#77DA63'
+                                },
+                                label: {
+                                    show: true,
+                                    color: '#77DA63',
+                                    formatter: '良好'
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 60,
+                                lineStyle: {
+                                    color: '#FFCC00'
+                                },
+                                label: {
+                                    show: true,
+                                    color: '#FFCC00',
+                                    formatter: '合格'
+                                }
+                            }
+                        ]
+                    },
                     data: dataSource.map(item => item.value)
                 }
             ]
@@ -118,8 +157,8 @@ onMounted(() => {
     opacity: 1 !important;
     color: #ffffff;
     background: var(--el-color-primary);
-    
-    .el-radio-button__inner{
+
+    .el-radio-button__inner {
         opacity: 1 !important;
         border-left: 1px solid #00fff4 !important;
     }
diff --git a/src/views/pqs/runManage/runEvaluate/index.vue b/src/views/pqs/runManage/runEvaluate/index.vue
index 659c00b5..601f7e60 100644
--- a/src/views/pqs/runManage/runEvaluate/index.vue
+++ b/src/views/pqs/runManage/runEvaluate/index.vue
@@ -159,13 +159,13 @@
                     :color="[color[0], color[0]]"
                     class="box"
                     :backgroundColor="`${color[0]}24`"
-                    title="最近一周终端评价趋势"
+                    title="终端运行评价详情"
                 >
                     <div class="title">
                         <span class="iconfont icon-a-qushi1"></span>
-                        最近一周终端评价趋势
+                        终端运行评价详情
                     </div>
-                    <week />
+                    <terminalOperation />
                 </BorderBox13>
             </div>
         </transition>
@@ -190,13 +190,14 @@
                         :color="[color[0], color[0]]"
                         class="box"
                         :backgroundColor="`${color[0]}24`"
-                        title="终端运行评价详情"
+                        title="最近一周终端评价趋势"
                     >
                         <div class="title">
                             <span class="iconfont icon-yunhangxiangqing"></span>
-                            终端运行评价详情
+                            最近一周终端评价趋势
                         </div>
-                        <terminalOperation />
+                    
+                        <week />
                     </BorderBox13>
                 </div>
             </div>
@@ -237,6 +238,9 @@ import week from './components/week.vue'
 import terminalDetails from './components/terminalDetails.vue'
 import statistics from './components/statistics.vue'
 import run from './components/run.vue'
+defineOptions({
+    name: 'runManage/runEvaluate'
+})
 const config = useConfig()
 const color = config.layout.elementUiPrimary
 const dictData = useDictData()