From 503398d0505b732030813ce58b42da393db1f843 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 29 Apr 2025 14:53:46 +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

---
 .../components/provinceDetails.vue            | 61 +++++++++++--------
 .../detailed/harmonicStatistics/index.vue     |  8 ++-
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
index b56707a1..1405d3ed 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/components/provinceDetails.vue
@@ -1,13 +1,14 @@
 <template>
-
     <el-dialog draggable v-model="dialogVisible" :title="title" width="70%">
-
         <div style="height: 55vh">
-            <vxe-table height="auto" auto-resize :data="tableData" v-loading="loading" v-bind="defaultAttribute"
-                :key="key">
-
-
-
+            <vxe-table
+                height="auto"
+                auto-resize
+                :data="tableData"
+                v-loading="loading"
+                v-bind="defaultAttribute"
+                :key="key"
+            >
                 <div v-if="!voltageLevelFlag">
                     <vxe-column field="name" title="名称" min-width="150"></vxe-column>
                     <vxe-column field="onlineCount" title="在线监测点数" min-width="120">
@@ -67,13 +68,20 @@
                         </vxe-column>
                         <vxe-column field="overTwentyThreeTimes" title="23次">
                             <template #default="scope">
-                                {{ scope.row.overTwentyThreeTimes == 3.14159 ? '暂无数据' : scope.row.overTwentyThreeTimes
+                                {{
+                                    scope.row.overTwentyThreeTimes == 3.14159
+                                        ? '暂无数据'
+                                        : scope.row.overTwentyThreeTimes
                                 }}
                             </template>
                         </vxe-column>
                         <vxe-column field="overTwentyFiveTimes" title="25次">
                             <template #default="scope">
-                                {{ scope.row.overTwentyFiveTimes == 3.14159 ? '暂无数据' : scope.row.overTwentyFiveTimes }}
+                                {{
+                                    scope.row.overTwentyFiveTimes == 3.14159
+                                        ? '暂无数据'
+                                        : scope.row.overTwentyFiveTimes
+                                }}
                             </template>
                         </vxe-column>
                         <vxe-column field="otherTimes" title="其他次">
@@ -82,16 +90,12 @@
                             </template>
                         </vxe-column>
                     </vxe-colgroup>
-
-
-
                 </div>
             </vxe-table>
         </div>
     </el-dialog>
-
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getSubInfoById, getXbLineInfoById } from '@/api/harmonic-boot/area'
@@ -109,20 +113,23 @@ const open = (row: any, flag: boolean, params: any) => {
     statisticalName.value = params.statisticalType.name + '(%)'
     tableData.value = []
     if (flag) {
-        getXbLineInfoById({ ...params, deptIndex: row.pid, id: row.id }).then((res: any) => {
-            tableData.value = res.data
-            loading.value = false
-        }).catch(() => {
-            loading.value = false
-        })
-
+        getXbLineInfoById({ ...params, deptIndex: row.pid, id: row.id, powerFlag: row.powerFlag })
+            .then((res: any) => {
+                tableData.value = res.data
+                loading.value = false
+            })
+            .catch(() => {
+                loading.value = false
+            })
     } else {
-        getSubInfoById({ ...params, deptIndex: row.id }).then((res: any) => {
-            tableData.value = res.data
-            loading.value = false
-        }).catch(() => {
-            loading.value = false
-        })
+        getSubInfoById({ ...params, deptIndex: row.id })
+            .then((res: any) => {
+                tableData.value = res.data
+                loading.value = false
+            })
+            .catch(() => {
+                loading.value = false
+            })
     }
 
     key.value += 1
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index 38f1e055..44cd3f84 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -7,6 +7,11 @@
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-DataAnalysis"
                         @click="rankingClick">排名前10监测点</el-button>
@@ -155,6 +160,7 @@ const rankingRef = ref()
 const dataList = ref([])
 
 const header = ref()
+const sign = dictData.getBasicData('power_flag')
 const options = dictData.getBasicData('Indicator_Type', ['PLPC', 'DYPC', 'SXDYBPHD', 'CSSB', 'FXDL', 'JXBDY'])
 const tableStore = new TableStore({
     url: '/harmonic-boot/detailAnalysis/deptSubRelations',
@@ -173,7 +179,7 @@ provide('tableStore', tableStore)
 tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.statisticalType = options[0]
 tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 tableStore.table.params.statFlag = true
 tableStore.table.params.serverName = 'event-boot'