From 8b356c87a3b2a54c556fd87252297bd2290ffb55 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Tue, 20 Jan 2026 14:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/MyEchartMap.vue                      | 4 +++-
 .../detailed/harmonicStatistics/index.vue                   | 4 ++--
 src/views/pqs/supervise/plan/components/detail.vue          | 2 +-
 src/views/pqs/voltageSags/Region/components/Tableabove.vue  | 3 +++
 .../pqs/voltageSags/Region/thermodynamicDiagram/index.vue   | 2 +-
 .../voltageSags/monitoringPoint/online/navigation/map.vue   | 6 +++---
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/echarts/MyEchartMap.vue b/src/components/echarts/MyEchartMap.vue
index 350a60a9..e2f297d0 100644
--- a/src/components/echarts/MyEchartMap.vue
+++ b/src/components/echarts/MyEchartMap.vue
@@ -34,7 +34,6 @@ const fetchConfig = async (name: string) => {
 // fetchConfig()
 
 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => {})
 
 const GetEchar = async (name: string) => {
     let chartDom = document.getElementById('chartMap')
@@ -44,6 +43,7 @@ const GetEchar = async (name: string) => {
     name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
 
     echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
+
     let option = {
         title: {
             left: 'center',
@@ -99,6 +99,7 @@ const GetEchar = async (name: string) => {
             // top: 10,
             //    bottom: 0,
             roam: true,
+             
             label: {
                 normal: {
                     show: true,
@@ -178,6 +179,7 @@ const GetEchar = async (name: string) => {
     }, 0)
     window.addEventListener('resize', resizeHandler)
     const flag1 = ref(true)
+
     // 点击事件
     myCharts.value.off('click')
     myCharts.value.on('click', (e: any) => {
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index e63a0163..a4cbce59 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 && item.data !== 3.14159"
                                                     style="color: #fff; background: #339966" size="small">
                                                     优
                                                 </el-tag>
@@ -56,7 +56,7 @@
                                             <div class="card-item" v-for="(item1, index1) in item.children"
                                                 :key="index1" @click="queryline(item1, true)">
 
-                                                <el-tag v-if="item1.data < 60 && item1.data >= 0"
+                                                <el-tag v-if="item1.data < 60 && item1.data >= 0 && item1.data !== 3.14159"
                                                     style="color: #fff; background: #339966" size="small">
                                                     优
                                                 </el-tag>
diff --git a/src/views/pqs/supervise/plan/components/detail.vue b/src/views/pqs/supervise/plan/components/detail.vue
index 80285743..2e40e163 100644
--- a/src/views/pqs/supervise/plan/components/detail.vue
+++ b/src/views/pqs/supervise/plan/components/detail.vue
@@ -160,7 +160,7 @@ import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
 import { Link, View } from '@element-plus/icons-vue'
 import { useAdminInfo } from '@/stores/adminInfo'
-import {download} from '@/utils/fileDownload'
+import {download} from '@/utils/fileDownLoad'
 defineOptions({ name: 'BpmUserReportDetail' })
 const { query } = useRoute() // 查询参数
 const props = defineProps({
diff --git a/src/views/pqs/voltageSags/Region/components/Tableabove.vue b/src/views/pqs/voltageSags/Region/components/Tableabove.vue
index a37d004a..88b881aa 100644
--- a/src/views/pqs/voltageSags/Region/components/Tableabove.vue
+++ b/src/views/pqs/voltageSags/Region/components/Tableabove.vue
@@ -91,6 +91,8 @@ const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaNa
         },
         ...list.voltageStatistics.voltageLevelCalculation
     ]
+       
+
     let all = 0
 
     list.monthlyStatistics.monthCalculation.forEach((item: any) => {
@@ -103,6 +105,7 @@ const info = (list: any, searchBeginTime: any, searchEndTime: any,selectedAreaNa
         },
         ...list.monthlyStatistics.monthCalculation
     ]
+  
 }
 const formatter = (row: any) => {
     if (row.column.field == 'areaName') {
diff --git a/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue b/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue
index b94bd96b..0073d198 100644
--- a/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue
+++ b/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue
@@ -112,7 +112,7 @@ const map = (res: any) => {
             }
         }
     }
-
+    console.log('areaData', areaData)
     echartMapList.value = {
         name: '',
         title: {
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
index 69dcdabe..e4dc1490 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
@@ -165,8 +165,8 @@ const lineId = ref('')
 const handler = async ({ BMap, map }: any) => {
     let data = props.mapList
     let r = 0.0035
-    let list = data.filter((item: any) => item.lng != 0)
-
+    //let list = data.filter((item: any) => item.lng != 0)
+    let list = data
     list.forEach((item: any) => {
         // 变电站图标
         item.icon = {
@@ -271,7 +271,7 @@ const syncCenterAndZoom = (e: any) => {
     zoom.value = e.target.getZoom()
 }
 const markerClick = (e: any) => {
-    console.log("🚀 ~ markerClick ~ e:", e)
+    //console.log("🚀 ~ markerClick ~ e:", e)
     infoWindowPoint.value = e
     monitoringPoint.setValue('lineId', e.lineId)
     infoWindowPoint.value.show = true