diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index 886ac96d..00636d13 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -30,7 +30,7 @@ import { downloadFile } from '@/api/system-boot/file'
 import { previewFile } from '@/utils/fileDownLoad'
 
 const { push, options, currentRoute } = useRouter()
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG = false//import.meta.env.VITE_NAME == 'jibei'
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
 const url = ref('')
 const excelOptions = ref({})
diff --git a/src/components/echarts/rmsWorker.js b/src/components/echarts/rmsWorker.js
new file mode 100644
index 00000000..562b4db5
--- /dev/null
+++ b/src/components/echarts/rmsWorker.js
@@ -0,0 +1,322 @@
+// 辅助函数
+const getMax = (temp, tempA, tempB, tempC) => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    if (tempC !== undefined) {
+        temp = temp > tempC ? temp : tempC
+    }
+    return temp
+}
+
+const getMaxTwo = (temp, tempA, tempB) => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    return temp
+}
+
+const getMin = (temp, tempA, tempB, tempC) => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    if (tempC !== undefined) {
+        temp = temp < tempC ? temp : tempC
+    }
+    return temp
+}
+
+const getMinOpen = (temp, tempA, tempB) => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    return temp
+}
+
+// 数据处理函数
+const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
+    const rmsData = wp.listRmsData
+    const pt = Number(wp.pt) / 1000
+    const ct = Number(wp.ct)
+    const titleList = wp.waveTitle
+    let xishu = pt
+    let aTitle = '',
+        bTitle = '',
+        cTitle = '',
+        unit = '电压'
+    let rmsvFirstX = 0,
+        rmsvFirstY = 0,
+        rmsvSecondX = 0,
+        rmsvSecondY = 0,
+        firstZhou = 'a',
+        secondeZhou = 'a'
+    let ifmax = 0,
+        ifmin = 0,
+        ismax = 0,
+        ismin = 0,
+        rfmax = 0,
+        rfmin = 0,
+        rsmax = 0,
+        rsmin = 0
+
+    const shunshiFA = []
+    const shunshiFB = []
+    const shunshiFC = []
+    const shunshiSA = []
+    const shunshiSB = []
+    const shunshiSC = []
+    const rmsFA = []
+    const rmsFB = []
+    const rmsFC = []
+    const rmsSA = []
+    const rmsSB = []
+    const rmsSC = []
+
+    if (titleList[iphasicValue * step + 1]?.substring(0, 1) !== 'U') {
+        xishu = ct
+        unit = '电流'
+    }
+
+    for (let i = 1; i <= iphasicValue; i++) {
+        switch (i) {
+            case 1:
+                aTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+            case 2:
+                bTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+            case 3:
+                cTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+        }
+    }
+
+    if (rmsData[0] && rmsData[0][iphasicValue * step + 1] !== undefined) {
+        rfmax = rmsData[0][iphasicValue * step + 1] * xishu
+        rfmin = rmsData[0][iphasicValue * step + 1] * xishu
+        rmsvFirstY = rmsData[0][iphasicValue * step + 1] * xishu
+        rmsvFirstX = rmsData[0][0]
+        rsmax = rmsData[0][iphasicValue * step + 1]
+        rsmin = rmsData[0][iphasicValue * step + 1]
+        rmsvSecondY = rmsData[0][iphasicValue * step + 1]
+        rmsvSecondX = rmsData[0][0]
+    }
+
+    for (let rms = 0; rms < rmsData.length; rms++) {
+        if (!rmsData[rms] || rmsData[rms][iphasicValue * step + 1] === undefined) {
+            break
+        }
+
+        switch (iphasicValue) {
+            case 1:
+                const rmsFirstA = rmsData[rms][iphasicValue * 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]
+                }
+
+                const rmsSecondA = rmsData[rms][iphasicValue * 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:
+                const rmsFirstA2 = rmsData[rms][iphasicValue * step + 1] * xishu
+                const rmsFirstB2 = rmsData[rms][iphasicValue * step + 2] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA2])
+                rmsFB.push([rmsData[rms][0], rmsFirstB2])
+                rfmax = getMaxTwo(rfmax, rmsFirstA2, rmsFirstB2)
+                rfmin = getMinOpen(rfmin, rmsFirstA2, rmsFirstB2)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA2) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB2) {
+                        firstZhou = 'b'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA2 = rmsData[rms][iphasicValue * step + 1]
+                const rmsSecondB2 = rmsData[rms][iphasicValue * step + 2]
+                rmsSA.push([rmsData[rms][0], rmsSecondA2])
+                rmsSB.push([rmsData[rms][0], rmsSecondB2])
+                rsmax = getMaxTwo(rsmax, rmsSecondA2, rmsSecondB2)
+                rsmin = getMinOpen(rsmin, rmsSecondA2, rmsSecondB2)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA2) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB2) {
+                        secondeZhou = 'b'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+            case 3:
+                const rmsFirstA3 = rmsData[rms][iphasicValue * step + 1] * xishu
+                const rmsFirstB3 = rmsData[rms][iphasicValue * step + 2] * xishu
+                const rmsFirstC3 = rmsData[rms][iphasicValue * step + 3] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA3])
+                rmsFB.push([rmsData[rms][0], rmsFirstB3])
+                rmsFC.push([rmsData[rms][0], rmsFirstC3])
+                rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                rfmin = isOpen
+                    ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3)
+                    : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA3) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB3) {
+                        firstZhou = 'b'
+                    } else {
+                        firstZhou = 'c'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA3 = rmsData[rms][iphasicValue * step + 1]
+                const rmsSecondB3 = rmsData[rms][iphasicValue * step + 2]
+                const rmsSecondC3 = rmsData[rms][iphasicValue * step + 3]
+                rmsSA.push([rmsData[rms][0], rmsSecondA3])
+                rmsSB.push([rmsData[rms][0], rmsSecondB3])
+                rmsSC.push([rmsData[rms][0], rmsSecondC3])
+                rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                rsmin = isOpen
+                    ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3)
+                    : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA3) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB3) {
+                        secondeZhou = 'b'
+                    } else {
+                        secondeZhou = 'c'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+        }
+    }
+
+    const instantF = { max: ifmax, min: ifmin }
+    const instantS = { max: ismax, min: ismin }
+    const RMSF = { max: rfmax, min: rfmin }
+    const RMSS = { max: rsmax, min: rsmin }
+    const RMSFMinDetail = { rmsvFirstX, rmsvFirstY, firstZhou }
+    const RMSSMinDetail = { rmsvSecondX, rmsvSecondY, secondeZhou }
+    const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
+    const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
+    const RMSFWave = { rmsFA, rmsFB, rmsFC }
+    const RMSSWave = { rmsSA, rmsSB, rmsSC }
+    const title = { aTitle, bTitle, cTitle, unit }
+
+    return {
+        instantF,
+        instantS,
+        RMSF,
+        RMSS,
+        RMSFMinDetail,
+        RMSSMinDetail,
+        shunshiF,
+        shunshiS,
+        RMSFWave,
+        RMSSWave,
+        title,
+        unit
+    }
+}
+
+// 监听消息
+self.onmessage = function (e) {
+    const { wp, isOpen, value, boxoList, requestId } = e.data
+
+    try {
+        const iphasicValue = wp.iphasic || 1
+
+        const picCounts = (wp.waveTitle.length - 1) / iphasicValue
+        const waveDatas = []
+
+        for (let i = 0; i < picCounts; i++) {
+            const data = fliteWaveData(wp, i, iphasicValue, isOpen, boxoList)
+            waveDatas.push(data)
+        }
+        // 处理标题
+        let titles = ''
+        if (boxoList.systemType == 'pms') {
+            titles =
+                '变电站名称:' +
+                boxoList.powerStationName +
+                '　监测点名称:' +
+                boxoList.measurementPointName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '% 　持续时间:' +
+                boxoList.duration +
+                's'
+        } else if (boxoList.systemType == 'ZL') {
+            titles =
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                boxoList.equipmentName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                boxoList.evtParamVVaDepth +
+                '%　持续时间:' +
+                boxoList.evtParamTm +
+                's'
+        } else if (boxoList.systemType == 'YPT') {
+            titles =
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                boxoList.lineName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '%　持续时间:' +
+                boxoList.persistTime +
+                's'
+        } else {
+            titles =
+                '　变电站名称:' +
+                boxoList.subName +
+                '　监测点名称:' +
+                boxoList.lineName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '%　持续时间:' +
+                boxoList.duration +
+                's'
+        }
+        // 发送处理结果回主线程
+        self.postMessage({
+            requestId,
+            titles: titles,
+            success: true,
+            waveDatas,
+            time: wp.time,
+            type: wp.waveType,
+            severity: wp.yzd,
+            iphasic: iphasicValue
+        })
+    } 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 45c4713e..8e9cd872 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -1,686 +1,241 @@
 <template>
-    <div v-loading="loading" style="position: relative">
+    <div v-loading="loading" style="position: relative; height: 100%">
         <div id="boxr">
-            <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="rms"></div>
+            <div id="rmsp" :style="`height:${vh};overflow: hidden;min-height: 200px;`">
+                <div class="bx" id="rms" style="min-height: 200px"></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";
+
+<script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
+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';
-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,
-    },
+import { calcRmsYAxisRange, formatAxisLabel } from '@/utils/chartAxisHelper'
+import url from '@/assets/img/point.png'
+import url2 from '@/assets/img/dw.png'
+import { buildWaveCacheKey, getWaveCache, setWaveCache } from '@/utils/waveCache'
+import { getRmsWorker, buildWorkerPayload } from '@/utils/waveWorkerPool'
 
-  },
-  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,
-      echartlist: null,
-      myChartess: null,
-            myChartess1: null,
-            myChartess2: null,
-            myChartess3: null,
-            myChartess4: null,
-            myChartess5: 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(165).height
-    } else if (this.height != false) {
-      this.vh = this.height
-    } else {
-      this.vh = mainHeight(165, 2).height
+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 }
+    RMSF: { max: number; min: number }
+    RMSS: { max: number; min: number }
+    RMSFMinDetail: {
+        rmsvFirstX: number
+        rmsvFirstY: number
+        firstZhou: string
     }
-    if (this.parentHeight != 0) {
-            this.vh = mainHeight(this.parentHeight, 2).height
+    RMSSMinDetail: {
+        rmsvSecondX: number
+        rmsvSecondY: number
+        secondeZhou: string
+    }
+    shunshiF: {
+        shunshiFA: number[][]
+        shunshiFB: number[][]
+        shunshiFC: number[][]
+    }
+    shunshiS: {
+        shunshiSA: number[][]
+        shunshiSB: number[][]
+        shunshiSC: number[][]
+    }
+    RMSFWave: {
+        rmsFA: number[][]
+        rmsFB: number[][]
+        rmsFC: number[][]
+    }
+    RMSSWave: {
+        rmsSA: number[][]
+        rmsSB: number[][]
+        rmsSC: number[][]
+    }
+    title: {
+        aTitle: string
+        bTitle: string
+        cTitle: string
+        unit: string
+    }
+    unit: string
+}
 
+interface Props {
+    value?: number
+    flag?: string | number | boolean
+    parentHeight?: any
+    DColor?: boolean
+    boxoList?: any
+    wp?: any
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    value: 2,
+    flag: 3,
+    parentHeight: 0,
+    DColor: false,
+    boxoList: () => ({}),
+    wp: () => ({})
+})
+
+const loading = ref(true)
+const tabvalue = ref(props.value)
+const valA: any = ref(0)
+const valB: any = ref(0)
+const isOpen = ref(false)
+const time = ref('')
+const type = ref('')
+const severity = ref('')
+const iphasic: any = ref(0)
+const eventValue = ref('')
+const persistTime = ref('')
+const lineName = ref('')
+const subName = ref('')
+const waveDatas = ref<WaveData[]>([])
+const ptpass = ref('')
+const color = ref('#006565')
+const charts = ref({})
+const arrpoints = ref([])
+const fz = ref<number[]>([])
+const titles = ref('')
+const zoom = ref(1)
+const myChartess = ref<echarts.ECharts | null>(null)
+const myChartess1 = ref<echarts.ECharts | null>(null)
+const myChartess2 = ref<echarts.ECharts | null>(null)
+const myChartess3 = ref<echarts.ECharts | null>(null)
+const myChartess4 = ref<echarts.ECharts | null>(null)
+const myChartess5 = ref<echarts.ECharts | null>(null)
+
+const vh = computed(() => {
+    if (props.parentHeight == 999) {
+        return `calc((60vh - 150px) / 2 )`
+    } else if (props.parentHeight != 0) {
+        return mainHeight(props.parentHeight, 2).height
+    }
+
+    if (props.flag == 1) {
+        return mainHeight(200).height
+    } else {
+        return mainHeight(200, 2).height
+    }
+})
+
+const vw = computed(() => '100%')
+
+watch(
+    () => props.value,
+    () => {
+        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)
+
+    rmsWorker = getRmsWorker(data => {
+        if (data.requestId !== waveRequestId) return
+        if (!data.success) {
+            console.error('Worker error:', data.error)
+            loading.value = false
+            return
         }
-    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();
-  },
-  beforeDestroy() {
-        this.backbxlb()
-  },
-  methods: {
-    backbxlb() {
-                     this.waveDatas = []
-    
-    // 清理所有可能的 echarts 实例
-    const chartNames = ['myChartess', 'myChartess1', 'myChartess2', 'myChartess3', 'myChartess4', 'myChartess5']
-    
-    chartNames.forEach(name => {
-        if (this[name]) {
-            this[name].dispose()
-            this[name] = null
+        const cacheKey = pendingCacheKeys.get(data.requestId)
+        if (cacheKey) {
+            setWaveCache(cacheKey, data)
+            pendingCacheKeys.delete(data.requestId)
         }
+        applyWorkerResult(data)
     })
-    
-    // 断开 echarts 实例连接
-    echarts.disconnect(chartNames.map(name => this[name]).filter(Boolean))
-      // this.waveDatas = []
-      //           if(this.myChartess){this.myChartess.dispose(); this.myChartess=null; }
-      //           if(this.myChartess1){this.myChartess1.dispose(); this.myChartess1=null; }
-      //           if(this.myChartess2){this.myChartess2.dispose(); this.myChartess2=null; }
-      //           if(this.myChartess3){this.myChartess3.dispose(); this.myChartess3=null; }
-      //           if(this.myChartess4){this.myChartess4.dispose(); this.myChartess4=null; }
-      //           if(this.myChartess5){this.myChartess5.dispose(); this.myChartess5=null; }
 
-      //           echarts.disconnect([this.myChartess,this.myChartess1,this.myChartess2,this.myChartess3,this.myChartess4,this.myChartess5])
+    nextTick(() => {
+        query()
+    })
+})
 
-      // if (this.echartlist.length > 0) {
+onBeforeUnmount(() => {
+    backbxlb()
+    window.removeEventListener('resize', handleResize)
+})
 
-      //   this.waveDatas = []
-      //   this.echartlist.forEach(item => {
-      //     item.dispose(); // 销毁echarts实例
+const handleResize = () => {
+    const zoomValue = document.body.style.getPropertyValue('zoom')
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
+}
 
+const download = () => {
+    const boxr = document.getElementById('boxr')
+    if (boxr) {
+        html2canvas(boxr, {
+            scale: 2
+        }).then(function (canvas) {
+            const creatIMg = document.createElement('a')
+            creatIMg.download = 'rms波形.png'
+            creatIMg.href = canvas.toDataURL()
+            creatIMg.click()
+            creatIMg.remove()
+        })
+    }
+}
 
-      //   })
+const EXTRA_PANEL_CLASS = 'wave-extra-panel'
 
+const resetWaveDom = () => {
+    backbxlb()
+    $('#rmsp').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+}
 
-      // }
-    },
-    download() {
-      // 转换成canvas
-      html2canvas(document.getElementById("boxr"), {
-        scale: 2,
-      }).then(function (canvas) {
-        // 创建a标签，实现下载
-        let 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(2) +
-            "% 持续时间：" +
-            this.boxoList.duration +
-            "s";
-        } else if (this.boxoList.systemType == "ZL") {
-          this.titles =
-            // "变电站名称：" +
-            // this.boxoList.equipmentName +
-            " 监测点名称：" +
-            this.boxoList.equipmentName +
-            " 发生时刻：" +
-            this.boxoList.startTime +
-            " 暂降(骤升)幅值：" +
-            this.boxoList.evtParamVVaDepth +
-            " 持续时间：" +
-            this.boxoList.evtParamTm +
-            "s";
-        } else {
-          this.titles =
-            "变电站名称：" +
-            this.boxoList.subName +
-            " 监测点名称：" +
-            this.boxoList.lineName +
-            " 发生时刻：" +
-            this.boxoList.startTime +
-            " 暂降(骤升)幅值：" +
-            (this.boxoList.featureAmplitude * 100).toFixed(2) +
-            "% 持续时间：" +
-            this.boxoList.duration +
-            "s";
-        }
+const query = () => {
+    initWaves()
+}
 
-        // 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;
-        }
-        let picCounts = (this.wp.waveTitle.length - 1) / this.iphasic;
-        this.waveDatas = [];
-        //循环筛选需求的数据
-        for (let 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) {
-      let shunData = wp.listWaveData;
-      let rmsData = wp.listRmsData;
-      // console.log(
-      //   rmsData
-      // );
-      let pt = Number(wp.pt) / 1000;
-      let ct = Number(wp.ct);
-      let titleList = wp.waveTitle;
-      //首先判断当前绘制的是电压还是电流
-      let xishu = pt; //默认电压，二次值转一次值乘以pt
-      //三相名称
-      let aTitle = "",
-        bTitle = "",
-        cTitle = "",
-        unit = "电压";
-      //RMS最小值横、纵坐标、相别名称
-      let rmsvFirstX = 0,
-        rmsvFirstY = 0,
-        rmsvSecondX = 0,
-        rmsvSecondY = 0,
-        firstZhou = "a",
-        secondeZhou = "a";
-      //每个波形对应的最大最小值
-      let ifmax, ifmin, ismax, ismin, rfmax, rfmin, rsmax, rsmin;
-      let 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 (let 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 (let shun = 0; shun < shunData.length; shun++) {
-          if (shunData[shun][this.iphasic * step + 1] === undefined) {
-            break;
-          }
-          let shunFirstA = []
-          let shunFirstB = []
-          let shunFirstC = []
-          let shunSecondA = []
-          let shunSecondB = []
-          let shunSecondC = []
-          //根据波形数据相的数量来筛选数据
-          switch (this.iphasic) {
-            case 1:
-              shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-              shunshiFA.push([shunData[shun][0], shunFirstA]);
-              ifmax = ifmax > shunFirstA ? ifmax : shunFirstA;
-              ifmin = ifmin < shunFirstA ? ifmin : shunFirstA;
-
-              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:
-              shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-              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);
-
-              shunSecondA = shunData[shun][this.iphasic * step + 1];
-              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:
-              shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-
-              shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
-              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);
-              }
-
-              shunSecondA = shunData[shun][this.iphasic * step + 1];
-              shunSecondB = shunData[shun][this.iphasic * step + 2];
-              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 (let rms = 0; rms < rmsData.length; rms++) {
-          if (rmsData[rms][this.iphasic * step + 1] === undefined) {
-            break;
-          }
-          let rmsFirstA = []
-          let rmsFirstB = []
-          let rmsFirstC = []
-          let rmsSecondA = []
-          let rmsSecondB = []
-          let rmsSecondC = []
-          //根据波形数据相的数量来筛选数据
-          switch (this.iphasic) {
-            case 1:
-              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];
-              }
-
-              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:
-              rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-              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];
-              }
-
-              rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-              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:
-              rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-              rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
-              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];
-              }
-
-              rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-              rmsSecondB = rmsData[rms][this.iphasic * step + 2];
-              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;
-          }
-        }
-      }
-      //瞬时一次值最大最小值
-      let instantFAn = {};
-      let instantSAn = {};
-      //let color;
-
-      let instantF = {};
-      let instantS = {};
-      let RMSF = {};
-      let RMSS = {};
-      let RMSFMinDetail = {};
-      let RMSSMinDetail = {};
-      let shunshiF = {};
-      let shunshiS = {};
-      let RMSFWave = {};
-      let RMSSWave = {};
-      let 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(
+const waveData = (
+    instantF: any,
+    instantS: any,
+    RMSF: any,
+    RMSS: any,
+    RMSFMinDetail: any,
+    RMSSMinDetail: any,
+    shunshiF: any,
+    shunshiS: any,
+    RMSFWave: any,
+    RMSSWave: any,
+    title: any,
+    unit: any
+): WaveData => {
+    return {
         instantF,
         instantS,
         RMSF,
@@ -693,932 +248,1017 @@ export default {
         RMSSWave,
         title,
         unit
-      );
-    },
-    //开始画图
-    initWave(waveDatas, time, type, severity, isOpen) {
-      //清除之前增加的div
-      // $("#wave ~ .bx").remove();
-      this.echartlist = []
-      $("#rms ~ .bx").remove();
-      //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
-      // let height = $(window).height() - 90;
-      let picHeight;
-      let show = true;
-      if (isOpen) {
-        show = false;
-      }
-      //let v = $("#interval").val();
-      let isvisible = false;
-      let cu = null,
-        rmscu = null,
-        rmscm = null,
-        title = null,
-        unit = null,
-        max = null,
-        min = null;
-      let a = null,
-        b = "",
-        c = "";
-      let adata = null,
-        bdata = null,
-        cdata = null;
-      let radata = null,
-        rbdata = null,
-        rcdata = null;
-      let 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);
-      let colors = [];
-      if (null == waveDatas) {
-        cu = [];
-        rmscu = [];
-        rmscm = [];
-        title = "该事件暂无波形图";
-      } else if (waveDatas.length > 0) {
-        title = this.titles;
+    }
+}
 
-        if (Number(this.eventValue) <= 90) {
-          isvisible = true;
+const initWaves = () => {
+    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 => {
+    const rmsData = wp.listRmsData
+    const pt = Number(wp.pt) / 1000
+    const ct = Number(wp.ct)
+    const titleList = wp.waveTitle
+    let xishu = pt
+    let aTitle = '',
+        bTitle = '',
+        cTitle = '',
+        unit = '电压'
+    let rmsvFirstX = 0,
+        rmsvFirstY = 0,
+        rmsvSecondX = 0,
+        rmsvSecondY = 0,
+        firstZhou = 'a',
+        secondeZhou = 'a'
+    let ifmax = 0,
+        ifmin = 0,
+        ismax = 0,
+        ismin = 0,
+        rfmax = 0,
+        rfmin = 0,
+        rsmax = 0,
+        rsmin = 0
+
+    const shunshiFA: number[][] = []
+    const shunshiFB: number[][] = []
+    const shunshiFC: number[][] = []
+    const shunshiSA: number[][] = []
+    const shunshiSB: number[][] = []
+    const shunshiSC: number[][] = []
+    const rmsFA: number[][] = []
+    const rmsFB: number[][] = []
+    const rmsFC: number[][] = []
+    const rmsSA: number[][] = []
+    const rmsSB: number[][] = []
+    const rmsSC: number[][] = []
+
+    if (titleList[iphasic.value * step + 1]?.substring(0, 1) !== 'U') {
+        xishu = ct
+        unit = '电流'
+    }
+
+    for (let i = 1; i <= iphasic.value; i++) {
+        switch (i) {
+            case 1:
+                aTitle = titleList[iphasic.value * step + i]?.substring(1) || ''
+                break
+            case 2:
+                bTitle = titleList[iphasic.value * step + i]?.substring(1) || ''
+                break
+            case 3:
+                cTitle = titleList[iphasic.value * step + i]?.substring(1) || ''
+                break
         }
-        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;
+    if (rmsData[0][iphasic.value * step + 1] !== undefined) {
+        rfmax = rmsData[0][iphasic.value * step + 1] * xishu
+        rfmin = rmsData[0][iphasic.value * step + 1] * xishu
+        rmsvFirstY = rmsData[0][iphasic.value * step + 1] * xishu
+        rmsvFirstX = rmsData[0][0]
+        rsmax = rmsData[0][iphasic.value * step + 1]
+        rsmin = rmsData[0][iphasic.value * step + 1]
+        rmsvSecondY = rmsData[0][iphasic.value * step + 1]
+        rmsvSecondX = rmsData[0][0]
+    }
 
-              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;
+    for (let rms = 0; rms < rmsData.length; rms++) {
+        if (rmsData[rms][iphasic.value * step + 1] === undefined) {
+            break
         }
-        if (waveDatas[0].unit === "电压") {
-          let 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";
-          }
+
+        switch (iphasic.value) {
+            case 1:
+                const rmsFirstA = rmsData[rms][iphasic.value * 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]
+                }
+
+                const rmsSecondA = rmsData[rms][iphasic.value * 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:
+                const rmsFirstA2 = rmsData[rms][iphasic.value * step + 1] * xishu
+                const rmsFirstB2 = rmsData[rms][iphasic.value * step + 2] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA2])
+                rmsFB.push([rmsData[rms][0], rmsFirstB2])
+                rfmax = getMaxTwo(rfmax, rmsFirstA2, rmsFirstB2)
+                rfmin = getMinOpen(rfmin, rmsFirstA2, rmsFirstB2)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA2) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB2) {
+                        firstZhou = 'b'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA2 = rmsData[rms][iphasic.value * step + 1]
+                const rmsSecondB2 = rmsData[rms][iphasic.value * step + 2]
+                rmsSA.push([rmsData[rms][0], rmsSecondA2])
+                rmsSB.push([rmsData[rms][0], rmsSecondB2])
+                rsmax = getMaxTwo(rsmax, rmsSecondA2, rmsSecondB2)
+                rsmin = getMinOpen(rsmin, rmsSecondA2, rmsSecondB2)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA2) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB2) {
+                        secondeZhou = 'b'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+            case 3:
+                const rmsFirstA3 = rmsData[rms][iphasic.value * step + 1] * xishu
+                const rmsFirstB3 = rmsData[rms][iphasic.value * step + 2] * xishu
+                const rmsFirstC3 = rmsData[rms][iphasic.value * step + 3] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA3])
+
+                rmsFB.push([rmsData[rms][0], rmsFirstB3])
+                rmsFC.push([rmsData[rms][0], rmsFirstC3])
+                rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                rfmin = isOpen.value
+                    ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3)
+                    : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA3) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB3) {
+                        firstZhou = 'b'
+                    } else {
+                        firstZhou = 'c'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA3 = rmsData[rms][iphasic.value * step + 1]
+                const rmsSecondB3 = rmsData[rms][iphasic.value * step + 2]
+                const rmsSecondC3 = rmsData[rms][iphasic.value * step + 3]
+                rmsSA.push([rmsData[rms][0], rmsSecondA3])
+                rmsSB.push([rmsData[rms][0], rmsSecondB3])
+                rmsSC.push([rmsData[rms][0], rmsSecondC3])
+                rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                rsmin = isOpen.value
+                    ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3)
+                    : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA3) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB3) {
+                        secondeZhou = 'b'
+                    } else {
+                        secondeZhou = 'c'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+        }
+    }
+
+    const instantF = { max: ifmax, min: ifmin }
+    const instantS = { max: ismax, min: ismin }
+    const RMSF = { max: rfmax, min: rfmin }
+    const RMSS = { max: rsmax, min: rsmin }
+    const RMSFMinDetail = { rmsvFirstX, rmsvFirstY, firstZhou }
+    const RMSSMinDetail = { rmsvSecondX, rmsvSecondY, secondeZhou }
+    const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
+    const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
+    const RMSFWave = { rmsFA, rmsFB, rmsFC }
+    const RMSSWave = { rmsSA, rmsSB, rmsSC }
+    const title = { aTitle, bTitle, cTitle, unit }
+
+    return waveData(
+        instantF,
+        instantS,
+        RMSF,
+        RMSS,
+        RMSFMinDetail,
+        RMSSMinDetail,
+        shunshiF,
+        shunshiS,
+        RMSFWave,
+        RMSSWave,
+        title,
+        unit
+    )
+}
+
+const initWave = (
+    waveDatas: WaveData[] | null,
+    time: string | null,
+    type: string | null,
+    severity: string | null,
+    isOpen: boolean | null
+) => {
+    resetWaveDom()
+
+    let picHeight = vh.value
+    const show = !isOpen
+    let isvisible = false
+    let rmscu: number[][] = []
+    let rmscm: number[][] = []
+    let titleText = ''
+    let unit = ''
+    let a: string | null = null,
+        b: string | null = null,
+        c: string | null = null
+    let radata: number[][] = [],
+        rbdata: number[][] = [],
+        rcdata: number[][] = []
+    let rmsvX: any = 0,
+        rmsvY: any = 0,
+        zhou = ''
+
+    if (!waveDatas) {
+        titleText = '该事件暂无波形图'
+    } else if (waveDatas.length > 0) {
+        titleText = titles.value
+
+        if (Number(eventValue.value) <= 90) {
+            isvisible = true
+        }
+
+        switch (iphasic.value) {
+            case 1:
+                a = waveDatas[0].title.aTitle
+                if (props.value === 1) {
+                    rmscu = [[0, waveDatas[0].RMSF.min]]
+                    rmscm = [[0, waveDatas[0].RMSF.max]]
+                    radata = waveDatas[0].RMSFWave.rmsFA
+                    rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX
+                    rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY
+                    zhou = waveDatas[0].RMSFMinDetail.firstZhou
+                } else {
+                    rmscu = [[0, waveDatas[0].RMSS.min]]
+                    rmscm = [[0, waveDatas[0].RMSS.max]]
+                    radata = waveDatas[0].RMSSWave.rmsSA
+                    rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX
+                    rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY
+                    zhou = waveDatas[0].RMSSMinDetail.secondeZhou
+                }
+                break
+            case 2:
+                a = waveDatas[0].title.aTitle
+                b = waveDatas[0].title.bTitle
+                if (props.value === 1) {
+                    rmscu = [[0, waveDatas[0].RMSF.min]]
+                    rmscm = [[0, waveDatas[0].RMSF.max]]
+                    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 {
+                    rmscu = [[0, waveDatas[0].RMSS.min]]
+                    rmscm = [[0, waveDatas[0].RMSS.max]]
+                    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
+                }
+                break
+            case 3:
+                a = waveDatas[0].title.aTitle
+                b = waveDatas[0].title.bTitle
+                c = waveDatas[0].title.cTitle
+                if (props.value === 1) {
+                    rmscu = [[0, waveDatas[0].RMSF.min]]
+                    rmscm = [[0, waveDatas[0].RMSF.max]]
+                    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 {
+                    rmscu = [[0, waveDatas[0].RMSS.min]]
+                    rmscm = [[0, waveDatas[0].RMSS.max]]
+                    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
+                }
+                break
+        }
+
+        if (waveDatas[0].title.unit === '电压') {
+            if (props.value === 1) {
+                fz.value = [
+                    props.wp.listRmsMinData[0][0],
+                    Number(((props.wp.listRmsMinData[0][1] * Number(props.wp.pt)) / 1000).toFixed(2))
+                ]
+                unit = 'kV'
+            } else {
+                fz.value = [props.wp.listRmsMinData[0][0], props.wp.listRmsMinData[0][1]]
+                unit = 'V'
+            }
         } else {
-          unit = "A";
+            unit = 'A'
         }
-        //把剩余的DIV先拼接好
-        for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
-          let rmsId = "rms" + step;
-          let 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 * 1).toFixed(0) +
-          "% 持续时间：" +
-          this.persistTime +
-          "s";
-      }
-      //绘制横向第一个波形图
-      //绘制瞬时波形图
-      // 绘制RMS波形图
-      let _this = this;
 
-      let 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);
-      let option = {
+        for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
+            const rmsId = 'rms' + step
+            const newDivRms = $(
+                `<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')
+        }
+    } else {
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
+            Number(eventValue.value) * 1
+        ).toFixed(0)}% 持续时间：${persistTime.value}s`
+    }
+    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',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
+
+    setTimeout(() => {
+        rms.style.width = '100%'
+        rms.style.height = vh.value
+    }, 0)
+
+    const option = {
         tooltip: {
-          top: "10px",
-          trigger: "axis",
-          borderColor: "grey",
-          formatter: function (params) {
-            let tips = "";
-            tips += "时刻:" + params[0].data[0] + "</br/>";
-
-            for (let 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:  title,
-          subtitle: {
-            text: "电压",
-            align: "left",
-          },
-          textStyle: {
-            fontSize: "16",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-        },
-        legend: {
-          right: 50,
-          top: 25,
-          verticalAlign: "top",
-          enabled: true,
-          itemDistance: 5,
-          textStyle: {
-            fontSize: "12",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            rich: {
-              a: {
-                verticalAlign: "middle",
-              },
-            },
-
-            padding: [0, 0, 0, 0], //[上、右、下、左]
-          },
-        },
-        toolbox: {
-          right: 20,
-           top: 15,
-                feature: {
-                    // 移除默认的 saveAsImage
-                    // saveAsImage: { title: '保存图片' }
-                    myCustomDownload: {
-                        title: '', // 按钮标题
-                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
-
-                        onclick: function () {
-                            _this.download()
-                        }
+            top: '10px',
+            trigger: 'axis',
+            borderColor: 'grey',
+            formatter: function (params: any) {
+                let tips = '时刻:' + params[0].data[0] + '</br/>'
+                for (let i = 0; i < params.length; i++) {
+                    if (params[i].seriesName != '暂降触发点') {
+                        tips +=
+                            params[i].marker +
+                            params[i].seriesName +
+                            ':' +
+                            (params[i].value[1] - 0).toFixed(2) +
+                            '<br/>'
                     }
                 }
+                return tips
             },
-        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: "12",
-              color: _this.DColor ? "#fff" : echartsColor.WordColor,
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
             },
-            enabled: true,
-            align: "high",
-          },
-          nameTextStyle: {
-            fontSize: "12",
-          },
-          labels: {
-            formatter: function () {
-              return this.value;
-            },
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            alignWithLabel: true,
-          },
-          axisLine: {
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "12",
-            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: "12",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-          //minInterval: 1,
-          type: "value",
-          axisLine: {
-            show: true,
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
-            },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "12",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            formatter: function (value, index) {
-              return (value - 0).toFixed(2);
-            },
-          },
-          splitLine: {
-            lineStyle: {
-              // 使用深浅的间隔色
-              color: [_this.DColor ? "#fff" : echartsColor.thread],
-              type: "dashed",
-              opacity: 0.5,
-            },
-          },
-        },
-        grid: {
-          left: "1%",
-          right: "45px",
-          bottom: "40px",
-             top: '70px',
-          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",
-            },
-            data: radata,
-          },
-          {
-            name: b,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#2E8B57",
-            },
-            data: rbdata,
-          },
-          {
-            name: c,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#A52a2a",
-            },
-            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);
-      // this.echartlist.push(myChartes)
-      this.myChartess=myChartes
-      //第一个波形图数据绘制完毕后，绘制后续的波形图
-      if (waveDatas !== null && waveDatas.length > 1) {
-        let waveDatasTemp = waveDatas.slice(1);
-        waveDatasTemp.reverse();
-        for (let step = 0; step < waveDatasTemp.length; step++) {
-          let 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
-      // let waveId = 'wave' + step;
-      let rmsId = "rms" + step;
-      // let v = $("#interval").val();
-      let a = "",
-        b = "",
-        c = "";
-      let max, min, unit;
-      let adata = null,
-        bdata = null,
-        cdata = null;
-      let radata = null,
-        rbdata = null,
-        rcdata = null;
-      let 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;
-
-      let myChartes = echarts.init(document.getElementById(rmsId));
-      //debugger
-      let titlename = ''
-      if (this.boxoList.systemType == "ZL") {
-        let str = []
-        str = rmsId.split('s')
-        let str1 = Number(str[1])
-
-        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
-            }
-          }
-
-        });
-      }
-      let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-      let option = {
-        tooltip: {
-          trigger: "axis",
-          borderColor: "grey",
-          backgroundColor: "#fff",
-          style: {
-            color: "#000",
-            fontSize: "15px",
-            padding: 10,
-          },
-          formatter: function (params) {
-            // console.log(params)
-            let tips = "";
-            tips += "时刻:" + params[0].data[0] + "</br/>";
-
-            for (let 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,
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0
         },
         title: {
-          left: "center",
-          text: titlename,
-          textStyle: {
-            fontSize: "16",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
+            left: 'center',
+            text: titleText,
+            subtitle: {
+                text: '电压',
+                align: 'left'
+            },
+            textStyle: {
+                fontSize: '16px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            }
         },
         legend: {
-          right: 50,
+            right: 50,
             top: 25,
-          verticalAlign: "top",
-          enabled: true,
-          itemDistance: 5,
-          textStyle: {
-            fontSize: "12",
-            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: "12",
-              color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            },
+            verticalAlign: 'top',
             enabled: true,
-            align: "high",
-          },
-          labels: {
-            formatter: function () {
-              return this.value;
+            itemDistance: 5,
+            textStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                rich: { a: { verticalAlign: 'middle' } },
+                padding: [0, 0, 0, 0]
+            }
+        },
+        toolbox: {
+            right: 20,
+            top: 15,
+            feature: {
+                myCustomDownload: {
+                    title: '',
+                    icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z',
+                    onclick: () => download()
+                }
+            }
+        },
+        xAxis: {
+            type: 'value',
+            name: '时间\n(ms)',
+            min: props.wp?.listRmsData[0][0] || 0,
+            max: props.wp?.listRmsData[props.wp?.listRmsData.length - 1][0] + 1 || 1,
+            boundaryGap: false,
+            title: {
+                text: 'ms',
+                textStyle: {
+                    fontSize: '12px',
+                    color: props.DColor ? '#000' : echartsColor.WordColor
+                },
+                enabled: true,
+                align: 'high'
             },
-          },
-          nameTextStyle: {
-            fontSize: "12",
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            alignWithLabel: true,
-          },
-          axisLine: {
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
+            nameTextStyle: { fontSize: '12px' },
+            labels: {
+                formatter: function () {
+                    return this.value
+                }
             },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "12",
-            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);
-              }
+            splitLine: { show: false },
+            axisTick: { alignWithLabel: true },
+            axisLine: {
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
             },
-            //rotate:39
-          },
-          // data: this.syncExtremes,
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    if (valA.value != (value - 0).toFixed(0)) {
+                        valA.value = Number((value - 0).toFixed(0))
+                        return (value - 0).toFixed(0)
+                    }
+                    return ''
+                }
+            }
         },
         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: "12",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-          //minInterval: 1,
-          type: "value",
-          axisLine: {
-            show: true,
-            lineStyle: {
-              color: _this.DColor ? "#fff" : echartsColor.thread,
+            type: 'value',
+            name: unit,
+            title: {
+                align: 'high',
+                offset: 0,
+                text: unit,
+                rotation: 0,
+                y: -10
             },
-            onZero: false, //-----------重点
-          },
-          axisLabel: {
-            fontSize: "12",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-            formatter: function (value, index) {
-              return (value - 0).toFixed(2);
+            // max: rmscm[0]?.[1] * 1.06 || 0,
+            // min: rmscu[0]?.[1] - rmscu[0]?.[1] * 0.2 || 0,
+            max: yRange.max,
+            min: yRange.min,
+            boundaryGap: [0, '100%'],
+            showLastLabel: true,
+            opposite: false,
+            nameTextStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
             },
-          },
-          splitLine: {
-            lineStyle: {
-              // 使用深浅的间隔色
-              color: [_this.DColor ? "#fff" : echartsColor.thread],
-              type: "dashed",
-              opacity: 0.5,
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
             },
-          },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    return formatAxisLabel(value)
+                }
+            },
+            splitLine: {
+                lineStyle: {
+                    color: [props.DColor ? '#000' : echartsColor.thread],
+                    type: 'dashed',
+                    opacity: 0.5
+                }
+            }
         },
         grid: {
-          left: "1%",
-          right: "45px",
-          bottom: "40px",
-             top: '70px',
-          containLabel: true,
+            left: '60px',
+            right: '45px',
+            bottom: '40px',
+            top: '60px'
+            // containLabel: true
         },
         dataZoom: [
-          {
-            type: "inside",
-            height: 13,
-            start: 0,
-            bottom: "20px",
-            end: 100,
-          },
-          {
-            start: 0,
-            height: 13,
-            bottom: "20px",
-            end: 100,
-          },
+            {
+                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",
+            {
+                name: a,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#DAA520' },
+                data: radata
             },
-            data: radata,
-          },
-          {
-            name: b,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#2E8B57",
+            {
+                name: b,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#2E8B57' },
+                data: rbdata
             },
-            data: rbdata,
-          },
-          {
-            name: c,
-            type: "line",
-            smooth: true,
-            symbol: "none",
-            sampling: "average",
-            itemStyle: {
-              color: "#A52a2a",
+            {
+                name: c,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#A52a2a' },
+                data: rcdata
             },
-            data: rcdata,
-          },
+            {
+                name: '暂降触发点',
+                type: 'scatter',
+                symbol: 'image://' + url,
+                itemStyle: { width: 18, height: 18 },
+                data: rmscu
+            },
+            {
+                name: '最小暂降(骤升)幅值',
+                type: 'scatter',
+                symbol: 'image://' + url2,
+                itemStyle: { width: 45, height: 45 },
+                label: {
+                    show: true,
+                    position: [5, -20],
+                    color: '#000',
+                    fontSize: '12px',
+                    fontWeight: 'bold',
+                    borderType: 'solid',
+                    borderWidth: 0.5,
+                    backgroundColor: '#ffff',
+                    borderColor: '#0099FF'
+                },
+                data: [fz.value]
+            }
+        ]
+    }
+
+    myChartes.setOption(option)
+    myChartess.value = myChartes
+
+    setTimeout(() => {
+        myChartes.resize()
+        loading.value = false
+    }, 500)
+
+    if (waveDatas && waveDatas.length > 1) {
+        const waveDatasTemp = waveDatas.slice(1)
+        for (let step = 0; step < waveDatasTemp.length; step++) {
+            drawPics(waveDatasTemp[step], picHeight, step, show, myChartes, rmscm, rmscu, titleText)
+        }
+    }
+}
+
+const drawPics = (
+    waveDataTemp: WaveData,
+    picHeight: string,
+    step: number,
+    show: boolean,
+    myChartes1: echarts.ECharts,
+    rmscm: number[][],
+    rmscu: number[][],
+    title: string
+) => {
+    step = step + 1
+    const rmsId = 'rms' + step
+    let a = '',
+        b = '',
+        c = ''
+    let unit = ''
+    let radata: number[][] = [],
+        rbdata: number[][] = [],
+        rcdata: number[][] = []
+
+    switch (iphasic.value) {
+        case 1:
+            a = waveDataTemp.title.aTitle
+            break
+        case 2:
+            a = waveDataTemp.title.aTitle
+            b = waveDataTemp.title.bTitle
+            break
+        case 3:
+            a = waveDataTemp.title.aTitle
+            b = waveDataTemp.title.bTitle
+            c = waveDataTemp.title.cTitle
+            break
+    }
+
+    if (props.value === 1) {
+        radata = waveDataTemp.RMSFWave.rmsFA
+        rbdata = waveDataTemp.RMSFWave.rmsFB
+        rcdata = waveDataTemp.RMSFWave.rmsFC
+    } else {
+        radata = waveDataTemp.RMSSWave.rmsSA
+        rbdata = waveDataTemp.RMSSWave.rmsSB
+        rcdata = waveDataTemp.RMSSWave.rmsSC
+    }
+
+    if (waveDataTemp.title.unit === '电压') {
+        unit = props.value === 1 ? 'kV' : 'V'
+    } else {
+        unit = 'A'
+    }
+
+    let titlename = ''
+    if (props.boxoList.systemType == 'ZL') {
+        const str = rmsId.split('s')
+        const str1 = Number(str[1])
+
+        props.wp.channelNames.forEach((element: string, i: number) => {
+            if (i == 4 || i == 7 || i == 10) {
+                if (str1 == 1 && i == 4) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'LI' ? '电网侧-电流' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+                if (str1 == 2 && i == 7) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'SU' ? '负载侧-电压' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+                if (str1 == 3 && i == 10) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'SI' ? '负载侧-电流' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+            }
+        })
+    }
+
+    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',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
+
+    const option = {
+        tooltip: {
+            top: '10px',
+            trigger: 'axis',
+            borderColor: 'grey',
+            formatter: function (params: any) {
+                let tips = '时刻:' + params[0].data[0] + '</br/>'
+                for (let i = 0; i < params.length; i++) {
+                    if (params[i].seriesName != '暂降触发点') {
+                        tips +=
+                            params[i].marker +
+                            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 || title,
+            textStyle: {
+                fontSize: '16px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            }
+        },
+        legend: {
+            right: 50,
+            top: 25,
+            verticalAlign: 'top',
+            enabled: true,
+            itemDistance: 5,
+            textStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                rich: { a: { verticalAlign: 'middle' } },
+                padding: [0, 0, 0, 0]
+            }
+        },
+        xAxis: {
+            type: 'value',
+            name: '时间\n(ms)',
+            min: props.wp.listRmsData[0][0],
+            max: props.wp.listRmsData[props.wp.listRmsData.length - 1][0] + 1,
+            boundaryGap: false,
+            title: {
+                text: 'ms',
+                textStyle: {
+                    fontSize: '12px',
+                    color: props.DColor ? '#000' : echartsColor.WordColor
+                },
+                enabled: true,
+                align: 'high'
+            },
+            labels: {
+                formatter: function () {
+                    return this.value
+                }
+            },
+            nameTextStyle: { fontSize: '12px' },
+            splitLine: { show: false },
+            axisTick: { alignWithLabel: true },
+            axisLine: {
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
+            },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    if (valB.value != (value - 0).toFixed(0)) {
+                        valB.value = Number((value - 0).toFixed(0))
+                        return (value - 0).toFixed(0)
+                    }
+                    return ''
+                }
+            }
+        },
+        yAxis: {
+            type: 'value',
+            name: unit,
+            title: {
+                align: 'high',
+                offset: 0,
+                text: unit,
+                rotation: 0,
+                y: -10
+            },
+            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,
+            nameTextStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
+            },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    return formatAxisLabel(value)
+                }
+            },
+            splitLine: {
+                lineStyle: {
+                    color: [props.DColor ? '#000' : echartsColor.thread],
+                    type: 'dashed',
+                    opacity: 0.5
+                }
+            }
+        },
+        grid: {
+            left: '60px',
+            right: '45px',
+            bottom: '40px',
+            top: '60px'
+            // containLabel: true
+        },
+        dataZoom: [
+            {
+                type: 'inside',
+                height: 13,
+                start: 0,
+                bottom: '20px',
+                end: 100
+            },
+            {
+                start: 0,
+                height: 13,
+                bottom: '20px',
+                end: 100
+            }
         ],
-      };
-      myChartes.setOption(option)
-      // window.echartsArr.push(myChartes);
-      setTimeout(() => {
-        myChartes.resize();
-        this.loading = false;
-      }, 500);
-      // this.echartlist.push(myChartes)
-      this[`myChartess${step}`]=myChartes
-      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;
-    },
-  },
-};
+        series: [
+            {
+                name: a,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#DAA520' },
+                data: radata
+            },
+            {
+                name: b,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#2E8B57' },
+                data: rbdata
+            },
+            {
+                name: c,
+                type: 'line',
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#A52a2a' },
+                data: rcdata
+            }
+        ]
+    }
+
+    myChartes.setOption(option)
+
+    switch (step) {
+        case 1:
+            myChartess1.value = myChartes
+            break
+        case 2:
+            myChartess2.value = myChartes
+            break
+        case 3:
+            myChartess3.value = myChartes
+            break
+        case 4:
+            myChartess4.value = myChartes
+            break
+        case 5:
+            myChartess5.value = myChartes
+            break
+    }
+
+    setTimeout(() => {
+        myChartes.resize()
+        loading.value = false
+    }, 500)
+
+    echarts.connect([myChartes1, myChartes])
+}
+
+const backbxlb = () => {
+    waveDatas.value = []
+    const charts = [
+        myChartess.value,
+        myChartess1.value,
+        myChartess2.value,
+        myChartess3.value,
+        myChartess4.value,
+        myChartess5.value
+    ]
+
+    charts.forEach(chart => {
+        if (chart) {
+            chart.dispose()
+        }
+    })
+
+    myChartess.value = null
+    myChartess1.value = null
+    myChartess2.value = null
+    myChartess3.value = null
+    myChartess4.value = null
+    myChartess5.value = null
+
+    $('#rmsp').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+}
+
+const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    temp = temp > tempC ? temp : tempC
+    return temp
+}
+
+const getMaxTwo = (temp: number, tempA: number, tempB: number): number => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    return temp
+}
+
+const getMin = (temp: number, tempA: number, tempB: number, tempC: number): number => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    temp = temp < tempC ? temp : tempC
+    return temp
+}
+
+const getMinOpen = (temp: number, tempA: number, tempB: number): number => {
+    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
new file mode 100644
index 00000000..79152f52
--- /dev/null
+++ b/src/components/echarts/shuWorker.js
@@ -0,0 +1,207 @@
+// waveData.worker.js
+self.addEventListener('message', function (e) {
+    const { wp, value, iphasic, isOpen, boxoList, requestId } = e.data
+
+    // 处理波形数据的函数
+    const fliteWaveData = (wp, step) => {
+        // 将原有的fliteWaveData函数实现复制到这里
+        const shunData = wp.listWaveData
+        const pt = Number(wp.pt) / 1000
+        const ct = Number(wp.ct)
+        const titleList = wp.waveTitle
+        let xishu = pt
+        let aTitle = '',
+            bTitle = '',
+            cTitle = '',
+            unit = '电压'
+        let ifmax = 0,
+            ifmin = 0,
+            ismax = 0,
+            ismin = 0
+
+        const shunshiFA = []
+        const shunshiFB = []
+        const shunshiFC = []
+        const shunshiSA = []
+        const shunshiSB = []
+        const shunshiSC = []
+
+        if (shunData.length > 0) {
+            if (titleList[iphasic * step + 1]?.substring(0, 1) !== 'U') {
+                xishu = ct
+                unit = '电流'
+            }
+
+            for (let i = 1; i <= iphasic; i++) {
+                switch (i) {
+                    case 1:
+                        aTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                    case 2:
+                        bTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                    case 3:
+                        cTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                }
+            }
+
+            if (shunData[0][iphasic * step + 1] !== undefined) {
+                ifmax = shunData[0][iphasic * step + 1] * xishu
+                ifmin = shunData[0][iphasic * step + 1] * xishu
+                ismax = shunData[0][iphasic * step + 1]
+                ismin = shunData[0][iphasic * step + 1]
+            }
+
+            for (let shun = 0; shun < shunData.length; shun++) {
+                if (shunData[shun][iphasic * step + 1] === undefined) {
+                    break
+                }
+
+                switch (iphasic) {
+                    case 1:
+                        const shunFirstA = shunData[shun][iphasic * step + 1] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA])
+                        ifmax = Math.max(ifmax, shunFirstA)
+                        ifmin = Math.min(ifmin, shunFirstA)
+
+                        const shunSecondA = shunData[shun][iphasic * step + 1]
+                        shunshiSA.push([shunData[shun][0], shunSecondA])
+                        ismax = Math.max(ismax, shunSecondA)
+                        ismin = Math.min(ismin, shunSecondA)
+                        break
+                    case 2:
+                        const shunFirstA2 = shunData[shun][iphasic * step + 1] * xishu
+                        const shunFirstB2 = shunData[shun][iphasic * step + 2] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA2])
+                        shunshiFB.push([shunData[shun][0], shunFirstB2])
+                        ifmax = Math.max(ifmax, shunFirstA2, shunFirstB2)
+                        ifmin = Math.min(ifmin, shunFirstA2, shunFirstB2)
+
+                        const shunSecondA2 = shunData[shun][iphasic * step + 1]
+                        const shunSecondB2 = shunData[shun][iphasic * step + 2]
+                        shunshiSA.push([shunData[shun][0], shunSecondA2])
+                        shunshiSB.push([shunData[shun][0], shunSecondB2])
+                        ismax = Math.max(ismax, shunSecondA2, shunSecondB2)
+                        ismin = Math.min(ismin, shunSecondA2, shunSecondB2)
+                        break
+                    case 3:
+                        const shunFirstA3 = shunData[shun][iphasic * step + 1] * xishu
+                        const shunFirstB3 = shunData[shun][iphasic * step + 2] * xishu
+                        const shunFirstC3 = shunData[shun][iphasic * step + 3] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA3])
+                        shunshiFB.push([shunData[shun][0], shunFirstB3])
+                        shunshiFC.push([shunData[shun][0], shunFirstC3])
+                        ifmax = Math.max(ifmax, shunFirstA3, shunFirstB3, shunFirstC3)
+                        ifmin = isOpen
+                            ? Math.min(ifmin, shunFirstA3, shunFirstC3)
+                            : Math.min(ifmin, shunFirstA3, shunFirstB3, shunFirstC3)
+
+                        const shunSecondA3 = shunData[shun][iphasic * step + 1]
+                        const shunSecondB3 = shunData[shun][iphasic * step + 2]
+                        const shunSecondC3 = shunData[shun][iphasic * step + 3]
+                        shunshiSA.push([shunData[shun][0], shunSecondA3])
+                        shunshiSB.push([shunData[shun][0], shunSecondB3])
+                        shunshiSC.push([shunData[shun][0], shunSecondC3])
+                        ismax = Math.max(ismax, shunSecondA3, shunSecondB3, shunSecondC3)
+                        ismin = isOpen
+                            ? Math.min(ismin, shunSecondA3, shunSecondC3)
+                            : Math.min(ismin, shunSecondA3, shunSecondB3, shunSecondC3)
+                        break
+                }
+            }
+        }
+
+        const instantF = { max: ifmax, min: ifmin }
+        const instantS = { max: ismax, min: ismin }
+        const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
+        const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
+        const title = { aTitle, bTitle, cTitle, unit }
+
+        return { instantF, instantS, shunshiF, shunshiS, title, unit }
+    }
+
+    // 处理标题
+    let titles = ''
+    if (boxoList.systemType == 'pms') {
+        titles =
+            '变电站名称:' +
+            boxoList.powerStationName +
+            '　监测点名称:' +
+            boxoList.measurementPointName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.duration +
+            's'
+    } else if (boxoList.systemType == 'ZL') {
+        titles =
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            boxoList.equipmentName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            boxoList.evtParamVVaDepth +
+            '%　持续时间:' +
+            boxoList.evtParamTm +
+            's'
+    } else if (boxoList.systemType == 'YPT') {
+        titles =
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            boxoList.lineName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.persistTime +
+            's'
+    } else {
+        titles =
+            '变电站名称:' +
+            boxoList.subName +
+            '　监测点名称:' +
+            boxoList.lineName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.duration +
+            's'
+    }
+
+    const iphasicValue = wp.iphasic || 1
+    const picCounts = (wp.waveTitle.length - 1) / iphasicValue
+    const waveDatas = []
+
+    for (let i = 0; i < picCounts; i++) {
+        const data = fliteWaveData(wp, i)
+        waveDatas.push(data)
+    }
+
+    const time = wp.time
+    const type = wp.waveType
+    let severity = wp.yzd
+
+    if (severity < 0) {
+        severity = '/'
+        type = '/'
+    }
+
+    // 将处理结果发送回主线程
+    self.postMessage({
+        requestId,
+        success: true,
+        waveDatas,
+        time,
+        type,
+        severity,
+        titles,
+        iphasic: iphasicValue
+    })
+})
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index 9e38eeb1..0a4402b7 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -1,1228 +1,999 @@
 <template>
-    <div v-loading="loading" class="boxbx" style="position: relative">
+    <div v-loading="loading" class="boxbx" style="position: relative; height: 100%">
         <div id="boxsj">
-            <div id="shushi" :style="`height:${vh};overflow: hidden;`">
-                <div class="bx" id="wave"></div>
+            <div id="shushi" :style="containerStyle">
+                <div class="bx" id="wave" :style="waveStyle"></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">
+
+<script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
 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'
+import { buildWaveCacheKey, getWaveCache, setWaveCache } from '@/utils/waveCache'
+import { getShuWorker, buildWorkerPayload } from '@/utils/waveWorkerPool'
 
-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: '',
-            echartlist: [null, null, null, null, null, null, null, null],
-            myChartess: null,
-            myChartess1: null,
-            myChartess2: null,
-            myChartess3: null,
-            myChartess4: null,
-            myChartess5: null,
+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 }
+    shunshiF: {
+        shunshiFA: number[][]
+        shunshiFB: number[][]
+        shunshiFC: number[][]
+    }
+    shunshiS: {
+        shunshiSA: number[][]
+        shunshiSB: number[][]
+        shunshiSC: number[][]
+    }
+    title: {
+        aTitle: string
+        bTitle: string
+        cTitle: string
+        unit: string
+    }
+    unit: string
+}
 
-        }
-    },
-    created() {
+interface Props {
+    value?: number
+    flag?: string | number | boolean
+    parentHeight?: any
+    DColor?: boolean
+    boxoList?: any
+    wp?: any
+}
 
-        if (this.flag == 1) {
-            this.vh = mainHeight(165).height
-        } else {
-            this.vh = mainHeight(165, 2).height
-        }
-        if (this.parentHeight != 0) {
-            this.vh = mainHeight(this.parentHeight, 2).height
+const props = withDefaults(defineProps<Props>(), {
+    value: 2,
+    flag: 3,
+    parentHeight: 0,
+    DColor: false,
+    boxoList: () => ({}),
+    wp: () => ({})
+})
 
-        }
-        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()
-        })
-    },
-    beforeDestroy() {
-        this.backbxlb()
-  },
-    methods: {
-        backbxlb() {
-               this.waveDatas = []
-    
-    // 清理所有可能的 echarts 实例
-    const chartNames = ['myChartess', 'myChartess1', 'myChartess2', 'myChartess3', 'myChartess4', 'myChartess5']
-    
-    chartNames.forEach(name => {
-        if (this[name]) {
-            this[name].dispose()
-            this[name] = null
+const loading = ref(true)
+const tabvalue = ref(props.value)
+const valA: any = ref(0)
+const valB: any = ref(0)
+const isOpen = ref(false)
+const time = ref('')
+const type = ref('')
+const severity: any = ref('')
+const iphasic: any = ref('')
+const eventValue = ref('')
+const persistTime = ref('')
+const lineName = ref('')
+const subName = ref('')
+const waveDatas = ref<WaveData[]>([])
+const ptpass = ref('')
+const waveHeight = ref<number>()
+const rmsHeight = ref<number>()
+const color = ref('#006565')
+const charts = ref({})
+const arrpoints = ref([])
+const titles = ref('')
+const zoom = ref(1)
+const myChartess = ref<echarts.ECharts | null>(null)
+const myChartess1 = ref<echarts.ECharts | null>(null)
+const myChartess2 = ref<echarts.ECharts | null>(null)
+const myChartess3 = ref<echarts.ECharts | null>(null)
+const myChartess4 = ref<echarts.ECharts | null>(null)
+const myChartess5 = ref<echarts.ECharts | null>(null)
+
+const vh = computed(() => {
+    if (props.parentHeight == 999) {
+        return `calc((60vh - 150px) / 2 )`
+    } else if (props.parentHeight != 0) {
+        return mainHeight(props.parentHeight, 2).height
+    }
+
+    if (props.flag == 1) {
+        return mainHeight(200).height
+    } else {
+        return mainHeight(200, 2).height
+    }
+
+    // if (props.flag == 1) {
+    //     return '690px'
+    // } else if (props.parentHeight != 0) {
+    //     return '310px'
+    // } else {
+    //     return '350px'
+    // }
+})
+
+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
         }
     })
-    
-    // 断开 echarts 实例连接
-    echarts.disconnect(chartNames.map(name => this[name]).filter(Boolean))
+}
 
-            //     this.echartlist.forEach(item => {
-            //         if (item) {
-            //             item.dispose(); // 销��echarts实例
-            //             echarts.disconnect(item)
-            //             item=null
-            //         }
+watch(
+    () => props.value,
+    () => {
+        query()
+    }
+)
 
+watch(
+    () => props.wp,
+    () => {
+        query()
+    }
+)
 
-            //     })
-            //    setTimeout(()=>{
-            //     console.log("🚀 ~ backbxlb ~  this.echartlist:",  this.echartlist)
+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
+}
 
-            //     },1000)
+onMounted(() => {
+    const zoomValue = document.body.style.getPropertyValue('zoom')
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
 
-        },
-        download() {
-            // 转换成canvas
-            html2canvas(document.getElementById('boxsj'), {
-                scale: 2
-            }).then(function (canvas) {
-                // 创建a标签，实现下载
-                let 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(2) +
-                        '% 持续时间：' +
-                        this.boxoList.duration +
-                        's'
-                } else if (this.boxoList.systemType == 'ZL') {
-                    this.titles =
-                        // "变电站名称：" +
-                        // this.boxoList.equipmentName +
-                        ' 监测点名称：' +
-                        this.boxoList.equipmentName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        this.boxoList.evtParamVVaDepth +
-                        ' 持续时间：' +
-                        this.boxoList.evtParamTm +
-                        's'
+    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(() => {
+        query()
+    })
+})
+
+onBeforeUnmount(() => {
+    backbxlb()
+    window.removeEventListener('resize', handleResize)
+})
+
+const handleResize = () => {
+    const zoomValue = document.body.style.getPropertyValue('zoom')
+    zoom.value = 1 / (zoomValue ? parseFloat(zoomValue) : 1)
+}
+
+const download = () => {
+    const boxsj = document.getElementById('boxsj')
+    if (boxsj) {
+        html2canvas(boxsj, {
+            scale: 2
+        }).then(function (canvas) {
+            const creatIMg = document.createElement('a')
+            creatIMg.download = '瞬间波形.png'
+            creatIMg.href = canvas.toDataURL()
+            creatIMg.click()
+            creatIMg.remove()
+        })
+    }
+}
+
+const EXTRA_PANEL_CLASS = 'wave-extra-panel'
+
+const resetWaveDom = () => {
+    backbxlb()
+    $('#shushi').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+}
+
+const query = () => {
+    loading.value = true
+    initWaves()
+}
+
+const waveData = (instantF: any, instantS: any, shunshiF: any, shunshiS: any, title: any, unit: any): WaveData => {
+    return {
+        instantF,
+        instantS,
+        shunshiF,
+        shunshiS,
+        title,
+        unit
+    }
+}
+
+// 在组件中修改initWaves函数
+const initWaves = () => {
+    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 = (
+    waveDatas: WaveData[] | null,
+    time: string | null,
+    type: string | null,
+    severity: string | null,
+    isOpen: boolean | null
+) => {
+    resetWaveDom()
+    $('div.bx1').remove()
+
+    let picHeight = vh.value
+    const show = !isOpen
+    let isvisible = false
+    let cu: number[][] = []
+    let titleText = ''
+    let unit = ''
+    let max: any = 0,
+        min: any = 0
+    let a: string | null = null,
+        b: string | null = null,
+        c: string | null = null
+    let adata: number[][] = [],
+        bdata: number[][] = [],
+        cdata: number[][] = []
+    const colors: string[] = []
+
+    if (!waveDatas) {
+        titleText = '该事件暂无波形图'
+    } else if (waveDatas.length > 0) {
+        titleText = titles.value
+
+        if (Number(eventValue.value) <= 90) {
+            isvisible = true
+        }
+
+        switch (iphasic.value) {
+            case 1:
+                a = waveDatas[0].title.aTitle
+                if (props.value === 1) {
+                    cu = [[0, waveDatas[0].instantF.min]]
+                    max = waveDatas[0].instantF.max
+                    min = waveDatas[0].instantF.min
+                    adata = waveDatas[0].shunshiF.shunshiFA
                 } else {
-                    this.titles =
-                        '变电站名称：' +
-                        this.boxoList.subName +
-                        ' 监测点名称：' +
-                        this.boxoList.lineName +
-                        ' 发生时刻：' +
-                        this.boxoList.startTime +
-                        ' 暂降(骤升)幅值：' +
-                        (this.boxoList.featureAmplitude * 100).toFixed(2) +
-                        '% 持续时间：' +
-                        this.boxoList.duration +
-                        's'
+                    cu = [[0, waveDatas[0].instantS.min]]
+                    max = waveDatas[0].instantS.max
+                    min = waveDatas[0].instantS.min
+                    adata = waveDatas[0].shunshiS.shunshiSA
                 }
-
-                //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
-                //相的数量
-                this.iphasic = this.wp.iphasic
-                if (this.iphasic === 0) {
-                    this.iphasic = 1
-                }
-                let picCounts = (this.wp.waveTitle.length - 1) / this.iphasic
-                this.waveDatas = []
-                //循环筛选需求的数据
-                for (let 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) {
-            
-            let shunData = wp.listWaveData
-            let pt = Number(wp.pt) / 1000
-            let ct = Number(wp.ct)
-            let titleList = wp.waveTitle
-            //首先判断当前绘制的是电压还是电流
-            let xishu = pt //默认电压，二次值转一次值乘以pt
-            //三相名称
-            let aTitle = '',
-                bTitle = '',
-                cTitle = '',
-                unit = '电压'
-            //每个波形对应的最大最小值
-            let ifmax, ifmin, ismax, ismin
-
-            let shunshiFA = [],
-                shunshiFB = [],
-                shunshiFC = [],
-                shunshiSA = [],
-                shunshiSB = [],
-                shunshiSC = []
-            //给瞬时赋个初始值
-            if (shunData.length > 0) {
-                if (titleList[this.iphasic * step + 1].substring(0, 1) !== 'U') {
-                    xishu = ct
-                    unit = '电流'
-                }
-                for (let 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 (let shun = 0; shun < shunData.length; shun++) {
-                    if (shunData[shun][this.iphasic * step + 1] === undefined) {
-                        break
-                    }
-                    let shunFirstA = []
-                    let shunFirstB = []
-                    let shunFirstC = []
-                    let shunSecondA = []
-                    let shunSecondB = []
-                    let shunSecondC = []
-                    //根据波形数据相的数量来筛选数据
-                    switch (this.iphasic) {
-
-                        case 1:
-
-                            shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            shunshiFA.push([shunData[shun][0], shunFirstA])
-                            ifmax = ifmax > shunFirstA ? ifmax : shunFirstA
-                            ifmin = ifmin < shunFirstA ? ifmin : shunFirstA
-
-                            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:
-                            shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            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)
-
-                            shunSecondA = shunData[shun][this.iphasic * step + 1]
-                            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:
-                            shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
-                            shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu
-                            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)
-                            }
-
-                            let shunSecondA = shunData[shun][this.iphasic * step + 1]
-                            let shunSecondB = shunData[shun][this.iphasic * step + 2]
-                            let 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
-                    }
-                }
-            }
-            //瞬时一次值最大最小值
-            let instantFAn = {}
-            let instantSAn = {}
-            //let color;
-
-            let instantF = {}
-            let instantS = {}
-            let shunshiF = {}
-            let shunshiS = {}
-            let 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轴不同（不是计算出来的）
-            // let height = $(window).height() - 90;
-            let picHeight
-            let show = true
-            if (isOpen) {
-                show = false
-            }
-            //let v = $("#interval").val();
-            let isvisible = false
-            let cu = null,
-                title = null,
-                unit = null,
-                max = null,
-                min = null
-            let a = null,
-                b = null,
-                c = null
-            let adata = null,
-                bdata = null,
-                cdata = null
-            picHeight = this.vh
-            // this.$wave.css('height', picHeight)
-            // this.$wave.css('width', this.vw)
-            let 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'
-                    }
+                colors.push('#DAA520', '#000', '#000')
+                break
+            case 2:
+                a = waveDatas[0].title.aTitle
+                b = waveDatas[0].title.bTitle
+                if (props.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 {
-                    unit = 'A'
+                    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
                 }
-                //把剩余的DIV先拼接好
-                for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
-                    let waveId = 'wave' + step
-                    let 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)
+                colors.push('#DAA520', '#2E8B57', '#000')
+                break
+            case 3:
+                a = waveDatas[0].title.aTitle
+                b = waveDatas[0].title.bTitle
+                c = waveDatas[0].title.cTitle
+                if (props.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
                 }
-            } else {
-                cu = []
-                title =
-                    '变电站名称：' +
-                    this.subName +
-                    ' 监测点名称：' +
-                    this.lineName +
-                    ' 发生时刻：' +
-                    this.time +
-                    ' 暂降(骤升)幅值：' +
-                    (this.eventValue * 1).toFixed(0) +
-                    '% 持续时间：' +
-                    this.persistTime +
-                    's'
+                colors.push('#DAA520', '#2E8B57', '#A52a2a')
+                break
+        }
+
+        if (waveDatas[0].title.unit === '电压') {
+            unit = props.value === 1 ? 'kV' : 'V'
+        } else {
+            unit = 'A'
+        }
+
+        for (let step = waveDatas.length - 1; step > 0 && step < waveDatas.length; step--) {
+            const waveId = 'wave' + step
+            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'))
+            $(`#${waveId}`).css('height', picHeight).css('width', vw.value).css('min-height', '200px')
+        }
+    } else {
+        titleText = `变电站名称：${subName.value} 监测点名称：${lineName.value} 发生时刻：${time} 暂降(骤升)幅值：${(
+            Number(eventValue.value) * 1
+        ).toFixed(0)}% 持续时间：${persistTime.value}s`
+    }
+
+    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',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
+
+    const option = {
+        tooltip: {
+            top: '10px',
+            trigger: 'axis',
+            borderColor: 'grey',
+            style: {
+                color: '#fff',
+                fontSize: '15px',
+                padding: 10
+            },
+            formatter: function (params: any) {
+                let tips = '时刻:' + params[0].data[0] + '</br/>'
+                for (let i = 0; i < params.length; i++) {
+                    if (params[i].seriesName != '暂降触发点') {
+                        tips +=
+                            params[i].marker +
+                            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: titleText,
+            textStyle: {
+                fontSize: '16px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
             }
-            //绘制横向第一个波形图
-            //绘制瞬时波形图
-            // const echarts = require('echarts')
-            let wave = document.getElementById('wave')
-
-            let _this = this
-            let 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);
-            let option = {
-                tooltip: {
-                    top: '10px',
-                    trigger: 'axis',
-                    borderColor: 'grey',
-                    backgroundColor: '#fff',
-                    style: {
-                        color: '#000',
-                        fontSize: '15px',
-                        padding: 10
-                    },
-                    formatter: function (params) {
-                        // console.log(params)
-                        let tips = ''
-                        tips += '时刻:' + params[0].data[0] + '</br/>'
-
-                        for (let 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: 16,
-                    //   },
-                    // },
-                    textStyle: {
-                        color: '#fff',
-                        fontStyle: 'normal',
-                        opacity: 0.35,
-                        fontSize: 14
-                    },
-                    backgroundColor: 'rgba(0,0,0,0.55)',
-                    borderWidth: 0
+        },
+        legend: {
+            right: 50,
+            top: 25,
+            verticalAlign: 'top',
+            enabled: true,
+            itemDistance: 5,
+            textStyle: {
+                fontSize: 12,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                rich: { a: { verticalAlign: 'middle' } },
+                padding: [0, 0, 0, 0]
+            }
+        },
+        toolbox: {
+            right: 20,
+            top: 15,
+            feature: {
+                myCustomDownload: {
+                    title: '',
+                    icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z',
+                    onclick: () => download()
+                }
+            }
+        },
+        xAxis: {
+            type: 'value',
+            name: '时间\n(ms)',
+            boundaryGap: false,
+            min: props.wp?.listWaveData[0][0] || 0,
+            max: props.wp?.listWaveData[props.wp?.listWaveData.length - 1][0] + 1 || 1,
+            title: {
+                text: 'ms',
+                textStyle: {
+                    fontSize: '12px',
+                    color: props.DColor ? '#000' : echartsColor.WordColor
                 },
-                title: {
-                    left: 'center',
-                    text:  title,
-                    textStyle: {
-                        fontSize: '16',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    }
+                enabled: true,
+                align: 'high'
+            },
+            splitLine: { show: false },
+            nameTextStyle: { fontSize: '12px' },
+            axisTick: { alignWithLabel: true },
+            axisLine: {
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
-                legend: {
-                    right: 50,
-                    top: 25,
-                    verticalAlign: 'top',
-                    enabled: true,
-                    itemDistance: 5,
-                    textStyle: {
-                        fontSize: '12',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        rich: {
-                            a: {
-                                verticalAlign: 'middle'
-                            }
-                        },
-
-                        padding: [0, 0, 0, 0] //[上、右、下、左]
+                onZero: false
+            },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    if (valA.value != (value - 0).toFixed(0)) {
+                        valA.value = Number((value - 0).toFixed(0))
+                        return (value - 0).toFixed(0)
                     }
+                    return ''
+                }
+            }
+        },
+        yAxis: {
+            type: 'value',
+            name: unit,
+            title: {
+                align: 'high',
+                offset: 0,
+                text: unit,
+                rotation: 0,
+                y: -10
+            },
+            boundaryGap: [0, '100%'],
+            showLastLabel: true,
+            max: yRange.max,
+            min: yRange.min,
+            opposite: false,
+            nameTextStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
                 },
-                toolbox: {
-                    right: 20,
-                     top: 15,
-                feature: {
-                    // 移除默认的 saveAsImage
-                    // saveAsImage: { title: '保存图片' }
-                    myCustomDownload: {
-                        title: '', // 按钮标题
-                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
-
-                        onclick: function () {
-                            _this.download()
-                        }
-                    }
+                onZero: false
+            },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    return formatAxisLabel(value)
                 }
             },
-                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: '12',
-                            color: _this.DColor ? '#fff' : echartsColor.WordColor
-                        },
-                        enabled: true,
-                        align: 'high'
-                    },
-                    splitLine: {
-                        show: false
-                    },
-                    nameTextStyle: {
-                        fontSize: '12'
-                    },
-                    axisTick: {
-                        alignWithLabel: true
-                    },
-                    axisLine: {
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '12',
-                        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: '12',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    },
-                    //minInterval: 1,
-                    type: 'value',
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '12',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            return (value - 0).toFixed(2)
-                        }
-                    },
-                    splitLine: {
-                        lineStyle: {
-                            // 使用深浅的间隔色
-                            color: [_this.DColor ? '#fff' : echartsColor.thread],
-                            type: 'dashed',
-                            opacity: 0.5
-                        }
-                    }
-                },
-                grid: {
-                    left: '1%',
-                    right: '2.8%',
-                    bottom: '40px',
-                    top: '70px',
-                    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',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#DAA520'
-                        },
-                        data: adata
-                    },
-                    {
-                        name: b,
-                        type: 'line',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#2E8B57'
-                        },
-                        data: bdata
-                    },
-                    {
-                        name: c,
-                        type: 'line',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#A52a2a'
-                        },
-                        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)
-            // this.echartlist[0]=(myChartes)
-            this.myChartess=myChartes
-
-            //第一个波形图数据绘制完毕后，绘制后续的波形图
-            if (waveDatas !== null && waveDatas.length > 1) {
-                let waveDatasTemp = waveDatas.slice(1)
-                waveDatasTemp.reverse()
-                for (let step = 0; step < waveDatasTemp.length; step++) {
-                    let waveDataTemp = waveDatasTemp[step]
-                    this.drawPics(waveDataTemp, picHeight, step, show, myChartes, title)
+            splitLine: {
+                lineStyle: {
+                    color: [props.DColor ? '#000' : echartsColor.thread],
+                    type: 'dashed',
+                    opacity: 0.5
                 }
             }
         },
-        //绘制剩余横向的波形图
-        drawPics(waveDataTemp, picHeight, step, show, myChartes1, title) {
-            let _this = this
-            step = step + 1
-            //新建瞬时DIV
-            let waveId = 'wave' + step
-            let a = null,
-                b = null,
-                c = null
-            let max, min, unit
-            let adata = null,
-                bdata = null,
-                cdata = null
-            let 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'
-            }
-            let titlename = ''
-            // const echarts = require('echarts')
-            let waveIds = document.getElementById(waveId)
-            if (this.boxoList.systemType == 'ZL') {
-                let str = []
-                str = waveId.split('e')
-                let str1 = Number(str[1])
-
-                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
-                        }
-                    }
-                })
-            }
-            let myChartes = echarts.init(waveIds)
-            let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
-            let option = {
-                tooltip: {
-                    trigger: 'axis',
-                    borderColor: 'grey',
-                    formatter: function (params) {
-                        // console.log(params)
-                        let tips = ''
-                        tips += '时刻:' + params[0].data[0] + '</br/>'
-
-                        for (let 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: 16,
-                    //   },
-                    // },
-                    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: '16',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    }
-                },
-                legend: {
-                    right: 50,
-                    top: 25,
-                    verticalAlign: 'top',
-                    enabled: true,
-                    itemDistance: 5,
-                    textStyle: {
-                        fontSize: '12',
-                        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: '12',
-                            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: '12'
-                    },
-                    axisLabel: {
-                        fontSize: '12',
-                        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: '12',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor
-                    },
-                    //minInterval: 1,
-                    type: 'value',
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: _this.DColor ? '#fff' : echartsColor.thread
-                        },
-                        onZero: false //-----------重点
-                    },
-                    axisLabel: {
-                        fontSize: '12',
-                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
-                        formatter: function (value, index) {
-                            return (value - 0).toFixed(2)
-                        }
-                    },
-                    splitLine: {
-                        lineStyle: {
-                            // 使用深浅的间隔色
-                            color: [_this.DColor ? '#fff' : echartsColor.thread],
-                            type: 'dashed',
-                            opacity: 0.5
-                        }
-                    }
-                },
-                grid: {
-                    left: '1%',
-                    right: '2.8%',
-                    bottom: '40px',
-                    top: '70px',
-                    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',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#DAA520'
-                        },
-                        data: adata
-                    },
-                    {
-                        name: b,
-                        type: 'line',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#2E8B57'
-                        },
-                        data: bdata
-                    },
-                    {
-                        name: c,
-                        type: 'line',
-                        large: true,
-
-                        smooth: true,
-                        symbol: 'none',
-                        sampling: 'average',
-                        itemStyle: {
-                            color: '#A52a2a'
-                        },
-                        data: cdata
-                    }
-                ]
-            }
-            myChartes.setOption(option)
-            // window.echartsArr.push(myChartes)
-            setTimeout(() => {
-                myChartes.resize()
-                this.loading = false
-            }, 400)
-            // this.echartlist[step]=(myChartes)
-            this[`myChartess${step}`]=myChartes
-
-            echarts.connect([myChartes1, myChartes])
+        grid: {
+            left: '60px',
+            right: '45px',
+            bottom: '40px',
+            top: '60px'
         },
-        //根据多个值的比较返回其中最大值
-        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
+        dataZoom: [
+            {
+                type: 'inside',
+                height: 13,
+                start: 0,
+                bottom: '20px',
+                end: 100
+            },
+            {
+                start: 0,
+                height: 13,
+                bottom: '20px',
+                end: 100
+            }
+        ],
+        series: [
+            {
+                name: a,
+                type: 'line',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#DAA520' },
+                data: adata
+            },
+            {
+                name: b,
+                type: 'line',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#2E8B57' },
+                data: bdata
+            },
+            {
+                name: c,
+                type: 'line',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#A52a2a' },
+                data: cdata
+            },
+            {
+                name: '暂降触发点',
+                type: 'scatter',
+                symbol: 'image://' + url,
+                itemStyle: { width: 18, height: 18 },
+                data: cu
+            }
+        ]
+    }
+
+    myChartes.setOption(option)
+    myChartess.value = myChartes
+    finishChartRender(myChartes, true)
+
+    if (waveDatas && waveDatas.length > 1) {
+        const waveDatasTemp = waveDatas.slice(1)
+        for (let step = 0; step < waveDatasTemp.length; step++) {
+            drawPics(waveDatasTemp[step], picHeight, step, show, myChartes, titleText)
         }
     }
 }
+
+const drawPics = (
+    waveDataTemp: WaveData,
+    picHeight: any,
+    step: number,
+    show: boolean,
+    myChartes1: echarts.ECharts,
+    title: string
+) => {
+    step = step + 1
+    const waveId = 'wave' + step
+    let a: string | null = null,
+        b: string | null = null,
+        c: string | null = null
+    let max: any = 0,
+        min: any = 0,
+        unit = ''
+    let adata: number[][] = [],
+        bdata: number[][] = [],
+        cdata: number[][] = []
+    const colors: string[] = []
+
+    switch (iphasic.value) {
+        case 1:
+            a = waveDataTemp.title.aTitle
+            colors.push('#DAA520', '#000', '#000')
+            break
+        case 2:
+            a = waveDataTemp.title.aTitle
+            b = waveDataTemp.title.bTitle
+            colors.push('#DAA520', '#2E8B57', '#000')
+            break
+        case 3:
+            a = waveDataTemp.title.aTitle
+            b = waveDataTemp.title.bTitle
+            c = waveDataTemp.title.cTitle
+            colors.push('#DAA520', '#2E8B57', '#A52a2a')
+            break
+    }
+
+    if (props.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.title.unit === '电压') {
+        unit = props.value === 1 ? 'kV' : 'V'
+    } else {
+        unit = 'A'
+    }
+
+    let titlename = ''
+    if (props.boxoList.systemType == 'ZL') {
+        const str = waveId.split('e')
+        const str1 = Number(str[1])
+        props.wp.channelNames.forEach((element: string, i: number) => {
+            if (i == 4 || i == 7 || i == 10) {
+                if (str1 == 1 && i == 4) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'LI' ? '电网侧-电流' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+                if (str1 == 2 && i == 7) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'SU' ? '负载侧-电压' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+                if (str1 == 3 && i == 10) {
+                    const s = element.split('A')
+                    const s1 = s[0] == 'SI' ? '负载侧-电流' : s[0] + '侧' + s[1]
+                    titlename = s1 + '    ' + title
+                }
+            }
+        })
+    }
+
+    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',
+        thread: '#000',
+        FigureColor: [
+            '#07CCCA ',
+            '#00BFF5',
+            '#FFBF00',
+            '#77DA63',
+            '#D5FF6B',
+            '#Ff6600',
+            '#FF9100',
+            '#5B6E96',
+            '#66FFCC',
+            '#B3B3B3',
+            '#FF00FF',
+            '#CC00FF',
+            '#FF9999'
+        ]
+    }
+
+    const option = {
+        tooltip: {
+            trigger: 'axis',
+            borderColor: 'grey',
+            formatter: function (params: any) {
+                let tips = '时刻:' + params[0].data[0] + '</br/>'
+                for (let 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 || title,
+            textStyle: {
+                fontSize: '16px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            }
+        },
+        legend: {
+            right: 50,
+            top: 25,
+            verticalAlign: 'top',
+            enabled: true,
+            itemDistance: 5,
+            textStyle: {
+                fontSize: 12,
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                rich: { a: { verticalAlign: 'middle' } },
+                padding: [0, 0, 0, 0]
+            }
+        },
+        xAxis: {
+            type: 'value',
+            name: '时间\n(ms)',
+            boundaryGap: false,
+            min: props.wp.listWaveData[0][0],
+            max: props.wp.listWaveData[props.wp.listWaveData.length - 1][0] + 1,
+            title: {
+                text: 'ms',
+                textStyle: {
+                    fontSize: '12px',
+                    color: props.DColor ? '#000' : echartsColor.WordColor
+                },
+                enabled: true,
+                align: 'high'
+            },
+            splitLine: { show: false },
+            axisTick: { alignWithLabel: true },
+            axisLine: {
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
+            },
+            nameTextStyle: { fontSize: '12px' },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    if (valB.value != (value - 0).toFixed(0)) {
+                        valB.value = Number((value - 0).toFixed(0))
+                        return (value - 0).toFixed(0)
+                    }
+                    return ''
+                }
+            }
+        },
+        yAxis: {
+            type: 'value',
+            name: unit,
+            title: {
+                align: 'high',
+                offset: 0,
+                text: unit,
+                rotation: 0,
+                y: -10
+            },
+            boundaryGap: [0, '100%'],
+            showLastLabel: true,
+            max: yRange.max,
+            min: yRange.min,
+            opposite: false,
+            nameTextStyle: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: props.DColor ? '#000' : echartsColor.thread
+                },
+                onZero: false
+            },
+            axisLabel: {
+                fontSize: '12px',
+                color: props.DColor ? '#000' : echartsColor.WordColor,
+                formatter: function (value: number) {
+                    return formatAxisLabel(value)
+                }
+            },
+            splitLine: {
+                lineStyle: {
+                    color: [props.DColor ? '#000' : echartsColor.thread],
+                    type: 'dashed',
+                    opacity: 0.5
+                }
+            }
+        },
+        grid: {
+            left: '60px',
+            right: '45px',
+            bottom: '40px',
+            top: '60px'
+            // 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',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#DAA520' },
+                data: adata
+            },
+            {
+                name: b,
+                type: 'line',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#2E8B57' },
+                data: bdata
+            },
+            {
+                name: c,
+                type: 'line',
+                large: true,
+                smooth: true,
+                symbol: 'none',
+                sampling: 'average',
+                itemStyle: { color: '#A52a2a' },
+                data: cdata
+            }
+        ]
+    }
+
+    myChartes.setOption(option)
+
+    switch (step) {
+        case 1:
+            myChartess1.value = myChartes
+            break
+        case 2:
+            myChartess2.value = myChartes
+            break
+        case 3:
+            myChartess3.value = myChartes
+            break
+        case 4:
+            myChartess4.value = myChartes
+            break
+        case 5:
+            myChartess5.value = myChartes
+            break
+    }
+
+    finishChartRender(myChartes)
+
+    echarts.connect([myChartes1, myChartes])
+}
+
+const backbxlb = () => {
+    waveDatas.value = []
+    const charts = [
+        myChartess.value,
+        myChartess1.value,
+        myChartess2.value,
+        myChartess3.value,
+        myChartess4.value,
+        myChartess5.value
+    ]
+
+    charts.forEach(chart => {
+        if (chart) {
+            chart.dispose()
+        }
+    })
+
+    myChartess.value = null
+    myChartess1.value = null
+    myChartess2.value = null
+    myChartess3.value = null
+    myChartess4.value = null
+    myChartess5.value = null
+
+    $('#shushi').nextAll(`.${EXTRA_PANEL_CLASS}`).remove()
+    $('div.bx1').remove()
+}
+
+const getMax = (temp: number, tempA: number, tempB: number, tempC: number): number => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    temp = temp > tempC ? temp : tempC
+    return temp
+}
+
+const getMaxTwo = (temp: number, tempA: number, tempB: number): number => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    return temp
+}
+
+const getMin = (temp: number, tempA: number, tempB: number, tempC: number): number => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    temp = temp < tempC ? temp : tempC
+    return temp
+}
+
+const getMinOpen = (temp: number, tempA: number, tempB: number): number => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    return temp
+}
 </script>
diff --git a/src/components/echarts/waveForm.vue b/src/components/echarts/waveForm.vue
index 0f7e871f..fb509276 100644
--- a/src/components/echarts/waveForm.vue
+++ b/src/components/echarts/waveForm.vue
@@ -2,7 +2,7 @@
     <div v-if="view2">
         <el-row>
             <el-col :span="12">
-                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
+                <!-- <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
                 <el-select
                     style="min-width: 200px; width: 200px"
                     @change="changeView"
@@ -15,7 +15,11 @@
                         :label="item.label"
                         :value="item.value"
                     ></el-option>
-                </el-select>
+                </el-select> -->
+                <el-radio-group v-model.trim="value" @change="changeView">
+                    <el-radio-button label="一次值" :value="1" />
+                    <el-radio-button label="二次值" :value="2" />
+                </el-radio-group>
                 <!-- <el-button v-if="view2 && senior" class="ml10" type="primary" @click="AdvancedAnalytics">
                     高级分析
                 </el-button> -->
@@ -24,37 +28,18 @@
                 <el-button @click="backbxlb" icon="el-icon-Back" style="float: right">返回</el-button>
             </el-col>
         </el-row>
-        <div v-loading="loading" style="height: calc(100vh - 190px)">
-            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
-                <el-tab-pane
-                    label="瞬时波形"
-                    name="ssbx"
-                    class="boxbx pt10 pb10"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <shushiboxi
-                        ref="shushiboxiRef"
-                        v-if="bxactiveName == 'ssbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></shushiboxi>
+        <div v-loading="loading" style="height: calc(100vh - 190px)" class="mt10">
+            <el-tabs v-if="view4" type="border-card"  v-model="bxactiveName"
+                @tab-click="bxhandleClick">
+                <el-tab-pane label="瞬时波形" name="ssbx" class="boxbx pt10 pb10"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+                    <shushiboxi ref="shushiboxiRef" v-if="bxactiveName == 'ssbx' && showBoxi" :value="value"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></shushiboxi>
                 </el-tab-pane>
-                <el-tab-pane
-                    label="RMS波形"
-                    class="boxbx pt10 pb10"
-                    name="rmsbx"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <rmsboxi
-                        ref="rmsboxiRef"
-                        v-if="bxactiveName == 'rmsbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></rmsboxi>
+                <el-tab-pane label="RMS波形" class="boxbx pt10 pb10" name="rmsbx"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+                    <rmsboxi ref="rmsboxiRef" v-if="bxactiveName == 'rmsbx' && showBoxi" :value="value"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></rmsboxi>
                 </el-tab-pane>
             </el-tabs>
             <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
@@ -100,7 +85,7 @@ const options = ref([
     }
 ])
 const shushiboxiRef = ref()
-const bxecharts = ref(mainHeight(95).height as any)
+const bxecharts = ref(mainHeight(145).height as any)
 const view2 = ref(true)
 const boxoList: any = ref(null)
 const wp = ref(null)
@@ -128,9 +113,6 @@ const open = async (row: any) => {
         })
 }
 const bxhandleClick = (tab: any) => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
     loading.value = true
     if (tab.name == 'ssbx') {
         bxactiveName.value = 'ssbx'
@@ -145,8 +127,7 @@ const bxhandleClick = (tab: any) => {
 const backbxlb = () => {
     boxoList.value = null
     wp.value = null
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
 
     emit('backbxlb')
 }
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 18b96052..b136c29b 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -1,24 +1,44 @@
 <template>
     <div :style="{ height: typeof props.height === 'string' ? props.height : tableStore.table.height }">
-        <vxe-table ref="tableRef" height="auto" :key="key" :data="tableStore.table.data"
-            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
-            @sort-change="handleSortChange">
+        <vxe-table
+            ref="tableRef"
+            height="auto"
+            :key="key"
+            :data="tableStore.table.data"
+            v-loading="tableStore.table.loading"
+            v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent"
+            :showOverflow="showOverflow"
+          
+        >
+          <!-- @sort-change="handleSortChange" -->
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode">
+                <Column
+                    :attr="item"
+                    :key="key + '-column'"
+                    v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode"
+                >
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
-                            '-' +
-                            item.render +
-                            '-' +
-                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            " />
+                        <FieldRender
+                            :field="item"
+                            :row="scope.row"
+                            :column="scope.column"
+                            :index="scope.rowIndex"
+                            :key="
+                                key +
+                                '-' +
+                                item.render +
+                                '-' +
+                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            "
+                        />
                     </template>
                 </Column>
             </template>
@@ -27,11 +47,16 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes" background
+        <el-pagination
+            :currentPage="tableStore.table.params!.pageNum"
+            :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes"
+            background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total" @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"></el-pagination>
+            :total="tableStore.table.total"
+            @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"
+        ></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>
diff --git a/src/layouts/admin/components/globalPopUp.vue b/src/layouts/admin/components/globalPopUp.vue
index 01b72954..9fc348cf 100644
--- a/src/layouts/admin/components/globalPopUp.vue
+++ b/src/layouts/admin/components/globalPopUp.vue
@@ -11,25 +11,25 @@
                     :data="eventList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
                 >
                     <!-- <vxe-column type="seq" width="70px" title="序号"></vxe-column> -->
-                    <vxe-column field="time" width="180px" sortable title="发生时刻"></vxe-column>
-                    <vxe-column field="lineName" title="监测点"></vxe-column>
-                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
-                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
-                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
-                        <template #default="{ row }">
-                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
-                        </template>
-                    </vxe-column>
+                    <vxe-column field="time" width="180px"       sortable title="暂降发生时刻"></vxe-column>
                     <vxe-column field="eventValue" width="160px" sortable title="暂降(骤升)幅值(%)">
                         <template #default="{ row }">
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
+                        <template #default="{ row }">
+                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
+                        </template>
+                    </vxe-column>
                     <vxe-column field="eventType" width="100px" title="触发类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
+                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
+                    <vxe-column field="lineName" title="监测点"></vxe-column>
                 </vxe-table>
                 <div class="table-pagination mt10">
                     <el-pagination
@@ -99,7 +99,6 @@ const dataSocket = reactive({
 // }
 const socket = async () => {
     const url = localStorage.getItem('WebSocketUrl3') || 'null' //'ws://192.168.2.130:10203/event/'
-   
 
     // const url = 'ws://192.168.1.68:10203/event/'
 
diff --git a/src/utils/chartAxisHelper.ts b/src/utils/chartAxisHelper.ts
new file mode 100644
index 00000000..36abddef
--- /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/waveCache.ts b/src/utils/waveCache.ts
new file mode 100644
index 00000000..d114d78f
--- /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 00000000..0f1dd327
--- /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/utils/webSocketClient.ts b/src/utils/webSocketClient.ts
index 6c4e4e5f..0e06281b 100644
--- a/src/utils/webSocketClient.ts
+++ b/src/utils/webSocketClient.ts
@@ -58,7 +58,7 @@ export default class SocketService {
     }
     // 处理连接成功事件
     private handleOpen(): void {
-        ElMessage.success('webSocket连接服务端成功了')
+        // ElMessage.success('webSocket连接服务端成功了')
         console.log('连接服务端成功了')
         this.connected = true
         this.connectRetryCount = 0
@@ -110,7 +110,7 @@ export default class SocketService {
             }
         } else {
             this.callBackMapping['message']!({ Flag: false })
-            ElMessage.error(event.data)
+            // ElMessage.error(event.data)
         }
     }
 
diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue
index a1ee9f3a..a612b31f 100644
--- a/src/views/LN/newEnergy/highAndLowPressure/index.vue
+++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue
@@ -1,423 +1,423 @@
-<template>
-    <div class="default-main">
-        <TableHeader datePicker theCurrentTime area ref="header">
-            <!-- <template v-slot:select>
-               
-            </template> -->
-        </TableHeader>
-        <div v-loading="tableStore.table.loading">
-            <el-row :gutter="10" class="pd10">
-                <el-col :span="11" style="position: relative">
-                    <el-card>
-                        <el-radio-group
-                            v-model="tableStore.table.params.type"
-                            class="group"
-                            @change="tableStore.index()"
-                        >
-                            <el-radio-button label="风电场" value="1" />
-                            <el-radio-button label="光伏电站" value="2" />
-                        </el-radio-group>
-                        <MyEchartMap
-                            ref="EchartMap"
-                            :options="echartMapList"
-                            class="map"
-                            @eliminate="eliminate"
-                            @getRegionByRegion="getRegionByRegion"
-                            @clickMap="clickMap"
-                        />
-                    </el-card>
-                </el-col>
-                <el-col :span="13">
-                    <el-card>
-                        <template #header>
-                            <div class="card-header">
-                                <span>暂降列表</span>
-                            </div>
-                        </template>
-
-                        <!-- <h3 class="mb10">暂降列表</h3> -->
-                        <div class="tall1">
-                            <vxe-table
-                                height="auto"
-                                auto-resize
-                                :data="distributionData"
-                                v-loading="loading"
-                                v-bind="defaultAttribute"
-                            >
-                                <vxe-column
-                                    field="newStationName"
-                                    title="新能源站名称"
-                                    min-width="150px"
-                                    show-overflow-tooltip
-                                ></vxe-column>
-                                <vxe-column field="startTime" title="暂降发生时刻" min-width="150px"></vxe-column>
-                                <vxe-column
-                                    field="featureAmplitude"
-                                    title="暂降(骤升)幅值(%)"
-                                    sortable
-                                    min-width="150px"
-                                ></vxe-column>
-                                <vxe-column
-                                    field="advanceReason"
-                                    title="暂降原因"
-                                    sortable
-                                    :formatter="formFilter"
-                                    min-width="100px"
-                                ></vxe-column>
-                                <vxe-column field="severity" title="严重度" min-width="100px" sortable></vxe-column>
-                                <vxe-column title="操作" width="80px">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            type="primary"
-                                            v-if="row.wavePath != null"
-                                            size="small"
-                                            link
-                                            @click="boxi(row)"
-                                        >
-                                            查看波形
-                                        </el-button>
-                                        <el-button v-else disabled size="small" link>暂无波形</el-button>
-                                    </template>
-                                </vxe-column>
-                            </vxe-table>
-                        </div>
-                    </el-card>
-                    <el-card class="mt10">
-                        <template #header>
-                            <div class="card-header">
-                                <span>暂降波形</span>
-                            </div>
-                        </template>
-                        <div class="tall" v-loading="loading1">
-                            <!-- <h3 class="mb10">暂降波形</h3> -->
-                            <div v-if="wp != null">
-                                <rmsboxi :value="1" :height="height" :boxoList="boxoList" :wp="wp" />
-                            </div>
-                            <el-empty v-else description="暂无数据" class="custom-empty" />
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import TableHeader from '@/components/table/header/index.vue'
-
-import { useDictData } from '@/stores/dictData'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
-import TableStore from '@/utils/tableStore'
-import { voltageRideThroughEventQueryPage } from '@/api/event-boot/highAndLowPressure'
-import { getMonitorEventAnalyseWave, getTransientDetailById } from '@/api/event-boot/transient'
-import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import { ref, onMounted, provide } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import { FormItem } from 'vxe-table'
-defineOptions({
-    name: 'newEnergy/highAndLowPressure'
-})
-const EchartMap = ref()
-const dictData = useDictData()
-const reason = dictData.getBasicData('Event_Reason')
-const triggerType = dictData.getBasicData('Event_Statis')
-const echartMapList: any = ref({})
-const header = ref()
-const distributionData: any = ref([])
-const loading = ref(false)
-const loading1 = ref(false)
-const boxoList = ref(null)
-const wp = ref(null)
-const tableStore = new TableStore({
-    url: '/event-boot/voltageRideThrough/view',
-    method: 'POST',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.areaId = tableStore.table.params.deptIndex
-    },
-    loadCallback: () => {
-        // 处理地图数据
-        map(tableStore.table.data)
-        // tabulation(tableStore.table.data)
-        EchartMap.value.GetEchar(header.value.areaRef.areaName)
-        if (tableStore.table.data.length > 0) {
-            tabulation({ data: tableStore.table.data[0], seriesName: '高压' })
-        }
-    }
-})
-const height = mainHeight(200, 2).height
-provide('tableStore', tableStore)
-tableStore.table.params.type = '1'
-
-// 地图点击事件
-const getRegionByRegion = (list: any) => {
-    tableStore.table.params.deptIndex = list.id
-    tableStore.onTableAction('search', {})
-}
-// 消除点
-const eliminate = (name: string) => {
-    echartMapList.value.options.series = []
-    EchartMap.value.GetEchar(name)
-}
-
-// 地图数处理
-const map = (res: any) => {
-    echartMapList.value = {
-        title: {
-            text: '高/低电压穿越'
-        },
-        tooltip: {
-            trigger: 'item',
-            formatter: function (params) {
-                if (params.seriesType == 'bar3D') {
-                    return [params.seriesName, params.name + '：' + params.value[2] + (params.value[3] || '')].join(
-                        '<br />'
-                    )
-                }
-            }
-        },
-
-        legend: {
-            selectedMode: false
-        },
-        geo3D: {
-            show: true,
-            // name: '浙江',
-            itemStyle: {
-                color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-3'),
-                borderWidth: 1,
-                borderColor: '#fff'
-            },
-            emphasis: {
-                label: { show: true, fontSize: 16 },
-                itemStyle: {
-                    color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-7')
-                }
-            },
-            viewControl: {
-                alpha: 60,
-                distance: 120,
-                panMouseButton: 'right', //平移操作使用的鼠标按键
-                rotateMouseButton: 'left' //旋转操作使用的鼠标按键
-            },
-            label: {
-                show: true,
-                color: '#000',
-                fontSize: 14,
-                distance: 0,
-                textStyle: {
-                    color: '#000',
-                    backgroundColor: '#000'
-                }
-            },
-
-            data: [
-                { name: '低压', field: 'lowPressure', unit: '次' },
-                { name: '高压', field: 'highPressure', unit: '次' }
-            ]
-        },
-        options: {
-            series: [
-                {
-                    name: '低压',
-                    type: 'bar3D',
-                    coordinateSystem: 'geo3D',
-                    shading: 'lambert',
-                    label: {
-                        show: true,
-                        position: 'top',
-                        formatter: params => {
-                            return params.value[2]
-                        }
-                    },
-
-                    data:
-                        res.length == 0
-                            ? []
-                            : res.map((item: any) => {
-                                  return {
-                                      ...item,
-                                      value: [item.lng, item.lat, item.lowPressure || 0]
-                                  }
-                              }),
-                    // data:[],
-                    barSize: 1,
-                    minHeight: 1,
-                    itemStyle: {
-                        color: '#77DA63'
-                    },
-                    emphasis: {
-                        label: { show: true }
-                    }
-                },
-                {
-                    name: '高压',
-                    type: 'bar3D',
-                    coordinateSystem: 'geo3D',
-                    shading: 'lambert',
-                    label: {
-                        show: true,
-                        // position: 'top',
-                        formatter: params => {
-                            return params.value[2]
-                        }
-                    },
-
-                    data:
-                        res.length == 0
-                            ? []
-                            : res.map((item: any) => {
-                                  return {
-                                      ...item,
-                                      value: [item.lng - 0.1, item.lat, item.highPressure || 0]
-                                  }
-                              }),
-                    // [
-
-                    //     {
-                    //         adcode: 330400,
-                    //         name: '大连',
-
-                    //         wcs: 10,
-                    //         mbs: 40,
-                    //         wcl: 100,
-                    //         value: [121.67391, 38.947468, 40, '']
-                    //     }
-                    // ],
-                    barSize: 1,
-                    minHeight: 1,
-                    itemStyle: {
-                        color: '#FFBF00'
-                    },
-                    emphasis: {
-                        label: { show: true }
-                    }
-                }
-            ]
-        }
-    }
-}
-
-// 点击地图
-const clickMap = (e: any) => {
-    tabulation(e)
-}
-// 表格数据处理
-const tabulation = (e: any) => {
-    console.log()
-
-    loading.value = true
-    voltageRideThroughEventQueryPage({
-        ...tableStore.table.params,
-        areaId: e.data.id,
-        frequencyType:
-            e.seriesName == '高压'
-                ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id
-                : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
-    })
-        .then(res => {
-            distributionData.value = res.data
-
-            for (let i = 0; i < res.data.length; i++) {
-                if (res.data[i].wavePath != null) {
-                    boxi(res.data[i])
-                    break
-                }
-            }
-
-            // res.data.forEach((item: any) => {
-            //     if (item.wavePath != null) {
-            //         boxi(item)
-            //         return
-            //     }
-            // })
-            // 。wavePath
-            loading.value = false
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-
-const formFilter = (row: any) => {
-    if (row.column.property == 'advanceReason') {
-        let title = ''
-        reason.forEach(item => {
-            if (item.id == row.row.advanceReason) {
-                title = item.name
-            } else if (row.row.advanceReason == null || row.row.advanceReason == '') {
-                title = '/'
-            }
-        })
-        return title
-    } else {
-        return row.row[row.column.property]
-    }
-}
-// 查看波形数据
-const boxi = async (row: any) => {
-    loading1.value = true
-    wp.value = null
-    await getTransientDetailById({
-        eventId: row.eventId,
-        sysType: 0,
-        smallType: 0
-    }).then(res => {
-        boxoList.value = res.data
-    })
-
-    await getMonitorEventAnalyseWave({
-        id: row.eventId,
-        systemType: 0,
-        type: 0
-    }).then(res => {
-        if (res != undefined) {
-            wp.value = res.data
-        }
-        loading1.value = false
-    })
-}
-
-onMounted(() => {
-    tableStore.index()
-})
-const layout = mainHeight(83) as any
-const layout1 = mainHeight(93) as any
-</script>
-<style lang="scss" scoped>
-.map {
-    height: calc(v-bind('layout1.height') - 30px);
-}
-.tall {
-    height: calc((v-bind('layout1.height') - 100px) / 2);
-}
-.tall1 {
-    height: calc((v-bind('layout1.height') - 100px) / 2 - 50px);
-}
-
-.group {
-    position: absolute;
-    top: 15px;
-    right: 20px;
-    z-index: 10;
-}
-
-:deep(.el-card__body) {
-    padding: 10px;
-}
-/* 自定义 el-empty 的样式 */
-:deep(.custom-empty) {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%; /* 调整高度 */
-    padding: 20px; /* 调整内边距 */
-    .el-empty__image {
-        display: none; /* 隐藏默认图片 */
-    }
-    .el-empty__description {
-        font-size: 14px; /* 调整字体大小 */
-        color: var(--vxe-font-color);
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader datePicker theCurrentTime area ref="header">
+            <!-- <template v-slot:select>
+               
+            </template> -->
+        </TableHeader>
+        <div v-loading="tableStore.table.loading">
+            <el-row :gutter="10" class="pd10">
+                <el-col :span="11" style="position: relative">
+                    <el-card>
+                        <el-radio-group
+                            v-model="tableStore.table.params.type"
+                            class="group"
+                            @change="tableStore.index()"
+                        >
+                            <el-radio-button label="风电场" value="1" />
+                            <el-radio-button label="光伏电站" value="2" />
+                        </el-radio-group>
+                        <MyEchartMap
+                            ref="EchartMap"
+                            :options="echartMapList"
+                            class="map"
+                            @eliminate="eliminate"
+                            @getRegionByRegion="getRegionByRegion"
+                            @clickMap="clickMap"
+                        />
+                    </el-card>
+                </el-col>
+                <el-col :span="13">
+                    <el-card>
+                        <template #header>
+                            <div class="card-header">
+                                <span>暂降列表</span>
+                            </div>
+                        </template>
+
+                        <!-- <h3 class="mb10">暂降列表</h3> -->
+                        <div class="tall1">
+                            <vxe-table
+                                height="auto"
+                                auto-resize
+                                :data="distributionData"
+                                v-loading="loading"
+                                v-bind="defaultAttribute"
+                            >
+                                <vxe-column
+                                    field="newStationName"
+                                    title="新能源站名称"
+                                    min-width="150px"
+                                    show-overflow-tooltip
+                                ></vxe-column>
+                                <vxe-column field="startTime" title="暂降发生时刻" min-width="180px" sortable></vxe-column>
+                                <vxe-column
+                                    field="featureAmplitude"
+                                    title="暂降(骤升)幅值(%)"
+                                    sortable
+                                    min-width="160px"
+                                ></vxe-column>
+                                <vxe-column
+                                    field="advanceReason"
+                                    title="暂降原因"
+                                    sortable
+                                    :formatter="formFilter"
+                                    min-width="100px"
+                                ></vxe-column>
+                                <vxe-column field="severity" title="严重度" min-width="100px" sortable></vxe-column>
+                                <vxe-column title="操作" width="80px">
+                                    <template #default="{ row }">
+                                        <el-button
+                                            type="primary"
+                                            v-if="row.wavePath != null"
+                                            size="small"
+                                            link
+                                            @click="boxi(row)"
+                                        >
+                                            查看波形
+                                        </el-button>
+                                        <el-button v-else disabled size="small" link>暂无波形</el-button>
+                                    </template>
+                                </vxe-column>
+                            </vxe-table>
+                        </div>
+                    </el-card>
+                    <el-card class="mt10">
+                        <template #header>
+                            <div class="card-header">
+                                <span>暂降波形</span>
+                            </div>
+                        </template>
+                        <div class="tall" v-loading="loading1">
+                            <!-- <h3 class="mb10">暂降波形</h3> -->
+                            <div v-if="wp != null">
+                                <rmsboxi :value="1" :height="height" :boxoList="boxoList" :wp="wp" />
+                            </div>
+                            <el-empty v-else description="暂无数据" class="custom-empty" />
+                        </div>
+                    </el-card>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
+import TableStore from '@/utils/tableStore'
+import { voltageRideThroughEventQueryPage } from '@/api/event-boot/highAndLowPressure'
+import { getMonitorEventAnalyseWave, getTransientDetailById } from '@/api/event-boot/transient'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import { FormItem } from 'vxe-table'
+defineOptions({
+    name: 'newEnergy/highAndLowPressure'
+})
+const EchartMap = ref()
+const dictData = useDictData()
+const reason = dictData.getBasicData('Event_Reason')
+const triggerType = dictData.getBasicData('Event_Statis')
+const echartMapList: any = ref({})
+const header = ref()
+const distributionData: any = ref([])
+const loading = ref(false)
+const loading1 = ref(false)
+const boxoList = ref(null)
+const wp = ref(null)
+const tableStore = new TableStore({
+    url: '/event-boot/voltageRideThrough/view',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.areaId = tableStore.table.params.deptIndex
+    },
+    loadCallback: () => {
+        // 处理地图数据
+        map(tableStore.table.data)
+        // tabulation(tableStore.table.data)
+        EchartMap.value.GetEchar(header.value.areaRef.areaName)
+        if (tableStore.table.data.length > 0) {
+            tabulation({ data: tableStore.table.data[0], seriesName: '高压' })
+        }
+    }
+})
+const height = mainHeight(200, 2).height
+provide('tableStore', tableStore)
+tableStore.table.params.type = '1'
+
+// 地图点击事件
+const getRegionByRegion = (list: any) => {
+    tableStore.table.params.deptIndex = list.id
+    tableStore.onTableAction('search', {})
+}
+// 消除点
+const eliminate = (name: string) => {
+    echartMapList.value.options.series = []
+    EchartMap.value.GetEchar(name)
+}
+
+// 地图数处理
+const map = (res: any) => {
+    echartMapList.value = {
+        title: {
+            text: '高/低电压穿越'
+        },
+        tooltip: {
+            trigger: 'item',
+            formatter: function (params) {
+                if (params.seriesType == 'bar3D') {
+                    return [params.seriesName, params.name + '：' + params.value[2] + (params.value[3] || '')].join(
+                        '<br />'
+                    )
+                }
+            }
+        },
+
+        legend: {
+            selectedMode: false
+        },
+        geo3D: {
+            show: true,
+            // name: '浙江',
+            itemStyle: {
+                color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-3'),
+                borderWidth: 1,
+                borderColor: '#fff'
+            },
+            emphasis: {
+                label: { show: true, fontSize: 16 },
+                itemStyle: {
+                    color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-7')
+                }
+            },
+            viewControl: {
+                alpha: 60,
+                distance: 120,
+                panMouseButton: 'right', //平移操作使用的鼠标按键
+                rotateMouseButton: 'left' //旋转操作使用的鼠标按键
+            },
+            label: {
+                show: true,
+                color: '#000',
+                fontSize: 14,
+                distance: 0,
+                textStyle: {
+                    color: '#000',
+                    backgroundColor: '#000'
+                }
+            },
+
+            data: [
+                { name: '低压', field: 'lowPressure', unit: '次' },
+                { name: '高压', field: 'highPressure', unit: '次' }
+            ]
+        },
+        options: {
+            series: [
+                {
+                    name: '低压',
+                    type: 'bar3D',
+                    coordinateSystem: 'geo3D',
+                    shading: 'lambert',
+                    label: {
+                        show: true,
+                        position: 'top',
+                        formatter: params => {
+                            return params.value[2]
+                        }
+                    },
+
+                    data:
+                        res.length == 0
+                            ? []
+                            : res.map((item: any) => {
+                                  return {
+                                      ...item,
+                                      value: [item.lng, item.lat, item.lowPressure || 0]
+                                  }
+                              }),
+                    // data:[],
+                    barSize: 1,
+                    minHeight: 1,
+                    itemStyle: {
+                        color: '#77DA63'
+                    },
+                    emphasis: {
+                        label: { show: true }
+                    }
+                },
+                {
+                    name: '高压',
+                    type: 'bar3D',
+                    coordinateSystem: 'geo3D',
+                    shading: 'lambert',
+                    label: {
+                        show: true,
+                        // position: 'top',
+                        formatter: params => {
+                            return params.value[2]
+                        }
+                    },
+
+                    data:
+                        res.length == 0
+                            ? []
+                            : res.map((item: any) => {
+                                  return {
+                                      ...item,
+                                      value: [item.lng - 0.1, item.lat, item.highPressure || 0]
+                                  }
+                              }),
+                    // [
+
+                    //     {
+                    //         adcode: 330400,
+                    //         name: '大连',
+
+                    //         wcs: 10,
+                    //         mbs: 40,
+                    //         wcl: 100,
+                    //         value: [121.67391, 38.947468, 40, '']
+                    //     }
+                    // ],
+                    barSize: 1,
+                    minHeight: 1,
+                    itemStyle: {
+                        color: '#FFBF00'
+                    },
+                    emphasis: {
+                        label: { show: true }
+                    }
+                }
+            ]
+        }
+    }
+}
+
+// 点击地图
+const clickMap = (e: any) => {
+    tabulation(e)
+}
+// 表格数据处理
+const tabulation = (e: any) => {
+    console.log()
+
+    loading.value = true
+    voltageRideThroughEventQueryPage({
+        ...tableStore.table.params,
+        areaId: e.data.id,
+        frequencyType:
+            e.seriesName == '高压'
+                ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id
+                : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
+    })
+        .then(res => {
+            distributionData.value = res.data
+
+            for (let i = 0; i < res.data.length; i++) {
+                if (res.data[i].wavePath != null) {
+                    boxi(res.data[i])
+                    break
+                }
+            }
+
+            // res.data.forEach((item: any) => {
+            //     if (item.wavePath != null) {
+            //         boxi(item)
+            //         return
+            //     }
+            // })
+            // 。wavePath
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+
+const formFilter = (row: any) => {
+    if (row.column.property == 'advanceReason') {
+        let title = ''
+        reason.forEach(item => {
+            if (item.id == row.row.advanceReason) {
+                title = item.name
+            } else if (row.row.advanceReason == null || row.row.advanceReason == '') {
+                title = '/'
+            }
+        })
+        return title
+    } else {
+        return row.row[row.column.property]
+    }
+}
+// 查看波形数据
+const boxi = async (row: any) => {
+    loading1.value = true
+    wp.value = null
+    await getTransientDetailById({
+        eventId: row.eventId,
+        sysType: 0,
+        smallType: 0
+    }).then(res => {
+        boxoList.value = res.data
+    })
+
+    await getMonitorEventAnalyseWave({
+        id: row.eventId,
+        systemType: 0,
+        type: 0
+    }).then(res => {
+        if (res != undefined) {
+            wp.value = res.data
+        }
+        loading1.value = false
+    })
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(83) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.map {
+    height: calc(v-bind('layout1.height') - 30px);
+}
+.tall {
+    height: calc((v-bind('layout1.height') - 100px) / 2);
+}
+.tall1 {
+    height: calc((v-bind('layout1.height') - 100px) / 2 - 50px);
+}
+
+.group {
+    position: absolute;
+    top: 15px;
+    right: 20px;
+    z-index: 10;
+}
+
+:deep(.el-card__body) {
+    padding: 10px;
+}
+/* 自定义 el-empty 的样式 */
+:deep(.custom-empty) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%; /* 调整高度 */
+    padding: 20px; /* 调整内边距 */
+    .el-empty__image {
+        display: none; /* 隐藏默认图片 */
+    }
+    .el-empty__description {
+        font-size: 14px; /* 调整字体大小 */
+        color: var(--vxe-font-color);
+    }
+}
+</style>
diff --git a/src/views/pqs/database/standard/index.vue b/src/views/pqs/database/standard/index.vue
index 384fd83e..e91875f8 100644
--- a/src/views/pqs/database/standard/index.vue
+++ b/src/views/pqs/database/standard/index.vue
@@ -79,7 +79,7 @@ onMounted(() => {
 })
 
 const urlKey=ref('')
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG = false//import.meta.env.VITE_NAME == 'jibei'
 const handleNodeClick = (data: any, node: any) => {
    // console.log("🚀 ~ handleNodeClick ~ data:", data)
     dotList.value = data
diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
index 856b09eb..24c2a181 100644
--- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
@@ -4,7 +4,13 @@
             <TableHeader datePicker area showExport>
                 <template #select>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            placeholder="输入关键字筛选"
+                            clearable
+                            maxlength="32"
+                            show-word-limit
+                        />
                     </el-form-item>
                     <el-form-item label="统计类型">
                         <el-select
@@ -127,7 +133,7 @@ const tableStore = new TableStore({
         { field: 'lineName', title: '监测点名称', minWidth: '180' },
         { field: 'gdName', title: '供电公司', minWidth: '120' },
         { field: 'subName', title: '变电站', minWidth: '150' },
-        { field: 'ip', title: '网络参数' ,width:'120px' },
+        { field: 'ip', title: '网络参数', width: '120px' },
         { field: 'scale', title: '电压等级', minWidth: '110' },
         {
             field: 'advanceType',
@@ -137,7 +143,7 @@ const tableStore = new TableStore({
                 return row.cellValue || '其他'
             }
         },
-         {
+        {
             field: 'eventType',
             title: '触发类型',
             minWidth: '120',
@@ -153,7 +159,7 @@ const tableStore = new TableStore({
                 return row.cellValue || '其他'
             }
         },
-       
+
         // {
         //     field: 'severity', title: '严重度', minWidth: "80", formatter: (row: any) => {
         //         return row.cellValue.toFixed(2)
@@ -180,7 +186,8 @@ const tableStore = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
@@ -278,6 +285,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+        ElMessage.success('波形下载成功')
     })
 }
 </script>
diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
index 7f5ea36f..90ae4bf9 100644
--- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="default-main online">
+        
         <div class="online_header">
             <TableHeader date-picker ref="tableHeaderRef">
                 <template #select>
@@ -54,6 +55,14 @@
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="通讯状态">
+                        <el-select v-model="tableStore.table.params.comFlagStatus"  clearable placeholder="请选择通讯状态"
+                            style="width: 100%" >
+                           <el-option label="正常" value="1" />
+                           <el-option label="中断" value="0" />
+                              
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="筛选数据">
                         <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字"></el-input>
                     </el-form-item>
@@ -313,6 +322,7 @@ tableStore.table.params.statisticalType = []
 tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
+tableStore.table.params.comFlagStatus=''
 provide('tableStore', tableStore)
 const tree2List = (list: any, id?: string) => {
     //存储结果的数组
@@ -479,13 +489,13 @@ const socket = async (form: any) => {
     await dataSocket.socketServe.send(form)
     logList.value.push({
         type: '',
-        time: formatDate(new Date(), 'YYYY-MM-DD hh:mm:ss'),
+        time:  formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
         name: '开始补召,请稍等...',
     })
     await dataSocket.socketServe.registerCallBack('message', (res: any) => {
         logList.value.push({
             type: res.code == 500 ? 'error' : '',
-            time: formatDate(new Date(), 'YYYY-MM-DD hh:mm:ss'),
+            time:  formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
             name: res.message
         })
 
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 58cacc86..55cd9093 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -10,39 +10,81 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选"
-                            style="width: 200px" maxlength="32" show-word-limit />
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="输入关键字筛选"
+                            style="width: 200px"
+                            maxlength="32"
+                            show-word-limit
+                        />
                     </el-form-item>
                     <el-form-item label="触发类型">
-                        <el-select v-model="tableStore.table.params.waveType" placeholder="请选择触发类型" clearable multiple
-                            collapse-tags style="width: 100%">
-                            <el-option v-for="item in triggeroptions" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.waveType"
+                            placeholder="请选择触发类型"
+                            clearable
+                            multiple
+                            collapse-tags
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in triggeroptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否有波形">
-                        <el-select v-model="tableStore.table.params.fileFlag" placeholder="请选择是否存在波形" clearable
-                            style="width: 100%">
-                            <el-option v-for="item in wareaoptions" :key="item.id" :label="item.label"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.fileFlag"
+                            placeholder="请选择是否存在波形"
+                            clearable
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in wareaoptions"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="暂态持续时间(s)">
-                        <el-input v-model="tableStore.table.params.persistMin" placeholder="请输入X秒"
-                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable style="width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.persistMin"
+                            placeholder="请输入X秒"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')"
+                            clearable
+                            style="width: 94px"
+                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 时间数 &lt;</el-tag>
-                        <el-input v-model="tableStore.table.params.persistMax" placeholder="请输入X秒"
-                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable
-                            style="margin-left: 5px; width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.persistMax"
+                            placeholder="请输入X秒"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')"
+                            clearable
+                            style="margin-left: 5px; width: 94px"
+                        ></el-input>
                     </el-form-item>
 
                     <el-form-item label="事件严重度">
-                        <el-input v-model="tableStore.table.params.severityMin" placeholder="请输入正负数"
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable style="width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.severityMin"
+                            placeholder="请输入正负数"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
+                            clearable
+                            style="width: 94px"
+                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 严重度 &lt;</el-tag>
-                        <el-input v-model="tableStore.table.params.severityMax" placeholder="请输入正负数"
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable
-                            style="margin-left: 5px; width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.severityMax"
+                            placeholder="请输入正负数"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
+                            clearable
+                            style="margin-left: 5px; width: 94px"
+                        ></el-input>
                     </el-form-item>
 
                     <!-- <el-form-item label="触发类型:">
@@ -53,23 +95,52 @@
                         </el-select>
                     </el-form-item> -->
                     <el-form-item label="暂态原因">
-                        <el-select v-model="tableStore.table.params.eventReason" placeholder="请选择暂态原因" clearable
-                            multiple collapse-tags style="width: 100%">
-                            <el-option v-for="item in reasonoptions" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.eventReason"
+                            placeholder="请选择暂态原因"
+                            clearable
+                            multiple
+                            collapse-tags
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in reasonoptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="暂态核实原因">
-                        <el-select v-model="tableStore.table.params.verifyReason" placeholder="请选择暂态核实原因" clearable
-                            multiple collapse-tags collapse-tags-tooltip>
-                            <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.verifyReason"
+                            placeholder="请选择暂态核实原因"
+                            clearable
+                            multiple
+                            collapse-tags
+                            collapse-tags-tooltip
+                        >
+                            <el-option
+                                v-for="item in verifyReasonList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="变电站(监测点)">
-                        <el-cascader v-model="tableStore.table.params.lineIds" :options="options" :props="defaultProps"
-                            collapse-tags-tooltip style="width: 257px" filterable clearable collapse-tags
-                            placeholder="请选择变电站(监测点)" :show-all-levels="true" />
+                        <el-cascader
+                            v-model="tableStore.table.params.lineIds"
+                            :options="options"
+                            :props="defaultProps"
+                            collapse-tags-tooltip
+                            style="width: 257px"
+                            filterable
+                            clearable
+                            collapse-tags
+                            placeholder="请选择变电站(监测点)"
+                            :show-all-levels="true"
+                        />
                     </el-form-item>
                 </template>
                 <template #operation>
@@ -146,33 +217,17 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '暂降发生时刻', minWidth: '200' },
-        { field: 'gdName', title: '供电公司', minWidth: '100' },
-        { field: 'subName', title: '变电站', minWidth: '200' },
-        { field: 'ip', title: '网络参数', width: '120px' },
-        { field: 'lineName', title: '监测点', minWidth: '100' },
-        { field: 'scale', title: '电压等级(kV)', minWidth: '120' },
-        {
-            field: 'verifyReason',
-            title: '暂态核实原因',
-            minWidth: '120',
-            formatter: function (row) {
-                return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/' //row.cellValue ? row.cellValue : '/'
-            }
-        },
-        // {
-        //     field: 'verifyReasonDetail', title: '暂降核实原因详情', minWidth: '200', formatter: function (row) {
-        //         return row.cellValue ? row.cellValue : '/'
-        //     }
-        // },
+        { field: 'startTime', title: '暂降发生时刻', minWidth: '200', sortable: true },
         {
             field: 'featureAmplitude',
             title: '暂降(骤升)幅值(%)',
-            minWidth: '130',
+            minWidth: '160',
+            sortable: true,
             formatter: (row: any) => {
                 return Math.floor(row.cellValue * 10000) / 100
             }
         },
+        { field: 'duration', title: '持续时间(s)', minWidth: 120, sortable: true },
         {
             field: 'eventType',
             title: '触发类型',
@@ -182,17 +237,32 @@ const tableStore = new TableStore({
                 return triggeroptions.filter(item => item.id == row.eventType)[0]?.name
             }
         },
-        // { field: 'advanceType', title: '触发类型', minWidth: '100', },
-        { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
         {
             field: 'depth',
             title: '暂降深度(%)',
-            minWidth: '100',
+            minWidth: 120,
+
             formatter: ({ row }: any) =>
                 row.featureAmplitude < 1 ? 100 - (row.featureAmplitude * 100).toFixed(0) : '/'
         },
 
-        { field: 'duration', title: '持续时间(s)', minWidth: '100' },
+        { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
+        {
+            field: 'verifyReason',
+            title: '暂态核实原因',
+            minWidth: '120',
+            formatter: function (row) {
+                return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/' //row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'gdName', title: '供电公司', minWidth: '100' },
+        { field: 'subName', title: '变电站', minWidth: '200' },
+        { field: 'lineName', title: '监测点', minWidth: '100' },
+        { field: 'ip', title: '网络参数', width: '120px' },
+        { field: 'scale', title: '电压等级(kV)', minWidth: '130', sortable: true },
+
+        // { field: 'advanceType', title: '触发类型', minWidth: '100', },
+
         {
             field: 'severity',
             title: '严重度',
@@ -201,7 +271,8 @@ const tableStore = new TableStore({
         },
 
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '150',
             render: 'buttons',
 
@@ -259,7 +330,7 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 const options = ref([])
 const defaultProps = {
@@ -353,6 +424,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+        ElMessage.success('波形下载成功')
     })
 }
 </script>
diff --git a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
index d0c95c0e..11aa3299 100644
--- a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
+++ b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
@@ -3,9 +3,9 @@
         <div v-show="view">
             <TableHeader datePicker :showReset="false" showExport ref="TableHeaderRef">
                 <template #select>
-<!--                    <el-form-item label="筛选数据">-->
-<!--                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
-<!--                    </el-form-item>-->
+                    <!--                    <el-form-item label="筛选数据">-->
+                    <!--                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
+                    <!--                    </el-form-item>-->
                 </template>
                 <template #operation>
                     <el-button icon="el-icon-Tickets" type="primary" @click="analysis1">分析记录管理</el-button>
@@ -29,7 +29,7 @@
                         </template>
                     </vxe-column>
                 </vxe-table>
-                 <el-pagination
+                <el-pagination
                     class="mt10"
                     :currentPage="form.pageNum"
                     :page-size="form.pageSize"
@@ -39,7 +39,7 @@
                     :total="total"
                     @size-change="onTableSizeChange"
                     @current-change="onTableCurrentChange"
-            ></el-pagination>
+                ></el-pagination>
             </el-dialog>
         </div>
         <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
@@ -70,7 +70,7 @@ const loading = ref(false)
 const view = ref(true)
 const view2 = ref(false)
 const TableHeaderRef = ref()
-const  waveFormRef = ref()
+const waveFormRef = ref()
 const tableStore = new TableStore({
     url: '/advance-boot/process/querySagEventsPage',
     method: 'POST',
@@ -83,19 +83,23 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '发生时间' },
-        { field: 'duration', title: '持续时间(s)' },
+        { field: 'startTime', title: '暂降发生时刻', sortable: true, minWidth: 200 },
         {
             field: 'featureAmplitude',
-            title: '暂降(骤升)幅值(%)'
+            title: '暂降(骤升)幅值(%)',
+            sortable: true,
+            minWidth: 160
         },
-        { field: 'gdName', title: '供电公司' },
-        { field: 'subName', title: '变电站' },
-        { field: 'lineName', title: '监测点' },
+        { field: 'duration', title: '持续时间(s)', sortable: true, minWidth: 120 },
+        { field: 'gdName', title: '供电公司', minWidth: 140 },
+        { field: 'subName', title: '变电站', minWidth: 140 },
+        { field: 'lineName', title: '监测点', minWidth: 140 },
+
         {
             field: 'dealFlag',
             title: '暂降特征幅值计算',
             render: 'tag',
+            minWidth: 160,
             custom: {
                 0: 'warning',
                 1: 'success',
@@ -115,6 +119,7 @@ const tableStore = new TableStore({
             field: 'fileFlag',
             title: '录波文件',
             render: 'tag',
+            minWidth: 140,
             custom: {
                 0: 'warning',
                 1: 'success'
@@ -125,7 +130,8 @@ const tableStore = new TableStore({
             }
         },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
@@ -140,9 +146,9 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     click: async row => {
                         view.value = false
-                      setTimeout(() => {
-                        waveFormRef.value.open(row)
-                      },100)
+                        setTimeout(() => {
+                            waveFormRef.value.open(row)
+                        }, 100)
                         // row.loading = true
                         // boxoList.value = row
                         // await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
@@ -173,7 +179,7 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 tableStore.table.params.searchValue = ''
 const bxactiveName = ref('ssbx')
@@ -190,25 +196,21 @@ provide('tableStore', tableStore)
 onMounted(() => {
     TableHeaderRef.value.setTheDate(1)
     nextTick(() => {
-
         // tableStore.index()
         TableHeaderRef.value.onComSearch()
-
     })
 })
 
 // 分页
 const onTableSizeChange = (val: number) => {
-     form.value.pageSize = val
-    form.value.pageNum = 1  // 改变每页条数时回到第一页
-    loadAnalysisData()      // 重新加载数据
- 
+    form.value.pageSize = val
+    form.value.pageNum = 1 // 改变每页条数时回到第一页
+    loadAnalysisData() // 重新加载数据
 }
 
 const onTableCurrentChange = (val: number) => {
     form.value.pageNum = val
-    loadAnalysisData()      // 重新加载数据
-  
+    loadAnalysisData() // 重新加载数据
 }
 
 // 封装数据加载逻辑
@@ -230,13 +232,12 @@ const loadAnalysisData = async () => {
 
 //分析记录管理
 const analysis1 = async () => {
-      // 初始化分页参数
+    // 初始化分页参数
     form.value.pageNum = 1
     await loadAnalysisData()
     dialogAnalysis.value = true
 }
 
-
 // 启动关联分析
 const firing = () => {
     processEvents({
@@ -257,7 +258,7 @@ const details = (row: any) => {
             type: 'success',
             message: res.message
         })
-          // 重新加载当前页的数据
+        // 重新加载当前页的数据
         loadAnalysisData()
     })
 }
@@ -266,6 +267,4 @@ const backbxlb = () => {
     view.value = true
     view2.value = false
 }
-
-
 </script>
diff --git a/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue b/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
index b6ba3839..068c6e48 100644
--- a/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
+++ b/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
@@ -3,7 +3,13 @@
         <TableHeader datePicker ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"  maxlength="32"  show-word-limit/>
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="输入事件关联分析描述"
+                        maxlength="32"
+                        show-word-limit
+                    />
                 </el-form-item>
             </template>
             <template #operation>
@@ -35,25 +41,18 @@
                 </vxe-table-column>
                 <vxe-table-column
                     field="startTime"
-                    title="发生时间"
+                    title="暂降发生时刻"
                     align="center"
+                    sortable
+                    width="200"
                     :show-overflow="true"
                 ></vxe-table-column>
-                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
-                <vxe-table-column
-                    field="subName"
-                    :show-overflow="true"
-                    title="变电站"
-                    align="center"
-                ></vxe-table-column>
-                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
-                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
+                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" sortable align="center" width="160">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
+                <vxe-table-column field="duration" title="持续时间(s)" sortable align="center" width="120"></vxe-table-column>
                 <vxe-table-column
                     field="advanceType"
                     title="触发类型"
@@ -68,6 +67,15 @@
                     width="120"
                     :formatter="formFilter"
                 ></vxe-table-column>
+                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
+                <vxe-table-column
+                    field="subName"
+                    :show-overflow="true"
+                    title="变电站"
+                    align="center"
+                ></vxe-table-column>
+                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
+                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
             </vxe-table>
             <el-pagination
                 class="mt10"
@@ -131,7 +139,8 @@ const tableStore = new TableStore({
             title: '事件关联分析描述'
         },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [
@@ -176,7 +185,6 @@ const bxcontrast = () => {
     }
 }
 
-
 // 波形分析
 const source = () => {
     queryEventDetailByAssId(form.value).then(res => {
@@ -245,14 +253,14 @@ const exportEvent = () => {
 }
 // 导出波形分析
 const positioningexport = () => {
-     const selectedRecords = positioningtableRef.value.getCheckboxRecords();
-    
+    const selectedRecords = positioningtableRef.value.getCheckboxRecords()
+
     if (selectedRecords.length === 0) {
         ElMessage({
             message: '请先选择要导出的数据!',
             type: 'warning'
-        });
-        return;
+        })
+        return
     }
 
     positioningtableRef.value.exportData({
diff --git a/src/views/pqs/voltageSags/analyse/impactscope/index.vue b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
index 9804fd34..7490e0a4 100644
--- a/src/views/pqs/voltageSags/analyse/impactscope/index.vue
+++ b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
@@ -27,22 +27,23 @@
                         <span>{{ (form.pageNum - 1) * form.pageSize + row.rowIndex + 1 }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="startTime" title="发生时间" align="center"
+                <vxe-table-column field="startTime" title="暂降发生时刻" align="center" sortable  width="200"
                     :show-overflow="true"></vxe-table-column>
-                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
-                <vxe-table-column field="subName" :show-overflow="true" title="变电站" align="center"></vxe-table-column>
-                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
-                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
+                    <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" sortable align="center" width="160">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
+                <vxe-table-column field="duration" title="持续时间(s)" align="center" sortable width="120"></vxe-table-column>
                 <vxe-table-column field="advanceType" title="触发类型" align="center" width="120"
                     :formatter="formFilter"></vxe-table-column>
                 <vxe-table-column field="advanceReason" title="暂降原因" align="center" width="120"
                     :formatter="formFilter"></vxe-table-column>
+                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
+                <vxe-table-column field="subName" :show-overflow="true" title="变电站" align="center"></vxe-table-column>
+                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
+                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
+                
             </vxe-table>
             <el-pagination class="mt10" :currentPage="form.pageNum" :page-size="form.pageSize"
                 :page-sizes="[10, 20, 50, 100]" background :layout="'sizes,total, ->, prev, pager, next, jumper'"
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
index fd56ad1f..6f27a91b 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -56,37 +56,40 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '变电站名称', field: 'subName', minWidth: '140' },
-        { title: '监测点名称', field: 'lineName', minWidth: '130' },
-        { title: '网络参数', field: 'ip', width: '120px' },
-        { title: '电压等级(kV)', field: 'voltageScale', width: '120' },
-        { title: '暂降发生时刻', field: 'startTime', width: '200' },
-        // { title: '触发类型', field: 'advanceType', minWidth: '130' },
-        { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
-        {
-            title: '触发类型',
-            field: 'eventType',
-            minWidth: '80',
-            formatter: (row: any) => {
-                return eventTypeOptions.find(item => item.id === row.cellValue)?.name || '/'
-            }
-        },
+        { title: '暂降发生时刻', field: 'startTime', width: '200',    sortable: true, },
         {
             title: '暂降(骤升)幅值(%)',
             field: 'featureAmplitude',
-            minWidth: '140',
-
+            minWidth: '160',
+            sortable: true,
             formatter: (row: any) => {
                 return Math.floor(row.cellValue * 10000) / 100
             }
         },
-        { title: '持续时间(s)', field: 'duration', minWidth: '100' },
+        { title: '持续时间(s)', field: 'duration', minWidth: '120' ,   sortable: true, },
+        {
+            title: '触发类型',
+            field: 'eventType',
+            minWidth: '100',
+            formatter: (row: any) => {
+                return eventTypeOptions.find(item => item.id === row.cellValue)?.name || '/'
+            }
+        },
+        { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
+        { title: '变电站名称', field: 'subName', minWidth: '140' },
+        { title: '监测点名称', field: 'lineName', minWidth: '130' },
+        { title: '网络参数', field: 'ip', width: '120px' },
+        { title: '电压等级(kV)', field: 'voltageScale', width: '120' },
+
+        // { title: '触发类型', field: 'advanceType', minWidth: '130' },
+
         // { title: '严重度', field: 'severity', minWidth: '80' },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '180',
             render: 'buttons',
-            
+
             buttons: [
                 {
                     name: 'edit',
@@ -127,7 +130,6 @@ const tableStore = new TableStore({
     ],
     beforeSearchFun: () => {
         tableStore.table.params.lineId = monitoringPoint.state.lineId
-       
     },
     loadCallback: () => {}
 })
@@ -174,6 +176,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+           ElMessage.success('波形下载成功')
     })
 }
 </script>
diff --git a/src/views/pqs/voltageSags/overview/popupEvent.vue b/src/views/pqs/voltageSags/overview/popupEvent.vue
index 29df8ebb..30cc8092 100644
--- a/src/views/pqs/voltageSags/overview/popupEvent.vue
+++ b/src/views/pqs/voltageSags/overview/popupEvent.vue
@@ -3,21 +3,21 @@
         <div style="height: 40vh">
             <vxe-table v-loading="loading" height="auto" auto-resize :data="tableData" v-bind="defaultAttribute">
                 <vxe-column type="seq" title="序号" width="80px"></vxe-column>
-                <vxe-column field="startTime" title="发生时间" width="180"></vxe-column>
-                <vxe-column field="duration" title="持续时间(s)" width="100"></vxe-column>
-                <vxe-column field="gdName" title="供电公司"  min-width="150"></vxe-column>
-                <vxe-column field="subName" title="变电站" min-width="150"></vxe-column>
-                <vxe-column field="lineName" title="监测点"  min-width="150"></vxe-column>
+                <vxe-column field="startTime" title="暂降发生时刻" width="200" sortable></vxe-column>
+                <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="160" sortable>
+                    <template #default="{ row }">
+                        {{ (row.featureAmplitude * 100).toFixed(2) }}
+                    </template>
+                </vxe-column>
+                <vxe-column field="duration" title="持续时间(s)" width="120" sortable></vxe-column>
                 <vxe-column field="advanceType" title="触发类型" width="100">
                     <template #default="{ row }">
                         {{ type.find(item => item.id === row.advanceType)?.name }}
                     </template>
                 </vxe-column>
-                <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="150">
-                    <template #default="{ row }">
-                        {{ (row.featureAmplitude * 100).toFixed(2) }}
-                    </template>
-                </vxe-column>
+                <vxe-column field="gdName" title="供电公司" min-width="140"></vxe-column>
+                <vxe-column field="subName" title="变电站" min-width="140"></vxe-column>
+                <vxe-column field="lineName" title="监测点名称" min-width="140"></vxe-column>
             </vxe-table>
         </div>
     </el-dialog>
diff --git a/src/views/pqs/voltageSags/overview/right.vue b/src/views/pqs/voltageSags/overview/right.vue
index 8028e88a..d6b6f4c5 100644
--- a/src/views/pqs/voltageSags/overview/right.vue
+++ b/src/views/pqs/voltageSags/overview/right.vue
@@ -23,14 +23,15 @@
             <div style="flex: 1; overflow: hidden">
                 <vxe-table height="auto" auto-resize :data="tableData" v-bind="defaultAttribute">
                     <vxe-column type="seq" title="序号" width="70px"></vxe-column>
-                    <vxe-column field="startTime" title="发生时刻" width="200"></vxe-column>
-                    <vxe-column field="lineName" title="监测点" width="120"></vxe-column>
-                    <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)">
+                    <vxe-column field="startTime" title="暂降发生时刻" width="200" sortable></vxe-column>
+                    <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="160" sortable>
                         <template #default="{ row }">
                             {{ row.featureAmplitude.toFixed(2) }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="duration" title="持续时间(s)"></vxe-column>
+                    <vxe-column field="duration" title="持续时间(s)" sortable width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点" width="120"></vxe-column>
+                    
                 </vxe-table>
             </div>
         </div>
diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue
index d4dd0c77..a86cd4a2 100644
--- a/src/views/pqs/voltageSags/report/eventReports/index.vue
+++ b/src/views/pqs/voltageSags/report/eventReports/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker area >
+        <TableHeader date-picker area>
             <template v-slot:select>
                 <el-form-item label="统计类型">
                     <el-radio-group v-model="tableStore.table.params.comFlag">
@@ -48,10 +48,12 @@
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">导出</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                    报告生成
+                </el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table ref="tableRef"  :checkboxConfig="checkboxConfig" />
     </div>
 </template>
 <script setup lang="tsx">
@@ -64,7 +66,7 @@ import { getEventReport } from '@/api/event-boot/report'
 import { ElMessage } from 'element-plus'
 
 defineOptions({
-    name: 'Operationmanagement/terminalmanagement'
+    name: 'TransientReport/eventreports'
 })
 const dictData = useDictData()
 const triggerType = dictData.getBasicData('Event_Statis')
@@ -82,6 +84,7 @@ const tableStore = new TableStore({
     url: '/event-boot/report/getEventReport',
     method: 'POST',
     column: [
+        { width: '60', type: 'checkbox' },
         {
             title: '序号',
 
@@ -93,19 +96,34 @@ const tableStore = new TableStore({
         },
         {
             field: 'startTime',
-            title: '发生时刻',
+            title: '暂降发生时刻',
             width: '180',
+            sortable: true,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue.replace('T', ' ') : '/'
             }
         },
-        { field: 'gdName', title: '供电公司', minWidth: '120' },
-        { field: 'subName', title: '变电站', minWidth: '120' },
-        { field: 'ip', title: '网络参数', width: '120px' },
-        { field: 'lineName', title: '监测点', minWidth: '120' },
+        {
+            field: 'featureAmplitude',
+            title: '暂降(骤升)幅值(%)',
+            width: '160',
+            sortable: true,
+            formatter: (row: any) => {
+                // return (row.cellValue * 100).toFixed(0)
+
+                return Math.floor(row.cellValue * 10000) / 100
+            }
+        },
+        {
+            field: 'duration',
+            title: '持续时间(s)',
+            width: '120',
+            sortable: true
+        },
         {
             field: 'eventType',
-            title: '触发类型',minWidth: '100' ,
+            title: '触发类型',
+            minWidth: '100',
             formatter: (row: any) => {
                 return triggerType.filter(item => item.id === row.cellValue)[0].name
             }
@@ -113,33 +131,30 @@ const tableStore = new TableStore({
         {
             field: 'advanceType',
             title: '暂态类型',
-            minWidth: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
         {
             field: 'advanceReason',
             title: '暂态原因',
-            minWidth: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
+        { field: 'gdName', title: '供电公司', minWidth: '120' },
+        { field: 'subName', title: '变电站', minWidth: '120' },
+        { field: 'lineName', title: '监测点', minWidth: '120' },
+        { field: 'ip', title: '网络参数', width: '120px' },
+
         {
             field: 'voltageScale',
             title: '电压等级',
             minWidth: '100'
-        },
-        {
-            field: 'featureAmplitude',
-            title: '暂降(骤升)幅值(%)',
-            width: '140',
-            formatter: (row: any) => {
-                // return (row.cellValue * 100).toFixed(0)
-                
-                return Math.floor(row.cellValue * 10000) / 100
-            }
-        },
-        {
-            field: 'duration',
-            title: '持续时间(s)',
-            width: '100'
         }
+
         // { field: 'severity', title: '严重度' }
     ]
 })
@@ -156,7 +171,11 @@ tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Typ
     'Voltage_Level',
     'Load_Type'
 ])[0]
-
+const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig<any>>({
+    checkMethod: ({ row }) => {
+        return row.fileFlag === 1
+    }
+})
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -178,15 +197,17 @@ const exportEvent = () => {
     //         }
     //     })
     // })
-
-
-    const ids = tableStore.table.data.map((item: any) => item.eventId);
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择数据')
+        return
+    }
+    const ids = tableStore.table.selection.map((item: any) => item.eventId)
     loading.value = true
 
     ElMessage('生成报告中,请稍等!')
     getEventReport(ids)
         .then((res: any) => {
-             if (res == undefined) {
+            if (res == undefined) {
                 loading.value = false
                 return
             }
@@ -197,14 +218,14 @@ const exportEvent = () => {
             const url = window.URL.createObjectURL(blob)
             const link = document.createElement('a') // 创建a标签
             link.href = url
-            link.download = '事件报告'  // 设置下载的文件名
+            link.download = '事件报告' // 设置下载的文件名
             document.body.appendChild(link)
             link.click() //执行下载
             document.body.removeChild(link)
             loading.value = false
-        }) .catch(() => {
+        })
+        .catch(() => {
             loading.value = false
         })
-        
 }
 </script>
diff --git a/src/views/pqs/voltageSags/report/weekly/index.vue b/src/views/pqs/voltageSags/report/weekly/index.vue
index 6d7741d2..19581e59 100644
--- a/src/views/pqs/voltageSags/report/weekly/index.vue
+++ b/src/views/pqs/voltageSags/report/weekly/index.vue
@@ -56,19 +56,20 @@ const list = ref([
                             )
                         }
                     },
-                    { field: 'startTime', title: '暂态事件发生时刻', width: '200' },
-                    { field: 'gdName', title: '供电公司' },
-                    { field: 'subName', title: '变电站' },
-                    { field: 'lineName', title: '监测点' },
-                    { field: 'voltageScale', title: '监测点电压等级' },
-                    { field: 'loadType', title: '干扰源类型' },
+                    { field: 'startTime', title: '暂态发生时刻', width: '200',sortable: true, },
                     {
                         field: 'featureAmplitude',
-                        title: '暂降(骤升)幅值(%)',
+                        title: '暂降(骤升)幅值(%)',sortable: true,width: '160',
                         formatter: ({ row }: any) => (row.featureAmplitude * 100).toFixed(2)
                     },
-                    { field: 'duration', title: '持续时间(s)' },
-                    { field: 'severity', title: '暂态事件严重度' }
+                    { field: 'duration', title: '持续时间(s)',sortable: true,width: '120', },
+                    { field: 'gdName', title: '供电公司' ,minWidth: '120'},
+                    { field: 'subName', title: '变电站' ,minWidth: '120'},
+                    { field: 'lineName', title: '监测点' ,minWidth: '120'},
+                    { field: 'voltageScale', title: '监测点电压等级' ,minWidth: '120'},
+                    { field: 'loadType', title: '干扰源类型' ,minWidth: '120'},
+
+                    { field: 'severity', title: '暂态事件严重度' ,minWidth: '120'}
                 ]
             }
         ]
@@ -86,7 +87,16 @@ const list = ref([
                     return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
                 }
             },
-            { field: 'startTime', title: '暂降事件发生时刻', width: '200' },
+            { field: 'startTime', title: '暂降发生时刻', width: '200',sortable: true, },
+             {
+                field: 'featureAmplitude',
+                title: '暂降(骤升)幅值(%)',
+                width: '160',sortable: true,
+                formatter: (row: any) => {
+                    return Math.floor(row.cellValue * 10000) / 100
+                }
+            },
+            { field: 'duration', title: '持续时间(s)', width: '120',sortable: true, },
             { field: 'gdName', title: '供电公司', width: '150' },
             { field: 'subName', title: '变电站', minWidth: '150' },
             { field: 'lineName', title: '监测点', minWidth: '150' },
@@ -99,15 +109,7 @@ const list = ref([
             { field: 'voltageScale', title: '电压等级', width: '80' },
             { field: 'loadType', title: '干扰源类型', width: '150' },
 
-            {
-                field: 'featureAmplitude',
-                title: '暂降(骤升)幅值(%)',
-                width: '150',
-                formatter: (row: any) => {
-                    return Math.floor(row.cellValue * 10000) / 100
-                }
-            },
-            { field: 'duration', title: '持续时间(s)', width: '120' },
+           
             { field: 'advanceType', title: '暂降类型(机器判断)', width: '150' }
         ]
     },