From 4e6bd5508950035218a00b14effcb875d0eaa652 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Tue, 9 Dec 2025 13:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cockpit/F47Curve/index.vue       |  4 ++--
 src/components/echarts/rmsWorker.js             |  8 ++++----
 src/components/echarts/rmsboxi.vue              |  6 +++---
 src/components/echarts/shuWorker.js             |  8 ++++----
 src/components/echarts/shushiboxi.vue           |  4 ++--
 .../tree/govern/cloudDeviceEntryTree.vue        | 17 +++++++++++------
 src/components/tree/govern/deviceTree.vue       |  2 --
 src/components/tree/index.vue                   |  8 +++++---
 src/views/govern/cloudDeviceEntry/index.vue     |  1 +
 .../tabs/components/waveFormAnalysis.vue        |  3 ++-
 src/views/govern/mxgraph/graphList/index.vue    |  2 +-
 src/views/govern/reportCore/report/index.vue    | 11 +++--------
 src/views/pqs/cockpit/realTimeData/index.vue    |  2 +-
 13 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/components/cockpit/F47Curve/index.vue b/src/components/cockpit/F47Curve/index.vue
index 69e7e22..2574091 100644
--- a/src/components/cockpit/F47Curve/index.vue
+++ b/src/components/cockpit/F47Curve/index.vue
@@ -22,7 +22,6 @@
         <el-dialog v-model="isWaveCharts" v-if="isWaveCharts" draggable :title="dialogTitle" append-to-body width="70%">
             <waveFormAnalysis
                 v-loading="loading"
-              
                 ref="waveFormAnalysisRef"
                 @handleHideCharts="isWaveCharts = false"
                 :wp="wp"
@@ -447,7 +446,7 @@ const handleTolerableEventClick = async (row: any) => {
     nextTick(() => {
         if (waveFormAnalysisRef.value) {
             //waveFormAnalysisRef.value.setHeight(false, 360)
-            waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
+            // waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         }
     })
    const messageInstance = ElMessage.info(`正在加载，请稍等...`)
@@ -475,6 +474,7 @@ const handleTolerableEventClick = async (row: any) => {
         })
 
     nextTick(() => {
+        waveFormAnalysisRef.value &&  waveFormAnalysisRef.value.setHeight(999, 130, 1.6666666)
         waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value, true)
     })
 }
diff --git a/src/components/echarts/rmsWorker.js b/src/components/echarts/rmsWorker.js
index 6159aaf..6bb5356 100644
--- a/src/components/echarts/rmsWorker.js
+++ b/src/components/echarts/rmsWorker.js
@@ -258,7 +258,7 @@ self.onmessage = function (e) {
                 boxoList.measurementPointName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.duration +
@@ -269,7 +269,7 @@ self.onmessage = function (e) {
                 boxoList.equipmentName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 boxoList.evtParamVVaDepth +
                 ' 持续时间：' +
                 boxoList.evtParamTm +
@@ -280,7 +280,7 @@ self.onmessage = function (e) {
                 boxoList.lineName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.persistTime +
@@ -293,7 +293,7 @@ self.onmessage = function (e) {
                 boxoList.lineName +
                 ' 发生时刻：' +
                 boxoList.startTime +
-                ' 残余电压：' +
+                ' 暂降(骤升)幅值：' +
                 (boxoList.featureAmplitude * 100).toFixed(2) +
                 '% 持续时间：' +
                 boxoList.duration +
diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index a050693..bf201e2 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -109,7 +109,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -600,7 +600,7 @@ const initWave = (
             $(`#${rmsId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
@@ -837,7 +837,7 @@ const initWave = (
                 data: rmscu
             },
             {
-                name: '最小残余电压',
+                name: '最小暂降(骤升)幅值',
                 type: 'scatter',
                 symbol: 'image://' + url2,
                 itemStyle: { width: 45, height: 45 },
diff --git a/src/components/echarts/shuWorker.js b/src/components/echarts/shuWorker.js
index 50c035a..db6937a 100644
--- a/src/components/echarts/shuWorker.js
+++ b/src/components/echarts/shuWorker.js
@@ -131,7 +131,7 @@ self.addEventListener('message', function (e) {
             boxoList.measurementPointName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +
@@ -142,7 +142,7 @@ self.addEventListener('message', function (e) {
             boxoList.equipmentName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             boxoList.evtParamVVaDepth +
             ' 持续时间：' +
             boxoList.evtParamTm +
@@ -153,7 +153,7 @@ self.addEventListener('message', function (e) {
             boxoList.lineName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.persistTime +
@@ -166,7 +166,7 @@ self.addEventListener('message', function (e) {
             boxoList.lineName +
             ' 发生时刻：' +
             boxoList.startTime +
-            ' 残余电压：' +
+            ' 暂降(骤升)幅值：' +
             (boxoList.featureAmplitude * 100).toFixed(2) +
             '% 持续时间：' +
             boxoList.duration +
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index 4bf181d..e9061d3 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -88,7 +88,7 @@ const myChartess5 = ref<echarts.ECharts | null>(null)
 
 const vh = computed(() => {
     if (props.parentHeight == 999) {
-        return '310px'
+        return `calc((60vh - 150px) / 2 )`
     } else if (props.parentHeight != 0) {
         return mainHeight(props.parentHeight, 2).height
     }
@@ -334,7 +334,7 @@ const initWave = (
             $(`#${waveId}`).css('height', picHeight).css('width', vw.value)
         }
     } else {
-        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 残余电压：${(
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
             Number(eventValue.value) * 1
         ).toFixed(0)}% 持续时间：${persistTime.value}s`
     }
diff --git a/src/components/tree/govern/cloudDeviceEntryTree.vue b/src/components/tree/govern/cloudDeviceEntryTree.vue
index f1bb9d3..49f362f 100644
--- a/src/components/tree/govern/cloudDeviceEntryTree.vue
+++ b/src/components/tree/govern/cloudDeviceEntryTree.vue
@@ -1,5 +1,5 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
 </template>
 
 <script lang="ts" setup>
@@ -12,9 +12,11 @@ import { useDictData } from '@/stores/dictData'
 
 interface Props {
     template?: boolean
+    showPush?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
-    template: false
+    template: false,
+    showPush: false
 })
 defineOptions({
     name: 'govern/deviceTree'
@@ -95,13 +97,16 @@ const info = (selectedNodeId?: string) => {
                 tree.value = []
             }
             nextTick(() => {
+              
                 if (arr1.length) {
-                    // 安全检查 treRef 和 treeRef1 是否存在
-                    if (treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey) {
+                    // 安全检查 treRef 和 treeRef 是否存在
+                        console.log("🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:", treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey)
+
+                    if (treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey) {
                         // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
                         console.log('selectedNodeId:', selectedNodeId);
                         if (selectedNodeId) {
-                            treRef.value.treeRef1.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
                             // 查找对应的节点数据并触发事件
                             let selectedNode = null;
                             const findNode = (nodes: any[]) => {
@@ -127,7 +132,7 @@ const info = (selectedNodeId?: string) => {
                             }
                         } else {
                             // 初始化选中第一个节点
-                            treRef.value.treeRef1.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
                             emit('init', {
                                 level: 2,
                                 ...arr1[0]
diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue
index e1779de..3e2f606 100644
--- a/src/components/tree/govern/deviceTree.vue
+++ b/src/components/tree/govern/deviceTree.vue
@@ -124,9 +124,7 @@ getDeviceTree().then(res => {
             })
             return
         }
-        console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3.length)
         if (arr3.length) {
-            console.log("🚀 ~ file: deviceTree.vue ~ line 33 ~ getDeviceTree ~ tree:", arr3)
             treRef.value.treeRef3.setCurrentKey(arr3[0].id)
             // 注册父组件事件
             emit('init', {
diff --git a/src/components/tree/index.vue b/src/components/tree/index.vue
index af08273..a619948 100644
--- a/src/components/tree/index.vue
+++ b/src/components/tree/index.vue
@@ -10,7 +10,7 @@
                         <Icon name='el-icon-Search' style='font-size: 16px' />
                     </template>
                 </el-input>
-                <el-tooltip placement="bottom" :hide-after="0">
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
                         <template #content>
                             <span>台账推送</span>
                         </template>
@@ -23,7 +23,7 @@
                         :style="{ color: config.getColorVal('elementUiPrimary') }" 
                         @click="onAdd" />
                 </el-tooltip>
-                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
                     :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
@@ -58,11 +58,13 @@ defineOptions({
 interface Props {
     width?: string
     canExpand?: boolean
+    showPush?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     width: '280px',
-    canExpand: true
+    canExpand: true,
+    showPush: false
 })
 const config = useConfig()
 const { proxy } = useCurrentInstance()
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 5321cda..52c38f1 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -7,6 +7,7 @@
                     @node-click="nodeClick"
                     @init="nodeClick"
                     @onAdd="onAdd"
+                    :showPush="true"
                 ></CloudDeviceEntryTree>
             </pane>
             <pane style="background: #fff">
diff --git a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
index 23b942c..08f3f6f 100644
--- a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
+++ b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
@@ -139,12 +139,13 @@ const handleBack = () => {
     emit('handleHideCharts')
 }
 const setHeight = (h: any, vh: any, num = 1) => {
+    console.log('🚀 ~ setHeight ~ h:', h)
     if (h != false) {
         parentHeight.value = h
     }
 
     setTimeout(() => {
-        bxecharts.value = mainHeight(vh,num).height
+        bxecharts.value = mainHeight(vh, num).height
     }, 100)
 }
 onMounted(() => {})
diff --git a/src/views/govern/mxgraph/graphList/index.vue b/src/views/govern/mxgraph/graphList/index.vue
index 11ff949..d335e6f 100644
--- a/src/views/govern/mxgraph/graphList/index.vue
+++ b/src/views/govern/mxgraph/graphList/index.vue
@@ -142,7 +142,7 @@ const editd = (e: any) => {
 const Aclick = (e: any) => {
     //window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
     window.open(
-        'http://192.168.1.128:4001' +
+       window.location.origin +
             `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=${VITE_FLAG ? 'ypt' : 'zl'}`
     )
 }
diff --git a/src/views/govern/reportCore/report/index.vue b/src/views/govern/reportCore/report/index.vue
index a4e4a8e..7b101c4 100644
--- a/src/views/govern/reportCore/report/index.vue
+++ b/src/views/govern/reportCore/report/index.vue
@@ -1,13 +1,8 @@
 <template>
     <div class="default-main" :style="height">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+        <splitpanes style="height: 100%"  id="navigation-splitpanes">
             <pane :size="size">
-                <!-- <pointTreeWx
-                    :default-expand-all="false"
-                    template
-                    @node-click="handleNodeClick"
-                    @init="handleNodeClick"
-                ></pointTreeWx> -->
+               
                 <CloudDeviceEntryTree
                     ref="TerminalRef"
                     @node-click="handleNodeClick"
@@ -81,7 +76,7 @@ import type { UploadProps, UploadUserFile } from 'element-plus'
 import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTree.vue'
 import { exportModel } from '@/api/cs-harmonic-boot/datatrend'
 defineOptions({
-    // name: 'harmonic-boot/report/word'
+    name: 'harmonic-boot/report/word'
 })
 const height = mainHeight(20)
 const size = ref(0)
diff --git a/src/views/pqs/cockpit/realTimeData/index.vue b/src/views/pqs/cockpit/realTimeData/index.vue
index 5759566..0ee73ee 100644
--- a/src/views/pqs/cockpit/realTimeData/index.vue
+++ b/src/views/pqs/cockpit/realTimeData/index.vue
@@ -186,7 +186,7 @@ const iframeSrc = ref('')
 
 onMounted(() => {
     iframeSrc.value =
-        'http://192.168.2.179:4001' + `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
+       window.location.origin + `/zutai/?id=4b4f7f4260198776594f5f9d93a532e8&&name=stt&&preview=true#/preview_YPT`
 
     // tableStore.index()