From 4f907a80c4729e3bad1da33a631e7ca49ac27e30 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 4 Jun 2026 19:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/exceedanceLevel/index.vue         |    2 +-
 .../cockpit/governanceReport/index.vue        |   17 +-
 .../components/transientList.vue              |    2 +-
 .../components/transientStatisticsDetail.vue  |    2 +-
 src/components/echarts/rmsWorker.js           |    4 +-
 src/components/echarts/rmsboxi.vue            |  177 +-
 src/components/echarts/rmsboxi1.vue           | 1596 -----------------
 src/components/echarts/shuWorker.js           |    4 +-
 src/components/echarts/shushiboxi.vue         |  220 ++-
 src/components/echarts/shushiboxi1.vue        | 1201 -------------
 src/components/table/index.vue                |    7 +-
 src/components/tree/govern/analyzeTree.vue    |    2 +-
 .../tree/govern/cloudDeviceEntryTree.vue      |    2 +-
 src/components/tree/govern/deviceInfoTree.vue |    2 +-
 src/components/tree/govern/deviceTree.vue     |   32 +-
 src/components/tree/govern/deviceTreeUtils.ts |    4 +-
 src/components/tree/govern/lineTreeUtils.ts   |   39 +-
 src/components/tree/govern/pointTree.vue      |    2 +-
 src/components/tree/govern/pointTreeWx.vue    |    3 +-
 src/components/tree/select.vue                |    8 +-
 src/layouts/admin/components/logo.vue         |   10 +-
 .../admin/components/navBar/classic.vue       |    7 +-
 src/utils/chartAxisHelper.ts                  |   59 +
 src/utils/luckysheetHelper.ts                 |   83 +
 src/utils/storage.ts                          |  105 +-
 src/utils/tableStore.ts                       |   10 +-
 src/utils/waveCache.ts                        |   42 +
 src/utils/waveWorkerPool.ts                   |   96 +
 src/views/govern/alarm/Abnormal.vue           |    2 +-
 src/views/govern/alarm/Device.vue             |   21 +-
 src/views/govern/alarm/Front.vue              |   10 +-
 src/views/govern/alarm/Steady.vue             |   30 +-
 src/views/govern/alarm/Transient.vue          |   49 +-
 src/views/govern/analyze/APF/index.vue        |   74 +-
 src/views/govern/analyze/DVR/index.vue        |   37 +-
 .../analyze/steadyState/components/chart.vue  |    2 +-
 .../analyze/steadyState/components/report.vue |   42 +-
 src/views/govern/device/control/index.vue     |  133 +-
 .../control/tabs/components/realtrend.vue     |   12 +-
 .../tabs/components/waveFormAnalysis.vue      |   27 +-
 .../device/control/tabs/electroplating.vue    |    4 +-
 .../govern/device/control/tabs/event.vue      |   53 +-
 src/views/govern/device/fileService/index.vue |    2 +-
 src/views/govern/device/manage/index.vue      |    3 +-
 .../device/planData/components/transient.vue  |   53 +-
 src/views/govern/device/tourist/index.vue     |   14 +-
 .../govern/reportCore/lineReport/index.vue    |    7 +-
 src/views/govern/reportCore/report/index.vue  |    9 +-
 .../govern/reportCore/statistics/index.vue    |   32 +-
 .../govern/reportCore/statisticsWx/index.vue  |   38 +-
 .../reportCore/statisticsWx/index_ypt.vue     |   50 +-
 .../reportCore/statisticsWx/index_zl.vue      |   42 +-
 types/table.d.ts                              |    2 +-
 53 files changed, 987 insertions(+), 3499 deletions(-)
 delete mode 100644 src/components/echarts/rmsboxi1.vue
 delete mode 100644 src/components/echarts/shushiboxi1.vue
 create mode 100644 src/utils/chartAxisHelper.ts
 create mode 100644 src/utils/luckysheetHelper.ts
 create mode 100644 src/utils/waveCache.ts
 create mode 100644 src/utils/waveWorkerPool.ts

diff --git a/src/components/cockpit/exceedanceLevel/index.vue b/src/components/cockpit/exceedanceLevel/index.vue
index 65c95c9..8910b2a 100644
--- a/src/components/cockpit/exceedanceLevel/index.vue
+++ b/src/components/cockpit/exceedanceLevel/index.vue
@@ -154,7 +154,7 @@ const tableStore: any = new TableStore({
                 series: [
                     {
                         type: 'bar',
-                        name: '越限占比',
+                        name: '指标越限严重度',
                         data: tableStore.table.data.map((item: any) => Math.floor(item.extent * 100) / 100),
                         barMaxWidth: 30
                     }
diff --git a/src/components/cockpit/governanceReport/index.vue b/src/components/cockpit/governanceReport/index.vue
index 12e6f1d..261857b 100644
--- a/src/components/cockpit/governanceReport/index.vue
+++ b/src/components/cockpit/governanceReport/index.vue
@@ -52,9 +52,10 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
+import { ref, onMounted, onUnmounted, provide, reactive, watch, h, computed, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import { exportExcel } from '@/views/govern/reportForms/export.js'
+import { destroyLuckysheet, renderLuckysheetReport } from '@/utils/luckysheetHelper'
 import TableHeader from '@/components/table/header/index.vue'
 import { querySysExcel } from '@/api/harmonic-boot/luckyexcel'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
@@ -119,6 +120,9 @@ const downloadExcel = () => {
 onMounted(() => {
     initListByIds()
 })
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 
 const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
     if (datePickerValue && datePickerValue.timeValue) {
@@ -159,16 +163,7 @@ const tableStore: any = new TableStore({
         // }
     },
     loadCallback: () => {
-        luckysheet.create({
-            container: 'luckysheet',
-            title: '', // 表 头名
-            lang: 'zh', // 中文
-            showtoolbar: false, // 是否显示工具栏
-            showinfobar: false, // 是否显示顶部信息栏
-            showsheetbar: true, // 是否显示底部sheet按钮
-            allowEdit: false, // 禁止所有编辑操作（必填）
-            data: tableStore.table.data
-        })
+        renderLuckysheetReport('luckysheet', tableStore.table.data, { allowEdit: false })
     }
 })
 
diff --git a/src/components/cockpit/transientDetails/components/transientList.vue b/src/components/cockpit/transientDetails/components/transientList.vue
index 64fd8e7..52ddeb0 100644
--- a/src/components/cockpit/transientDetails/components/transientList.vue
+++ b/src/components/cockpit/transientDetails/components/transientList.vue
@@ -220,7 +220,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return !!row.wavePath
+                        return row.wavePath
                     }
                 }
             ]
diff --git a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
index 33de7fd..702de10 100644
--- a/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
+++ b/src/components/cockpit/transientStatistics/components/transientStatisticsDetail.vue
@@ -214,7 +214,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return !!row.wavePath
+                        return row.wavePath
                     }
                 }
             ]
diff --git a/src/components/echarts/rmsWorker.js b/src/components/echarts/rmsWorker.js
index 0a98a5f..562b4db 100644
--- a/src/components/echarts/rmsWorker.js
+++ b/src/components/echarts/rmsWorker.js
@@ -236,7 +236,7 @@ const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
 
 // 监听消息
 self.onmessage = function (e) {
-    const { wp, isOpen, value, boxoList } = JSON.parse(e.data)
+    const { wp, isOpen, value, boxoList, requestId } = e.data
 
     try {
         const iphasicValue = wp.iphasic || 1
@@ -303,6 +303,7 @@ self.onmessage = function (e) {
         }
         // 发送处理结果回主线程
         self.postMessage({
+            requestId,
             titles: titles,
             success: true,
             waveDatas,
@@ -313,6 +314,7 @@ self.onmessage = function (e) {
         })
     } catch (error) {
         self.postMessage({
+            requestId,
             success: false,
             error: error.message
         })
diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index 4de6b5c..20fc9ed 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -14,9 +14,15 @@ import html2canvas from 'html2canvas'
 import $ from 'jquery'
 import * as echarts from 'echarts'
 import { mainHeight } from '@/utils/layout'
+import { calcRmsYAxisRange, formatAxisLabel } from '@/utils/chartAxisHelper'
 import url from '@/assets/img/point.png'
 import url2 from '@/assets/img/dw.png'
-const worker = ref<Worker | null>(null)
+import { buildWaveCacheKey, getWaveCache, setWaveCache } from '@/utils/waveCache'
+import { getRmsWorker, buildWorkerPayload } from '@/utils/waveWorkerPool'
+
+let waveRequestId = 0
+const pendingCacheKeys = new Map<number, string>()
+let rmsWorker: Worker | null = null
 interface WaveData {
     instantF: { max: number; min: number }
     instantS: { max: number; min: number }
@@ -125,52 +131,61 @@ const vw = computed(() => '100%')
 
 watch(
     () => props.value,
-    newVal => {
-        if (newVal == 2) {
-            initWaves()
-        } else {
-            $('#wave1').remove()
-            initWaves()
-        }
+    () => {
+        query()
     }
 )
 
+watch(
+    () => props.wp,
+    () => {
+        query()
+    }
+)
+
+const applyWorkerResult = (data: any) => {
+    titles.value = data.titles
+    waveDatas.value = data.waveDatas
+    time.value = data.time
+    type.value = data.type
+    severity.value = data.severity
+    iphasic.value = data.iphasic
+
+    if (Number(severity.value) < 0) {
+        severity.value = '/'
+        type.value = '/'
+    }
+
+    initWave(waveDatas.value, time.value, type.value, severity.value, isOpen.value)
+    loading.value = false
+}
+
 onMounted(() => {
     const zoomValue = document.body.style.getPropertyValue('zoom')
     zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
     window.addEventListener('resize', handleResize)
 
-    // 初始化 Web Worker
-    worker.value = new Worker(new URL('./rmsWorker.js', import.meta.url))
-    worker.value.onmessage = e => {
-        if (e.data.success) {
-            const data = e.data
-            titles.value = data.titles
-            waveDatas.value = data.waveDatas
-            time.value = data.time
-            type.value = data.type
-            severity.value = data.severity
-            iphasic.value = data.iphasic
-
-            // 初始化波形图
-            initWave(waveDatas.value, time.value, type.value, severity.value, isOpen.value)
-        } else {
-            console.error('Worker error:', e.data.error)
+    rmsWorker = getRmsWorker(data => {
+        if (data.requestId !== waveRequestId) return
+        if (!data.success) {
+            console.error('Worker error:', data.error)
             loading.value = false
+            return
         }
-    }
+        const cacheKey = pendingCacheKeys.get(data.requestId)
+        if (cacheKey) {
+            setWaveCache(cacheKey, data)
+            pendingCacheKeys.delete(data.requestId)
+        }
+        applyWorkerResult(data)
+    })
 
     nextTick(() => {
-        setTimeout(() => {
-            query()
-        }, 500)
+        query()
     })
 })
 
 onBeforeUnmount(() => {
-    if (worker.value) {
-        worker.value.terminate()
-    }
     backbxlb()
     window.removeEventListener('resize', handleResize)
 })
@@ -195,23 +210,15 @@ const download = () => {
     }
 }
 
+const EXTRA_PANEL_CLASS = 'wave-extra-panel'
+
+const resetWaveDom = () => {
+    backbxlb()
+    $('#rmsp').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+}
+
 const query = () => {
-    loading.value = true
-    if (props.wp) {
-        // 使用 Worker 处理数据
-        if (worker.value) {
-            worker.value.postMessage(
-                JSON.stringify({
-                    wp: props.wp,
-                    isOpen: isOpen.value,
-                    value: props.value,
-                    boxoList: props.boxoList
-                })
-            )
-        }
-    } else {
-        initWave(null, null, null, null, null)
-    }
+    initWaves()
 }
 
 const waveData = (
@@ -245,29 +252,31 @@ const waveData = (
 }
 
 const initWaves = () => {
-    if (props.wp) {
-        iphasic.value = props.wp.iphasic || 1
-        const picCounts = (props.wp.waveTitle.length - 1) / iphasic.value
-        waveDatas.value = []
-
-        for (let i = 0; i < picCounts; i++) {
-            const data = fliteWaveData(props.wp, i)
-            waveDatas.value.push(data)
-        }
-
-        time.value = props.wp.time
-        type.value = props.wp.waveType
-        severity.value = props.wp.yzd
-
-        if (Number(severity.value) < 0) {
-            severity.value = '/'
-            type.value = '/'
-        }
-
-        initWave(waveDatas.value, time.value, type.value, severity.value, isOpen.value)
-    } else {
+    if (!props.wp?.listRmsData?.length) {
         initWave(null, null, null, null, null)
+        loading.value = false
+        return
     }
+
+    const cacheKey = buildWaveCacheKey('rms', props.wp, props.value, isOpen.value, props.boxoList)
+    const cached = getWaveCache<any>(cacheKey)
+    if (cached) {
+        applyWorkerResult(cached)
+        return
+    }
+
+    loading.value = true
+    iphasic.value = props.wp.iphasic || 1
+    const currentRequestId = ++waveRequestId
+    pendingCacheKeys.set(currentRequestId, cacheKey)
+
+    rmsWorker?.postMessage(
+        buildWorkerPayload('rms', props.wp, props.boxoList, {
+            requestId: currentRequestId,
+            value: props.value,
+            isOpen: isOpen.value
+        })
+    )
 }
 
 const fliteWaveData = (wp: any, step: number): WaveData => {
@@ -482,7 +491,7 @@ const initWave = (
     severity: string | null,
     isOpen: boolean | null
 ) => {
-    $('div.bx').remove()
+    resetWaveDom()
 
     let picHeight = vh.value
     const show = !isOpen
@@ -594,7 +603,7 @@ const initWave = (
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const rmsId = 'rms' + step
             const newDivRms = $(
-                `<div style="height:${vh.value};overflow: hidden;min-height: 200px;"><div class='bx' id='${rmsId}'></div></div>`
+                `<div class="${EXTRA_PANEL_CLASS}" style="height:${vh.value};overflow: hidden;min-height: 200px;"><div class='bx' id='${rmsId}'></div></div>`
             )
             newDivRms.insertAfter($('#rmsp'))
             $(`#${rmsId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
@@ -607,6 +616,12 @@ const initWave = (
     const rms = document.getElementById('rmsp')
 
     if (!rms) return
+
+    const yRange = calcRmsYAxisRange(rmscu[0]?.[1] ?? 0, rmscm[0]?.[1] ?? 0)
+
+    const existingChart = echarts.getInstanceByDom(rms)
+    if (existingChart) existingChart.dispose()
+
     const myChartes = echarts.init(rms)
     const echartsColor = {
         WordColor: '#000',
@@ -750,8 +765,8 @@ const initWave = (
             },
             // max: rmscm[0]?.[1] * 1.06 || 0,
             // min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0,
-            max: Math.floor((rmscm[0]?.[1] * 1.06 || 0) * 1.1 * 10) / 10,
-            min: Math.floor((rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0) * 10) / 10,
+            max: yRange.max,
+            min: yRange.min,
             boundaryGap: [0, '100%'],
             showLastLabel: true,
             opposite: false,
@@ -770,7 +785,7 @@ const initWave = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    return Math.floor(value * 1000) / 1000
+                    return formatAxisLabel(value)
                 }
             },
             splitLine: {
@@ -955,6 +970,10 @@ const drawPics = (
     const rmsIds = document.getElementById(rmsId)
     if (!rmsIds) return
 
+    const subMin = props.value === 1 ? waveDataTemp.RMSF.min : waveDataTemp.RMSS.min
+    const subMax = props.value === 1 ? waveDataTemp.RMSF.max : waveDataTemp.RMSS.max
+    const yRange = calcRmsYAxisRange(subMin, subMax)
+
     const myChartes = echarts.init(rmsIds)
     const echartsColor = {
         WordColor: '#000',
@@ -1078,6 +1097,8 @@ const drawPics = (
             },
             boundaryGap: [0, '100%'],
             showLastLabel: true,
+            max: yRange.max,
+            min: yRange.min,
             opposite: false,
             // max: Math.floor((rmscm[0]?.[1] * 1.06 || 0) * 1.1 * 10) / 10,
             // min: Math.floor((rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0) * 10) / 10,
@@ -1096,8 +1117,7 @@ const drawPics = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    // return (value - 0).toFixed(2)
-                    return Math.floor(value * 1000) / 1000
+                    return formatAxisLabel(value)
                 }
             },
             splitLine: {
@@ -1213,12 +1233,7 @@ const backbxlb = () => {
     myChartess4.value = null
     myChartess5.value = null
 
-    // echarts.disconnect(charts.filter(Boolean) as echarts.ECharts[])
-    charts.filter(Boolean).forEach(chart => {
-        if (chart && typeof chart.dispose === 'function') {
-            chart.dispose()
-        }
-    })
+    $('#rmsp').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
 }
 
 const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {
diff --git a/src/components/echarts/rmsboxi1.vue b/src/components/echarts/rmsboxi1.vue
deleted file mode 100644
index 3f5cfb9..0000000
--- a/src/components/echarts/rmsboxi1.vue
+++ /dev/null
@@ -1,1596 +0,0 @@
-<template>
-  <div v-loading="loading" style="position: relative">
-    <div id="boxr">
-      <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
-        <div class="bx" id="rms"></div>
-      </div>
-    </div>
-    <!-- <el-button
-          style="position: absolute; right: 10px; top: 0px; z-index: 20000"
-          type="primary"
-          link
-          icon="el-icon-Download"
-          title="生成图片"
-          @click="download"
-      >
-          下载
-      </el-button> -->
-  </div>
-</template>
-<script lang="js">
-import html2canvas from "html2canvas";
-import $ from "jquery";
-import * as echarts from 'echarts'
-import { mainHeight } from '@/utils/layout'
-// url: '@/assets/img/point.png',
-//       url2: ("@/assets/dw.png"),
-import url from '@/assets/img/point.png';
-import url2 from '@/assets/img/dw.png';
-const VITE_FLAG = import.meta.env.VITE_NAME == 'zl'
-export default {
-  props: {
-    value: {
-      type: Number,
-      default: 2,
-    },
-    flag: {
-      type: [String, Number, Boolean],
-      default: 3,
-    },
-    parentHeight: {
-      type: [String, Number, Boolean],
-      default: 0
-    },
-    DColor: {
-      type: Boolean,
-      default: false,
-    },
-    boxoList: {
-      type: [Object, Array],
-    },
-    wp: {
-      type: [Object, Array],
-    },
-    height: {
-      type: [String, Number],
-      default: false,
-    },
-
-  },
-  data() {
-    return {
-      zoom: "",
-      loading: true,
-      tabvalue: this.value,
-
-      valA: 0,
-      valB: 0,
-      isOpen: false,
-      time: "",
-      type: "",
-      severity: "",
-      iphasic: "",
-      eventValue: "",
-      persistTime: "",
-      lineName: "",
-      subName: "",
-      waveDatas: [],
-      ptpass: "",
-      waveHeight: undefined,
-      rmsHeight: undefined,
-      $wave: undefined,
-      $rms: undefined,
-      color: "#006565",
-      charts: {},
-      arrpoints: [],
-      fz: "",
-      titles: "",
-      vh: null,
-      vw: null,
-    };
-  },
-  watch: {
-    value: function (a, b) {
-      if (a == 2) {
-        //alert(a)
-        this.initWaves();
-      } else {
-        //alert(a)
-        this.initWaves();
-      }
-    },
-  },
-  created() {
-    if (this.flag == 1) {
-      this.vh = mainHeight(200).height
-    } else if (this.height != false) {
-      this.vh = this.height
-    } else {
-      this.vh = mainHeight(200, 2).height
-    }
-    if (this.parentHeight != 0) {
-      this.vh = mainHeight(this.parentHeight, 2).height
-
-    }
-    this.vw = '100%'
-  },
-  mounted() {
-    // this.$wave = $("#wave").eq(0);
-    this.zoom = 1 / document.body.style.zoom;
-    window.addEventListener("resize", () => {
-      this.zoom = 1 / document.body.style.zoom;
-    });
-    // this.$rms = $("#rms").eq(0);
-    this.query();
-  },
-  methods: {
-    download() {
-      // 转换成canvas
-      html2canvas(document.getElementById("boxr"), {
-        scale: 2,
-      }).then(function (canvas) {
-        // 创建a标签，实现下载
-        var creatIMg = document.createElement("a");
-        creatIMg.download = "rms波形.png"; // 设置下载的文件名，
-        creatIMg.href = canvas.toDataURL(); // 下载url
-        creatIMg.click();
-        creatIMg.remove(); // 下载之后把创建的元素删除
-      });
-    },
-    query() {
-      this.loading = true;
-      //                   let from={
-      //         lineId:this.boxoList.lineId,
-      //         timeId:this.boxoList.timeId,
-      //     }
-      //    getMonitorEventAnalyseWave(from).then(res=>{
-      //     this.wp=res.data
-      this.initWaves();
-      //    })
-    },
-    //波形总体数据构造函数
-    waveData(
-      instantF,
-      instantS,
-      RMSF,
-      RMSS,
-      RMSFMinDetail,
-      RMSSMinDetail,
-      shunshiF,
-      shunshiS,
-      RMSFWave,
-      RMSSWave,
-      title,
-      unit
-    ) {
-      /*瞬时一次值最大最小值*/
-      this.instantF = instantF;
-      /*瞬时二次值最大最小值*/
-      this.instantS = instantS;
-      /*RMS一次值最大最小值*/
-      this.RMSF = RMSF;
-      /*RMS二次值最大最小值*/
-      this.RMSS = RMSS;
-      /*RMS一次值最小值具体的X Y周的位置，已经具体的相别*/
-      this.RMSFMinDetail = RMSFMinDetail;
-      /*RMS二次值最小值具体的X Y周的位置，已经具体的相别*/
-      this.RMSSMinDetail = RMSSMinDetail;
-      /*瞬时值一次值3相详细数据*/
-      this.shunshiF = shunshiF;
-      /*瞬时值二次值3相详细数据*/
-      this.shunshiS = shunshiS;
-      /*RMS一次值3相详细数据*/
-      this.RMSFWave = RMSFWave;
-      /*RMS二次值3相详细数据*/
-      this.RMSSWave = RMSSWave;
-      /*三相名称*/
-      this.title = title;
-      /*电压还是电流*/
-      this.unit = unit;
-    },
-    //根据后台查询的数据，清洗数据
-    initWaves() {
-      if (null != this.wp) {
-        if (this.boxoList.systemType == 'pms') {
-          this.titles =
-            '变电站名称：' +
-            this.boxoList.powerStationName +
-            ' 监测点名称：' +
-            this.boxoList.measurementPointName +
-            ' 发生时刻：' +
-            this.boxoList.startTime +
-            ' 暂降(骤升)幅值：' +
-            (this.boxoList.featureAmplitude * 100).toFixed(0) +
-            '% 持续时间：' +
-            this.boxoList.duration +
-            's'
-        } else if (this.boxoList.systemType == 'ZL') {
-          this.titles =
-            // "变电站名称：" +
-            // this.boxoList.equipmentName +
-            ' 监测点名称：' +
-            this.boxoList.lineName +
-            ' 发生时刻：' +
-            this.boxoList.startTime +
-            ' 暂降(骤升)幅值：' +
-            this.boxoList.evtParamVVaDepth +
-            ' 持续时间：' +
-            this.boxoList.evtParamTm +
-            's'
-        }
-        else if (this.boxoList.systemType == 'WX') {
-          let featureAmplitude = this.boxoList.featureAmplitude + '' ? this.boxoList.featureAmplitude.toFixed(2) : '/'
-          if (String(this.boxoList.featureAmplitude).split('.')[1] == '00') {
-            this.boxoList.featureAmplitude = String(this.boxoList.featureAmplitude).split('.')[0]
-          }
-
-          this.titles =
-
-            ' 监测点名称：' +
-            this.boxoList.lineName +
-            ' 发生时刻：' +
-            this.boxoList.startTime +
-            ' 暂降(骤升)幅值：' +
-            (featureAmplitude) +
-            '%  持续时间：' +
-            (this.boxoList.persistTime || this.boxoList.evtParamTm || '-') +
-            's'
-        } else {
-          this.titles =
-            '变电站名称：' +
-            this.boxoList.subName +
-            ' 监测点名称：' +
-            this.boxoList.lineName +
-            ' 发生时刻：' +
-            this.boxoList.startTime +
-            ' 暂降(骤升)幅值：' +
-            (this.boxoList.featureAmplitude * 100).toFixed(0) +
-            '% 持续时间：' +
-            this.boxoList.duration +
-            's'
-        }
-
-        // this.eventValue = this.boxoList.eventValue;
-        // this.persistTime = this.boxoList.persistTime;
-        // this.lineName = this.boxoList.lineName; //监测点名称：
-        // this.isOpen = this.boxoList.openTri;
-        // this.subName = this.boxoList.subName; //变电站名称：
-        //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
-        //相的数量
-        this.iphasic = this.wp.iphasic;
-        if (this.iphasic === 0) {
-          this.iphasic = 1;
-        }
-        var picCounts = (this.wp.waveTitle.length - 1) / this.iphasic;
-        this.waveDatas = [];
-        //循环筛选需求的数据
-        for (var i = 0; i < picCounts; i++) {
-          this.fliteWaveData(this.wp, i)
-          this.waveDatas.push({
-            instantF: this.instantF,
-            instantS: this.instantS,
-            RMSF: this.RMSF,
-            RMSS: this.RMSS,
-            RMSFMinDetail: this.RMSFMinDetail,
-            RMSSMinDetail: this.RMSSMinDetail,
-            shunshiF: this.shunshiF,
-            shunshiS: this.shunshiS,
-            RMSFWave: this.RMSFWave,
-            RMSSWave: this.RMSSWave,
-            title: this.title,
-            unit: this.unit
-
-          });
-        }
-        this.time = this.wp.time;
-        this.type = this.wp.waveType;
-        this.severity = this.wp.yzd;
-        //严重度为负，事件为暂升事件
-        if (this.severity < 0) {
-          this.severity = "/";
-          this.type = "/";
-        }
-        this.initWave(
-          this.waveDatas,
-          this.time,
-          this.type,
-          this.severity,
-          this.isOpen
-        );
-      } else {
-        this.initWave(null, null, null, null, null);
-      }
-    },
-    //获取横向一个波形的全部数据，包括瞬时波形的一次、二次值，RMS波形的一次、二次值，如果是电压的话，还需要计算出对应的最大最小值
-    fliteWaveData(wp, step) {
-      var shunData = wp.listWaveData;
-      var rmsData = wp.listRmsData;
-      // console.log(
-      //   rmsData
-      // );
-      var pt = Number(wp.pt) / 1000;
-      var ct = Number(wp.ct);
-      var titleList = wp.waveTitle;
-      //首先判断当前绘制的是电压还是电流
-      var xishu = pt; //默认电压，二次值转一次值乘以pt
-      //三相名称
-      var aTitle = "",
-        bTitle = "",
-        cTitle = "",
-        unit = "电压";
-      //RMS最小值横、纵坐标、相别名称
-      var rmsvFirstX = 0,
-        rmsvFirstY = 0,
-        rmsvSecondX = 0,
-        rmsvSecondY = 0,
-        firstZhou = "a",
-        secondeZhou = "a";
-      //每个波形对应的最大最小值
-      var ifmax, ifmin, ismax, ismin, rfmax, rfmin, rsmax, rsmin;
-      var shunshiFA = [],
-        shunshiFB = [],
-        shunshiFC = [],
-        shunshiSA = [],
-        shunshiSB = [],
-        shunshiSC = [],
-        rmsFA = [],
-        rsmFB = [],
-        rmsFC = [],
-        rmsSA = [],
-        rsmSB = [],
-        rmsSC = [];
-      //给瞬时赋个初始值
-      if (shunData.length > 0) {
-        if (titleList[this.iphasic * step + 1].substring(0, 1) !== "U") {
-          xishu = ct;
-          unit = "电流";
-        }
-        for (var i = 1; i <= this.iphasic; i++) {
-          switch (i) {
-            case 1:
-              aTitle = titleList[this.iphasic * step + i].substring(1);
-              break;
-            case 2:
-              bTitle = titleList[this.iphasic * step + i].substring(1);
-              break;
-            case 3:
-              cTitle = titleList[this.iphasic * step + i].substring(1);
-              break;
-          }
-        }
-        if (shunData[0][this.iphasic * step + 1] !== undefined) {
-          ifmax = shunData[0][this.iphasic * step + 1] * xishu;
-          ifmin = shunData[0][this.iphasic * step + 1] * xishu;
-          ismax = shunData[0][this.iphasic * step + 1];
-          ismin = shunData[0][this.iphasic * step + 1];
-        }
-
-        if (rmsData[0][this.iphasic * step + 1] !== undefined) {
-          rfmax = rmsData[0][this.iphasic * step + 1] * xishu;
-          rfmin = rmsData[0][this.iphasic * step + 1] * xishu;
-          rmsvFirstY = rmsData[0][this.iphasic * step + 1] * xishu;
-          rmsvFirstX = rmsData[0][0];
-          rsmax = rmsData[0][this.iphasic * step + 1];
-          rsmin = rmsData[0][this.iphasic * step + 1];
-          rmsvSecondY = rmsData[0][this.iphasic * step + 1];
-          rmsvSecondX = rmsData[0][0];
-        }
-        //瞬时值--同时还需要获取出瞬时值的一次、二次的最大最小值
-        for (var shun = 0; shun < shunData.length; shun++) {
-          if (shunData[shun][this.iphasic * step + 1] === undefined) {
-            break;
-          }
-          //根据波形数据相的数量来筛选数据
-          switch (this.iphasic) {
-            case 1:
-              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-              shunshiFA.push([shunData[shun][0], shunFirstA]);
-              ifmax = ifmax > shunFirstA ? ifmax : shunFirstA;
-              ifmin = ifmin < shunFirstA ? ifmin : shunFirstA;
-
-              var shunSecondA = shunData[shun][this.iphasic * step + 1];
-              shunshiSA.push([shunData[shun][0], shunSecondA]);
-              ismax = ismax > shunSecondA ? ismax : shunSecondA;
-              ismin = ismin < shunSecondA ? ismin : shunSecondA;
-              break;
-            case 2:
-              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-              var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
-              shunshiFA.push([shunData[shun][0], shunFirstA]);
-              shunshiFB.push([shunData[shun][0], shunFirstB]);
-              ifmax = this.getMaxTwo(ifmax, shunFirstA, shunFirstB);
-              ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstB);
-
-              var shunSecondA = shunData[shun][this.iphasic * step + 1];
-              var shunSecondB = shunData[shun][this.iphasic * step + 2];
-              shunshiSA.push([shunData[shun][0], shunSecondA]);
-              shunshiSB.push([shunData[shun][0], shunSecondB]);
-              ismax = this.getMaxTwo(ismax, shunSecondA, shunSecondB);
-              ismin = this.getMinOpen(ismin, shunSecondA, shunSecondB);
-              break;
-            case 3:
-              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-
-              var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
-              var shunFirstC = shunData[shun][this.iphasic * step + 3] * xishu;
-              shunshiFA.push([shunData[shun][0], shunFirstA]);
-              shunshiFB.push([shunData[shun][0], shunFirstB]);
-              shunshiFC.push([shunData[shun][0], shunFirstC]);
-              ifmax = this.getMax(ifmax, shunFirstA, shunFirstB, shunFirstC);
-              //如果接线方式是V
-              if (this.isOpen) {
-                ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstC);
-              } else {
-                ifmin = this.getMin(ifmin, shunFirstA, shunFirstB, shunFirstC);
-              }
-
-              var shunSecondA = shunData[shun][this.iphasic * step + 1];
-              var shunSecondB = shunData[shun][this.iphasic * step + 2];
-              var shunSecondC = shunData[shun][this.iphasic * step + 3];
-              shunshiSA.push([shunData[shun][0], shunSecondA]);
-              shunshiSB.push([shunData[shun][0], shunSecondB]);
-              shunshiSC.push([shunData[shun][0], shunSecondC]);
-              ismax = this.getMax(ismax, shunSecondA, shunSecondB, shunSecondC);
-              //如果接线方式是V
-              if (this.isOpen) {
-                ismin = this.getMinOpen(ismin, shunSecondA, shunSecondC);
-              } else {
-                ismin = this.getMin(
-                  ismin,
-                  shunSecondA,
-                  shunSecondB,
-                  shunSecondC
-                );
-              }
-              break;
-          }
-        }
-
-        //RMS值--同时还需要获取出RMS值的一次、二次的最大最小值
-        for (var rms = 0; rms < rmsData.length; rms++) {
-          if (rmsData[rms][this.iphasic * step + 1] === undefined) {
-            break;
-          }
-          //根据波形数据相的数量来筛选数据
-          switch (this.iphasic) {
-            case 1:
-              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-              rmsFA.push([rmsData[rms][0], rmsFirstA]);
-              rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA;
-              rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA;
-              if (rfmin < rmsvFirstY) {
-                rmsvFirstY = rfmin;
-                firstZhou = "a";
-                rmsvFirstX = rmsData[rms][0];
-              }
-
-              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-              rmsSA.push([rmsData[rms][0], rmsSecondA]);
-              rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA;
-              rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA;
-              if (rsmin < rmsvSecondY) {
-                rmsvSecondY = rsmin;
-                secondeZhou = "a";
-                rmsvSecondX = rmsData[rms][0];
-              }
-              break;
-            case 2:
-              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-              var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
-              rmsFA.push([rmsData[rms][0], rmsFirstA]);
-              rsmFB.push([rmsData[rms][0], rmsFirstB]);
-              rfmax = this.getMaxTwo(rfmax, rmsFirstA, rmsFirstB);
-              rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstB);
-              if (rfmin < rmsvFirstY) {
-                rmsvFirstY = rfmin;
-                if (rfmin === rmsFirstA) {
-                  firstZhou = "a";
-                } else if (rfmin === rmsFirstB) {
-                  firstZhou = "b";
-                }
-                rmsvFirstX = rmsData[rms][0];
-              }
-
-              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-              var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
-              rmsSA.push([rmsData[rms][0], rmsSecondA]);
-              rsmSB.push([rmsData[rms][0], rmsSecondB]);
-              rsmax = this.getMaxTwo(rsmax, rmsSecondA, rmsSecondB);
-              rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondB);
-              if (rsmin < rmsvSecondY) {
-                rmsvSecondY = rsmin;
-                if (rsmin === rmsSecondA) {
-                  secondeZhou = "a";
-                } else if (rsmin === rmsSecondB) {
-                  secondeZhou = "b";
-                }
-                rmsvSecondX = rmsData[rms][0];
-              }
-              break;
-            case 3:
-              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-              var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
-              var rmsFirstC = rmsData[rms][this.iphasic * step + 3] * xishu;
-              rmsFA.push([rmsData[rms][0], rmsFirstA]);
-              rsmFB.push([rmsData[rms][0], rmsFirstB]);
-              rmsFC.push([rmsData[rms][0], rmsFirstC]);
-              rfmax = this.getMax(rfmax, rmsFirstA, rmsFirstB, rmsFirstC);
-              if (this.isOpen) {
-                rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstC);
-              } else {
-                rfmin = this.getMin(rfmin, rmsFirstA, rmsFirstB, rmsFirstC);
-              }
-              if (rfmin < rmsvFirstY) {
-                rmsvFirstY = rfmin;
-                if (rfmin === rmsFirstA) {
-                  firstZhou = "a";
-                } else if (rfmin === rmsFirstB) {
-                  firstZhou = "b";
-                } else {
-                  firstZhou = "c";
-                }
-                rmsvFirstX = rmsData[rms][0];
-              }
-
-              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-              var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
-              var rmsSecondC = rmsData[rms][this.iphasic * step + 3];
-              rmsSA.push([rmsData[rms][0], rmsSecondA]);
-              rsmSB.push([rmsData[rms][0], rmsSecondB]);
-              rmsSC.push([rmsData[rms][0], rmsSecondC]);
-              rsmax = this.getMax(rsmax, rmsSecondA, rmsSecondB, rmsSecondC);
-              if (this.isOpen) {
-                rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondC);
-              } else {
-                rsmin = this.getMin(rsmin, rmsSecondA, rmsSecondB, rmsSecondC);
-              }
-              if (rsmin < rmsvSecondY) {
-                rmsvSecondY = rsmin;
-                if (rsmin === rmsSecondA) {
-                  secondeZhou = "a";
-                } else if (rsmin === rmsSecondB) {
-                  secondeZhou = "b";
-                } else {
-                  secondeZhou = "c";
-                }
-                rmsvSecondX = rmsData[rms][0];
-              }
-              break;
-          }
-        }
-      }
-      //瞬时一次值最大最小值
-      var instantFAn = {};
-      var instantSAn = {};
-      //var color;
-
-      var instantF = {};
-      var instantS = {};
-      var RMSF = {};
-      var RMSS = {};
-      var RMSFMinDetail = {};
-      var RMSSMinDetail = {};
-      var shunshiF = {};
-      var shunshiS = {};
-      var RMSFWave = {};
-      var RMSSWave = {};
-      var title = {};
-
-      //三相名称
-      title.aTitle = aTitle;
-      title.bTitle = bTitle;
-      title.cTitle = cTitle;
-
-      //电流还是电压
-      title.unit = unit;
-
-      //每个波形对应的三相数据
-      shunshiFA = shunshiFA.slice(0);
-      shunshiFB = shunshiFB.slice(0);
-      shunshiFC = shunshiFC.slice(0);
-      rmsFA = rmsFA.slice(0);
-      rsmFB = rsmFB.slice(0);
-      rmsFC = rmsFC.slice(0);
-
-      shunshiSA = shunshiSA.slice(0);
-      shunshiSB = shunshiSB.slice(0);
-      shunshiSC = shunshiSC.slice(0);
-      rmsSA = rmsSA.slice(0);
-      rsmSB = rsmSB.slice(0);
-      rmsSC = rmsSC.slice(0);
-
-      shunshiF.shunshiFA = shunshiFA;
-      shunshiF.shunshiFB = shunshiFB;
-      shunshiF.shunshiFC = shunshiFC;
-
-      shunshiS.shunshiSA = shunshiSA;
-      shunshiS.shunshiSB = shunshiSB;
-      shunshiS.shunshiSC = shunshiSC;
-
-      RMSFWave.rmsFA = rmsFA;
-      RMSFWave.rmsFB = rsmFB;
-      RMSFWave.rmsFC = rmsFC;
-
-      RMSSWave.rmsSA = rmsSA;
-      RMSSWave.rmsSB = rsmSB;
-      RMSSWave.rmsSC = rmsSC;
-
-      //赋值对应的最大最小值
-      instantF.max = ifmax;
-      instantF.min = ifmin;
-      instantS.max = ismax;
-      instantS.min = ismin;
-      if (step === 0) {
-        instantFAn.max = ifmax;
-        instantFAn.min = ifmin;
-        instantSAn.max = ismax;
-        instantSAn.min = ismin;
-      }
-      RMSF.max = rfmax;
-      RMSF.min = rfmin;
-      RMSS.max = rsmax;
-      RMSS.min = rsmin;
-      //精确到小数位2位
-      rmsvFirstY = rmsvFirstY;
-      rmsvSecondY = rmsvSecondY;
-      RMSFMinDetail.rmsvFirstX = rmsvFirstX;
-      RMSFMinDetail.rmsvFirstY = rmsvFirstY;
-      RMSFMinDetail.firstZhou = firstZhou;
-
-      RMSSMinDetail.rmsvSecondX = rmsvSecondX;
-      RMSSMinDetail.rmsvSecondY = rmsvSecondY;
-      RMSSMinDetail.secondeZhou = secondeZhou;
-      return this.waveData(
-        instantF,
-        instantS,
-        RMSF,
-        RMSS,
-        RMSFMinDetail,
-        RMSSMinDetail,
-        shunshiF,
-        shunshiS,
-        RMSFWave,
-        RMSSWave,
-        title,
-        unit
-      );
-    },
-    //开始画图
-    initWave(waveDatas, time, type, severity, isOpen) {
-      //清除之前增加的div
-      // $("#wave ~ .bx").remove();
-      $("#rms ~ .bx").remove();
-      //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
-      // var height = $(window).height() - 90;
-      var picHeight;
-      var show = true;
-      if (isOpen) {
-        show = false;
-      }
-      //var v = $("#interval").val();
-      var isvisible = false;
-      var cu = [],
-        rmscu = [],
-        rmscm = [],
-        title,
-        unit,
-        max,
-        min;
-      var a = "",
-        b = "",
-        c = "";
-      var adata = [],
-        bdata = [],
-        cdata = [];
-      var radata = [],
-        rbdata = [],
-        rcdata = [];
-      var rmsvX = 0,
-        rmsvY = 0,
-        zhou = 0;
-      // if (null == waveDatas || waveDatas.length === 1) {
-      //   picHeight = height;
-      // } else if (waveDatas.length > 1) {
-      //   picHeight = height * 0.45;
-      // }
-      picHeight = this.vh;
-      //this.waveHeight = picHeight
-      // this.waveHeight = picHeight
-      this.rmsHeight = picHeight;
-      // this.$rms.css("height", picHeight);
-      // this.$rms.css("width", this.vw);
-      // this.rmsHeight = picHeight
-      // $wave.css("height", picHeight);
-      // $rms.css("height", picHeight);
-      var colors = [];
-      if (null == waveDatas) {
-        cu = [];
-        rmscu = [];
-        rmscm = [];
-        title = "该事件暂无波形图";
-      } else if (waveDatas.length > 0) {
-        title = this.titles;
-
-        if (Number(this.eventValue) <= 90) {
-          isvisible = true;
-        }
-        switch (this.iphasic) {
-          case 1:
-            a = waveDatas[0].title.aTitle;
-            if (this.value === 1) {
-              cu = [[0, waveDatas[0].instantF.min]];
-              rmscu = [[0, waveDatas[0].RMSF.min]];
-              rmscm = [[0, waveDatas[0].RMSF.max]];
-              max = waveDatas[0].instantF.max;
-              min = waveDatas[0].instantF.min;
-              adata = waveDatas[0].shunshiF.shunshiFA;
-
-              radata = waveDatas[0].RMSFWave.rmsFA;
-
-              rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX;
-              rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY;
-              zhou = waveDatas[0].RMSFMinDetail.firstZhou;
-            } else {
-              cu = [[0, waveDatas[0].instantS.min]];
-              rmscu = [[0, waveDatas[0].RMSS.min]];
-              rmscm = [[0, waveDatas[0].RMSS.max]];
-              max = waveDatas[0].instantS.max;
-              min = waveDatas[0].instantS.min;
-              adata = waveDatas[0].shunshiS.shunshiSA;
-
-              radata = waveDatas[0].RMSSWave.rmsSA;
-
-              rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX;
-              rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY;
-              zhou = waveDatas[0].RMSSMinDetail.secondeZhou;
-            }
-
-            colors.push("#DAA520");
-            colors.push("#fff");
-            colors.push("#fff");
-            break;
-          case 2:
-            a = waveDatas[0].title.aTitle;
-            b = waveDatas[0].title.bTitle;
-            if (this.value === 1) {
-              cu = [[0, waveDatas[0].instantF.min]];
-              rmscu = [[0, waveDatas[0].RMSF.min]];
-              rmscm = [[0, waveDatas[0].RMSF.max]];
-              max = waveDatas[0].instantF.max;
-              min = waveDatas[0].instantF.min;
-              adata = waveDatas[0].shunshiF.shunshiFA;
-              bdata = waveDatas[0].shunshiF.shunshiFB;
-
-              radata = waveDatas[0].RMSFWave.rmsFA;
-              rbdata = waveDatas[0].RMSFWave.rmsFB;
-
-              rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX;
-              rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY;
-              zhou = waveDatas[0].RMSFMinDetail.firstZhou;
-            } else {
-              cu = [[0, waveDatas[0].instantS.min]];
-              rmscu = [[0, waveDatas[0].RMSS.min]];
-              rmscm = [[0, waveDatas[0].RMSS.max]];
-              max = waveDatas[0].instantS.max;
-              min = waveDatas[0].instantS.min;
-              adata = waveDatas[0].shunshiS.shunshiSA;
-              bdata = waveDatas[0].shunshiS.shunshiSB;
-
-              radata = waveDatas[0].RMSSWave.rmsSA;
-              rbdata = waveDatas[0].RMSSWave.rmsSB;
-
-              rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX;
-              rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY;
-              zhou = waveDatas[0].RMSSMinDetail.secondeZhou;
-            }
-            colors.push("#DAA520");
-            colors.push("#2E8B57");
-            colors.push("#fff");
-            break;
-          case 3:
-            a = waveDatas[0].title.aTitle;
-            b = waveDatas[0].title.bTitle;
-            c = waveDatas[0].title.cTitle;
-            if (this.value === 1) {
-              cu = [[0, waveDatas[0].instantF.min]];
-              rmscu = [[0, waveDatas[0].RMSF.min]];
-              rmscm = [[0, waveDatas[0].RMSF.max]];
-              max = waveDatas[0].instantF.max;
-              min = waveDatas[0].instantF.min;
-              adata = waveDatas[0].shunshiF.shunshiFA;
-              bdata = waveDatas[0].shunshiF.shunshiFB;
-              cdata = waveDatas[0].shunshiF.shunshiFC;
-              radata = waveDatas[0].RMSFWave.rmsFA;
-              rbdata = waveDatas[0].RMSFWave.rmsFB;
-              rcdata = waveDatas[0].RMSFWave.rmsFC;
-              rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX;
-              rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY;
-              zhou = waveDatas[0].RMSFMinDetail.firstZhou;
-            } else {
-              cu = [[0, waveDatas[0].instantS.min]];
-              rmscu = [[0, waveDatas[0].RMSS.min]];
-              rmscm = [[0, waveDatas[0].RMSS.max]];
-              max = waveDatas[0].instantS.max;
-              min = waveDatas[0].instantS.min;
-              adata = waveDatas[0].shunshiS.shunshiSA;
-              bdata = waveDatas[0].shunshiS.shunshiSB;
-              cdata = waveDatas[0].shunshiS.shunshiSC;
-              radata = waveDatas[0].RMSSWave.rmsSA;
-              rbdata = waveDatas[0].RMSSWave.rmsSB;
-              rcdata = waveDatas[0].RMSSWave.rmsSC;
-              rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX;
-              rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY;
-              zhou = waveDatas[0].RMSSMinDetail.secondeZhou;
-            }
-            colors.push("#DAA520");
-            colors.push("#2E8B57");
-            colors.push("#A52a2a");
-            break;
-        }
-        if (waveDatas[0].unit === "电压") {
-          var xdata = this.wp.listRmsData[0][0];
-          if (this.value === 1) {
-            this.fz = [
-              this.wp.listRmsMinData[0][0],
-              (
-                (this.wp.listRmsMinData[0][1] * Number(this.wp.pt)) /
-                1000
-              ).toFixed(2),
-            ];
-            //  (this.fz * Number(this.wp.pt)) / 1000;
-            unit = "kV";
-          } else {
-            this.fz = [
-              this.wp.listRmsMinData[0][0],
-              this.wp.listRmsMinData[0][1],
-            ];
-            unit = "V";
-          }
-        } else {
-          unit = "A";
-        }
-        //把剩余的DIV先拼接好
-        for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
-          var rmsId = "rms" + step;
-          var newDivRms = $(
-            ` <div style="height:${this.vh
-            };overflow: hidden;"><div class='bx' id='${rmsId}'  ></div></div>`
-          );
-          newDivRms.insertAfter($("#rmsp"));
-          $("#" + rmsId).css("height", picHeight);
-          $("#" + rmsId).css("width", this.vw);
-        }
-      } else {
-        cu = [];
-        // rmscu = [];
-        title =
-          "变电站名称：" +
-          this.subName +
-          " 监测点名称：" +
-          this.lineName +
-          " 发生时刻：" +
-          this.time +
-          " 暂降(骤升)幅值：" +
-          (this.eventValue * 100).toFixed(0) +
-          "% 持续时间：" +
-          this.persistTime +
-          "s";
-      }
-      //绘制横向第一个波形图
-      //绘制瞬时波形图
-      // 绘制RMS波形图
-      let _this = this;
-
-      var myChartes = echarts.init(document.getElementById("rms"));
-      // console.log("==========", radata);
-      let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-      setTimeout(() => {
-        document.getElementById("rms").style.width = '100%';
-        document.getElementById("rms").style.height = _this.vh;
-      }, 0);
-      var option = {
-        tooltip: {
-          top: "10px",
-          trigger: "axis",
-          borderColor: "grey",
-          formatter: function (params) {
-            var tips = "";
-            tips += "时刻:" + params[0].data[0] + "</br/>";
-
-            for (var i = 0; i < params.length; i++) {
-              if (params[i].seriesName != "暂降触发点") {
-
-                tips +=
-                  params[i].seriesName + ":" + (params[i].value[1] - 0).toFixed(2) + "<br/>";
-              }
-            }
-            return tips;
-          },
-          // axisPointer: {
-          //   type: "cross",
-          //   label: {
-
-          //     color: "#fff",
-          //      fontSize: '0.8rem',
-          //   },
-          // },
-          textStyle: {
-            color: "#fff",
-            fontStyle: "normal",
-            opacity: 0.35,
-            fontSize: 14,
-          },
-          backgroundColor: "rgba(0,0,0,0.55)",
-          borderWidth: 0,
-        },
-        title: {
-          left: "center",
-          text: VITE_FLAG ? "电网侧-电压    " + title : title,
-          subtitle: {
-            text: "电压",
-            align: "left",
-          },
-          textStyle: {
-            fontSize: "0.8rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-        },
-        legend: {
-          left: "70px",
-          top: "20",
-          verticalAlign: "top",
-          enabled: true,
-          itemDistance: 5,
-          textStyle: {
-            fontSize: "0.7rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            rich: {
-              a: {
-                verticalAlign: "middle",
-              },
-            },
-
-            padding: [0, 0, 0, 0], //[上、右、下、左]
-          },
-        },
-        // toolbox: {
-        //   show: step != 1 ? true : false,
-        //   feature: {
-        //     //restore: {},
-        //     saveAsImage: {
-        //       iconStyle: {
-        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
-        //       },
-        //     },
-        //   },
-        // },
-        xAxis: {
-          type: "value",
-          name: "时间\n(ms)",
-          min: _this.wp.listRmsData[0][0],
-          max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
-          boundaryGap: false,
-          title: {
-            text: "ms",
-            textStyle: {
-              fontSize: "0.6rem",
-              color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            },
-            enabled: true,
-            align: "high",
-          },
-          nameTextStyle: {
-            fontSize: "0.6rem",
-          },
-          labels: {
-            formatter: function () {
-              return this.value;
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            alignWithLabel: true,
-          },
-          axisLine: {
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            // interval: 50,
-            formatter: function (value, index) {
-              if (_this.valA != (value - 0).toFixed(0)) {
-                _this.valA = (value - 0).toFixed(0);
-                return (value - 0).toFixed(0);
-              }
-            },
-            //rotate:39
-          },
-          // data: this.syncExtremes,
-        },
-        yAxis: {
-          type: "value",
-          name: unit,
-          title: {
-            align: "high",
-            offset: 0,
-            text: unit,
-            rotation: 0,
-            y: -10,
-          },
-          max: rmscm[0][1] * 1.06,
-          min: rmscu[0][1] - rmscu[0][1] * 0.04,
-          boundaryGap: [0, "100%"],
-          showLastLabel: true,
-          // max: max.toFixed(2),
-          // min: min.toFixed(2),
-          opposite: false,
-          nameTextStyle: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-          //minInterval: 1,
-          type: "value",
-          axisLine: {
-            show: true,
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            formatter: function (value, index) {
-              return (value - 0).toFixed(2);
-            },
-          },
-          splitLine: {
-            show: false,
-            lineStyle: {
-              // 使用深浅的间隔色
-              color: [_this.DColor ? "#fff" : echartsColor.thread],
-              type: "dashed",
-              opacity: 0.5,
-            },
-          },
-        },
-        grid: {
-          left: "1%",
-          right: "45px",
-          bottom: "40px",
-          top: "15%",
-          containLabel: true,
-        },
-        dataZoom: [
-          {
-            type: "inside",
-            height: 13,
-            start: 0,
-            bottom: "20px",
-            end: 100,
-          },
-          {
-            start: 0,
-            height: 13,
-            bottom: "20px",
-            end: 100,
-          },
-        ],
-        series: [
-          {
-            name: a,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#DAA520",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: radata,
-          },
-          {
-            name: b,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#2E8B57",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: rbdata,
-          },
-          {
-            name: c,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#A52a2a",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: rcdata,
-          },
-          {
-            name: "暂降触发点",
-            type: "scatter",
-            symbol: "image://" + url,
-            itemStyle: {
-              width: 18,
-              height: 18,
-            },
-            data: rmscu,
-          },
-          //   {
-          //     type: 'flags',
-          //     color: '#34c0e2',
-          //     name: '最小暂降幅值',
-          //     cursor: 'pointer',
-          //     visible: isvisible,
-          //     showInLegend: isvisible,
-          //     data: [{
-          //         x: rmsvX,
-          //         title: rmsvY
-          //     }],
-          //     onSeries: zhou,
-          //     shape: 'flag'
-          // }
-          {
-            name: "最小暂降幅值",
-            type: "scatter",
-            symbol: "image://" + url2,
-            itemStyle: {
-              width: 45,
-              height: 45,
-            },
-            label: {
-              show: true,
-              position: [5, -20],
-              color: "#000",
-              fontSize: "14px",
-              fontWeight: "bold",
-              borderType: "solid",
-              borderWidth: 0.5,
-              backgroundColor: "#ffff",
-              borderColor: "#0099FF",
-            },
-            data: [this.fz],
-          },
-        ],
-      };
-      myChartes.setOption(option)
-      // window.echartsArr.push(myChartes);
-      setTimeout(() => {
-        myChartes.resize();
-        this.loading = false;
-      }, 500);
-      //第一个波形图数据绘制完毕后，绘制后续的波形图
-      if (waveDatas !== null && waveDatas.length > 1) {
-        var waveDatasTemp = waveDatas.slice(1);
-        waveDatasTemp.reverse();
-        for (var step = 0; step < waveDatasTemp.length; step++) {
-          var waveDataTemp = waveDatasTemp[step];
-
-          this.drawPics(waveDataTemp, picHeight, step, show, myChartes, rmscm, rmscu, title);
-        }
-      }
-    },
-    //绘制剩余横向的波形图
-    drawPics(waveDataTemp, picHeight, step, show, myChartes1, rmscm, rmscu, title) {
-      step = step + 1;
-      //新建瞬时DIV和RMS波形DIV
-      // var waveId = 'wave' + step;
-      var rmsId = "rms" + step;
-      // var v = $("#interval").val();
-      var a = "",
-        b = "",
-        c = "";
-      var max, min, unit;
-      var adata = [],
-        bdata = [],
-        cdata = [];
-      var radata = [],
-        rbdata = [],
-        rcdata = [];
-      var colors = [];
-      switch (this.iphasic) {
-        case 1:
-          a = waveDataTemp.title.aTitle;
-          colors.push("yellow");
-          colors.push("#fff");
-          colors.push("#fff");
-          break;
-        case 2:
-          a = waveDataTemp.title.aTitle;
-          b = waveDataTemp.title.bTitle;
-          colors.push("yellow");
-          colors.push("green");
-          colors.push("#fff");
-          break;
-        case 3:
-          a = waveDataTemp.title.aTitle;
-          b = waveDataTemp.title.bTitle;
-          c = waveDataTemp.title.cTitle;
-          colors.push("yellow");
-          colors.push("green");
-          colors.push("red");
-          break;
-      }
-
-      if (this.value === 1) {
-        max = waveDataTemp.instantF.max;
-        min = waveDataTemp.instantF.min;
-        adata = waveDataTemp.shunshiF.shunshiFA;
-        bdata = waveDataTemp.shunshiF.shunshiFB;
-        cdata = waveDataTemp.shunshiF.shunshiFC;
-        radata = waveDataTemp.RMSFWave.rmsFA;
-        rbdata = waveDataTemp.RMSFWave.rmsFB;
-        rcdata = waveDataTemp.RMSFWave.rmsFC;
-      } else {
-        max = waveDataTemp.instantS.max;
-        min = waveDataTemp.instantS.min;
-        adata = waveDataTemp.shunshiS.shunshiSA;
-        bdata = waveDataTemp.shunshiS.shunshiSB;
-        cdata = waveDataTemp.shunshiS.shunshiSC;
-        radata = waveDataTemp.RMSSWave.rmsSA;
-        rbdata = waveDataTemp.RMSSWave.rmsSB;
-        rcdata = waveDataTemp.RMSSWave.rmsSC;
-      }
-      if (waveDataTemp.unit === "电压") {
-        if (this.value === 1) {
-          unit = "kV";
-        } else {
-          unit = "V";
-        }
-      } else {
-        unit = "A";
-      }
-      //绘制rms波形
-      let _this = this;
-
-      var myChartes = echarts.init(document.getElementById(rmsId));
-      //debugger
-      if (VITE_FLAG) {
-        let str = []
-        str = rmsId.split('s')
-        let str1 = Number(str[1])
-        var titlename = ''
-        this.wp.channelNames.forEach((element, i) => {
-          if (i == 4 || i == 7 || i == 10) {
-            let s = []
-            let s1 = ''
-            s = element.split('A')
-            if (str1 == 1 && i == 4) {
-
-              if (s[0] == 'LI') {
-                s1 = '电网侧-电流'
-              } else {
-                s1 = s[0] + '侧' + s[1]
-              }
-
-              titlename = s1 + '    ' + title
-            }
-            if (str1 == 2 && i == 7) {
-
-              if (s[0] == 'SU') {
-                s1 = '负载侧-电压'
-              } else {
-                s1 = s[0] + '侧' + s[1]
-              }
-
-              titlename = s1 + '    ' + title
-            }
-            if (str1 == 3 && i == 10) {
-
-
-              if (s[0] == 'SI') {
-                s1 = '负载侧-电流'
-              } else {
-                s1 = s[0] + '侧' + s[1]
-              }
-
-              titlename = s1 + '    ' + title
-            }
-          }
-
-        });
-      }
-      let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-      var option = {
-        tooltip: {
-          trigger: "axis",
-          borderColor: "grey",
-          backgroundColor: "#fff",
-          style: {
-            color: "#000",
-            fontSize: "15px",
-            padding: 10,
-          },
-          formatter: function (params) {
-            // console.log(params)
-            var tips = "";
-            tips += "时刻:" + params[0].data[0] + "</br/>";
-
-            for (var i = 0; i < params.length; i++) {
-              if (params[i].seriesName != "暂降触发点") {
-                tips +=
-                  params[i].seriesName + ":" + (params[i].value[1] - 0).toFixed(2) + "<br/>";
-              }
-            }
-            return tips;
-          },
-          // axisPointer: {
-          //   type: "cross",
-          //   label: {
-          //     color: "#fff",
-          //      fontSize: '0.8rem',
-          //   },
-          // },
-          textStyle: {
-            color: "#fff",
-            fontStyle: "normal",
-            opacity: 0.35,
-            fontSize: 14,
-          },
-          backgroundColor: "rgba(0,0,0,0.55)",
-          borderWidth: 0,
-        },
-        title: {
-          left: "center",
-          text: titlename,
-          textStyle: {
-            fontSize: "0.8rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-        },
-        legend: {
-          left: "70px",
-          top: "20",
-          verticalAlign: "top",
-          enabled: true,
-          itemDistance: 5,
-          textStyle: {
-            fontSize: "0.7rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            rich: {
-              a: {
-                verticalAlign: "middle",
-              },
-            },
-
-            padding: [0, 0, 0, 0], //[上、右、下、左]
-          },
-        },
-        // toolbox: {
-        //   show: step != 1 ? true : false,
-        //   feature: {
-        //     //restore: {},
-        //     saveAsImage: {
-        //       iconStyle: {
-        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
-        //       },
-        //     },
-        //   },
-        // },
-        xAxis: {
-          type: "value",
-          name: "时间\n(ms)",
-          min: _this.wp.listRmsData[0][0],
-          max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
-          boundaryGap: false,
-          title: {
-            text: "ms",
-            textStyle: {
-              fontSize: "0.6rem",
-              color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            },
-            enabled: true,
-            align: "high",
-          },
-          labels: {
-            formatter: function () {
-              return this.value;
-            },
-          },
-          nameTextStyle: {
-            fontSize: "0.6rem",
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            alignWithLabel: true,
-          },
-          axisLine: {
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            // interval: 50,
-            formatter: function (value, index) {
-              if (_this.valB != (value - 0).toFixed(0)) {
-                _this.valB = (value - 0).toFixed(0);
-                return (value - 0).toFixed(0);
-              }
-            },
-            //rotate:39
-          },
-          // data: this.syncExtremes,
-        },
-        yAxis: {
-          type: "value",
-          name: unit,
-          title: {
-            align: "high",
-            offset: 0,
-            text: unit,
-            rotation: 0,
-            y: -10,
-          },
-          // max: rmscm[0][1] * 1.01,
-          // min: rmscu[0][1] - rmscu[0][1] * 0.01,
-          boundaryGap: [0, "100%"],
-          showLastLabel: true,
-          // max: max.toFixed(2),
-          // min: min.toFixed(2),
-          opposite: false,
-          // axisLabel: {
-          //   formatter: "{value}",
-          // },
-          nameTextStyle: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-          //minInterval: 1,
-          type: "value",
-          axisLine: {
-            show: true,
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            formatter: function (value, index) {
-              return (value - 0).toFixed(2);
-            },
-          },
-          splitLine: {
-            show: false,
-            lineStyle: {
-              // 使用深浅的间隔色
-              color: [_this.DColor ? "#fff" : echartsColor.thread],
-              type: "dashed",
-              opacity: 0.5,
-            },
-          },
-        },
-        grid: {
-          left: "1%",
-          right: "45px",
-          bottom: "40px",
-          top: "15%",
-          containLabel: true,
-        },
-        dataZoom: [
-          {
-            type: "inside",
-            height: 13,
-            start: 0,
-            bottom: "20px",
-            end: 100,
-          },
-          {
-            start: 0,
-            height: 13,
-            bottom: "20px",
-            end: 100,
-          },
-        ],
-        series: [
-          {
-            name: a,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#DAA520",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: radata,
-          },
-          {
-            name: b,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#2E8B57",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: rbdata,
-          },
-          {
-            name: c,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#A52a2a",
-            },
-            progressive: 500,
-            // 渲染阈值，大于此值则启动渐进渲染
-            progressiveThreshold: 1000,
-            large: true,
-            data: rcdata,
-          },
-        ],
-      };
-      myChartes.setOption(option)
-      // window.echartsArr.push(myChartes);
-      setTimeout(() => {
-        myChartes.resize();
-        this.loading = false;
-      }, 500);
-      echarts.connect([myChartes1, myChartes]);
-    },
-    //根据多个值的比较返回其中最大值
-    getMax(temp, tempA, tempB, tempC) {
-      temp = temp > tempA ? temp : tempA;
-      temp = temp > tempB ? temp : tempB;
-      temp = temp > tempC ? temp : tempC;
-      return temp;
-    },
-    //根据多个值的比较返回其中最大值
-    getMaxTwo(temp, tempA, tempB) {
-      temp = temp > tempA ? temp : tempA;
-      temp = temp > tempB ? temp : tempB;
-      return temp;
-    },
-    //根据多个值的比较返回其中最小值
-    getMin(temp, tempA, tempB, tempC) {
-      temp = temp < tempA ? temp : tempA;
-      temp = temp < tempB ? temp : tempB;
-      temp = temp < tempC ? temp : tempC;
-      return temp;
-    },
-    getMinOpen(temp, tempA, tempB) {
-      temp = temp < tempA ? temp : tempA;
-      temp = temp < tempB ? temp : tempB;
-      return temp;
-    },
-  },
-};
-</script>
diff --git a/src/components/echarts/shuWorker.js b/src/components/echarts/shuWorker.js
index 9e8f064..79152f5 100644
--- a/src/components/echarts/shuWorker.js
+++ b/src/components/echarts/shuWorker.js
@@ -1,6 +1,6 @@
 // waveData.worker.js
 self.addEventListener('message', function (e) {
-    const { wp, value, iphasic, isOpen, boxoList } = JSON.parse(e.data)
+    const { wp, value, iphasic, isOpen, boxoList, requestId } = e.data
 
     // 处理波形数据的函数
     const fliteWaveData = (wp, step) => {
@@ -195,6 +195,8 @@ self.addEventListener('message', function (e) {
 
     // 将处理结果发送回主线程
     self.postMessage({
+        requestId,
+        success: true,
         waveDatas,
         time,
         type,
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index 33e64ef..dca92bf 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-loading="loading" class="boxbx" style="position: relative; height: 100%">
         <div id="boxsj">
-            <div id="shushi" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
-                <div class="bx" id="wave" style="min-height: 200px"></div>
+            <div id="shushi" :style="containerStyle">
+                <div class="bx" id="wave" :style="waveStyle"></div>
             </div>
         </div>
     </div>
@@ -14,9 +14,14 @@ import html2canvas from 'html2canvas'
 import $ from 'jquery'
 import * as echarts from 'echarts'
 import { mainHeight } from '@/utils/layout'
+import { calcShuYAxisRange, formatAxisLabel } from '@/utils/chartAxisHelper'
 import url from '@/assets/img/point.png'
-// 创建Worker
-let waveDataWorker: Worker | null = null
+import { buildWaveCacheKey, getWaveCache, setWaveCache } from '@/utils/waveCache'
+import { getShuWorker, buildWorkerPayload } from '@/utils/waveWorkerPool'
+
+let waveRequestId = 0
+const pendingCacheKeys = new Map<number, string>()
+let shuWorker: Worker | null = null
 interface WaveData {
     instantF: { max: number; min: number }
     instantS: { max: number; min: number }
@@ -110,38 +115,82 @@ const vh = computed(() => {
 
 const vw = computed(() => '100%')
 
+const containerStyle = computed(() => ({
+    height: vh.value,
+    overflow: 'hidden',
+    minHeight: '200px'
+}))
+
+const waveStyle = computed(() => ({
+    width: '100%',
+    height: '100%',
+    minHeight: '200px'
+}))
+
+const applyChartSize = (el: HTMLElement) => {
+    el.style.width = '100%'
+    el.style.height = vh.value
+}
+
+const finishChartRender = (chart: echarts.ECharts, endLoading = false) => {
+    nextTick(() => {
+        chart.resize()
+        if (endLoading) {
+            loading.value = false
+        }
+    })
+}
+
 watch(
     () => props.value,
-    newVal => {
-        if (newVal == 2) {
-            initWaves()
-        } else {
-            $('#wave1').remove()
-            initWaves()
-        }
+    () => {
+        query()
     }
 )
 
+watch(
+    () => props.wp,
+    () => {
+        query()
+    }
+)
+
+const applyWorkerResult = (data: any) => {
+    titles.value = data.titles
+    iphasic.value = data.iphasic
+    time.value = data.time
+    type.value = data.type
+    severity.value = data.severity
+    initWave(data.waveDatas, data.time, data.type, data.severity, isOpen.value)
+    loading.value = false
+}
+
 onMounted(() => {
     const zoomValue = document.body.style.getPropertyValue('zoom')
     zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
 
     window.addEventListener('resize', handleResize)
+    shuWorker = getShuWorker(data => {
+        if (data.requestId !== waveRequestId) return
+        if (!data.success) {
+            console.error('Worker error:', data.error)
+            loading.value = false
+            return
+        }
+        const cacheKey = pendingCacheKeys.get(data.requestId)
+        if (cacheKey) {
+            setWaveCache(cacheKey, data)
+            pendingCacheKeys.delete(data.requestId)
+        }
+        applyWorkerResult(data)
+    })
+
     nextTick(() => {
-        setTimeout(() => {
-            query()
-        }, 500)
+        query()
     })
 })
 
 onBeforeUnmount(() => {
-    console.log('组件卸载')
-
-    if (waveDataWorker) {
-        waveDataWorker.terminate()
-        waveDataWorker = null
-    }
-
     backbxlb()
     window.removeEventListener('resize', handleResize)
 })
@@ -166,6 +215,13 @@ const download = () => {
     }
 }
 
+const EXTRA_PANEL_CLASS = 'wave-extra-panel'
+
+const resetWaveDom = () => {
+    backbxlb()
+    $('#shushi').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+}
+
 const query = () => {
     loading.value = true
     initWaves()
@@ -184,48 +240,32 @@ const waveData = (instantF: any, instantS: any, shunshiF: any, shunshiS: any, ti
 
 // 在组件中修改initWaves函数
 const initWaves = () => {
-    if (props.wp) {
-        loading.value = true
-        iphasic.value = props.wp.iphasic || 1
-        // 使用Web Worker处理数据
-        if (!waveDataWorker) {
-            waveDataWorker = new Worker(new URL('./shuWorker.js', import.meta.url))
-
-            waveDataWorker.onmessage = function (e) {
-                const data = e.data
-
-                titles.value = data.titles
-                iphasic.value = data.iphasic
-                time.value = data.time
-                type.value = data.type
-                severity.value = data.severity
-
-                initWave(data.waveDatas, data.time, data.type, data.severity, isOpen.value)
-
-                loading.value = false
-            }
-
-            waveDataWorker.onerror = function (error) {
-                console.error('Worker error:', error)
-                loading.value = false
-                // 备用方案：在主线程处理数据
-                // processDataInMainThread();
-            }
-        }
-
-        // 发送数据到Worker
-        waveDataWorker.postMessage(
-            JSON.stringify({
-                wp: props.wp,
-                value: props.value,
-                iphasic: iphasic.value,
-                isOpen: isOpen.value,
-                boxoList: props.boxoList
-            })
-        )
-    } else {
+    if (!props.wp?.listWaveData?.length) {
         initWave(null, null, null, null, null)
+        loading.value = false
+        return
     }
+
+    const cacheKey = buildWaveCacheKey('shu', props.wp, props.value, isOpen.value, props.boxoList)
+    const cached = getWaveCache<any>(cacheKey)
+    if (cached) {
+        applyWorkerResult(cached)
+        return
+    }
+
+    loading.value = true
+    iphasic.value = props.wp.iphasic || 1
+    const currentRequestId = ++waveRequestId
+    pendingCacheKeys.set(currentRequestId, cacheKey)
+
+    shuWorker?.postMessage(
+        buildWorkerPayload('shu', props.wp, props.boxoList, {
+            requestId: currentRequestId,
+            value: props.value,
+            isOpen: isOpen.value,
+            iphasic: iphasic.value
+        })
+    )
 }
 
 const initWave = (
@@ -235,6 +275,7 @@ const initWave = (
     severity: string | null,
     isOpen: boolean | null
 ) => {
+    resetWaveDom()
     $('div.bx1').remove()
 
     let picHeight = vh.value
@@ -327,7 +368,7 @@ const initWave = (
 
         for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
             const waveId = 'wave' + step
-            const newDivShunshi = $(`<div style="height:${vh.value};overflow: hidden;min-height: 200px;">
+            const newDivShunshi = $(`<div class="${EXTRA_PANEL_CLASS}" style="height:${vh.value};overflow: hidden;min-height: 200px;">
         <div class='bx1' id='${waveId}'></div>
       </div>`)
             newDivShunshi.insertAfter($('#shushi'))
@@ -342,6 +383,13 @@ const initWave = (
     const wave = document.getElementById('wave')
     if (!wave) return
 
+    applyChartSize(wave)
+
+    const yRange = calcShuYAxisRange(Number(min), Number(max))
+
+    const existingChart = echarts.getInstanceByDom(wave)
+    if (existingChart) existingChart.dispose()
+
     const myChartes = echarts.init(wave)
     const echartsColor = {
         WordColor: '#000',
@@ -363,11 +411,6 @@ const initWave = (
         ]
     }
 
-    setTimeout(() => {
-        wave.style.width = '100%'
-        wave.style.height = vh.value
-    }, 0)
-
     const option = {
         tooltip: {
             top: '10px',
@@ -481,10 +524,8 @@ const initWave = (
             },
             boundaryGap: [0, '100%'],
             showLastLabel: true,
-            // max: max.toFixed(2) * 1.1,
-            // min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
-               max: Math.floor(max.toFixed(2) * 1.1 * 10) / 10,
-            min: Math.floor(min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1 * 10) / 10  ,
+            max: yRange.max,
+            min: yRange.min,
             opposite: false,
             nameTextStyle: {
                 fontSize: '12px',
@@ -501,8 +542,7 @@ const initWave = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    // return (value - 0).toFixed(2)
-                    return Math.floor(value * 1000) / 1000
+                    return formatAxisLabel(value)
                 }
             },
             splitLine: {
@@ -518,7 +558,6 @@ const initWave = (
             right: '45px',
             bottom: '40px',
             top: '60px'
-            // containLabel: true
         },
         dataZoom: [
             {
@@ -578,11 +617,7 @@ const initWave = (
 
     myChartes.setOption(option)
     myChartess.value = myChartes
-
-    setTimeout(() => {
-        myChartes.resize()
-        loading.value = false
-    }, 400)
+    finishChartRender(myChartes, true)
 
     if (waveDatas && waveDatas.length > 1) {
         const waveDatasTemp = waveDatas.slice(1)
@@ -679,6 +714,13 @@ const drawPics = (
     const waveIds = document.getElementById(waveId)
     if (!waveIds) return
 
+    applyChartSize(waveIds)
+
+    const yRange = calcShuYAxisRange(Number(min), Number(max))
+
+    const existingChart = echarts.getInstanceByDom(waveIds)
+    if (existingChart) existingChart.dispose()
+
     const myChartes = echarts.init(waveIds)
     const echartsColor = {
         WordColor: '#000',
@@ -791,8 +833,8 @@ const drawPics = (
             },
             boundaryGap: [0, '100%'],
             showLastLabel: true,
-            max: Math.floor(max.toFixed(2) * 1.1 * 10) / 10,
-            min: Math.floor(min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1 * 10) / 10  ,
+            max: yRange.max,
+            min: yRange.min,
             opposite: false,
             nameTextStyle: {
                 fontSize: '12px',
@@ -809,8 +851,7 @@ const drawPics = (
                 fontSize: '12px',
                 color: props.DColor ? '#000' : echartsColor.WordColor,
                 formatter: function (value: number) {
-                    // return (value - 0).toFixed(2)
-                    return Math.floor(value * 1000) / 1000
+                    return formatAxisLabel(value)
                 }
             },
             splitLine: {
@@ -897,10 +938,7 @@ const drawPics = (
             break
     }
 
-    setTimeout(() => {
-        myChartes.resize()
-        loading.value = false
-    }, 400)
+    finishChartRender(myChartes)
 
     echarts.connect([myChartes1, myChartes])
 }
@@ -929,12 +967,8 @@ const backbxlb = () => {
     myChartess4.value = null
     myChartess5.value = null
 
-    // echarts.disconnect(charts.filter(Boolean) as echarts.ECharts[])
-    charts.filter(Boolean).forEach(chart => {
-        if (chart && typeof chart.dispose === 'function') {
-            chart.dispose()
-        }
-    })
+    $('#shushi').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+    $('div.bx1').remove()
 }
 
 const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {
diff --git a/src/components/echarts/shushiboxi1.vue b/src/components/echarts/shushiboxi1.vue
deleted file mode 100644
index d3d8f13..0000000
--- a/src/components/echarts/shushiboxi1.vue
+++ /dev/null
@@ -1,1201 +0,0 @@
-<template>
-    <div v-loading="loading" class="boxbx" style="position: relative">
-        <div id="boxsj">
-            <div id="shushi" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="wave"></div>
-            </div>
-        </div>
-        <el-button style="position: absolute; right: 10px; top: 0px; z-index: 20000" type="primary" link
-            icon="el-icon-Download" title="生成图片" @click="download">
-            下载
-        </el-button>
-    </div>
-</template>
-<script lang="js">
-import html2canvas from 'html2canvas'
-import $ from 'jquery'
-import * as echarts from 'echarts'
-
-import { mainHeight } from '@/utils/layout'
-import url from '@/assets/img/point.png'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'zl'
-export default {
-    props: {
-        value: {
-            type: Number,
-            default: 2
-        },
-        flag: {
-            type: [String, Number, Boolean],
-            default: 3
-        },
-        parentHeight: {
-            type: [String, Number, Boolean],
-            default: 0
-        },
-        DColor: {
-            type: Boolean,
-            default: false
-        },
-        boxoList: {
-            type: [Object, Array]
-        },
-        wp: {
-            type: [Object, Array]
-        }
-    },
-    data() {
-        return {
-            loading: true,
-            tabvalue: this.value,
-            // url: '@/assets/img/point.png',
-            valA: 0,
-            valB: 0,
-            isOpen: false,
-            time: '',
-            type: '',
-            severity: '',
-            iphasic: '',
-            eventValue: '',
-            persistTime: '',
-            lineName: '',
-            subName: '',
-            waveDatas: [],
-            ptpass: '',
-            waveHeight: undefined,
-            rmsHeight: undefined,
-            $wave: undefined,
-            $rms: undefined,
-            color: '#006565',
-            charts: {},
-            arrpoints: [],
-            titles: '',
-            vh: null,
-            vw: null,
-            zoom: ''
-        }
-    },
-    created() {
-
-        if (this.flag == 1) {
-            this.vh = mainHeight(200).height
-        } else {
-            this.vh = mainHeight(200, 2).height
-        }
-        if (this.parentHeight != 0) {
-            this.vh = mainHeight(this.parentHeight, 2).height
-
-        }
-        this.vw = '100%'
-    },
-    watch: {
-        value: function (a, b) {
-            if (a == 2) {
-                // $("#wave1").remove();
-                this.initWaves()
-            } else {
-                $('#wave1').remove()
-                this.initWaves()
-            }
-        }
-    },
-    mounted() {
-        // console.log(`123123`,this.boxoList,this.wp);
-        this.zoom = 1 / document.body.style.zoom
-        window.addEventListener('resize', () => {
-            this.zoom = 1 / document.body.style.zoom
-        })
-        // this.$wave = $('#wave').eq(0)
-        this.$nextTick(() => {
-            this.query()
-        })
-    },
-    methods: {
-        download() {
-            // 转换成canvas
-            html2canvas(document.getElementById('boxsj'), {
-                scale: 2
-            }).then(function (canvas) {
-                // 创建a标签，实现下载
-                var creatIMg = document.createElement('a')
-                creatIMg.download = '瞬间波形.png' // 设置下载的文件名，
-                creatIMg.href = canvas.toDataURL() // 下载url
-                creatIMg.click()
-                creatIMg.remove() // 下载之后把创建的元素删除
-            })
-        },
-        query() {
-            this.loading = true
-            this.initWaves()
-        },
-        //波形总体数据构造函数
-        waveData(instantF, instantS, shunshiF, shunshiS, title, unit) {
-            // console.log(1);
-            /*瞬时一次值最大最小值*/
-            this.instantF = instantF
-            /*瞬时二次值最大最小值*/
-            this.instantS = instantS
-            /*瞬时值一次值3相详细数据*/
-            this.shunshiF = shunshiF
-            /*瞬时值二次值3相详细数据*/
-            this.shunshiS = shunshiS
-            /*三相名称*/
-            this.title = title
-            /*电压还是电流*/
-            this.unit = unit
-        },
-        //根据后台查询的数据，清洗数据
-        initWaves() {
-            if (null != this.wp) {
-                if (this.boxoList.systemType == 'pms') {
-                    this.titles =
-                        '变电站名称：' +
-                        this.boxoList.powerStationName +
-                        ' 监测点名称：' +
-                        this.boxoList.measurementPointName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        (this.boxoList.featureAmplitude * 100).toFixed(0) +
-                        '% 持续时间：' +
-                        this.boxoList.duration +
-                        's'
-                } else if (this.boxoList.systemType == 'ZL') {
-                    this.titles =
-                        // "变电站名称：" +
-                        // this.boxoList.equipmentName +
-                        ' 监测点名称：' +
-                        this.boxoList.lineName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        this.boxoList.evtParamVVaDepth +
-                        ' 持续时间：' +
-                        this.boxoList.evtParamTm +
-                        's'
-                }
-                else if (this.boxoList.systemType == 'WX') {
-                    let featureAmplitude = this.boxoList.featureAmplitude + '' ? this.boxoList.featureAmplitude.toFixed(2) : '/'
-                    if (String(this.boxoList.featureAmplitude).split('.')[1] == '00') {
-                        this.boxoList.featureAmplitude = String(this.boxoList.featureAmplitude).split('.')[0]
-                    }
-
-                    this.titles =
-
-                        ' 监测点名称：' +
-                        this.boxoList.lineName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        (featureAmplitude) +
-                        '%  持续时间：' +
-                        (this.boxoList.persistTime || this.boxoList.evtParamTm || '-') +
-                        's'
-                } else {
-                    this.titles =
-                        '变电站名称：' +
-                        this.boxoList.subName +
-                        ' 监测点名称：' +
-                        this.boxoList.lineName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        (this.boxoList.featureAmplitude * 100).toFixed(0) +
-                        '% 持续时间：' +
-                        this.boxoList.duration +
-                        's'
-                }
-
-                //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
-                //相的数量
-                this.iphasic = this.wp.iphasic
-                if (this.iphasic === 0) {
-                    this.iphasic = 1
-                }
-                var picCounts = (this.wp.waveTitle.length - 1) / this.iphasic
-                this.waveDatas = []
-                //循环筛选需求的数据
-                for (var i = 0; i < picCounts; i++) {
-                    this.fliteWaveData(this.wp, i)
-                    this.waveDatas.push({
-                        instantF: this.instantF,
-                        instantS: this.instantS,
-                        shunshiF: this.shunshiF,
-                        shunshiS: this.shunshiS,
-                        title: this.title,
-                        unit: this.unit,
-
-                    })
-
-                }
-
-                this.time = this.wp.time
-                this.type = this.wp.waveType
-                this.severity = this.wp.yzd
-                //严重度为负，事件为暂升事件
-                if (this.severity < 0) {
-                    this.severity = '/'
-                    this.type = '/'
-                }
-
-                this.initWave(this.waveDatas, this.time, this.type, this.severity, this.isOpen)
-            } else {
-                this.initWave(null, null, null, null, null)
-            }
-        },
-        //获取横向一个波形的全部数据，包括瞬时波形的一次、二次值，如果是电压的话，还需要计算出对应的最大最小值
-        fliteWaveData(wp, step) {
-
-            var shunData = wp.listWaveData
-            var pt = Number(wp.pt) / 1000
-            var ct = Number(wp.ct)
-            var titleList = wp.waveTitle
-            //首先判断当前绘制的是电压还是电流
-            var xishu = pt //默认电压，二次值转一次值乘以pt
-            //三相名称
-            var aTitle = '',
-                bTitle = '',
-                cTitle = '',
-                unit = '电压'
-            //每个波形对应的最大最小值
-            var ifmax, ifmin, ismax, ismin
-
-            var shunshiFA = [],
-                shunshiFB = [],
-                shunshiFC = [],
-                shunshiSA = [],
-                shunshiSB = [],
-                shunshiSC = []
-            //给瞬时赋个初始值
-            if (shunData.length > 0) {
-                if (titleList[this.iphasic * step + 1].substring(0, 1) !== 'U') {
-                    xishu = ct
-                    unit = '电流'
-                }
-                for (var i = 1; i <= this.iphasic; i++) {
-                    switch (i) {
-                        case 1:
-                            aTitle = titleList[this.iphasic * step + i].substring(1)
-                            break
-                        case 2:
-                            bTitle = titleList[this.iphasic * step + i].substring(1)
-                            break
-                        case 3:
-                            cTitle = titleList[this.iphasic * step + i].substring(1)
-                            break
-                    }
-                }
-                if (shunData[0][this.iphasic * step + 1] !== undefined) {
-                    ifmax = shunData[0][this.iphasic * step + 1] * xishu
-                    ifmin = shunData[0][this.iphasic * step + 1] * xishu
-                    ismax = shunData[0][this.iphasic * step + 1]
-                    ismin = shunData[0][this.iphasic * step + 1]
-                }
-
-                //瞬时值--同时还需要获取出瞬时值的一次、二次的最大最小值
-                for (var shun = 0; shun < shunData.length; shun++) {
-                    if (shunData[shun][this.iphasic * step + 1] === undefined) {
-                        break
-                    }
-                    //根据波形数据相的数量来筛选数据
-                    switch (this.iphasic) {
-                        case 1:
-                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            shunshiFA.push([shunData[shun][0], shunFirstA])
-                            ifmax = ifmax > shunFirstA ? ifmax : shunFirstA
-                            ifmin = ifmin < shunFirstA ? ifmin : shunFirstA
-
-                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
-                            shunshiSA.push([shunData[shun][0], shunSecondA])
-                            ismax = ismax > shunSecondA ? ismax : shunSecondA
-                            ismin = ismin < shunSecondA ? ismin : shunSecondA
-                            break
-                        case 2:
-                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu
-                            shunshiFA.push([shunData[shun][0], shunFirstA])
-                            shunshiFB.push([shunData[shun][0], shunFirstB])
-                            ifmax = this.getMaxTwo(ifmax, shunFirstA, shunFirstB)
-                            ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstB)
-
-                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
-                            var shunSecondB = shunData[shun][this.iphasic * step + 2]
-                            shunshiSA.push([shunData[shun][0], shunSecondA])
-                            shunshiSB.push([shunData[shun][0], shunSecondB])
-                            ismax = this.getMaxTwo(ismax, shunSecondA, shunSecondB)
-                            ismin = this.getMinOpen(ismin, shunSecondA, shunSecondB)
-                            break
-                        case 3:
-                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu
-                            var shunFirstC = shunData[shun][this.iphasic * step + 3] * xishu
-                            shunshiFA.push([shunData[shun][0], shunFirstA])
-                            shunshiFB.push([shunData[shun][0], shunFirstB])
-                            shunshiFC.push([shunData[shun][0], shunFirstC])
-                            ifmax = this.getMax(ifmax, shunFirstA, shunFirstB, shunFirstC)
-                            //如果接线方式是V
-                            if (this.isOpen) {
-                                ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstC)
-                            } else {
-                                ifmin = this.getMin(ifmin, shunFirstA, shunFirstB, shunFirstC)
-                            }
-
-                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
-                            var shunSecondB = shunData[shun][this.iphasic * step + 2]
-                            var shunSecondC = shunData[shun][this.iphasic * step + 3]
-                            shunshiSA.push([shunData[shun][0], shunSecondA])
-                            shunshiSB.push([shunData[shun][0], shunSecondB])
-                            shunshiSC.push([shunData[shun][0], shunSecondC])
-                            ismax = this.getMax(ismax, shunSecondA, shunSecondB, shunSecondC)
-                            //如果接线方式是V
-                            if (this.isOpen) {
-                                ismin = this.getMinOpen(ismin, shunSecondA, shunSecondC)
-                            } else {
-                                ismin = this.getMin(ismin, shunSecondA, shunSecondB, shunSecondC)
-                            }
-                            break
-                    }
-                }
-            }
-            //瞬时一次值最大最小值
-            var instantFAn = {}
-            var instantSAn = {}
-            //var color;
-
-            var instantF = {}
-            var instantS = {}
-            var shunshiF = {}
-            var shunshiS = {}
-            var title = {}
-
-            //三相名称
-            title.aTitle = aTitle
-            title.bTitle = bTitle
-            title.cTitle = cTitle
-
-            //电流还是电压
-            title.unit = unit
-
-            //每个波形对应的三相数据
-            shunshiFA = shunshiFA.slice(0)
-            shunshiFB = shunshiFB.slice(0)
-            shunshiFC = shunshiFC.slice(0)
-            shunshiSA = shunshiSA.slice(0)
-            shunshiSB = shunshiSB.slice(0)
-            shunshiSC = shunshiSC.slice(0)
-
-            shunshiF.shunshiFA = shunshiFA
-            shunshiF.shunshiFB = shunshiFB
-            shunshiF.shunshiFC = shunshiFC
-
-            shunshiS.shunshiSA = shunshiSA
-            shunshiS.shunshiSB = shunshiSB
-            shunshiS.shunshiSC = shunshiSC
-
-            //赋值对应的最大最小值
-            instantF.max = ifmax
-            instantF.min = ifmin
-            instantS.max = ismax
-            instantS.min = ismin
-            if (step === 0) {
-                instantFAn.max = ifmax
-                instantFAn.min = ifmin
-                instantSAn.max = ismax
-                instantSAn.min = ismin
-            }
-
-
-            return this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit)
-        },
-        //开始画图
-        initWave(waveDatas, time, type, severity, isOpen) {
-
-            //清除之前增加的div
-            // $("#wave ~ .bx1").remove();
-            $('div.bx1').remove()
-            //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
-            // var height = $(window).height() - 90;
-            var picHeight
-            var show = true
-            if (isOpen) {
-                show = false
-            }
-            //var v = $("#interval").val();
-            var isvisible = false
-            var cu = [],
-                title,
-                unit,
-                max,
-                min
-            var a = '',
-                b = '',
-                c = ''
-            var adata = [],
-                bdata = [],
-                cdata = []
-            picHeight = this.vh
-            // this.$wave.css('height', picHeight)
-            // this.$wave.css('width', this.vw)
-            var colors = []
-            if (null == waveDatas) {
-                cu = []
-                title = '该事件暂无波形图'
-            } else if (waveDatas.length > 0) {
-                title = this.titles
-
-                if (Number(this.eventValue) <= 90) {
-                    isvisible = true
-                }
-                switch (this.iphasic) {
-                    case 1:
-                        a = waveDatas[0].title.aTitle
-                        if (this.value === 1) {
-                            cu = [[0, waveDatas[0].instantF.min]]
-                            max = waveDatas[0].instantF.max
-                            min = waveDatas[0].instantF.min
-                            adata = waveDatas[0].shunshiF.shunshiFA
-                        } else {
-                            cu = [[0, waveDatas[0].instantS.min]]
-                            max = waveDatas[0].instantS.max
-                            min = waveDatas[0].instantS.min
-                            adata = waveDatas[0].shunshiS.shunshiSA
-                        }
-
-                        colors.push('#DAA520')
-                        colors.push('#fff')
-                        colors.push('#fff')
-                        break
-                    case 2:
-                        a = waveDatas[0].title.aTitle
-                        b = waveDatas[0].title.bTitle
-                        if (this.value === 1) {
-                            cu = [[0, waveDatas[0].instantF.min]]
-                            max = waveDatas[0].instantF.max
-                            min = waveDatas[0].instantF.min
-                            adata = waveDatas[0].shunshiF.shunshiFA
-                            bdata = waveDatas[0].shunshiF.shunshiFB
-                        } else {
-                            cu = [[0, waveDatas[0].instantS.min]]
-                            max = waveDatas[0].instantS.max
-                            min = waveDatas[0].instantS.min
-                            adata = waveDatas[0].shunshiS.shunshiSA
-                            bdata = waveDatas[0].shunshiS.shunshiSB
-                        }
-                        colors.push('#DAA520')
-                        colors.push('#2E8B57')
-                        colors.push('#fff')
-                        break
-                    case 3:
-                        a = waveDatas[0].title.aTitle
-                        b = waveDatas[0].title.bTitle
-                        c = waveDatas[0].title.cTitle
-                        if (this.value === 1) {
-                            cu = [[0, waveDatas[0].instantF.min]]
-                            max = waveDatas[0].instantF.max
-                            min = waveDatas[0].instantF.min
-                            adata = waveDatas[0].shunshiF.shunshiFA
-                            bdata = waveDatas[0].shunshiF.shunshiFB
-                            cdata = waveDatas[0].shunshiF.shunshiFC
-                        } else {
-                            cu = [[0, waveDatas[0].instantS.min]]
-                            max = waveDatas[0].instantS.max
-                            min = waveDatas[0].instantS.min
-                            adata = waveDatas[0].shunshiS.shunshiSA
-                            bdata = waveDatas[0].shunshiS.shunshiSB
-                            cdata = waveDatas[0].shunshiS.shunshiSC
-                        }
-
-                        colors.push('#DAA520')
-                        colors.push('#2E8B57')
-                        colors.push('#A52a2a')
-                        break
-                }
-
-
-                if (waveDatas[0].unit === '电压') {
-                    if (this.value === 1) {
-                        unit = 'kV'
-                    } else {
-                        unit = 'V'
-                    }
-                } else {
-                    unit = 'A'
-                }
-
-
-                //把剩余的DIV先拼接好
-                for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
-                    var waveId = 'wave' + step
-                    var newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;">
-                                        <div class='bx1' id='${waveId}'>
-                                        </div>
-                                    </div>`)
-                    newDivShunshi.insertAfter($('#shushi'))
-                    //第二个图高度宽度
-                    $('#' + waveId).css('height', picHeight)
-                    $('#' + waveId).css('width', this.vw)
-                }
-            } else {
-                cu = []
-                title =
-                    '变电站名称：' +
-                    this.subName +
-                    ' 监测点名称：' +
-                    this.lineName +
-                    ' 发生时刻：' +
-                    this.time +
-                    ' 暂降(骤升)幅值：' +
-                    (this.eventValue * 100).toFixed(0) +
-                    '% 持续时间：' +
-                    this.persistTime +
-                    's'
-            }
-            //绘制横向第一个波形图
-            //绘制瞬时波形图
-            // const echarts = require('echarts')
-            let wave = document.getElementById('wave')
-
-            let _this = this
-            var myChartes = echarts.init(wave)
-            let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-            setTimeout(() => {
-                wave.style.width = '100%';
-                wave.style.height = _this.vh;
-            }, 0);
-            var option = {
-                animation: false,
-                tooltip: {
-                    top: '10px',
-                    trigger: 'axis',
-                    borderColor: 'grey',
-                    backgroundColor: '#fff',
-                    style: {
-                        color: '#000',
-                        fontSize: '15px',
-                        padding: 10
-                    },
-                    enterable: true,
-                    formatter: function (params) {
-                        // console.log(params)
-                        var tips = ''
-                        tips += '时刻:' + params[0].data[0] + '</br/>'
-
-                        for (var i = 0; i < params.length; i++) {
-                            if (params[i].seriesName != '暂降触发点') {
-                                tips += params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
-                            }
-                        }
-                        return tips
-                    },
-
-                    textStyle: {
-                        color: '#fff',
-                        fontStyle: 'normal',
-                        opacity: 0.35,
-                        fontSize: 14
-                    },
-                    backgroundColor: 'rgba(0,0,0,0.55)',
-                    borderWidth: 0,
-
-                },
-                title: {
-                    left: 'center',
-                    text: VITE_FLAG ? "电网侧-电压    " + title : title,
-                    textStyle: {
-                        fontSize: '0.8rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    }
-                },
-                legend: {
-                    left: '70px',
-                    top: '20',
-                    verticalAlign: 'top',
-                    enabled: true,
-                    itemDistance: 5,
-                    textStyle: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        rich: {
-                            a: {
-                                verticalAlign: 'middle'
-                            }
-                        },
-
-                        padding: [0, 0, 0, 0] //[上、右、下、左]
-                    }
-                },
-                // toolbox: {
-                //   show: step != 1 ? true : false,
-                //   feature: {
-                //     //restore: {},
-                //     saveAsImage: {
-                //       iconStyle: {
-                //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
-                //       },
-                //     },
-                //   },
-                // },
-                xAxis: {
-                    type: 'value',
-                    name: '时间\n(ms)',
-                    boundaryGap: false,
-                    min: _this.wp.listWaveData[0][0],
-                    max: _this.wp.listWaveData[_this.wp.listWaveData.length - 1][0] + 1,
-                    title: {
-                        text: 'ms',
-                        textStyle: {
-                            fontSize: '0.6rem',
-                            color: _this.DColor ? '#fff' : echartsColor.WordColor
-                        },
-                        enabled: true,
-                        align: 'high'
-                    },
-                    splitLine: {
-                        show: false
-                    },
-                    nameTextStyle: {
-                        fontSize: '0.6rem'
-                    },
-                    axisTick: {
-                        alignWithLabel: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            if (_this.valA != (value - 0).toFixed(0)) {
-                                _this.valA = (value - 0).toFixed(0)
-                                return (value - 0).toFixed(0)
-                            }
-                        }
-                        //rotate:39
-                    }
-                    // data: this.syncExtremes,
-                },
-                yAxis: {
-                    type: 'value',
-                    name: unit,
-                    title: {
-                        align: 'high',
-                        offset: 0,
-                        text: unit,
-                        rotation: 0,
-                        y: -10
-                    },
-
-                    boundaryGap: [0, '100%'],
-                    showLastLabel: true,
-                    max: max.toFixed(2) * 1.1,
-                    min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
-                    opposite: false,
-                    nameTextStyle: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    },
-                    //minInterval: 1,
-                    type: 'value',
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            return (value - 0).toFixed(2)
-                        }
-                    },
-                    splitLine: {
-                        show: false,
-                        lineStyle: {
-                            // 使用深浅的间隔色
-                            color: [_this.DColor ? '#fff' : echartsColor.thread],
-                            type: 'dashed',
-                            opacity: 0.5
-                        }
-                    }
-                },
-                grid: {
-                    left: '1%',
-                    right: '2.8%',
-                    bottom: '40px',
-                    top: '15%',
-                    containLabel: true
-                },
-                dataZoom: [
-                    {
-                        type: 'inside',
-                        height: 13,
-                        start: 0,
-                        bottom: '20px',
-                        end: 100
-                    },
-                    {
-                        start: 0,
-                        height: 13,
-                        bottom: '20px',
-                        end: 100
-                    }
-                ],
-                series: [
-                    {
-                        name: a,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#DAA520'
-                        },
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-
-                        large: true,
-                        data: adata
-                    },
-                    {
-                        name: b,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#2E8B57'
-                        },
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-
-                        large: true,
-                        data: bdata
-                    },
-                    {
-                        name: c,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#A52a2a'
-                        },
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-
-                        large: true,
-                        data: cdata
-                    },
-                    {
-                        name: '暂降触发点',
-                        type: 'scatter',
-                        symbol: 'image://' + url,
-                        itemStyle: {
-                            width: 18,
-                            height: 18
-                        },
-
-                        data: cu
-                    }
-                ]
-            }
-
-            myChartes.setOption(option)
-            // window.echartsArr.push(myChartes)
-            setTimeout(() => {
-                myChartes.resize()
-                this.loading = false
-            }, 400)
-
-            //第一个波形图数据绘制完毕后，绘制后续的波形图
-            if (waveDatas !== null && waveDatas.length > 1) {
-                let waveDatasTemp = waveDatas.slice(1)
-                waveDatasTemp.reverse()
-                for (var step = 0; step < waveDatasTemp.length; step++) {
-                    var waveDataTemp = waveDatasTemp[step]
-                    this.drawPics(waveDataTemp, picHeight, step, show, myChartes, title)
-                }
-            }
-        },
-        //绘制剩余横向的波形图
-        drawPics(waveDataTemp, picHeight, step, show, myChartes1, title) {
-
-            let _this = this
-            step = step + 1
-            //新建瞬时DIV
-            var waveId = 'wave' + step
-            var a = '',
-                b = '',
-                c = ''
-            var max, min, unit
-            var adata = [],
-                bdata = [],
-                cdata = []
-            var colors = []
-            switch (this.iphasic) {
-                case 1:
-                    a = waveDataTemp.title.aTitle
-                    colors.push('#DAA520')
-                    colors.push('#fff')
-                    colors.push('#fff')
-                    break
-                case 2:
-                    a = waveDataTemp.title.aTitle
-                    b = waveDataTemp.title.bTitle
-                    colors.push('#DAA520')
-                    colors.push('#2E8B57')
-                    colors.push('#fff')
-                    break
-                case 3:
-                    a = waveDataTemp.title.aTitle
-                    b = waveDataTemp.title.bTitle
-                    c = waveDataTemp.title.cTitle
-                    colors.push('#DAA520')
-                    colors.push('#2E8B57')
-                    colors.push('#A52a2a')
-                    break
-            }
-
-            if (this.value === 1) {
-                max = waveDataTemp.instantF.max
-                min = waveDataTemp.instantF.min
-                adata = waveDataTemp.shunshiF.shunshiFA
-                bdata = waveDataTemp.shunshiF.shunshiFB
-                cdata = waveDataTemp.shunshiF.shunshiFC
-            } else {
-                max = waveDataTemp.instantS.max
-                min = waveDataTemp.instantS.min
-                adata = waveDataTemp.shunshiS.shunshiSA
-                bdata = waveDataTemp.shunshiS.shunshiSB
-                cdata = waveDataTemp.shunshiS.shunshiSC
-            }
-            if (waveDataTemp.unit === '电压') {
-                if (this.value === 1) {
-                    unit = 'kV'
-                } else {
-                    unit = 'V'
-                }
-            } else {
-                unit = 'A'
-            }
-            // const echarts = require('echarts')
-
-
-            let waveIds = document.getElementById(waveId)
-            if (VITE_FLAG) {
-                let str = []
-                str = waveId.split('e')
-                let str1 = Number(str[1])
-                var titlename = ''
-                this.wp.channelNames.forEach((element, i) => {
-                    if (i == 4 || i == 7 || i == 10) {
-                        if (str1 == 1 && i == 4) {
-                            let s = []
-                            let s1 = ''
-                            s = element.split('A')
-                            if (s[0] == 'LI') {
-                                s1 = '电网侧-电流'
-                            } else {
-                                s1 = s[0] + '侧' + s[1]
-                            }
-
-                            titlename = s1 + '    ' + title
-                        }
-                        if (str1 == 2 && i == 7) {
-                            let s = []
-                            let s1 = ''
-                            s = element.split('A')
-                            if (s[0] == 'SU') {
-                                s1 = '负载侧-电压'
-                            } else {
-                                s1 = s[0] + '侧' + s[1]
-                            }
-
-                            titlename = s1 + '    ' + title
-                        }
-                        if (str1 == 3 && i == 10) {
-                            let s = []
-                            let s1 = ''
-                            s = element.split('A')
-                            if (s[0] == 'SI') {
-                                s1 = '负载侧-电流'
-                            } else {
-                                s1 = s[0] + '侧' + s[1]
-                            }
-                            titlename = s1 + '    ' + title
-                        }
-                    }
-                })
-            }
-            var myChartes = echarts.init(waveIds)
-            let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-            var option = {
-                animation: false,
-                tooltip: {
-                    trigger: 'axis',
-                    borderColor: 'grey',
-                    formatter: function (params) {
-                        // console.log(params)
-                        var tips = ''
-                        tips += '时刻:' + params[0].data[0] + '</br/>'
-
-                        for (var i = 0; i < params.length; i++) {
-                            if (params[i].seriesName != '暂降触发点') {
-                                tips += params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
-                            }
-                        }
-                        return tips
-                    },
-
-                    textStyle: {
-                        color: '#fff',
-                        fontStyle: 'normal',
-                        opacity: 0.35,
-                        fontSize: 14
-                    },
-                    backgroundColor: 'rgba(0,0,0,0.55)',
-                    borderWidth: 0
-                },
-                title: {
-                    left: 'center',
-                    text: titlename,
-                    textStyle: {
-                        fontSize: '0.8rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    }
-                },
-                legend: {
-                    left: '70px',
-                    top: '20',
-                    verticalAlign: 'top',
-                    enabled: true,
-                    itemDistance: 5,
-                    textStyle: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        rich: {
-                            a: {
-                                verticalAlign: 'middle'
-                            }
-                        },
-
-                        padding: [0, 0, 0, 0] //[上、右、下、左]
-                    }
-                },
-                // toolbox: {
-                //     show: step != 1 ? true : false,
-                //     feature: {
-                //         //restore: {},
-                //         saveAsImage: {
-                //             iconStyle: {
-                //                 borderColor: _this.DColor ? '#fff' : echartsColor.WordColor
-                //             }
-                //         }
-                //     }
-                // },
-                xAxis: {
-                    type: 'value',
-                    name: '时间\n(ms)',
-                    boundaryGap: false,
-                    min: _this.wp.listWaveData[0][0],
-                    max: _this.wp.listWaveData[_this.wp.listWaveData.length - 1][0] + 1,
-                    title: {
-                        text: 'ms',
-                        textStyle: {
-                            fontSize: '0.6rem',
-                            color: _this.DColor ? '#fff' : echartsColor.WordColor
-                        },
-                        enabled: true,
-                        align: 'high'
-                    },
-                    splitLine: {
-                        show: false
-                    },
-                    axisTick: {
-                        alignWithLabel: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    nameTextStyle: {
-                        fontSize: '0.6rem'
-                    },
-                    axisLabel: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            if (_this.valB != (value - 0).toFixed(0)) {
-                                _this.valB = (value - 0).toFixed(0)
-                                return (value - 0).toFixed(0)
-                            }
-                        }
-                        //rotate:39
-                    }
-                    // data: this.syncExtremes,
-                },
-                yAxis: {
-                    type: 'value',
-                    name: unit,
-                    title: {
-                        align: 'high',
-                        offset: 0,
-                        text: unit,
-                        rotation: 0,
-                        y: -10
-                    },
-                    boundaryGap: [0, '100%'],
-                    showLastLabel: true,
-                    max: max.toFixed(2) * 1.1,
-                    min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
-                    opposite: false,
-                    // axisLabel: {
-                    //   formatter: "{value}",
-                    // },
-                    nameTextStyle: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    },
-                    //minInterval: 1,
-                    type: 'value',
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '0.6rem',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            return (value - 0).toFixed(2)
-                        }
-                    },
-                    splitLine: {
-                        show: false,
-                        lineStyle: {
-                            // 使用深浅的间隔色
-                            color: [_this.DColor ? '#fff' : echartsColor.thread],
-                            type: 'dashed',
-                            opacity: 0.5
-                        }
-                    }
-                },
-                grid: {
-                    left: '1%',
-                    right: '2.8%',
-                    bottom: '40px',
-                    top: '15%',
-                    containLabel: true
-                },
-                dataZoom: [
-                    {
-                        type: 'inside',
-                        height: 13,
-                        start: 0,
-                        bottom: '20px',
-                        end: 100
-                    },
-                    {
-                        start: 0,
-                        height: 13,
-                        bottom: '20px',
-                        end: 100
-                    }
-                ],
-                series: [
-                    {
-                        name: a,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#DAA520'
-                        },
-                        large: true,
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-                        data: adata
-                    },
-                    {
-                        name: b,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#2E8B57'
-                        },
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-                        large: true,
-                        data: bdata
-                    },
-                    {
-                        name: c,
-                        type: 'line',
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#A52a2a'
-                        },
-                        progressive: 1000,
-                        // 渲染阈值，大于此值则启动渐进渲染
-                        progressiveThreshold: 2000,
-                        large: true,
-                        data: cdata
-                    }
-                ]
-            }
-            myChartes.setOption(option)
-            // window.echartsArr.push(myChartes)
-            setTimeout(() => {
-                myChartes.resize()
-                this.loading = false
-            }, 400)
-            echarts.connect([myChartes1, myChartes])
-        },
-        //根据多个值的比较返回其中最大值
-        getMax(temp, tempA, tempB, tempC) {
-            temp = temp > tempA ? temp : tempA
-            temp = temp > tempB ? temp : tempB
-            temp = temp > tempC ? temp : tempC
-            return temp
-        },
-        //根据多个值的比较返回其中最大值
-        getMaxTwo(temp, tempA, tempB) {
-            temp = temp > tempA ? temp : tempA
-            temp = temp > tempB ? temp : tempB
-            return temp
-        },
-        //根据多个值的比较返回其中最小值
-        getMin(temp, tempA, tempB, tempC) {
-            temp = temp < tempA ? temp : tempA
-            temp = temp < tempB ? temp : tempB
-            temp = temp < tempC ? temp : tempC
-            return temp
-        },
-        getMinOpen(temp, tempA, tempB) {
-            temp = temp < tempA ? temp : tempA
-            temp = temp < tempB ? temp : tempB
-            return temp
-        }
-    }
-}
-</script>
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 84b353e..8c1fa8a 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -10,10 +10,11 @@
             @checkbox-all="selectChangeEvent"
             @checkbox-change="selectChangeEvent"
             :showOverflow="showOverflow"
-            :sort-config="{ remote: true }"
-            @sort-change="handleSortChange"
+            
+          
         >
-        
+        <!-- :sort-config="{ remote: true }" -->
+        <!-- @sort-change="handleSortChange" -->
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
diff --git a/src/components/tree/govern/analyzeTree.vue b/src/components/tree/govern/analyzeTree.vue
index 6dabb56..124f9c0 100644
--- a/src/components/tree/govern/analyzeTree.vue
+++ b/src/components/tree/govern/analyzeTree.vue
@@ -152,7 +152,7 @@ async function selectInitialNode(
 
         treeInstance?.setCurrentKey(node.id)
 
-        emit('init', { level, ...node })
+        emit('init', { ...node })
 
         return
 
diff --git a/src/components/tree/govern/cloudDeviceEntryTree.vue b/src/components/tree/govern/cloudDeviceEntryTree.vue
index c333480..d8845de 100644
--- a/src/components/tree/govern/cloudDeviceEntryTree.vue
+++ b/src/components/tree/govern/cloudDeviceEntryTree.vue
@@ -64,7 +64,7 @@ async function loadTree() {
     await selectTreeNode(treRef.value, node, {
         level: 3,
         onSelect: selected => {
-            emit('init', { level: 3, ...selected })
+            emit('init', { ...selected, level: 3 })
             changePointType('4', selected)
         }
     })
diff --git a/src/components/tree/govern/deviceInfoTree.vue b/src/components/tree/govern/deviceInfoTree.vue
index d0e24db..408a2eb 100644
--- a/src/components/tree/govern/deviceInfoTree.vue
+++ b/src/components/tree/govern/deviceInfoTree.vue
@@ -48,7 +48,7 @@ async function initTree(list: any[]) {
     }
 
     await selectTreeNode(treRef.value, node, {
-        onSelect: selected => emit('init', { level: 2, ...selected })
+        onSelect: selected => emit('init', { ...selected, level: 2 })
     })
 }
 
diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue
index c7a127e..ec03293 100644
--- a/src/components/tree/govern/deviceTree.vue
+++ b/src/components/tree/govern/deviceTree.vue
@@ -1,16 +1,7 @@
 <template>
-    <Tree
-        ref="treRef"
-        @check-change="handleCheckChange"
-        :default-checked-keys="defaultCheckedKeys"
-        :show-checkbox="props.showCheckbox"
-        :data="tree"
-        :height="props.height"
-        @changeDeviceType="changeDeviceType"
-        @changeTreeType="loadTree"
-        :engineering="props.engineering"
-        leaf-mode="device"
-    />
+    <Tree ref="treRef" @check-change="handleCheckChange" :default-checked-keys="defaultCheckedKeys"
+        :show-checkbox="props.showCheckbox" :data="tree" :height="props.height" @changeDeviceType="changeDeviceType"
+        @changeTreeType="loadTree" :engineering="props.engineering" leaf-mode="device" />
 </template>
 
 <script lang="ts" setup>
@@ -55,17 +46,17 @@ async function selectInitialNode(type: string | undefined, leaves: LineTreeLeave
         type === '2'
             ? [{ refKey: 'treeRef4', list: leaves.engineering, level: 2 }]
             : [
-                  { refKey: 'treeRef1', list: leaves.govern, level: 2 },
-                  { refKey: 'treeRef2', list: leaves.portable, level: 2 },
-                  { refKey: 'treeRef3', list: leaves.monitor, level: 2 }
-              ]
+                { refKey: 'treeRef1', list: leaves.govern, level: 2 },
+                { refKey: 'treeRef2', list: leaves.portable, level: 2 },
+                { refKey: 'treeRef3', list: leaves.monitor, level: 2 }
+            ]
 
     for (const { refKey, list, level } of candidates) {
         const node = list[0]
         if (!node) continue
         const treeInstance = await waitForTreeRef(treRef.value, refKey)
         treeInstance?.setCurrentKey(node.id)
-        emit('init', { level, ...node })
+        emit('init', { ...node })
         return
     }
     emit('init')
@@ -81,13 +72,10 @@ const loadTree = (type?: string) => {
 
 onMounted(() => loadTree(props.engineering ? '2' : '1'))
 
-const handleCheckChange = throttle(
+const handleCheckChange =
     (data: any, checked: any, indeterminate: any) => {
         emit('checkChange', { data, checked, indeterminate })
-    },
-    300,
-    { leading: true, trailing: false }
-)
+    }
 
 defineExpose({ treRef })
 </script>
diff --git a/src/components/tree/govern/deviceTreeUtils.ts b/src/components/tree/govern/deviceTreeUtils.ts
index 8c9b0e1..8d2de56 100644
--- a/src/components/tree/govern/deviceTreeUtils.ts
+++ b/src/components/tree/govern/deviceTreeUtils.ts
@@ -17,7 +17,8 @@ export function decorateDeviceTree(
                 child.children?.forEach((grand: any) => {
                     applyMeta(grand, {
                         icon: 'el-icon-Platform',
-                        color: statusColor(grand.comFlag)
+                        color: statusColor(grand.comFlag),
+                        level: 3
                     })
                     leaves.engineering.push(grand)
                 })
@@ -68,6 +69,7 @@ export function decorateDeviceTree(
                         l3.pName = '监测设备'
                         applyMeta(l3, {
                             icon: 'el-icon-Platform',
+                            level: 3,
                             color: l3.comFlag === 1 ? '#e26257 !important' : primary()
                         })
                         leaves.monitor.push(l3)
diff --git a/src/components/tree/govern/lineTreeUtils.ts b/src/components/tree/govern/lineTreeUtils.ts
index 55c9ee9..ce8dc42 100644
--- a/src/components/tree/govern/lineTreeUtils.ts
+++ b/src/components/tree/govern/lineTreeUtils.ts
@@ -39,6 +39,21 @@ export function createLineTreeDecorators(getPrimaryColor: () => string): LineTre
 
 export type TreeRefKey = 'treeRef1' | 'treeRef2' | 'treeRef3' | 'treeRef4'
 
+/** 线路树可选叶子节点元数据 */
+export const LINE_LEAF_META = { level: 3, type: 'line' as const }
+
+/** 是否为线路树可选叶子（监测点/线路） */
+export function isLineTreeLeaf(node: any): boolean {
+    if (!node?.id) return false
+    return node.type === 'line' || node.level === 3
+}
+
+/** 是否为报告/导出可选监测点 */
+export function isReportMonitorPoint(node: any): boolean {
+    if (!node?.id) return false
+    return isLineTreeLeaf(node) || node.level === 3 || (!node.children?.length && !!node.pid)
+}
+
 export interface DecorateLineTreeOptions {
     /** 是否禁用父级节点（分析树隐藏父节点，测点树不禁用） */
     disableParents?: boolean
@@ -69,7 +84,11 @@ export function decorateLineTree(
                         ...parentDisabled
                     })
                     grand.children?.forEach((leaf: any) => {
-                        applyMeta(leaf, { icon: 'el-icon-Platform', color: statusColor(leaf.comFlag) })
+                        applyMeta(leaf, {
+                            icon: 'el-icon-Platform',
+                            color: statusColor(leaf.comFlag),
+                            ...LINE_LEAF_META
+                        })
                         leaves.engineering.push(leaf)
                     })
                 })
@@ -90,7 +109,11 @@ export function decorateLineTree(
                             ...parentDisabled
                         })
                         l3.children?.forEach((l4: any) => {
-                            applyMeta(l4, { icon: 'el-icon-Platform', color: statusColor(l4.comFlag) })
+                            applyMeta(l4, {
+                                icon: 'el-icon-Platform',
+                                color: statusColor(l4.comFlag),
+                                ...LINE_LEAF_META
+                            })
                             leaves.govern.push(l4)
                         })
                     })
@@ -100,7 +123,11 @@ export function decorateLineTree(
             item.children?.forEach((l1: any) => {
                 applyMeta(l1, { icon: 'el-icon-Platform', color: statusColor(l1.comFlag) })
                 l1.children?.forEach((l2: any) => {
-                    applyMeta(l2, { icon: 'el-icon-Platform', color: statusColor(l2.comFlag) })
+                    applyMeta(l2, {
+                        icon: 'el-icon-Platform',
+                        color: statusColor(l2.comFlag),
+                        ...LINE_LEAF_META
+                    })
                     leaves.portable.push(l2)
                 })
             })
@@ -117,7 +144,11 @@ export function decorateLineTree(
                             ...parentDisabled
                         })
                         l3.children?.forEach((l4: any) => {
-                            applyMeta(l4, { icon: 'el-icon-Platform', color: statusColor(l4.comFlag) })
+                            applyMeta(l4, {
+                                icon: 'el-icon-Platform',
+                                color: statusColor(l4.comFlag),
+                                ...LINE_LEAF_META
+                            })
                             leaves.monitor.push(l4)
                         })
                     })
diff --git a/src/components/tree/govern/pointTree.vue b/src/components/tree/govern/pointTree.vue
index 270d0a0..96d25e4 100644
--- a/src/components/tree/govern/pointTree.vue
+++ b/src/components/tree/govern/pointTree.vue
@@ -64,7 +64,7 @@ async function selectInitialNode(type: string | undefined, leaves: LineTreeLeave
 
         const treeInstance = await waitForTreeRef(treRef.value, refKey)
         treeInstance?.setCurrentKey(node.id)
-        emit('init', { level, ...node })
+        emit('init', { ...node })
 
         if (type === '2') {
             changePointType('4', node)
diff --git a/src/components/tree/govern/pointTreeWx.vue b/src/components/tree/govern/pointTreeWx.vue
index 3e37123..d9964f6 100644
--- a/src/components/tree/govern/pointTreeWx.vue
+++ b/src/components/tree/govern/pointTreeWx.vue
@@ -59,7 +59,7 @@ interface Props {
 
 const props = withDefaults(defineProps<Props>(), { template: false })
 
-const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'editNode', 'getChart', 'Policy'])
+const emit = defineEmits(['init', 'checkChange', 'nodeChange', 'node-click', 'editNode', 'getChart', 'Policy'])
 
 const config = useConfig()
 const tree = ref<any[]>([])
@@ -109,6 +109,7 @@ const clickNode = (e: any) => {
     planId.value = e?.children ? e.id : e.pid
     id.value = e.id
     emit('nodeChange', e)
+    emit('node-click', e)
 }
 
 bootstrapWithTemplate(
diff --git a/src/components/tree/select.vue b/src/components/tree/select.vue
index a4caac0..4e8ca49 100644
--- a/src/components/tree/select.vue
+++ b/src/components/tree/select.vue
@@ -52,6 +52,7 @@ import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElMessage, ElTree } from 'element-plus'
 import { ref, watch } from 'vue'
 import { createTreeFilterNode } from './govern/treeFilterUtils'
+import { isLineTreeLeaf } from './govern/lineTreeUtils'
 
 defineOptions({ name: 'govern/select', inheritAttrs: false })
 
@@ -75,7 +76,8 @@ const filterNode = createTreeFilterNode()
 const checkedNodes = ref<any[]>([])
 const defaultCheckedKeys = ref<string[]>([])
 const MAX_CHECK = 5
-const MONITOR_LEVEL = 3
+
+const isMonitorLeaf = (node: any) => isLineTreeLeaf(node)
 
 watch(filterText, val => treeRef.value?.filter(val))
 
@@ -85,7 +87,7 @@ const onMenuCollapse = () => {
 }
 
 const handleCheckChange = (_data: any, checkInfo: any) => {
-    const monitoringPointNodes = (checkInfo.checkedNodes as any[]).filter(node => node.level === MONITOR_LEVEL)
+    const monitoringPointNodes = (checkInfo.checkedNodes as any[]).filter(isMonitorLeaf)
 
     if (monitoringPointNodes.length > MAX_CHECK) {
         const previousCheckedNodes = checkedNodes.value
@@ -122,7 +124,7 @@ const updateNodeCheckStatus = (currentCount: number) => {
     if (!treeRef.value) return
     const isMaxSelected = currentCount >= MAX_CHECK
     treeRef.value.store._getAllNodes().forEach((node: any) => {
-        if (node.level === MONITOR_LEVEL) {
+        if (isMonitorLeaf(node.data)) {
             node.data.disabled = isMaxSelected && !node.checked
         }
     })
diff --git a/src/layouts/admin/components/logo.vue b/src/layouts/admin/components/logo.vue
index 674d0fc..97fade5 100644
--- a/src/layouts/admin/components/logo.vue
+++ b/src/layouts/admin/components/logo.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img v-if="!config.layout.menuCollapse && getTheme.logoUrl" class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -8,7 +8,7 @@
         <!--        >-->
         <!--            灿能-->
         <!--        </div>-->
-        <!-- <Icon
+        <Icon
             v-if="config.layout.layoutMode != 'Streamline'"
             @click="onMenuCollapse"
             :name="config.layout.menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
@@ -17,18 +17,18 @@
             style="margin: 15px;"
             size="18"
             class="fold"
-        /> -->
+        />
     </div>
 </template>
 
 <script setup lang="ts">
 import { useConfig } from '@/stores/config'
 import { closeShade } from '@/utils/pageShade'
-import { Session } from '@/utils/storage'
+import { getStoredTheme } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = getStoredTheme()
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()
diff --git a/src/layouts/admin/components/navBar/classic.vue b/src/layouts/admin/components/navBar/classic.vue
index bc6d2ad..76c019a 100644
--- a/src/layouts/admin/components/navBar/classic.vue
+++ b/src/layouts/admin/components/navBar/classic.vue
@@ -4,7 +4,7 @@
             <!-- <Icon @click="onMenuCollapse" name="fa fa-indent" :color="config.getColorVal('menuActiveColor')"
                 size="18" /> -->
         </div>
-        <span class="nav-bar-title">{{ getTheme.name }} <span style="font-size: 14px;" v-if="Version?.versionName">
+        <span class="nav-bar-title">{{ themeName }} <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
             </span></span>
         <NavMenus />
@@ -19,8 +19,9 @@ import NavMenus from '../navMenus.vue'
 import { showShade } from '@/utils/pageShade'
 import { onMounted } from 'vue'
 import { getLastData } from '@/api/systerm'
+import { getStoredThemeName } from '@/utils/storage'
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const themeName = getStoredThemeName()
 const Version: any = ref({})
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
@@ -33,7 +34,7 @@ onMounted(() => {
         Version.value = res.data
 
     })
-    document.title = getTheme.name
+    document.title = themeName
 })
 </script>
 
diff --git a/src/utils/chartAxisHelper.ts b/src/utils/chartAxisHelper.ts
new file mode 100644
index 0000000..36abdde
--- /dev/null
+++ b/src/utils/chartAxisHelper.ts
@@ -0,0 +1,59 @@
+const AXIS_DECIMALS = 2
+
+export function roundAxisValue(val: number, decimals = AXIS_DECIMALS): number {
+    if (!Number.isFinite(val)) return 0
+    const factor = 10 ** decimals
+    return Math.round(val * factor) / factor
+}
+
+/** Y 轴刻度：最多 2 位小数，末尾 0 去掉（如 1.00 → 1，0.10 → 0.1） */
+export function formatAxisLabel(value: number): string {
+    if (!Number.isFinite(value)) return '0'
+    return String(Number(roundAxisValue(value).toFixed(AXIS_DECIMALS)))
+}
+
+/** 瞬间波形 Y 轴范围 */
+export function calcShuYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.1
+    let axisMin = min > 0 ? min - min * 0.1 : min * 1.1
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}
+
+/** RMS 波形 Y 轴范围 */
+export function calcRmsYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.06 * 1.1
+    let axisMin = min - min * 0.2
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max - min) * 0.1 || Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}
diff --git a/src/utils/luckysheetHelper.ts b/src/utils/luckysheetHelper.ts
new file mode 100644
index 0000000..36f42b2
--- /dev/null
+++ b/src/utils/luckysheetHelper.ts
@@ -0,0 +1,83 @@
+import { ElMessage } from 'element-plus'
+import { exportExcel } from '@/views/system/reportForms/export.js'
+
+/** 解析 Luckysheet 接口返回的 sheet 数据 */
+export function parseLuckysheetSheets(sheets: any[]) {
+    sheets.forEach((item: any) => {
+        if (item.data1) {
+            try {
+                item.data = JSON.parse(item.data1)
+            } catch {
+                /* ignore invalid json */
+            }
+        }
+        item.celldata?.forEach((cell: any) => {
+            if (item.data?.[cell.r]?.[cell.c]?.v != null) {
+                item.data[cell.r][cell.c] = cell.v
+            }
+        })
+    })
+}
+
+declare const luckysheet: any
+
+const DEFAULT_REPORT_OPTIONS = {
+    title: '',
+    lang: 'zh',
+    showtoolbar: false,
+    showinfobar: false,
+    showsheetbar: true,
+}
+
+/** 销毁已有 Luckysheet 实例，避免重复 create 导致 DOM 堆积 */
+export function destroyLuckysheet() {
+    try {
+        if (typeof luckysheet !== 'undefined' && luckysheet.destroy) {
+            luckysheet.destroy()
+        }
+    } catch {
+        /* ignore */
+    }
+}
+
+/** 解析 sheet 数据、销毁旧实例并渲染报表 */
+export function renderLuckysheetReport(
+    container: string,
+    sheets: any[],
+    options: Record<string, any> = {}
+) {
+    parseLuckysheetSheets(sheets)
+    destroyLuckysheet()
+    setTimeout(() => {
+        luckysheet.create({
+            container,
+            ...DEFAULT_REPORT_OPTIONS,
+            ...options,
+            data: sheets,
+        })
+    }, 10)
+}
+
+/** 安全导出 Luckysheet，无数据时提示并返回 false */
+export function exportLuckysheetFile(filename: string, hasData = true): boolean {
+    if (!hasData) {
+        ElMessage.warning('暂无数据')
+        return false
+    }
+    try {
+        if (typeof luckysheet === 'undefined' || !luckysheet.getAllSheets) {
+            ElMessage.warning('暂无数据')
+            return false
+        }
+        const sheets = luckysheet.getAllSheets()
+        if (!sheets?.length) {
+            ElMessage.warning('暂无数据')
+            return false
+        }
+        exportExcel(sheets, filename)
+        return true
+    } catch {
+        ElMessage.warning('导出失败，请先加载报表数据')
+        return false
+    }
+}
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 1b4d3e5..9b52e35 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,45 +1,60 @@
-/**
- * window.localStorage
- * @method set 设置
- * @method get 获取
- * @method remove 移除
- * @method clear 移除全部
- */
-export const Local = {
-    set(key: string, val: any) {
-        window.localStorage.setItem(key, JSON.stringify(val))
-    },
-    get(key: string) {
-        const json: any = window.localStorage.getItem(key)
-        return JSON.parse(json)
-    },
-    remove(key: string) {
-        window.localStorage.removeItem(key)
-    },
-    clear() {
-        window.localStorage.clear()
-    },
-}
-
-/**
- * window.sessionStorage
- * @method set 设置会话缓存
- * @method get 获取会话缓存
- * @method remove 移除会话缓存
- * @method clear 移除全部会话缓存
- */
-export const Session = {
-    set(key: string, val: any) {
-        window.sessionStorage.setItem(key, JSON.stringify(val))
-    },
-    get(key: string) {
-        const json: any = window.sessionStorage.getItem(key)
-        return JSON.parse(json)
-    },
-    remove(key: string) {
-        window.sessionStorage.removeItem(key)
-    },
-    clear() {
-        window.sessionStorage.clear()
-    },
-}
+/**
+ * window.localStorage
+ * @method set 设置
+ * @method get 获取
+ * @method remove 移除
+ * @method clear 移除全部
+ */
+export const Local = {
+    set(key: string, val: any) {
+        window.localStorage.setItem(key, JSON.stringify(val))
+    },
+    get(key: string) {
+        const json: any = window.localStorage.getItem(key)
+        return JSON.parse(json)
+    },
+    remove(key: string) {
+        window.localStorage.removeItem(key)
+    },
+    clear() {
+        window.localStorage.clear()
+    },
+}
+
+/**
+ * window.sessionStorage
+ * @method set 设置会话缓存
+ * @method get 获取会话缓存
+ * @method remove 移除会话缓存
+ * @method clear 移除全部会话缓存
+ */
+const DEFAULT_THEME_NAME = '电能质量监测系统'
+
+export function getStoredTheme(): { name?: string; logoUrl?: string; [key: string]: any } {
+    try {
+        const raw = window.localStorage.getItem('getTheme')
+        return raw ? JSON.parse(raw) : {}
+    } catch {
+        return {}
+    }
+}
+
+export function getStoredThemeName(): string {
+    return getStoredTheme().name || DEFAULT_THEME_NAME
+}
+
+export const Session = {
+    set(key: string, val: any) {
+        window.sessionStorage.setItem(key, JSON.stringify(val))
+    },
+    get(key: string) {
+        const json: any = window.sessionStorage.getItem(key)
+        return JSON.parse(json)
+    },
+    remove(key: string) {
+        window.sessionStorage.removeItem(key)
+    },
+    clear() {
+        window.sessionStorage.clear()
+    },
+}
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index 633da77..1f284ea 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -19,7 +19,7 @@ interface TableStoreParams {
     resetCallback?: () => void // 重置
     loadCallback?: () => void // 接口调用后的回调
     exportProcessingData?: () => void //导出处理数据
-    beforeSearchFun?: () => void // 接口调用前的回调
+    beforeSearchFun?: () => void | boolean // 接口调用前的回调，返回 false 中止请求
 }
 
 export default class TableStore {
@@ -75,7 +75,13 @@ export default class TableStore {
     }
 
     index() {
-        this.table.beforeSearchFun && this.table.beforeSearchFun()
+        if (this.table.beforeSearchFun) {
+            const canSearch = this.table.beforeSearchFun()
+            if (canSearch === false) {
+                this.table.loading = false
+                return
+            }
+        }
         this.table.data = []
         this.table.loading = true
         // 重置用的数据数据
diff --git a/src/utils/waveCache.ts b/src/utils/waveCache.ts
new file mode 100644
index 0000000..d114d78
--- /dev/null
+++ b/src/utils/waveCache.ts
@@ -0,0 +1,42 @@
+const MAX_CACHE_SIZE = 30
+
+const cache = new Map<string, unknown>()
+
+function dataFingerprint(data: unknown[][] | undefined): string {
+    if (!data?.length) return '0'
+    const first = data[0]
+    const last = data[data.length - 1]
+    return `${data.length}:${first?.[0]}:${last?.[0]}`
+}
+
+export function buildWaveCacheKey(
+    type: 'shu' | 'rms',
+    wp: Record<string, any> | undefined,
+    value: number,
+    isOpen: boolean,
+    boxoList: Record<string, any>
+): string {
+    if (!wp) return ''
+    const waveFp =
+        type === 'shu' ? dataFingerprint(wp.listWaveData) : dataFingerprint(wp.listRmsData)
+    const boxoFp = boxoList?.startTime ?? boxoList?.lineName ?? boxoList?.equipmentName ?? ''
+    return `${type}|${wp.time}|${wp.waveType}|${wp.iphasic}|${value}|${isOpen}|${waveFp}|${boxoFp}`
+}
+
+export function getWaveCache<T>(key: string): T | null {
+    if (!key || !cache.has(key)) return null
+    const value = cache.get(key) as T
+    cache.delete(key)
+    cache.set(key, value)
+    return value
+}
+
+export function setWaveCache(key: string, value: unknown): void {
+    if (!key) return
+    if (cache.has(key)) cache.delete(key)
+    cache.set(key, value)
+    while (cache.size > MAX_CACHE_SIZE) {
+        const oldest = cache.keys().next().value
+        if (oldest !== undefined) cache.delete(oldest)
+    }
+}
diff --git a/src/utils/waveWorkerPool.ts b/src/utils/waveWorkerPool.ts
new file mode 100644
index 0000000..0f1dd32
--- /dev/null
+++ b/src/utils/waveWorkerPool.ts
@@ -0,0 +1,96 @@
+import { toRaw } from 'vue'
+
+type WorkerMessageHandler = (data: any) => void
+
+let shuWorker: Worker | null = null
+let rmsWorker: Worker | null = null
+
+/** 递归剥离 Vue 响应式代理，得到可 structuredClone 的纯对象 */
+export function toPlainDeep<T>(value: T): T {
+    const raw = toRaw(value as object) as T
+    if (Array.isArray(raw)) {
+        return raw.map(item => toPlainDeep(item)) as T
+    }
+    if (raw !== null && typeof raw === 'object') {
+        const out: Record<string, unknown> = {}
+        for (const [key, val] of Object.entries(raw)) {
+            out[key] = toPlainDeep(val)
+        }
+        return out as T
+    }
+    return raw
+}
+
+const BOXO_LIST_KEYS = [
+    'systemType',
+    'powerStationName',
+    'measurementPointName',
+    'startTime',
+    'featureAmplitude',
+    'duration',
+    'engineeringName',
+    'equipmentName',
+    'evtParamVVaDepth',
+    'evtParamTm',
+    'lineName',
+    'persistTime',
+    'subName'
+] as const
+
+export function buildWorkerPayload(
+    type: 'shu' | 'rms',
+    wp: Record<string, any>,
+    boxoList: Record<string, any>,
+    extras: { requestId: number; value: number; isOpen: boolean; iphasic?: number }
+) {
+    const plainWp = toPlainDeep(wp)
+    const wpPayload: Record<string, unknown> = {
+        pt: plainWp.pt,
+        ct: plainWp.ct,
+        waveTitle: plainWp.waveTitle,
+        iphasic: plainWp.iphasic,
+        time: plainWp.time,
+        waveType: plainWp.waveType,
+        yzd: plainWp.yzd
+    }
+    if (type === 'shu') {
+        wpPayload.listWaveData = plainWp.listWaveData
+    } else {
+        wpPayload.listRmsData = plainWp.listRmsData
+    }
+
+    const plainBoxo: Record<string, unknown> = {}
+    const rawBoxo = toPlainDeep(boxoList)
+    for (const key of BOXO_LIST_KEYS) {
+        if (rawBoxo[key] !== undefined) {
+            plainBoxo[key] = rawBoxo[key]
+        }
+    }
+
+    return {
+        requestId: extras.requestId,
+        value: extras.value,
+        isOpen: extras.isOpen,
+        iphasic: extras.iphasic,
+        wp: wpPayload,
+        boxoList: plainBoxo
+    }
+}
+
+export function getShuWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!shuWorker) {
+        shuWorker = new Worker(new URL('../components/echarts/shuWorker.js', import.meta.url))
+    }
+    shuWorker.onmessage = e => onMessage(e.data)
+    shuWorker.onerror = error => console.error('Shu worker error:', error)
+    return shuWorker
+}
+
+export function getRmsWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!rmsWorker) {
+        rmsWorker = new Worker(new URL('../components/echarts/rmsWorker.js', import.meta.url))
+    }
+    rmsWorker.onmessage = e => onMessage(e.data)
+    rmsWorker.onerror = error => console.error('Rms worker error:', error)
+    return rmsWorker
+}
diff --git a/src/views/govern/alarm/Abnormal.vue b/src/views/govern/alarm/Abnormal.vue
index 3dbc541..881a5dd 100644
--- a/src/views/govern/alarm/Abnormal.vue
+++ b/src/views/govern/alarm/Abnormal.vue
@@ -92,8 +92,8 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'ndid', align: 'center' },
         { title: '异常时间', field: 'evtTime', align: 'center', sortable: true },
+        { title: '设备名称', field: 'ndid', align: 'center' },
         {
             title: '告警代码',
             field: 'code',
diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue
index b797703..7591cec 100644
--- a/src/views/govern/alarm/Device.vue
+++ b/src/views/govern/alarm/Device.vue
@@ -99,16 +99,17 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'equipmentName', align: 'center', width: 120 },
-        { title: '监测点名称', field: 'lineName', align: 'center', width: 140 },
-        { title: '工程名称', field: 'engineeringName', align: 'center', width: 120 },
-        { title: '项目名称', field: 'projectName', align: 'center', width: 120 },
-        { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
+        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true },
+        { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 120 },
+        { title: '项目名称', field: 'projectName', align: 'center', minWidth: 120 },
+        { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 120 },
+        { title: '监测点名称', field: 'lineName', align: 'center', minWidth: 120 },
+
         {
             title: '模块信息',
             field: 'moduleNo',
             align: 'center',
-            width: 100,
+            minWidth: 100,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -117,7 +118,7 @@ const tableStore = new TableStore({
             title: '告警代码',
             field: 'code',
             align: 'center',
-            width: 100,
+            minWidth: 100,
             formatter: (row: any) => {
                 return row.cellValue ? '\u200B' + row.cellValue : '/'
             },
@@ -125,13 +126,13 @@ const tableStore = new TableStore({
         },
         {
             title: '事件描述',
-            minWidth: 250,
+            minWidth: 300,
             field: 'showName'
         },
         {
             title: '级别',
             field: 'level',
-            width: 100,
+            width: 110,
             render: 'tag',
             custom: {
                 // 1:Ⅰ级 2:Ⅱ级 3:Ⅲ级 4:DEBUG 5:NORMAL 6:WARN 7:ERROR
@@ -202,7 +203,7 @@ tableStore.table.params.deviceTypeId = ''
 tableStore.table.params.deviceTypeName = ''
 const deviceTreeOptions = ref<any>(props.deviceTree)
 deviceTreeOptions.value.map((item: any, index: any) => {
-    if (item.children.length == 0) {
+    if (item?.children.length == 0) {
         deviceTreeOptions.value.splice(index, 1)
     }
 })
diff --git a/src/views/govern/alarm/Front.vue b/src/views/govern/alarm/Front.vue
index cd86550..b4d921f 100644
--- a/src/views/govern/alarm/Front.vue
+++ b/src/views/govern/alarm/Front.vue
@@ -78,10 +78,10 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '前置服务器名称', field: 'lineId', align: 'center',  width: 120 },
-        { title: '前置服务器ip', field: 'wavePath', align: 'center', width: 120 },
-        { title: '进程号', field: 'clDid', align: 'center', width: 60 },
         { title: '发生时刻', field: 'startTime', align: 'center', width: 180, sortable: true },
+        { title: '前置服务器名称', field: 'lineId', align: 'center',  width: 150 },
+        { title: '前置服务器ip', field: 'wavePath', align: 'center', width: 150 },
+        { title: '进程号', field: 'clDid', align: 'center', width: 70 },
 
         {
             title: '事件描述',
@@ -102,7 +102,7 @@ const tableStore = new TableStore({
         {
             title: '级别',
             field: 'level',
-            width: 100,
+            width: 110,
             render: 'tag',
             custom: {
                 // 1:Ⅰ级 2:Ⅱ级 3:Ⅲ级 4:DEBUG 5:NORMAL 6:WARN 7:ERROR
@@ -153,7 +153,7 @@ tableStore.table.params.searchValue = ''
 tableStore.table.params.level = ''
 const deviceTreeOptions = ref<any>(props.deviceTree)
 deviceTreeOptions.value.map((item: any, index: any) => {
-    if (item.children.length == 0) {
+    if (item?.children.length == 0) {
         deviceTreeOptions.value.splice(index, 1)
     }
 })
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index 8889ab7..724f2d1 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -2,16 +2,9 @@
     <TableHeader datePicker ref="refheader" showExport>
         <template v-slot:select>
             <el-form-item label="数据来源">
-                <el-cascader
-                    v-model.trim="tableStore.table.params.cascader"
-                    filterable
-                    placeholder="请选择数据来源"
-                    @change="sourceChange"
-                    :options="deviceTreeOptions"
-                    :show-all-levels="false"
-                    :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-                    clearable
-                ></el-cascader>
+                <el-cascader v-model.trim="tableStore.table.params.cascader" filterable placeholder="请选择数据来源"
+                    @change="sourceChange" :options="deviceTreeOptions" :show-all-levels="false"
+                    :props="{ checkStrictly: true, value: 'id', label: 'name' }" clearable></el-cascader>
                 <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
             </el-form-item>
             <!-- <el-form-item label="级别">
@@ -83,14 +76,15 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'equipmentName', align: 'center' },
-        { title: '工程名称', field: 'engineeringName', align: 'center' },
-        { title: '项目名称', field: 'projectName', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', sortable: true },
+        { title: '发生时刻', field: 'startTime', align: 'center', sortable: true, minWidth: 180, },
+        { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 120, },
+        { title: '项目名称', field: 'projectName', align: 'center', minWidth: 120, },
+        { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 120, },
 
-        { title: '事件描述', field: 'showName', align: 'center' }
+
+        { title: '事件描述', field: 'showName', align: 'center', minWidth: 250, }
     ],
-    beforeSearchFun: () => {}
+    beforeSearchFun: () => { }
 })
 
 provide('tableStore', tableStore)
@@ -112,7 +106,7 @@ tableStore.table.params.deviceTypeName = ''
 
 const deviceTreeOptions = ref<any>(props.deviceTree)
 deviceTreeOptions.value.map((item: any, index: any) => {
-    if (item.children.length == 0) {
+    if (item?.children.length == 0) {
         deviceTreeOptions.value.splice(index, 1)
     }
 })
@@ -143,6 +137,6 @@ onMounted(() => {
 setTimeout(() => {
     tableStore.table.height = mainHeight(200).height as any
 }, 0)
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style></style>
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index d0f6728..1299257 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -3,16 +3,10 @@
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="数据来源">
-                    <el-cascader
-                        placeholder="请选择数据来源"
-                        @change="sourceChange"
-                        filterable
-                        v-model.trim="tableStore.table.params.cascader"
-                        :options="deviceTreeOptions"
-                        :show-all-levels="false"
-                        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-                        clearable
-                    ></el-cascader>
+                    <el-cascader placeholder="请选择数据来源" @change="sourceChange" filterable
+                        v-model.trim="tableStore.table.params.cascader" :options="deviceTreeOptions"
+                        :show-all-levels="false" :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+                        clearable></el-cascader>
                     <!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
                 </el-form-item>
                 <!-- <el-form-item label="级别">
@@ -26,13 +20,8 @@
 
         <Table></Table>
     </div>
-    <waveFormAnalysis
-        v-loading="loading"
-        v-if="isWaveCharts"
-        ref="waveFormAnalysisRef"
-        @handleHideCharts="isWaveCharts = false"
-        :wp="wp"
-    />
+    <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
+        @handleHideCharts="isWaveCharts = false" :wp="wp" />
     <!-- <div style="height: 300px;"> -->
 
     <!-- <div style="padding: 10px" v-if="!view" v-loading="loading">
@@ -129,16 +118,20 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'equipmentName', minWidth: 120, align: 'center' },
+        { title: '暂降发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true },
+
+
+        { title: '暂降(骤升)幅值(%)', minWidth: 160, field: 'evtParamVVaDepth', align: 'center', sortable: true },
+
+        { title: '持续时间(s)', field: 'evtParamTm', minWidth: 110, align: 'center', sortable: true },
+        { title: '相别', field: 'evtParamPhase', minWidth: 80, align: 'center' },
+
+        { title: '触发类型', field: 'showName', minWidth: 120, align: 'center' },
         { title: '工程名称', field: 'engineeringName', minWidth: 120, align: 'center' },
         { title: '项目名称', field: 'projectName', minWidth: 120, align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true },
+        { title: '设备名称', field: 'equipmentName', minWidth: 120, align: 'center' },
         { title: '监测点名称', field: 'lineName', minWidth: 120, align: 'center' },
-        { title: '事件描述', field: 'showName', minWidth: 120, align: 'center' },
-        { title: '事件发生位置', field: 'evtParamPosition', minWidth: 150, align: 'center' },
-        { title: '相别', field: 'evtParamPhase', minWidth: 80, align: 'center' },
-        { title: '持续时间(s)', field: 'evtParamTm', minWidth: 80, align: 'center', sortable: true },
-        { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center', sortable: true },
+        { title: '发生位置', field: 'evtParamPosition', minWidth: 150, align: 'center' },
 
         {
             title: '操作',
@@ -219,6 +212,7 @@ const tableStore = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
+                        ElMessage.info('下载中......')
                         getFileZip({ eventId: row.id }).then(res => {
                             let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
                             const url = window.URL.createObjectURL(blob)
@@ -228,6 +222,7 @@ const tableStore = new TableStore({
                             document.body.appendChild(link)
                             link.click() //执行下载
                             document.body.removeChild(link) //释放标签
+                            ElMessage.success('波形下载成功')
                         })
                     }
                 },
@@ -238,7 +233,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.showName != '未知'
+                        return row.wavePath 
                     }
                 },
                 {
@@ -295,7 +290,7 @@ tableStore.table.params.deviceTypeName = ''
 
 const deviceTreeOptions: any = ref<any>(props.deviceTree)
 deviceTreeOptions.value.map((item: any, index: any) => {
-    if (item.children.length == 0) {
+    if (item?.children.length == 0) {
         deviceTreeOptions.value.splice(index, 1)
     }
 })
@@ -380,6 +375,6 @@ setTimeout(() => {
     tableStore.table.height = mainHeight(200).height as any
 }, 0)
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style scoped lang="scss"></style>
diff --git a/src/views/govern/analyze/APF/index.vue b/src/views/govern/analyze/APF/index.vue
index d1d0e38..d24850a 100644
--- a/src/views/govern/analyze/APF/index.vue
+++ b/src/views/govern/analyze/APF/index.vue
@@ -9,44 +9,23 @@
                             <DatePicker ref="datePickerRef"></DatePicker>
                         </el-form-item>
                         <el-form-item label="统计指标:">
-                            <el-select
-                                style="width: 200px"
-                                v-model.trim="formInline.statisticalId"
-                                filterable
-                                @change="frequencyFlag"
-                                placeholder="请选择" 
-                            >
-                                <el-option
-                                    v-for="item in zblist"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
+                            <el-select style="width: 200px" v-model.trim="formInline.statisticalId" filterable
+                                @change="frequencyFlag" placeholder="请选择">
+                                <el-option v-for="item in zblist" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="谐波次数:" v-show="frequencyShow">
-                            <el-select
-                                v-model.trim="formInline.frequency"
-                                filterable
-                                placeholder="请选择"
-                                style="width: 100px"
-                            >
-                                <el-option
-                                    v-for="item in 49"
-                                    :key="item + 1"
-                                    :label="item + 1"
-                                    :value="item + 1"
-                                ></el-option>
+                            <el-select v-model.trim="formInline.frequency" filterable placeholder="请选择"
+                                style="width: 100px">
+                                <el-option v-for="item in 49" :key="item + 1" :label="item + 1"
+                                    :value="item + 1"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="值类型:">
                             <el-select v-model.trim="formInline.valueType" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in typelist"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
+                                <el-option v-for="item in typelist" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
                             </el-select>
                         </el-form-item>
                     </template>
@@ -149,7 +128,7 @@ const deviceTypeChange = (val: any, obj: any) => {
     nodeClick(obj)
 }
 const nodeClick = async (e: anyObj) => {
-    if (e.level == 2 && flag.value) {
+    if ((e.level == 2 || e.level == 3) && flag.value) {
         formInline.devId = e.id
         loading.value = true
         if (zblist.value.length === 0) {
@@ -158,7 +137,7 @@ const nodeClick = async (e: anyObj) => {
         getDevCapacity(formInline.devId)
             .then(res => {
                 devCapacity.value = res.data
-                
+
                 search()
             })
             .catch(() => {
@@ -261,19 +240,19 @@ const setEchart = () => {
                         // ]),
                         data: timeControl.value
                             ? completeTimeSeries(
-                                  phaseList[j].map(item => [
-                                      item.time,
-                                      Math.floor(item.statisticalData * 100) / 100,
-                                      unit,
-                                      lineName.type
-                                  ])
-                              )
+                                phaseList[j].map(item => [
+                                    item.time,
+                                    Math.floor(item.statisticalData * 100) / 100,
+                                    unit,
+                                    lineName.type
+                                ])
+                            )
                             : phaseList[j].map(item => [
-                                  item.time,
-                                  Math.floor(item.statisticalData * 100) / 100,
-                                  unit,
-                                  lineName.type
-                              ]),
+                                item.time,
+                                Math.floor(item.statisticalData * 100) / 100,
+                                unit,
+                                lineName.type
+                            ]),
 
                         lineStyle: lineName,
                         yAxisIndex: unit.indexOf(units)
@@ -315,9 +294,8 @@ const setEchart = () => {
                             marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
                         }
 
-                        str += `${marker}${el.seriesName.split('(')[0]}：${
-                            el.value[1] != null ? el.value[1] + ' ' + (el.value[2] == 'null' ? '' : el.value[2]) : '-'
-                        }<br>`
+                        str += `${marker}${el.seriesName.split('(')[0]}：${el.value[1] != null ? el.value[1] + ' ' + (el.value[2] == 'null' ? '' : el.value[2]) : '-'
+                            }<br>`
                     })
                     return str
                 }
diff --git a/src/views/govern/analyze/DVR/index.vue b/src/views/govern/analyze/DVR/index.vue
index 754f8b8..40b6600 100644
--- a/src/views/govern/analyze/DVR/index.vue
+++ b/src/views/govern/analyze/DVR/index.vue
@@ -122,15 +122,16 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '事件描述', field: 'showName', minWidth: 150 },
+        { title: '暂降发生时刻', field: 'startTime', sortable: true, minWidth: 180 },
         {
-            title: '发生位置', field: 'evtParamPosition', minWidth: 150,
+            title: '暂降(骤升)幅值(%)',
+            field: 'evtParamVVaDepth',
+            minWidth: 160,
             formatter: (row: any) => {
-                const val = row.cellValue
-                if (val === null || val === undefined || val === '' || val === '-') return '/'
-
-                return val
-            }
+                let a = row.cellValue.split('%')[0] - 0
+                return a ? a.toFixed(2) : '/'
+            },
+            sortable: true
         },
         {
             title: '持续时间(s)',
@@ -145,17 +146,19 @@ const tableStore = new TableStore({
                 return Math.floor(num * 10000) / 100
             }
         },
+        { title: '触发类型', field: 'showName', minWidth: 150 },
         {
-            title: '暂降(聚升)幅值(%)',
-            field: 'evtParamVVaDepth',
-            minWidth: 150,
+            title: '发生位置', field: 'evtParamPosition', minWidth: 150,
             formatter: (row: any) => {
-                let a = row.cellValue.split('%')[0] - 0
-                return a ? a.toFixed(2) : '/'
-            },
-            sortable: true
+                const val = row.cellValue
+                if (val === null || val === undefined || val === '' || val === '-') return '/'
+
+                return val
+            }
         },
-        { title: '发生时刻', field: 'startTime', sortable: true, minWidth: 180 },
+       
+      
+       
         {
             title: '操作',
             fixed: 'right',
@@ -229,6 +232,7 @@ const tableStore = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
+                        ElMessage.info('下载中......')
                         getFileZip({ eventId: row.id }).then(res => {
                             let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
                             const url = window.URL.createObjectURL(blob)
@@ -238,6 +242,7 @@ const tableStore = new TableStore({
                             document.body.appendChild(link)
                             link.click() //执行下载
                             document.body.removeChild(link) //释放标签
+                            ElMessage.success('波形下载成功')
                         })
                     }
                 }
@@ -262,7 +267,7 @@ const deviceTypeChange = (val: any, obj: any) => {
 }
 const nodeClick = async (e: anyObj) => {
     // console.log("🚀 ~ nodeClick ~ e:", e)
-    if (e.level == 2 && flag.value) {
+    if ((e.level == 2 || e.level == 3) && flag.value) {
         loading.value = false
         tableStore.table.params.deviceId = e.id
         nextTick(() => {
diff --git a/src/views/govern/analyze/steadyState/components/chart.vue b/src/views/govern/analyze/steadyState/components/chart.vue
index 2d05c82..a935a97 100644
--- a/src/views/govern/analyze/steadyState/components/chart.vue
+++ b/src/views/govern/analyze/steadyState/components/chart.vue
@@ -39,7 +39,7 @@
                 </TableHeader>
             </div>
 
-            <el-empty description="暂无数据" v-if="!echartsData" style="flex: 1"></el-empty>
+            <el-empty description="暂无数据"  v-if="!echartsData" style="flex: 1;margin-top:  10%"></el-empty>
             <template v-else>
                 <div :style="echartHeight">
                     <MyEchart :options="echartsData" />
diff --git a/src/views/govern/analyze/steadyState/components/report.vue b/src/views/govern/analyze/steadyState/components/report.vue
index e076883..3767f3d 100644
--- a/src/views/govern/analyze/steadyState/components/report.vue
+++ b/src/views/govern/analyze/steadyState/components/report.vue
@@ -42,13 +42,14 @@
     </div>
 </template>
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { onMounted, onUnmounted, ref, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import { exportExcel } from '@/views/system/reportForms/export.js'
+import { destroyLuckysheet, exportLuckysheetFile, renderLuckysheetReport } from '@/utils/luckysheetHelper'
+import { isLineTreeLeaf } from '@/components/tree/govern/lineTreeUtils'
 import DatePicker from '@/components/form/datePicker/time.vue'
 import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTreeZL.vue'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
@@ -77,35 +78,20 @@ const tableStore = new TableStore({
         // ;(tableStore.table.params.startTime = datePickerRef.value.timeValue[0]),
         //     (tableStore.table.params.endTime = datePickerRef.value.timeValue[1]),
         if (!tableStore.table.params.tempId) {
-            return ElMessage.warning('请选择模板')
+            ElMessage.warning('请选择模板')
+            return false
+        }
+        if (!dotList.value?.id) {
+            ElMessage.warning('请选择监测点')
+            return false
         }
         delete tableStore.table.params.searchBeginTime
         delete tableStore.table.params.searchEndTime
         delete tableStore.table.params.timeFlag
     },
     loadCallback: () => {
-        console.log('🚀 ~ tableStore.table:', tableStore.table.data)
         name.value = dotList.value.name
-        // tableStore.table.data.forEach((item: any) => {
-        //     item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-        //     item.celldata.forEach((k: any) => {
-        //         item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-        //     })
-        // })
-
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                allowEdit: false, // 禁止所有编辑操作（必填）
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
+        renderLuckysheetReport('luckysheet', tableStore.table.data, { allowEdit: false })
     }
 })
 provide('tableStore', tableStore)
@@ -115,6 +101,9 @@ const flag = ref(true)
 onMounted(() => {
     initListByIds()
 })
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 
 const idList = ref([])
 // 监测对象
@@ -131,7 +120,6 @@ const initListByIds = () => {
     })
 }
 const stencil = (val: any) => {
-    console.log('🚀 ~ stencil ~ val:', val)
     templatePolicy.value = val.filter((item: any) => item.excelType == '4')
     Template.value = templatePolicy.value[0]
     reportForm.value = templatePolicy.value[0]?.excelType
@@ -142,7 +130,7 @@ const changetype = (val: any) => {
 }
 
 const handleNodeClick = (data: any, node: any) => {
-    if (data?.level == 3) {
+    if (isLineTreeLeaf(data) || data?.level == 3) {
         dotList.value = data
         setTimeout(() => {
             tableStore.index()
@@ -160,7 +148,7 @@ const exportEvent = () => {
 
     // 格式化YYYY - MM - DD（补零）
     const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
-    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+    exportLuckysheetFile(name.value + formattedDate, tableStore.table.data.length > 0)
 }
 </script>
 <style lang="scss">
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index 8f9b803..37d4e4d 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -484,7 +484,7 @@
                 <div style="height: calc(100vh - 340px)" v-if="dataSet.indexOf('_trenddata') != -1">
                     <Trend ref="trendRef" :TrendList="TrendList"></Trend>
                 </div>
-                <!-- 电镀数据 -->
+                <!-- 电度数据 -->
                 <div style="height: calc(100vh - 340px)" v-if="dataSet.indexOf('_kilowattHour') != -1">
                     <electroplating ref="electroplatingRef" :TrendList="TrendList"></electroplating>
                 </div>
@@ -585,7 +585,7 @@ import { ElMessage } from 'element-plus'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import Trend from './tabs/trend.vue' //趋势数据
 import realTime from './tabs/realtime.vue' //实时数据-主界面
-import electroplating from './tabs/electroplating.vue' //电镀数据-主界面
+import electroplating from './tabs/electroplating.vue' //电度数据-主界面
 import realTrend from './tabs/components/realtrend.vue' //实时数据-实时趋势
 import operatingTrend from './tabs/operatingTrend.vue' //运行趋势
 import harmonicSpectrum from './tabs/components/harmonicSpectrum.vue' //实时数据-谐波频谱子页面
@@ -705,6 +705,25 @@ const activeTrendName: any = ref(0)
 const trendTimer: any = ref()
 const trendDataTime: any = ref()
 const showButton = ref(false)
+
+const decodeMqttPayload = (message: any) => {
+    try {
+        return JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+    } catch {
+        return {}
+    }
+}
+
+/** 谐波频谱 MQTT 消息（命名函数，便于 off 避免重复注册） */
+const onMqttTrendMessage = (topic: any, message: any) => {
+    const obj = decodeMqttPayload(message) || {}
+    if ((obj.hasOwnProperty('data1') || obj.hasOwnProperty('data2')) && obj.dataTime) {
+        trendDataTime.value = obj.dataTime
+        realTrendRef.value?.setRealTrendData(obj)
+        tableLoading.value = false
+    }
+}
+
 //谐波频谱方法
 const handleTrend = async () => {
     realTimeFlag.value = false
@@ -728,21 +747,7 @@ const handleTrend = async () => {
                         // console.log(res, '获取谐波频谱数据')
                     })
                 }, 30000)
-                mqttRef.value.on('message', (topic: any, message: any) => {
-                    let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))) || {}
-                    if ((obj.hasOwnProperty('data1') || obj.hasOwnProperty('data2')) && obj.dataTime) {
-                        trendDataTime.value = obj.dataTime
-                        realTrendRef.value && realTrendRef.value.setRealTrendData(obj)
-                        tableLoading.value = false
-                        // console.log(
-                        //     '谐波频谱---mqtt接收到消息',
-                        //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                        // )
-                    }
-                    // else {
-                    //     trendDataTime.value = obj.dataTime
-                    // }
-                })
+                bindMqttMessage(onMqttTrendMessage)
             } else {
                 ElMessage.warning('设备应答失败')
             }
@@ -885,8 +890,8 @@ const lineId: any = ref('')
 const dataLevel: any = ref('')
 const dataSource = ref([])
 const engineeringName = ref('')
-const nodeClick = async (e: anyObj, node: any) => {
-    if (e == undefined || e.level == 2) {
+const nodeClick = async (e: anyObj, node?: any) => {
+    if (e == undefined) {
         return (loading.value = false)
     }
     searchValue.value = ''
@@ -900,7 +905,7 @@ const nodeClick = async (e: anyObj, node: any) => {
     }
 
     //选中设备名称后，点击标签页也能查询数据，要求点击设备名称后，点击标签页默认查询第一个监测点数据
-    if (e.level == 3 || e.level == 2) {
+    if (e.level == 3 ) {
         engineeringName.value = node?.parent.parent.data.name
 
         await queryDictType({
@@ -940,7 +945,7 @@ const nodeClick = async (e: anyObj, node: any) => {
                         if (item.type === 'trenddata') {
                             item.id = item.id + '_trenddata'
                         }
-                        //电镀数据
+                        //电度数据
                         if (item.type === 'kilowattHour') {
                             item.id = item.id + '_kilowattHour'
                         }
@@ -995,6 +1000,14 @@ const trendRef: any = ref()
 const eventRef: any = ref()
 const mqttRef = ref()
 const url: any = window.localStorage.getItem('MQTTURL')
+
+/** 同一 handler 先 off 再 on，避免重复 message 监听 */
+const bindMqttMessage = (handler: (topic: any, message: any) => void) => {
+    if (!mqttRef.value) return
+    mqttRef.value.off('message', handler)
+    mqttRef.value.on('message', handler)
+}
+
 const connectMqtt = () => {
     if (mqttRef.value) {
         if (mqttRef.value.connected) {
@@ -1035,16 +1048,44 @@ const getRealDataMqttMsg = async () => {
                         // console.log(res, '获取基础实时数据')
                     })
                 }, 30000)
-                mqttRef.value.on('message', (topic: any, message: any) => {
-                    // console.log(
-                    //     '实时数据&实时趋势---mqtt接收到消息',
-                    //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                    // )
-                    let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+                bindMqttMessage(onMqttRealDataMessage)
+                //2.建立mqtt通讯
+                //每隔30s调用一下接口，通知后台推送mqtt消息
 
-                    if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return
+                mqttRef.value.on('error', (error: any) => {
+                    console.log('mqtt连接失败...', error)
+                    mqttRef.value.end()
+                })
 
-                    //处理mqtt数据 1转2除 2转1乘
+                mqttRef.value.on('close', function () {
+                    console.log('mqtt客户端已断开连接.....')
+                })
+                setTimeout(() => {
+                    tableLoading.value = false
+                }, 6000)
+            } else {
+                ElMessage.success('设备应答失败')
+                tableLoading.value = false
+            }
+        })
+        .catch(e => {
+            setTimeout(() => {
+                tableLoading.value = false
+            }, 0)
+        })
+}
+//tab点击事件
+
+const realDataTimer: any = ref()
+const mqttMessage = ref<any>({})
+
+/** 实时数据 / 实时趋势 MQTT 消息（命名函数，便于 off 避免重复注册） */
+const onMqttRealDataMessage = (topic: any, message: any) => {
+    let obj = decodeMqttPayload(message)
+
+    if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return
+
+    //处理mqtt数据 1转2除 2转1乘
                     //如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
                     //如果消息返回值是一次值，下拉框是一次值只需要单位换算 除以1000
                     if (obj.dataLevel == formInline.dataLevel) {
@@ -1178,36 +1219,8 @@ const getRealDataMqttMsg = async () => {
                     //     sonTab.value == 1 &&
                     //     realTrendRef.value &&
                     //     realTrendRef.value.setRealTrendData(obj)
-                })
-                //2.建立mqtt通讯
-                //每隔30s调用一下接口，通知后台推送mqtt消息
-
-                mqttRef.value.on('error', (error: any) => {
-                    console.log('mqtt连接失败...', error)
-                    mqttRef.value.end()
-                })
-
-                mqttRef.value.on('close', function () {
-                    console.log('mqtt客户端已断开连接.....')
-                })
-                setTimeout(() => {
-                    tableLoading.value = false
-                }, 6000)
-            } else {
-                ElMessage.success('设备应答失败')
-                tableLoading.value = false
-            }
-        })
-        .catch(e => {
-            setTimeout(() => {
-                tableLoading.value = false
-            }, 0)
-        })
 }
-//tab点击事件
 
-const realDataTimer: any = ref()
-const mqttMessage = ref<any>({})
 const handleClick = async (tab?: any) => {
     tableLoading.value = true
     showButton.value = false
@@ -1272,7 +1285,7 @@ const handleClick = async (tab?: any) => {
             tableLoading.value = false
         }, 0)
     }
-    //电镀数据
+    //电度数据
     if (dataSet.value.includes('_kilowattHour')) {
         let obj = {
             devId: deviceId.value, //e.id
@@ -1475,6 +1488,8 @@ const handleClick = async (tab?: any) => {
             window.clearInterval(trendTimer.value)
         }
         if (mqttRef.value) {
+            mqttRef.value.off('message', onMqttTrendMessage)
+            mqttRef.value.off('message', onMqttRealDataMessage)
             mqttRef.value.end()
         }
     }
@@ -1557,6 +1572,8 @@ onBeforeUnmount(() => {
     realDataTimer.value = 0
     trendTimer.value = 0
     if (mqttRef.value) {
+        mqttRef.value.off('message', onMqttTrendMessage)
+        mqttRef.value.off('message', onMqttRealDataMessage)
         mqttRef.value.end()
     }
 })
diff --git a/src/views/govern/device/control/tabs/components/realtrend.vue b/src/views/govern/device/control/tabs/components/realtrend.vue
index 0eb72dc..521466a 100644
--- a/src/views/govern/device/control/tabs/components/realtrend.vue
+++ b/src/views/govern/device/control/tabs/components/realtrend.vue
@@ -293,31 +293,31 @@ const setRealTrendData = (val: any) => {
                 if (selectValue.value == '2') {
                     if (activeName.value == 2) {
                         if (numberPart % 2 !== 0 && numberPart < 17) {
-                            tableData.value[key] = val[key]
+                            tableData.value[key] = val[key].toFixed(2)
                         }
                     } else {
                         if (numberPart % 2 === 0) {
-                            tableData.value[key] = val[key]
+                            tableData.value[key] = val[key].toFixed(2)
                         }
                     }
                 } else {
                     if (activeName.value == 2) {
                         if (numberPart % 2 === 0 && numberPart < 17) {
-                            tableData.value[key] = val[key]
+                            tableData.value[key] = val[key].toFixed(2)
                         }
                     } else {
                         if (numberPart % 2 !== 0) {
-                            tableData.value[key] = val[key]
+                            tableData.value[key] = val[key].toFixed(2)
                         }
                     }
                 }
             } else {
                 if (activeName.value == 2) {
                     if (numberPart < 17) {
-                        tableData.value[key] = val[key]
+                        tableData.value[key] = val[key].toFixed(2)
                     }
                 } else {
-                    tableData.value[key] = val[key]
+                    tableData.value[key] = val[key].toFixed(2)
                 }
             }
         }
diff --git a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
index d7d6adc..aeb009e 100644
--- a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
+++ b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
@@ -20,25 +20,15 @@
 
             <el-button @click="handleBack" :icon="Back">返回</el-button>
         </div>
-        <!-- v-loading="loading" -->
-        <el-tabs class="home_body" type="border-card" v-model.trim="activeName1" @tab-click="handleClick">
+        <!--  -->
+        <el-tabs class="home_body" v-loading="loading" type="border-card" v-model.trim="activeName1" @tab-click="handleClick">
             <el-tab-pane label="瞬时波形" name="ssbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
-                <shushiboxi
-                    v-if="isWp && wp && activeName == 'ssbx' && showBoxi"
-                    :value="value"
-                    :boxoList="boxoList"
-                    :parentHeight="parentHeight"
-                    :wp="wp"
-                ></shushiboxi>
+                <shushiboxi v-if="isWp && wp && activeName == 'ssbx' && showBoxi" :value="value" :boxoList="boxoList"
+                    :parentHeight="parentHeight" :wp="wp"></shushiboxi>
             </el-tab-pane>
             <el-tab-pane label="RMS波形" name="rmsbx" :style="'height:' + bxecharts + ';overflow-y: auto;'">
-                <rmsboxi
-                    v-if="isWp && wp && activeName == 'rmsbx' && showBoxi"
-                    :value="value"
-                    :boxoList="boxoList"
-                    :parentHeight="parentHeight"
-                    :wp="wp"
-                ></rmsboxi>
+                <rmsboxi v-if="isWp && wp && activeName == 'rmsbx' && showBoxi" :value="value" :boxoList="boxoList"
+                    :parentHeight="parentHeight" :wp="wp"></rmsboxi>
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -117,11 +107,10 @@ const getWpData = (val: any, list: any) => {
 const changeView = () => {
     showBoxi.value = false
     loading.value = true
+
     setTimeout(() => {
         value.value = theTypeOfValue.value
         showBoxi.value = true
-    }, 500)
-    setTimeout(() => {
         loading.value = false
     }, 1000)
 }
@@ -148,7 +137,7 @@ const setHeight = (h: any, vh: any, num = 1) => {
         bxecharts.value = mainHeight(vh, num).height
     }, 100)
 }
-onMounted(() => {})
+onMounted(() => { })
 defineExpose({ getWpData, setHeight })
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/govern/device/control/tabs/electroplating.vue b/src/views/govern/device/control/tabs/electroplating.vue
index ad3d2cd..cdf8a11 100644
--- a/src/views/govern/device/control/tabs/electroplating.vue
+++ b/src/views/govern/device/control/tabs/electroplating.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <!-- 电镀数据数据 -->
+        <!-- 电度数据数据 -->
         <div>
             <TableHeader ref="tableHeaderRef" :showSearch="false" @selectChange="selectChange">
                 <template v-slot:select>
@@ -310,7 +310,7 @@ const setEchart = () => {
                         exportCSV(
                             echartsData.value.options.series.map((item: any) => item.name),
                             dataList,
-                            '电镀数据.csv'
+                            '电度数据.csv'
                         )
                     }
                 }
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index fe85637..fe6be8b 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -4,13 +4,8 @@
             <TableHeader datePicker ref="headerRef" :showReset="false"></TableHeader>
             <Table ref="tableRef" />
         </div>
-        <waveFormAnalysis
-            v-loading="loading"
-            v-if="isWaveCharts"
-            ref="waveFormAnalysisRef"
-            @handleHideCharts="isWaveCharts = false"
-            :wp="wp"
-        />
+        <waveFormAnalysis v-loading="loading" v-if="isWaveCharts" ref="waveFormAnalysisRef"
+            @handleHideCharts="isWaveCharts = false" :wp="wp" />
     </div>
 </template>
 <script lang="ts" setup>
@@ -57,16 +52,23 @@ const tableStore: any = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
-        { field: 'showName', title: '事件描述', minWidth: 120 },
+        { field: 'startTime', title: '暂降发生时刻', minWidth: 180, sortable: true },
+
         {
-            field: 'phaseType',
-            title: '相别',
-            minWidth: 80,
+            field: 'featureAmplitude',
+            title: '暂降(骤升)幅值(%)',
+            minWidth: 160,
+            sortable: true,
             formatter: (row: any) => {
-                return row.cellValue || '/'
+                //row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
+                row.cellValue = row.cellValue != null ? Number(row.cellValue).toFixed(2) : '/'
+                if (String(row.cellValue).split('.')[1] == '00') {
+                    row.cellValue = String(row.cellValue).split('.')[0]
+                }
+                return row.cellValue
             }
         },
+
         {
             field: 'persistTime',
             title: '持续时间(s)',
@@ -79,18 +81,17 @@ const tableStore: any = new TableStore({
             sortable: true
         },
         {
-            field: 'featureAmplitude',
-            title: '暂降(聚升)幅值(%)',
-            minWidth: 130,
+            field: 'phaseType',
+            title: '相别',
+            minWidth: 80,
             formatter: (row: any) => {
-                //row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
-                row.cellValue = row.cellValue != null ? Number(row.cellValue).toFixed(2) : '/'
-                if (String(row.cellValue).split('.')[1] == '00') {
-                    row.cellValue = String(row.cellValue).split('.')[0]
-                }
-                return row.cellValue
+                return row.cellValue || '/'
             }
         },
+        { field: 'showName', title: '触发类型', minWidth: 120 },
+
+
+
         {
             title: '操作',
             fixed: 'right',
@@ -111,7 +112,7 @@ const tableStore: any = new TableStore({
                     },
                     click: async row => {
                         row.loading1 = true
-                      
+
                         await analyseWave(row.id)
                             .then(res => {
                                 isWaveCharts.value = true
@@ -149,7 +150,7 @@ const tableStore: any = new TableStore({
                     icon: 'el-icon-DataLine',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.showName != '未知'
+                        return row.wavePath 
                     }
                 },
                 {
@@ -164,6 +165,7 @@ const tableStore: any = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
+                        ElMessage.info('下载中......')
                         getFileZip({ eventId: row.id }).then(res => {
                             let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
                             const url = window.URL.createObjectURL(blob)
@@ -173,6 +175,7 @@ const tableStore: any = new TableStore({
                             document.body.appendChild(link)
                             link.click() //执行下载
                             document.body.removeChild(link) //释放标签
+                            ElMessage.success('波形下载成功')
                         })
                     }
                 },
@@ -202,7 +205,7 @@ const tableStore: any = new TableStore({
         tableStore.table.params.list = tableParams.value.list
         tableStore.table.params.type = 3
     },
-    loadCallback: () => {}
+    loadCallback: () => { }
 })
 provide('tableStore', tableStore)
 const isWaveCharts = ref(false)
diff --git a/src/views/govern/device/fileService/index.vue b/src/views/govern/device/fileService/index.vue
index 4308f49..bcb83b0 100644
--- a/src/views/govern/device/fileService/index.vue
+++ b/src/views/govern/device/fileService/index.vue
@@ -238,7 +238,7 @@ const deviceTypeChange = (val: any, obj: any) => {
     nodeClick(obj)
 }
 const nodeClick = (e: any) => {
-    if (e && (e.level == 2 || e.type == 'device')) {
+    if (e && (e.level == 2 || e.level == 3 || e.type == 'device')) {
         loading.value = true
         nDid.value = e.ndid
         devId.value = e.id
diff --git a/src/views/govern/device/manage/index.vue b/src/views/govern/device/manage/index.vue
index 9a2ba57..f49a79a 100644
--- a/src/views/govern/device/manage/index.vue
+++ b/src/views/govern/device/manage/index.vue
@@ -137,12 +137,11 @@ const deviceTypeChange = (val: any, obj: any) => {
 }
 // 树节点点击
 const nodeClick = (e: anyObj) => {
-    console.log('🚀 ~ nodeClick ~ e:', e)
     if (!e) {
         loading.value = false
         return
     }
-    if (e.level == 2) {
+    if (e.level == 2 || e.level == 3) {
         pName.value = e.pName
         nDid.value = e.ndid
         loading.value = true
diff --git a/src/views/govern/device/planData/components/transient.vue b/src/views/govern/device/planData/components/transient.vue
index 6b9e5fa..cdbadc7 100644
--- a/src/views/govern/device/planData/components/transient.vue
+++ b/src/views/govern/device/planData/components/transient.vue
@@ -44,30 +44,11 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '发生时刻', minWidth: 170, sortable: true },
-        { field: 'showName', title: '事件描述', minWidth: 170 },
-        {
-            field: 'phaseType',
-            title: '相别',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
-            }
-        },
-        {
-            field: 'persistTime',
-            title: '持续时间(s)',
-            minWidth: 100,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
-                return row.cellValue
-            }, sortable: true
-        },
+        { field: 'startTime', title: '暂降发生时刻', minWidth: 170, sortable: true },
         {
             field: 'featureAmplitude',
-            title: '暂降(聚升)幅值(%)',
-            minWidth: 100,
+            title: '暂降(骤升)幅值(%)',
+            minWidth: 160,
             formatter: (row: any) => {
                 row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/'
                 if (String(row.cellValue).split('.')[1] == '00') {
@@ -76,11 +57,32 @@ const tableStore = new TableStore({
                 return row.cellValue
             }, sortable: true
         },
+        {
+            field: 'persistTime',
+            title: '持续时间(s)',
+            minWidth: 110,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
+                return row.cellValue
+            }, sortable: true
+        },
+        {
+            field: 'phaseType',
+            title: '相别',
+            minWidth: 100,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+
+
+        { field: 'showName', title: '触发类型', minWidth: 170 },
         {
             title: '操作', fixed: 'right',
             width: 180,
             render: 'buttons',
-        
+
             buttons: [
                 {
                     name: 'edit',
@@ -95,7 +97,7 @@ const tableStore = new TableStore({
                     },
                     click: async row => {
                         row.loading1 = true
-                      
+
                         await analyseWave(row.id)
                             .then(res => {
                                 loading.value = true
@@ -143,6 +145,7 @@ const tableStore = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
+                        ElMessage.info('下载中......')
                         getFileZip({ eventId: row.id }).then(res => {
                             let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
                             const url = window.URL.createObjectURL(blob)
@@ -152,7 +155,7 @@ const tableStore = new TableStore({
                             document.body.appendChild(link)
                             link.click() //执行下载
                             document.body.removeChild(link) //释放标签
-
+                            ElMessage.success('波形下载成功')
                         })
 
                     }
diff --git a/src/views/govern/device/tourist/index.vue b/src/views/govern/device/tourist/index.vue
index 089db13..b5c0e19 100644
--- a/src/views/govern/device/tourist/index.vue
+++ b/src/views/govern/device/tourist/index.vue
@@ -1,13 +1,7 @@
 <template>
     <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
-        <DeviceTree
-            ref="treeRef"
-            :showCheckbox="true"
-            :default-checked-keys="defaultCheckedKeys"
-            @checkChange="checkChange"
-            :height="35"
-            :engineering="true"
-        ></DeviceTree>
+        <DeviceTree ref="treeRef" :showCheckbox="true" :default-checked-keys="defaultCheckedKeys"
+            @checkChange="checkChange" :height="35" :engineering="true"></DeviceTree>
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
                 <vxe-column field="enginerName" title="工程名称"></vxe-column>
@@ -36,6 +30,7 @@ const tableData = ref([])
 const treeRef = ref(null)
 const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
+    console.log("🚀 ~ checkChange ~ data:", data)
     if (data == undefined) return (loading.value = false)
     if (data.data.pName == '便携式设备') {
         if (ignoreCheckChange.value) {
@@ -47,7 +42,7 @@ const checkChange = (data: any) => {
         return treeRef.value?.treRef?.treeRef2?.setCheckedKeys([])
     }
 
-    if (data.data.level === 2) {
+    if (data.data.level === 2 || data.data.level === 3) {
         if (data.checked) {
             defaultCheckedKeys.value.push(data.data.id)
         } else {
@@ -100,6 +95,7 @@ onMounted(() => {
         overflow: hidden;
         flex: 1;
         padding: 10px 10px 10px 0;
+
         .el-descriptions__header {
             height: 36px;
             margin-bottom: 7px;
diff --git a/src/views/govern/reportCore/lineReport/index.vue b/src/views/govern/reportCore/lineReport/index.vue
index 123cc46..1f484db 100644
--- a/src/views/govern/reportCore/lineReport/index.vue
+++ b/src/views/govern/reportCore/lineReport/index.vue
@@ -83,7 +83,7 @@
                             </div>
                         </el-col>
                         <el-col :span="12" class="mTop">
-                            <el-checkbox v-model="formd.glfbfz">暂降幅值</el-checkbox>
+                            <el-checkbox v-model="formd.glfbfz">暂降(骤升)幅值</el-checkbox>
                             <el-checkbox v-model="formd.glfbsj">持续时间</el-checkbox>
                         </el-col>
                     </el-row>
@@ -144,6 +144,7 @@ import { genFileId, ElMessage, ElNotification } from 'element-plus'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import pointTree from '@/components/tree/govern/pointTree.vue'
 import { getLineExport } from '@/api/harmonic-boot/cockpit/cockpit'
+import { isReportMonitorPoint } from '@/components/tree/govern/lineTreeUtils'
 defineOptions({
     name: 'TransientReport/monitoringpointReport'
 })
@@ -194,7 +195,7 @@ const pointTypeChange = (val: any, obj: any) => {
     handleNodeClick(obj)
 }
 const handleNodeClick = (data: any,) => {
-    dotList.value = data
+        dotList.value = data
 }
 // 上传
 const choose = (files: any) => {
@@ -212,7 +213,7 @@ const choose = (files: any) => {
 
 //生成报告
 const exportEvent = () => {
-    if (dotList.value?.level != 3) {
+    if (!isReportMonitorPoint(dotList.value)) {
         return ElMessage.warning('请选择监测点进行报告生成!')
     }
     let a = ''
diff --git a/src/views/govern/reportCore/report/index.vue b/src/views/govern/reportCore/report/index.vue
index 724aa98..f41e98e 100644
--- a/src/views/govern/reportCore/report/index.vue
+++ b/src/views/govern/reportCore/report/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="default-main" :style="height" style="display: flex; height: 100%; overflow: hidden">
+    <div class="default-main" :style="height" style="display: flex;  overflow: hidden">
         <div style="width: 280px; flex-shrink: 0; height: 100%; overflow: hidden">
                 <pointTree
                     ref="TerminalRef"
@@ -73,6 +73,7 @@ import { genFileId, ElMessage, ElNotification } from 'element-plus'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import pointTree from '@/components/tree/govern/pointTree.vue'
 import { exportModel } from '@/api/cs-harmonic-boot/datatrend'
+import { isReportMonitorPoint } from '@/components/tree/govern/lineTreeUtils'
 defineOptions({
     name: 'harmonic-boot/report/word'
 })
@@ -97,7 +98,9 @@ const pointTypeChange = (val: any, obj: any) => {
     handleNodeClick(obj)
 }
 const handleNodeClick = (data: any) => {
-    dotList.value = data
+    if (isReportMonitorPoint(data)) {
+        dotList.value = data
+    }
 }
 // 上传
 const choose = (files: any) => {
@@ -115,7 +118,7 @@ const choose = (files: any) => {
 // 生成
 const exportEvent = () => {
     console.log('🚀 ~ exportEvent ~ dotList.value:', dotList.value)
-    if (dotList.value?.level != 3) {
+    if (!isReportMonitorPoint(dotList.value)) {
         return ElMessage.warning('请选择监测点进行报告生成!')
     }
     let form = new FormData()
diff --git a/src/views/govern/reportCore/statistics/index.vue b/src/views/govern/reportCore/statistics/index.vue
index 238ae95..c263d3e 100644
--- a/src/views/govern/reportCore/statistics/index.vue
+++ b/src/views/govern/reportCore/statistics/index.vue
@@ -29,13 +29,14 @@
     </div>
 </template>
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { onMounted, onUnmounted, ref, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import PointTree from '@/components/tree/govern/pointTree.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import { exportExcel } from '@/views/system/reportForms/export.js'
+import { destroyLuckysheet, exportLuckysheetFile, renderLuckysheetReport } from '@/utils/luckysheetHelper'
+import { isLineTreeLeaf } from '@/components/tree/govern/lineTreeUtils'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
 // import data from './123.json'
@@ -74,25 +75,7 @@ const tableStore = new TableStore({
         tableStore.table.params.lineId = dotList.value.id
     },
     loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-            item.celldata.forEach((k: any) => {
-
-                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-            })
-        })
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
+        renderLuckysheetReport('luckysheet', tableStore.table.data)
     }
 })
 provide('tableStore', tableStore)
@@ -104,6 +87,9 @@ onMounted(() => {
         size.value = ((280 / (dom.offsetWidth - 7)) * 100)
     }
 })
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 
 
 const stencil = (val: any) => {
@@ -118,7 +104,7 @@ const changetype = (val: any) => {
 }
 
 const handleNodeClick = (data: any, node: any) => {
-    if (data?.type == "line") {
+    if (isLineTreeLeaf(data)) {
         dotList.value = data
         setTimeout(() => {
             tableStore.index()
@@ -127,7 +113,7 @@ const handleNodeClick = (data: any, node: any) => {
 }
 
 const exportEvent = () => {
-    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
+    exportLuckysheetFile('统计报表下载', tableStore.table.data.length > 0)
 }
 </script>
 <style lang="scss">
diff --git a/src/views/govern/reportCore/statisticsWx/index.vue b/src/views/govern/reportCore/statisticsWx/index.vue
index ab05b63..dc90085 100644
--- a/src/views/govern/reportCore/statisticsWx/index.vue
+++ b/src/views/govern/reportCore/statisticsWx/index.vue
@@ -31,14 +31,15 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, provide } from 'vue'
+import { ref, provide, onUnmounted } from 'vue'
 import TableStore from '@/utils/tableStore'
 import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import { exportExcel } from '@/views/system/reportForms/export.js'
+import { destroyLuckysheet, exportLuckysheetFile, renderLuckysheetReport } from '@/utils/luckysheetHelper'
 import DatePicker from '@/components/form/datePicker/time.vue'
+import { ElMessage } from 'element-plus'
 const name = ref('')
 // import data from './123.json'
 defineOptions({
@@ -61,33 +62,19 @@ const tableStore = new TableStore({
     beforeSearchFun: () => {
         tableStore.table.params.tempId = Template.value.id
         tableStore.table.params.lineId = dotList.value.id
-        tableStore.table.params.startTime  = datePickerRef.value.timeValue[0],
-        tableStore.table.params.endTime = datePickerRef.value.timeValue[1],
+        if (!datePickerRef.value?.timeValue?.[0] || !datePickerRef.value?.timeValue?.[1]) {
+            ElMessage.warning('请选择时间')
+            return false
+        }
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
         delete tableStore.table.params.searchBeginTime
         delete tableStore.table.params.searchEndTime
         delete tableStore.table.params.timeFlag
     },
     loadCallback: () => {
         name.value = dotList.value.name
-        tableStore.table.data.forEach((item: any) => {
-            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-            item.celldata.forEach((k: any) => {
-
-                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-            })
-        })
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
+        renderLuckysheetReport('luckysheet', tableStore.table.data, { allowEdit: false })
     }
 })
 provide('tableStore', tableStore)
@@ -127,8 +114,11 @@ const exportEvent = () => {
 
     // 格式化YYYY - MM - DD（补零）
     const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
-    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+    exportLuckysheetFile(name.value + formattedDate, tableStore.table.data.length > 0)
 }
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 </script>
 <style lang="scss">
 .report-zl-page {
diff --git a/src/views/govern/reportCore/statisticsWx/index_ypt.vue b/src/views/govern/reportCore/statisticsWx/index_ypt.vue
index c61e8a8..256d67e 100644
--- a/src/views/govern/reportCore/statisticsWx/index_ypt.vue
+++ b/src/views/govern/reportCore/statisticsWx/index_ypt.vue
@@ -55,13 +55,14 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, provide } from 'vue'
+import { ref, provide, onUnmounted } from 'vue'
 import TableStore from '@/utils/tableStore'
 import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import { exportExcel } from '@/views/system/reportForms/export.js'
+import { destroyLuckysheet, exportLuckysheetFile, renderLuckysheetReport } from '@/utils/luckysheetHelper'
+import { isLineTreeLeaf } from '@/components/tree/govern/lineTreeUtils'
 import DatePicker from '@/components/form/datePicker/time.vue'
 import pointTree from '@/components/tree/govern/pointTree.vue'
 // import data from './123.json'
@@ -92,36 +93,8 @@ const tableStore = new TableStore({
         delete tableStore.table.params.timeFlag
     },
     loadCallback: () => {
-        console.log('🚀 ~ tableStore.table:', tableStore.table)
         name.value = dotList.value.name
-        // tableStore.table.data.forEach((item: any) => {
-        //     item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-        //     item.celldata.forEach((k: any) => {
-
-        //         item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-        //     })
-        // })
-        tableStore.table.data.forEach((item: any) => {
-            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-            item.celldata.forEach((k: any) => {
-                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-            })
-        })
-        console.log('🚀 ~ tableStore.table:', tableStore.table)
-
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                allowEdit: false, // 禁止所有编辑操作（必填）
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
+        renderLuckysheetReport('luckysheet', tableStore.table.data, { allowEdit: false })
     }
 })
 provide('tableStore', tableStore)
@@ -143,7 +116,7 @@ const pointTypeChange = (val: any, obj: any) => {
 }
 
 const handleNodeClick = (data: any) => {
-    if (data?.level == 3) {
+    if (isLineTreeLeaf(data)) {
         dotList.value = data
         setTimeout(() => {
             tableStore.index()
@@ -155,14 +128,15 @@ const handleNodeClick = (data: any) => {
 
 const exportEvent = () => {
     const now = new Date()
-    const year = now.getFullYear() // 4位年份
-    const month = now.getMonth() + 1 // 月份0-11，需+1
-    const day = now.getDate() // 日期1-31
-
-    // 格式化YYYY - MM - DD（补零）
+    const year = now.getFullYear()
+    const month = now.getMonth() + 1
+    const day = now.getDate()
     const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
-    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+    exportLuckysheetFile(name.value + formattedDate, tableStore.table.data.length > 0)
 }
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 </script>
 <style lang="scss">
 .report-zl-page {
diff --git a/src/views/govern/reportCore/statisticsWx/index_zl.vue b/src/views/govern/reportCore/statisticsWx/index_zl.vue
index 8d87eb3..806355f 100644
--- a/src/views/govern/reportCore/statisticsWx/index_zl.vue
+++ b/src/views/govern/reportCore/statisticsWx/index_zl.vue
@@ -43,13 +43,14 @@
     </div>
 </template>
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { onMounted, onUnmounted, ref, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import pointTreeWx from '@/components/tree/govern/pointTreeWx.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-import { exportExcel } from '@/views/system/reportForms/export.js'
+import { destroyLuckysheet, exportLuckysheetFile, renderLuckysheetReport } from '@/utils/luckysheetHelper'
+import { isLineTreeLeaf } from '@/components/tree/govern/lineTreeUtils'
 import DatePicker from '@/components/form/datePicker/time.vue'
 import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTreeZL.vue'
 import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
@@ -80,35 +81,20 @@ const tableStore = new TableStore({
         // ;(tableStore.table.params.startTime = datePickerRef.value.timeValue[0]),
         //     (tableStore.table.params.endTime = datePickerRef.value.timeValue[1]),
         if (!tableStore.table.params.tempId) {
-            return ElMessage.warning('请选择模板')
+            ElMessage.warning('请选择模板')
+            return false
+        }
+        if (!dotList.value?.id) {
+            ElMessage.warning('请选择监测点')
+            return false
         }
         delete tableStore.table.params.searchBeginTime
         delete tableStore.table.params.searchEndTime
         delete tableStore.table.params.timeFlag
     },
     loadCallback: () => {
-        console.log('🚀 ~ tableStore.table:', tableStore.table.data)
         name.value = dotList.value.name
-        // tableStore.table.data.forEach((item: any) => {
-        //     item.data1 ? (item.data = JSON.parse(item.data1)) : ''
-        //     item.celldata.forEach((k: any) => {
-        //         item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
-        //     })
-        // })
-
-        setTimeout(() => {
-            luckysheet.create({
-                container: 'luckysheet',
-                title: '', // 表 头名
-                lang: 'zh', // 中文
-                showtoolbar: false, // 是否显示工具栏
-                showinfobar: false, // 是否显示顶部信息栏
-                showsheetbar: true, // 是否显示底部sheet按钮
-                allowEdit: false, // 禁止所有编辑操作（必填）
-                data: tableStore.table.data
-                //  tableStore.table.data
-            })
-        }, 10)
+        renderLuckysheetReport('luckysheet', tableStore.table.data, { allowEdit: false })
     }
 })
 provide('tableStore', tableStore)
@@ -118,6 +104,9 @@ const flag = ref(true)
 onMounted(() => {
     initListByIds()
 })
+onUnmounted(() => {
+    destroyLuckysheet()
+})
 
 const idList = ref([])
 // 监测对象
@@ -134,7 +123,6 @@ const initListByIds = () => {
     })
 }
 const stencil = (val: any) => {
-    console.log('🚀 ~ stencil ~ val:', val)
     templatePolicy.value = val.filter((item: any) => item.excelType == '4')
     Template.value = templatePolicy.value[0]
     reportForm.value = templatePolicy.value[0]?.excelType
@@ -145,7 +133,7 @@ const changetype = (val: any) => {
 }
 
 const handleNodeClick = (data: any, node: any) => {
-    if (data?.level == 3) {
+    if (isLineTreeLeaf(data) || data?.level == 3) {
         dotList.value = data
         setTimeout(() => {
             tableStore.index()
@@ -163,7 +151,7 @@ const exportEvent = () => {
 
     // 格式化YYYY - MM - DD（补零）
     const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
-    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
+    exportLuckysheetFile(name.value + formattedDate, tableStore.table.data.length > 0)
 }
 </script>
 <style lang="scss">
diff --git a/types/table.d.ts b/types/table.d.ts
index 04fd3e1..34f0788 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -30,7 +30,7 @@ declare global {
         }
         loadCallback: (() => void) | null
         resetCallback: (() => void) | null
-        beforeSearchFun: (() => void) | null
+        beforeSearchFun: (() => void | boolean) | null
         exportProcessingData: (() => void) | null
         height: string
         publicHeight: number