From 67383d5888237d2f34842a45472fe11d42de226e Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 16 Oct 2024 20:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/rmsboxi.vue            | 2943 +++++++++--------
 src/components/echarts/shushiboxi.vue         |   87 +-
 .../admin/components/popup/password.vue       |    2 +-
 src/views/govern/alarm/Transient.vue          |   21 +-
 .../tabs/components/waveFormAnalysis.vue      |    6 +-
 .../govern/device/control/tabs/event.vue      |    8 +-
 src/views/govern/device/planData/index.vue    |   17 +-
 src/views/govern/manage/basic/dictionary.vue  |   71 +-
 src/views/govern/manage/basic/version.vue     |    2 +-
 9 files changed, 1599 insertions(+), 1558 deletions(-)

diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index 4251dc3..a27b85c 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -1,11 +1,11 @@
 <template>
   <div v-loading="loading" style="position: relative">
-      <div id="boxr">
-          <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
-              <div class="bx" id="rms"></div>
-          </div>
+    <div id="boxr">
+      <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
+        <div class="bx" id="rms"></div>
       </div>
-      <!-- <el-button
+    </div>
+    <!-- <el-button
           style="position: absolute; right: 10px; top: 0px; z-index: 20000"
           type="primary"
           link
@@ -27,593 +27,120 @@ import { mainHeight } from '@/utils/layout'
 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,
-  },
-  DColor: {
-    type: Boolean,
-    default: false,
-  },
-  boxoList: {
-    type: [Object, Array],
-  },
-  wp: {
-    type: [Object, Array],
-  },
-  height: {
-    type: [String,Number],
-    default: false,
-  },
+  props: {
+    value: {
+      type: Number,
+      default: 2,
+    },
+    flag: {
+      type: [String, Number, Boolean],
+      default: 3,
+    },
+    DColor: {
+      type: Boolean,
+      default: false,
+    },
+    boxoList: {
+      type: [Object, Array],
+    },
+    wp: {
+      type: [Object, Array],
+    },
+    height: {
+      type: [String, Number],
+      default: false,
+    },
 
-},
-data() {
-  return {
-    zoom: "",
-    loading: true,
-    tabvalue: this.value,
-
-    valA: 0,
-    valB: 0,
-    isOpen: false,
-    time: "",
-    type: "",
-    severity: "",
-    iphasic: "",
-    eventValue: "",
-    persistTime: "",
-    lineName: "",
-    subName: "",
-    waveDatas: [],
-    ptpass: "",
-    waveHeight: undefined,
-    rmsHeight: undefined,
-    $wave: undefined,
-    $rms: undefined,
-    color: "#006565",
-    charts: {},
-    arrpoints: [],
-    fz: "",
-    titles: "",
-    vh: null,
-    vw: null,
-  };
-},
-watch: {
-  value: function (a, b) {
-    if (a == 2) {
-      //alert(a)
-      this.initWaves();
-    } else {
-      //alert(a)
-      this.initWaves();
-    }
   },
-},
-created() {
-  if (this.flag == 1) {
-          this.vh = mainHeight(165).height
-      }else if( this.height  != false){
-        this.vh =  this.height
-      }  else {
-          this.vh =  mainHeight(165,2).height
+  data() {
+    return {
+      zoom: "",
+      loading: true,
+      tabvalue: this.value,
+
+      valA: 0,
+      valB: 0,
+      isOpen: false,
+      time: "",
+      type: "",
+      severity: "",
+      iphasic: "",
+      eventValue: "",
+      persistTime: "",
+      lineName: "",
+      subName: "",
+      waveDatas: [],
+      ptpass: "",
+      waveHeight: undefined,
+      rmsHeight: undefined,
+      $wave: undefined,
+      $rms: undefined,
+      color: "#006565",
+      charts: {},
+      arrpoints: [],
+      fz: "",
+      titles: "",
+      vh: null,
+      vw: null,
+    };
+  },
+  watch: {
+    value: function (a, b) {
+      if (a == 2) {
+        //alert(a)
+        this.initWaves();
+      } else {
+        //alert(a)
+        this.initWaves();
       }
-      this.vw = '100%'
-},
-mounted() {
-  // this.$wave = $("#wave").eq(0);
-  this.zoom = 1 / document.body.style.zoom;
-  window.addEventListener("resize", () => {
+    },
+  },
+  created() {
+    if (this.flag == 1) {
+      this.vh = mainHeight(200).height
+    } else if (this.height != false) {
+      this.vh = this.height
+    } else {
+      this.vh = mainHeight(200, 2).height
+    }
+    this.vw = '100%'
+  },
+  mounted() {
+    // this.$wave = $("#wave").eq(0);
     this.zoom = 1 / document.body.style.zoom;
-  });
-  // this.$rms = $("#rms").eq(0);
-  this.query();
-},
-methods: {
-  download() {
-    // 转换成canvas
-    html2canvas(document.getElementById("boxr"), {
-      scale: 2,
-    }).then(function (canvas) {
-      // 创建a标签，实现下载
-      var creatIMg = document.createElement("a");
-      creatIMg.download = "rms波形.png"; // 设置下载的文件名，
-      creatIMg.href = canvas.toDataURL(); // 下载url
-      creatIMg.click();
-      creatIMg.remove(); // 下载之后把创建的元素删除
+    window.addEventListener("resize", () => {
+      this.zoom = 1 / document.body.style.zoom;
     });
+    // this.$rms = $("#rms").eq(0);
+    this.query();
   },
-  query() {
-    this.loading = true;
-    //                   let from={
-    //         lineId:this.boxoList.lineId,
-    //         timeId:this.boxoList.timeId,
-    //     }
-    //    getMonitorEventAnalyseWave(from).then(res=>{
-    //     this.wp=res.data
-    this.initWaves();
-    //    })
-  },
-  //波形总体数据构造函数
-  waveData(
-    instantF,
-    instantS,
-    RMSF,
-    RMSS,
-    RMSFMinDetail,
-    RMSSMinDetail,
-    shunshiF,
-    shunshiS,
-    RMSFWave,
-    RMSSWave,
-    title,
-    unit
-  ) {
-    /*瞬时一次值最大最小值*/
-    this.instantF = instantF;
-    /*瞬时二次值最大最小值*/
-    this.instantS = instantS;
-    /*RMS一次值最大最小值*/
-    this.RMSF = RMSF;
-    /*RMS二次值最大最小值*/
-    this.RMSS = RMSS;
-    /*RMS一次值最小值具体的X Y周的位置，已经具体的相别*/
-    this.RMSFMinDetail = RMSFMinDetail;
-    /*RMS二次值最小值具体的X Y周的位置，已经具体的相别*/
-    this.RMSSMinDetail = RMSSMinDetail;
-    /*瞬时值一次值3相详细数据*/
-    this.shunshiF = shunshiF;
-    /*瞬时值二次值3相详细数据*/
-    this.shunshiS = shunshiS;
-    /*RMS一次值3相详细数据*/
-    this.RMSFWave = RMSFWave;
-    /*RMS二次值3相详细数据*/
-    this.RMSSWave = RMSSWave;
-    /*三相名称*/
-    this.title = title;
-    /*电压还是电流*/
-    this.unit = unit;
-  },
-  //根据后台查询的数据，清洗数据
-  initWaves() {
-    if (null != this.wp) {
-      if (this.boxoList.systemType == "pms") {
-        this.titles =
-          "变电站名称：" +
-          this.boxoList.powerStationName +
-          " 监测点名称：" +
-          this.boxoList.measurementPointName +
-          " 发生时刻：" +
-          this.boxoList.startTime +
-          " 暂降(骤升)幅值：" +
-          (this.boxoList.featureAmplitude * 100).toFixed(0) +
-          "% 持续时间：" +
-          this.boxoList.duration +
-          "s";
-      } else if(this.boxoList.systemType == "ZL"){
-        this.titles =
-          // "变电站名称：" +
-          // this.boxoList.equipmentName +
-          " 监测点名称：" +
-          this.boxoList.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(0) +
-          "% 持续时间：" +
-          this.boxoList.duration +
-          "s";
-      }
-
-      // this.eventValue = this.boxoList.eventValue;
-      // this.persistTime = this.boxoList.persistTime;
-      // this.lineName = this.boxoList.lineName; //监测点名称：
-      // this.isOpen = this.boxoList.openTri;
-      // this.subName = this.boxoList.subName; //变电站名称：
-      //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
-      //相的数量
-      this.iphasic = this.wp.iphasic;
-      if (this.iphasic === 0) {
-        this.iphasic = 1;
-      }
-      var picCounts = (this.wp.waveTitle.length - 1) / this.iphasic;
-      this.waveDatas = [];
-      //循环筛选需求的数据
-      for (var i = 0; i < picCounts; i++) {
-        this.fliteWaveData(this.wp, i)
-        this.waveDatas.push({
-                        instantF :this.instantF,
-                        instantS  :this.instantS,
-    RMSF  :this.RMSF,
-    RMSS  :this.RMSS,
-    RMSFMinDetail  :this.RMSFMinDetail,
-    RMSSMinDetail  :this.RMSSMinDetail,
-    shunshiF  :this.shunshiF,
-    shunshiS  :this.shunshiS,
-    RMSFWave  :this.RMSFWave,
-    RMSSWave  :this.RMSSWave,
-    title  :this.title,
-    unit  :this.unit
-
-        });
-      }
-      this.time = this.wp.time;
-      this.type = this.wp.waveType;
-      this.severity = this.wp.yzd;
-      //严重度为负，事件为暂升事件
-      if (this.severity < 0) {
-        this.severity = "/";
-        this.type = "/";
-      }
-      this.initWave(
-        this.waveDatas,
-        this.time,
-        this.type,
-        this.severity,
-        this.isOpen
-      );
-    } else {
-      this.initWave(null, null, null, null, null);
-    }
-  },
-  //获取横向一个波形的全部数据，包括瞬时波形的一次、二次值，RMS波形的一次、二次值，如果是电压的话，还需要计算出对应的最大最小值
-  fliteWaveData(wp, step) {
-    var shunData = wp.listWaveData;
-    var rmsData = wp.listRmsData;
-    // console.log(
-    //   rmsData
-    // );
-    var pt = Number(wp.pt) / 1000;
-    var ct = Number(wp.ct);
-    var titleList = wp.waveTitle;
-    //首先判断当前绘制的是电压还是电流
-    var xishu = pt; //默认电压，二次值转一次值乘以pt
-    //三相名称
-    var aTitle = "",
-      bTitle = "",
-      cTitle = "",
-      unit = "电压";
-    //RMS最小值横、纵坐标、相别名称
-    var rmsvFirstX = 0,
-      rmsvFirstY = 0,
-      rmsvSecondX = 0,
-      rmsvSecondY = 0,
-      firstZhou = "a",
-      secondeZhou = "a";
-    //每个波形对应的最大最小值
-    var ifmax, ifmin, ismax, ismin, rfmax, rfmin, rsmax, rsmin;
-    var shunshiFA = [],
-      shunshiFB = [],
-      shunshiFC = [],
-      shunshiSA = [],
-      shunshiSB = [],
-      shunshiSC = [],
-      rmsFA = [],
-      rsmFB = [],
-      rmsFC = [],
-      rmsSA = [],
-      rsmSB = [],
-      rmsSC = [];
-    //给瞬时赋个初始值
-    if (shunData.length > 0) {
-      if (titleList[this.iphasic * step + 1].substring(0, 1) !== "U") {
-        xishu = ct;
-        unit = "电流";
-      }
-      for (var i = 1; i <= this.iphasic; i++) {
-        switch (i) {
-          case 1:
-            aTitle = titleList[this.iphasic * step + i].substring(1);
-            break;
-          case 2:
-            bTitle = titleList[this.iphasic * step + i].substring(1);
-            break;
-          case 3:
-            cTitle = titleList[this.iphasic * step + i].substring(1);
-            break;
-        }
-      }
-      if (shunData[0][this.iphasic * step + 1] !== undefined) {
-        ifmax = shunData[0][this.iphasic * step + 1] * xishu;
-        ifmin = shunData[0][this.iphasic * step + 1] * xishu;
-        ismax = shunData[0][this.iphasic * step + 1];
-        ismin = shunData[0][this.iphasic * step + 1];
-      }
-
-      if (rmsData[0][this.iphasic * step + 1] !== undefined) {
-        rfmax = rmsData[0][this.iphasic * step + 1] * xishu;
-        rfmin = rmsData[0][this.iphasic * step + 1] * xishu;
-        rmsvFirstY = rmsData[0][this.iphasic * step + 1] * xishu;
-        rmsvFirstX = rmsData[0][0];
-        rsmax = rmsData[0][this.iphasic * step + 1];
-        rsmin = rmsData[0][this.iphasic * step + 1];
-        rmsvSecondY = rmsData[0][this.iphasic * step + 1];
-        rmsvSecondX = rmsData[0][0];
-      }
-      //瞬时值--同时还需要获取出瞬时值的一次、二次的最大最小值
-      for (var shun = 0; shun < shunData.length; shun++) {
-        if (shunData[shun][this.iphasic * step + 1] === undefined) {
-          break;
-        }
-        //根据波形数据相的数量来筛选数据
-        switch (this.iphasic) {
-          case 1:
-            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-            shunshiFA.push([shunData[shun][0], shunFirstA]);
-            ifmax = ifmax > shunFirstA ? ifmax : shunFirstA;
-            ifmin = ifmin < shunFirstA ? ifmin : shunFirstA;
-
-            var shunSecondA = shunData[shun][this.iphasic * step + 1];
-            shunshiSA.push([shunData[shun][0], shunSecondA]);
-            ismax = ismax > shunSecondA ? ismax : shunSecondA;
-            ismin = ismin < shunSecondA ? ismin : shunSecondA;
-            break;
-          case 2:
-            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
-            shunshiFA.push([shunData[shun][0], shunFirstA]);
-            shunshiFB.push([shunData[shun][0], shunFirstB]);
-            ifmax = this.getMaxTwo(ifmax, shunFirstA, shunFirstB);
-            ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstB);
-
-            var shunSecondA = shunData[shun][this.iphasic * step + 1];
-            var shunSecondB = shunData[shun][this.iphasic * step + 2];
-            shunshiSA.push([shunData[shun][0], shunSecondA]);
-            shunshiSB.push([shunData[shun][0], shunSecondB]);
-            ismax = this.getMaxTwo(ismax, shunSecondA, shunSecondB);
-            ismin = this.getMinOpen(ismin, shunSecondA, shunSecondB);
-            break;
-          case 3:
-            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
-
-            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
-            var shunFirstC = shunData[shun][this.iphasic * step + 3] * xishu;
-            shunshiFA.push([shunData[shun][0], shunFirstA]);
-            shunshiFB.push([shunData[shun][0], shunFirstB]);
-            shunshiFC.push([shunData[shun][0], shunFirstC]);
-            ifmax = this.getMax(ifmax, shunFirstA, shunFirstB, shunFirstC);
-            //如果接线方式是V
-            if (this.isOpen) {
-              ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstC);
-            } else {
-              ifmin = this.getMin(ifmin, shunFirstA, shunFirstB, shunFirstC);
-            }
-
-            var shunSecondA = shunData[shun][this.iphasic * step + 1];
-            var shunSecondB = shunData[shun][this.iphasic * step + 2];
-            var shunSecondC = shunData[shun][this.iphasic * step + 3];
-            shunshiSA.push([shunData[shun][0], shunSecondA]);
-            shunshiSB.push([shunData[shun][0], shunSecondB]);
-            shunshiSC.push([shunData[shun][0], shunSecondC]);
-            ismax = this.getMax(ismax, shunSecondA, shunSecondB, shunSecondC);
-            //如果接线方式是V
-            if (this.isOpen) {
-              ismin = this.getMinOpen(ismin, shunSecondA, shunSecondC);
-            } else {
-              ismin = this.getMin(
-                ismin,
-                shunSecondA,
-                shunSecondB,
-                shunSecondC
-              );
-            }
-            break;
-        }
-      }
-
-      //RMS值--同时还需要获取出RMS值的一次、二次的最大最小值
-      for (var rms = 0; rms < rmsData.length; rms++) {
-        if (rmsData[rms][this.iphasic * step + 1] === undefined) {
-          break;
-        }
-        //根据波形数据相的数量来筛选数据
-        switch (this.iphasic) {
-          case 1:
-            var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-            rmsFA.push([rmsData[rms][0], rmsFirstA]);
-            rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA;
-            rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA;
-            if (rfmin < rmsvFirstY) {
-              rmsvFirstY = rfmin;
-              firstZhou = "a";
-              rmsvFirstX = rmsData[rms][0];
-            }
-
-            var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-            rmsSA.push([rmsData[rms][0], rmsSecondA]);
-            rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA;
-            rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA;
-            if (rsmin < rmsvSecondY) {
-              rmsvSecondY = rsmin;
-              secondeZhou = "a";
-              rmsvSecondX = rmsData[rms][0];
-            }
-            break;
-          case 2:
-            var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-            var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
-            rmsFA.push([rmsData[rms][0], rmsFirstA]);
-            rsmFB.push([rmsData[rms][0], rmsFirstB]);
-            rfmax = this.getMaxTwo(rfmax, rmsFirstA, rmsFirstB);
-            rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstB);
-            if (rfmin < rmsvFirstY) {
-              rmsvFirstY = rfmin;
-              if (rfmin === rmsFirstA) {
-                firstZhou = "a";
-              } else if (rfmin === rmsFirstB) {
-                firstZhou = "b";
-              }
-              rmsvFirstX = rmsData[rms][0];
-            }
-
-            var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-            var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
-            rmsSA.push([rmsData[rms][0], rmsSecondA]);
-            rsmSB.push([rmsData[rms][0], rmsSecondB]);
-            rsmax = this.getMaxTwo(rsmax, rmsSecondA, rmsSecondB);
-            rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondB);
-            if (rsmin < rmsvSecondY) {
-              rmsvSecondY = rsmin;
-              if (rsmin === rmsSecondA) {
-                secondeZhou = "a";
-              } else if (rsmin === rmsSecondB) {
-                secondeZhou = "b";
-              }
-              rmsvSecondX = rmsData[rms][0];
-            }
-            break;
-          case 3:
-            var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
-            var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
-            var rmsFirstC = rmsData[rms][this.iphasic * step + 3] * xishu;
-            rmsFA.push([rmsData[rms][0], rmsFirstA]);
-            rsmFB.push([rmsData[rms][0], rmsFirstB]);
-            rmsFC.push([rmsData[rms][0], rmsFirstC]);
-            rfmax = this.getMax(rfmax, rmsFirstA, rmsFirstB, rmsFirstC);
-            if (this.isOpen) {
-              rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstC);
-            } else {
-              rfmin = this.getMin(rfmin, rmsFirstA, rmsFirstB, rmsFirstC);
-            }
-            if (rfmin < rmsvFirstY) {
-              rmsvFirstY = rfmin;
-              if (rfmin === rmsFirstA) {
-                firstZhou = "a";
-              } else if (rfmin === rmsFirstB) {
-                firstZhou = "b";
-              } else {
-                firstZhou = "c";
-              }
-              rmsvFirstX = rmsData[rms][0];
-            }
-
-            var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
-            var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
-            var rmsSecondC = rmsData[rms][this.iphasic * step + 3];
-            rmsSA.push([rmsData[rms][0], rmsSecondA]);
-            rsmSB.push([rmsData[rms][0], rmsSecondB]);
-            rmsSC.push([rmsData[rms][0], rmsSecondC]);
-            rsmax = this.getMax(rsmax, rmsSecondA, rmsSecondB, rmsSecondC);
-            if (this.isOpen) {
-              rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondC);
-            } else {
-              rsmin = this.getMin(rsmin, rmsSecondA, rmsSecondB, rmsSecondC);
-            }
-            if (rsmin < rmsvSecondY) {
-              rmsvSecondY = rsmin;
-              if (rsmin === rmsSecondA) {
-                secondeZhou = "a";
-              } else if (rsmin === rmsSecondB) {
-                secondeZhou = "b";
-              } else {
-                secondeZhou = "c";
-              }
-              rmsvSecondX = rmsData[rms][0];
-            }
-            break;
-        }
-      }
-    }
-    //瞬时一次值最大最小值
-    var instantFAn = {};
-    var instantSAn = {};
-    //var color;
-
-    var instantF = {};
-    var instantS = {};
-    var RMSF = {};
-    var RMSS = {};
-    var RMSFMinDetail = {};
-    var RMSSMinDetail = {};
-    var shunshiF = {};
-    var shunshiS = {};
-    var RMSFWave = {};
-    var RMSSWave = {};
-    var title = {};
-
-    //三相名称
-    title.aTitle = aTitle;
-    title.bTitle = bTitle;
-    title.cTitle = cTitle;
-
-    //电流还是电压
-    title.unit = unit;
-
-    //每个波形对应的三相数据
-    shunshiFA = shunshiFA.slice(0);
-    shunshiFB = shunshiFB.slice(0);
-    shunshiFC = shunshiFC.slice(0);
-    rmsFA = rmsFA.slice(0);
-    rsmFB = rsmFB.slice(0);
-    rmsFC = rmsFC.slice(0);
-
-    shunshiSA = shunshiSA.slice(0);
-    shunshiSB = shunshiSB.slice(0);
-    shunshiSC = shunshiSC.slice(0);
-    rmsSA = rmsSA.slice(0);
-    rsmSB = rsmSB.slice(0);
-    rmsSC = rmsSC.slice(0);
-
-    shunshiF.shunshiFA = shunshiFA;
-    shunshiF.shunshiFB = shunshiFB;
-    shunshiF.shunshiFC = shunshiFC;
-
-    shunshiS.shunshiSA = shunshiSA;
-    shunshiS.shunshiSB = shunshiSB;
-    shunshiS.shunshiSC = shunshiSC;
-
-    RMSFWave.rmsFA = rmsFA;
-    RMSFWave.rmsFB = rsmFB;
-    RMSFWave.rmsFC = rmsFC;
-
-    RMSSWave.rmsSA = rmsSA;
-    RMSSWave.rmsSB = rsmSB;
-    RMSSWave.rmsSC = rmsSC;
-
-    //赋值对应的最大最小值
-    instantF.max = ifmax;
-    instantF.min = ifmin;
-    instantS.max = ismax;
-    instantS.min = ismin;
-    if (step === 0) {
-      instantFAn.max = ifmax;
-      instantFAn.min = ifmin;
-      instantSAn.max = ismax;
-      instantSAn.min = ismin;
-    }
-    RMSF.max = rfmax;
-    RMSF.min = rfmin;
-    RMSS.max = rsmax;
-    RMSS.min = rsmin;
-    //精确到小数位2位
-    rmsvFirstY = rmsvFirstY;
-    rmsvSecondY = rmsvSecondY;
-    RMSFMinDetail.rmsvFirstX = rmsvFirstX;
-    RMSFMinDetail.rmsvFirstY = rmsvFirstY;
-    RMSFMinDetail.firstZhou = firstZhou;
-
-    RMSSMinDetail.rmsvSecondX = rmsvSecondX;
-    RMSSMinDetail.rmsvSecondY = rmsvSecondY;
-    RMSSMinDetail.secondeZhou = secondeZhou;
-    return  this.waveData(
+  methods: {
+    download() {
+      // 转换成canvas
+      html2canvas(document.getElementById("boxr"), {
+        scale: 2,
+      }).then(function (canvas) {
+        // 创建a标签，实现下载
+        var creatIMg = document.createElement("a");
+        creatIMg.download = "rms波形.png"; // 设置下载的文件名，
+        creatIMg.href = canvas.toDataURL(); // 下载url
+        creatIMg.click();
+        creatIMg.remove(); // 下载之后把创建的元素删除
+      });
+    },
+    query() {
+      this.loading = true;
+      //                   let from={
+      //         lineId:this.boxoList.lineId,
+      //         timeId:this.boxoList.timeId,
+      //     }
+      //    getMonitorEventAnalyseWave(from).then(res=>{
+      //     this.wp=res.data
+      this.initWaves();
+      //    })
+    },
+    //波形总体数据构造函数
+    waveData(
       instantF,
       instantS,
       RMSF,
@@ -626,922 +153,1430 @@ methods: {
       RMSSWave,
       title,
       unit
-    );
-  },
-  //开始画图
-  initWave(waveDatas, time, type, severity, isOpen) {
-    //清除之前增加的div
-    // $("#wave ~ .bx").remove();
-    $("#rms ~ .bx").remove();
-    //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
-    // var height = $(window).height() - 90;
-    var picHeight;
-    var show = true;
-    if (isOpen) {
-      show = false;
-    }
-    //var v = $("#interval").val();
-    var isvisible = false;
-    var cu = [],
-      rmscu = [],
-      rmscm = [],
-      title,
-      unit,
-      max,
-      min;
-    var a = "",
-      b = "",
-      c = "";
-    var adata = [],
-      bdata = [],
-      cdata = [];
-    var radata = [],
-      rbdata = [],
-      rcdata = [];
-    var rmsvX = 0,
-      rmsvY = 0,
-      zhou = 0;
-    // if (null == waveDatas || waveDatas.length === 1) {
-    //   picHeight = height;
-    // } else if (waveDatas.length > 1) {
-    //   picHeight = height * 0.45;
-    // }
-    picHeight = this.vh;
-    //this.waveHeight = picHeight
-    // this.waveHeight = picHeight
-    this.rmsHeight = picHeight;
-    // this.$rms.css("height", picHeight);
-    // this.$rms.css("width", this.vw);
-    // this.rmsHeight = picHeight
-    // $wave.css("height", picHeight);
-    // $rms.css("height", picHeight);
-    var colors = [];
-    if (null == waveDatas) {
-      cu = [];
-      rmscu = [];
-      rmscm = [];
-      title = "该事件暂无波形图";
-    } else if (waveDatas.length > 0) {
-      title = this.titles;
+    ) {
+      /*瞬时一次值最大最小值*/
+      this.instantF = instantF;
+      /*瞬时二次值最大最小值*/
+      this.instantS = instantS;
+      /*RMS一次值最大最小值*/
+      this.RMSF = RMSF;
+      /*RMS二次值最大最小值*/
+      this.RMSS = RMSS;
+      /*RMS一次值最小值具体的X Y周的位置，已经具体的相别*/
+      this.RMSFMinDetail = RMSFMinDetail;
+      /*RMS二次值最小值具体的X Y周的位置，已经具体的相别*/
+      this.RMSSMinDetail = RMSSMinDetail;
+      /*瞬时值一次值3相详细数据*/
+      this.shunshiF = shunshiF;
+      /*瞬时值二次值3相详细数据*/
+      this.shunshiS = shunshiS;
+      /*RMS一次值3相详细数据*/
+      this.RMSFWave = RMSFWave;
+      /*RMS二次值3相详细数据*/
+      this.RMSSWave = RMSSWave;
+      /*三相名称*/
+      this.title = title;
+      /*电压还是电流*/
+      this.unit = unit;
+    },
+    //根据后台查询的数据，清洗数据
+    initWaves() {
+      if (null != this.wp) {
+        if (this.boxoList.systemType == "pms") {
+          this.titles =
+            "变电站名称：" +
+            this.boxoList.powerStationName +
+            " 监测点名称：" +
+            this.boxoList.measurementPointName +
+            " 发生时刻：" +
+            this.boxoList.startTime +
+            " 暂降(骤升)幅值：" +
+            (this.boxoList.featureAmplitude * 100).toFixed(0) +
+            "% 持续时间：" +
+            this.boxoList.duration +
+            "s";
+        } else if (this.boxoList.systemType == "ZL") {
+          this.titles =
+            // "变电站名称：" +
+            // this.boxoList.equipmentName +
+            " 监测点名称：" +
+            this.boxoList.equipmentName +
+            " 发生时刻：" +
+            this.boxoList.startTime +
+            " 暂降(骤升)幅值：" +
+            this.boxoList.evtParamVVaDepth +
+            " 持续时间：" +
+            this.boxoList.evtParamTm +
+            "s";
+        } else if (this.boxoList.systemType == 'WX') {
+          this.titles =
 
-      if (Number(this.eventValue) <= 90) {
-        isvisible = true;
+            ' 监测点名称：' +
+            this.boxoList.lineName +
+            ' 发生时刻：' +
+            this.boxoList.startTime +
+            ' 暂降(骤升)幅值：' +
+            (this.boxoList.featureAmplitude ? this.boxoList.featureAmplitude.toFixed(2) : '-') +
+            '%  持续时间：' +
+            (this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') +
+            's'
+        } else {
+          this.titles =
+            "变电站名称：" +
+            this.boxoList.subName +
+            " 监测点名称：" +
+            this.boxoList.lineName +
+            " 发生时刻：" +
+            this.boxoList.startTime +
+            " 暂降(骤升)幅值：" +
+            (this.boxoList.featureAmplitude * 100).toFixed(0) +
+            "% 持续时间：" +
+            this.boxoList.duration +
+            "s";
+        }
+
+        // this.eventValue = this.boxoList.eventValue;
+        // this.persistTime = this.boxoList.persistTime;
+        // this.lineName = this.boxoList.lineName; //监测点名称：
+        // this.isOpen = this.boxoList.openTri;
+        // this.subName = this.boxoList.subName; //变电站名称：
+        //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
+        //相的数量
+        this.iphasic = this.wp.iphasic;
+        if (this.iphasic === 0) {
+          this.iphasic = 1;
+        }
+        var picCounts = (this.wp.waveTitle.length - 1) / this.iphasic;
+        this.waveDatas = [];
+        //循环筛选需求的数据
+        for (var i = 0; i < picCounts; i++) {
+          this.fliteWaveData(this.wp, i)
+          this.waveDatas.push({
+            instantF: this.instantF,
+            instantS: this.instantS,
+            RMSF: this.RMSF,
+            RMSS: this.RMSS,
+            RMSFMinDetail: this.RMSFMinDetail,
+            RMSSMinDetail: this.RMSSMinDetail,
+            shunshiF: this.shunshiF,
+            shunshiS: this.shunshiS,
+            RMSFWave: this.RMSFWave,
+            RMSSWave: this.RMSSWave,
+            title: this.title,
+            unit: this.unit
+
+          });
+        }
+        this.time = this.wp.time;
+        this.type = this.wp.waveType;
+        this.severity = this.wp.yzd;
+        //严重度为负，事件为暂升事件
+        if (this.severity < 0) {
+          this.severity = "/";
+          this.type = "/";
+        }
+        this.initWave(
+          this.waveDatas,
+          this.time,
+          this.type,
+          this.severity,
+          this.isOpen
+        );
+      } else {
+        this.initWave(null, null, null, null, null);
       }
+    },
+    //获取横向一个波形的全部数据，包括瞬时波形的一次、二次值，RMS波形的一次、二次值，如果是电压的话，还需要计算出对应的最大最小值
+    fliteWaveData(wp, step) {
+      var shunData = wp.listWaveData;
+      var rmsData = wp.listRmsData;
+      // console.log(
+      //   rmsData
+      // );
+      var pt = Number(wp.pt) / 1000;
+      var ct = Number(wp.ct);
+      var titleList = wp.waveTitle;
+      //首先判断当前绘制的是电压还是电流
+      var xishu = pt; //默认电压，二次值转一次值乘以pt
+      //三相名称
+      var aTitle = "",
+        bTitle = "",
+        cTitle = "",
+        unit = "电压";
+      //RMS最小值横、纵坐标、相别名称
+      var rmsvFirstX = 0,
+        rmsvFirstY = 0,
+        rmsvSecondX = 0,
+        rmsvSecondY = 0,
+        firstZhou = "a",
+        secondeZhou = "a";
+      //每个波形对应的最大最小值
+      var ifmax, ifmin, ismax, ismin, rfmax, rfmin, rsmax, rsmin;
+      var shunshiFA = [],
+        shunshiFB = [],
+        shunshiFC = [],
+        shunshiSA = [],
+        shunshiSB = [],
+        shunshiSC = [],
+        rmsFA = [],
+        rsmFB = [],
+        rmsFC = [],
+        rmsSA = [],
+        rsmSB = [],
+        rmsSC = [];
+      //给瞬时赋个初始值
+      if (shunData.length > 0) {
+        if (titleList[this.iphasic * step + 1].substring(0, 1) !== "U") {
+          xishu = ct;
+          unit = "电流";
+        }
+        for (var i = 1; i <= this.iphasic; i++) {
+          switch (i) {
+            case 1:
+              aTitle = titleList[this.iphasic * step + i].substring(1);
+              break;
+            case 2:
+              bTitle = titleList[this.iphasic * step + i].substring(1);
+              break;
+            case 3:
+              cTitle = titleList[this.iphasic * step + i].substring(1);
+              break;
+          }
+        }
+        if (shunData[0][this.iphasic * step + 1] !== undefined) {
+          ifmax = shunData[0][this.iphasic * step + 1] * xishu;
+          ifmin = shunData[0][this.iphasic * step + 1] * xishu;
+          ismax = shunData[0][this.iphasic * step + 1];
+          ismin = shunData[0][this.iphasic * step + 1];
+        }
+
+        if (rmsData[0][this.iphasic * step + 1] !== undefined) {
+          rfmax = rmsData[0][this.iphasic * step + 1] * xishu;
+          rfmin = rmsData[0][this.iphasic * step + 1] * xishu;
+          rmsvFirstY = rmsData[0][this.iphasic * step + 1] * xishu;
+          rmsvFirstX = rmsData[0][0];
+          rsmax = rmsData[0][this.iphasic * step + 1];
+          rsmin = rmsData[0][this.iphasic * step + 1];
+          rmsvSecondY = rmsData[0][this.iphasic * step + 1];
+          rmsvSecondX = rmsData[0][0];
+        }
+        //瞬时值--同时还需要获取出瞬时值的一次、二次的最大最小值
+        for (var shun = 0; shun < shunData.length; shun++) {
+          if (shunData[shun][this.iphasic * step + 1] === undefined) {
+            break;
+          }
+          //根据波形数据相的数量来筛选数据
+          switch (this.iphasic) {
+            case 1:
+              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
+              shunshiFA.push([shunData[shun][0], shunFirstA]);
+              ifmax = ifmax > shunFirstA ? ifmax : shunFirstA;
+              ifmin = ifmin < shunFirstA ? ifmin : shunFirstA;
+
+              var shunSecondA = shunData[shun][this.iphasic * step + 1];
+              shunshiSA.push([shunData[shun][0], shunSecondA]);
+              ismax = ismax > shunSecondA ? ismax : shunSecondA;
+              ismin = ismin < shunSecondA ? ismin : shunSecondA;
+              break;
+            case 2:
+              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
+              var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
+              shunshiFA.push([shunData[shun][0], shunFirstA]);
+              shunshiFB.push([shunData[shun][0], shunFirstB]);
+              ifmax = this.getMaxTwo(ifmax, shunFirstA, shunFirstB);
+              ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstB);
+
+              var shunSecondA = shunData[shun][this.iphasic * step + 1];
+              var shunSecondB = shunData[shun][this.iphasic * step + 2];
+              shunshiSA.push([shunData[shun][0], shunSecondA]);
+              shunshiSB.push([shunData[shun][0], shunSecondB]);
+              ismax = this.getMaxTwo(ismax, shunSecondA, shunSecondB);
+              ismin = this.getMinOpen(ismin, shunSecondA, shunSecondB);
+              break;
+            case 3:
+              var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu;
+
+              var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu;
+              var shunFirstC = shunData[shun][this.iphasic * step + 3] * xishu;
+              shunshiFA.push([shunData[shun][0], shunFirstA]);
+              shunshiFB.push([shunData[shun][0], shunFirstB]);
+              shunshiFC.push([shunData[shun][0], shunFirstC]);
+              ifmax = this.getMax(ifmax, shunFirstA, shunFirstB, shunFirstC);
+              //如果接线方式是V
+              if (this.isOpen) {
+                ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstC);
+              } else {
+                ifmin = this.getMin(ifmin, shunFirstA, shunFirstB, shunFirstC);
+              }
+
+              var shunSecondA = shunData[shun][this.iphasic * step + 1];
+              var shunSecondB = shunData[shun][this.iphasic * step + 2];
+              var shunSecondC = shunData[shun][this.iphasic * step + 3];
+              shunshiSA.push([shunData[shun][0], shunSecondA]);
+              shunshiSB.push([shunData[shun][0], shunSecondB]);
+              shunshiSC.push([shunData[shun][0], shunSecondC]);
+              ismax = this.getMax(ismax, shunSecondA, shunSecondB, shunSecondC);
+              //如果接线方式是V
+              if (this.isOpen) {
+                ismin = this.getMinOpen(ismin, shunSecondA, shunSecondC);
+              } else {
+                ismin = this.getMin(
+                  ismin,
+                  shunSecondA,
+                  shunSecondB,
+                  shunSecondC
+                );
+              }
+              break;
+          }
+        }
+
+        //RMS值--同时还需要获取出RMS值的一次、二次的最大最小值
+        for (var rms = 0; rms < rmsData.length; rms++) {
+          if (rmsData[rms][this.iphasic * step + 1] === undefined) {
+            break;
+          }
+          //根据波形数据相的数量来筛选数据
+          switch (this.iphasic) {
+            case 1:
+              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
+              rmsFA.push([rmsData[rms][0], rmsFirstA]);
+              rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA;
+              rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA;
+              if (rfmin < rmsvFirstY) {
+                rmsvFirstY = rfmin;
+                firstZhou = "a";
+                rmsvFirstX = rmsData[rms][0];
+              }
+
+              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
+              rmsSA.push([rmsData[rms][0], rmsSecondA]);
+              rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA;
+              rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA;
+              if (rsmin < rmsvSecondY) {
+                rmsvSecondY = rsmin;
+                secondeZhou = "a";
+                rmsvSecondX = rmsData[rms][0];
+              }
+              break;
+            case 2:
+              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
+              var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
+              rmsFA.push([rmsData[rms][0], rmsFirstA]);
+              rsmFB.push([rmsData[rms][0], rmsFirstB]);
+              rfmax = this.getMaxTwo(rfmax, rmsFirstA, rmsFirstB);
+              rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstB);
+              if (rfmin < rmsvFirstY) {
+                rmsvFirstY = rfmin;
+                if (rfmin === rmsFirstA) {
+                  firstZhou = "a";
+                } else if (rfmin === rmsFirstB) {
+                  firstZhou = "b";
+                }
+                rmsvFirstX = rmsData[rms][0];
+              }
+
+              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
+              var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
+              rmsSA.push([rmsData[rms][0], rmsSecondA]);
+              rsmSB.push([rmsData[rms][0], rmsSecondB]);
+              rsmax = this.getMaxTwo(rsmax, rmsSecondA, rmsSecondB);
+              rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondB);
+              if (rsmin < rmsvSecondY) {
+                rmsvSecondY = rsmin;
+                if (rsmin === rmsSecondA) {
+                  secondeZhou = "a";
+                } else if (rsmin === rmsSecondB) {
+                  secondeZhou = "b";
+                }
+                rmsvSecondX = rmsData[rms][0];
+              }
+              break;
+            case 3:
+              var rmsFirstA = rmsData[rms][this.iphasic * step + 1] * xishu;
+              var rmsFirstB = rmsData[rms][this.iphasic * step + 2] * xishu;
+              var rmsFirstC = rmsData[rms][this.iphasic * step + 3] * xishu;
+              rmsFA.push([rmsData[rms][0], rmsFirstA]);
+              rsmFB.push([rmsData[rms][0], rmsFirstB]);
+              rmsFC.push([rmsData[rms][0], rmsFirstC]);
+              rfmax = this.getMax(rfmax, rmsFirstA, rmsFirstB, rmsFirstC);
+              if (this.isOpen) {
+                rfmin = this.getMinOpen(rfmin, rmsFirstA, rmsFirstC);
+              } else {
+                rfmin = this.getMin(rfmin, rmsFirstA, rmsFirstB, rmsFirstC);
+              }
+              if (rfmin < rmsvFirstY) {
+                rmsvFirstY = rfmin;
+                if (rfmin === rmsFirstA) {
+                  firstZhou = "a";
+                } else if (rfmin === rmsFirstB) {
+                  firstZhou = "b";
+                } else {
+                  firstZhou = "c";
+                }
+                rmsvFirstX = rmsData[rms][0];
+              }
+
+              var rmsSecondA = rmsData[rms][this.iphasic * step + 1];
+              var rmsSecondB = rmsData[rms][this.iphasic * step + 2];
+              var rmsSecondC = rmsData[rms][this.iphasic * step + 3];
+              rmsSA.push([rmsData[rms][0], rmsSecondA]);
+              rsmSB.push([rmsData[rms][0], rmsSecondB]);
+              rmsSC.push([rmsData[rms][0], rmsSecondC]);
+              rsmax = this.getMax(rsmax, rmsSecondA, rmsSecondB, rmsSecondC);
+              if (this.isOpen) {
+                rsmin = this.getMinOpen(rsmin, rmsSecondA, rmsSecondC);
+              } else {
+                rsmin = this.getMin(rsmin, rmsSecondA, rmsSecondB, rmsSecondC);
+              }
+              if (rsmin < rmsvSecondY) {
+                rmsvSecondY = rsmin;
+                if (rsmin === rmsSecondA) {
+                  secondeZhou = "a";
+                } else if (rsmin === rmsSecondB) {
+                  secondeZhou = "b";
+                } else {
+                  secondeZhou = "c";
+                }
+                rmsvSecondX = rmsData[rms][0];
+              }
+              break;
+          }
+        }
+      }
+      //瞬时一次值最大最小值
+      var instantFAn = {};
+      var instantSAn = {};
+      //var color;
+
+      var instantF = {};
+      var instantS = {};
+      var RMSF = {};
+      var RMSS = {};
+      var RMSFMinDetail = {};
+      var RMSSMinDetail = {};
+      var shunshiF = {};
+      var shunshiS = {};
+      var RMSFWave = {};
+      var RMSSWave = {};
+      var title = {};
+
+      //三相名称
+      title.aTitle = aTitle;
+      title.bTitle = bTitle;
+      title.cTitle = cTitle;
+
+      //电流还是电压
+      title.unit = unit;
+
+      //每个波形对应的三相数据
+      shunshiFA = shunshiFA.slice(0);
+      shunshiFB = shunshiFB.slice(0);
+      shunshiFC = shunshiFC.slice(0);
+      rmsFA = rmsFA.slice(0);
+      rsmFB = rsmFB.slice(0);
+      rmsFC = rmsFC.slice(0);
+
+      shunshiSA = shunshiSA.slice(0);
+      shunshiSB = shunshiSB.slice(0);
+      shunshiSC = shunshiSC.slice(0);
+      rmsSA = rmsSA.slice(0);
+      rsmSB = rsmSB.slice(0);
+      rmsSC = rmsSC.slice(0);
+
+      shunshiF.shunshiFA = shunshiFA;
+      shunshiF.shunshiFB = shunshiFB;
+      shunshiF.shunshiFC = shunshiFC;
+
+      shunshiS.shunshiSA = shunshiSA;
+      shunshiS.shunshiSB = shunshiSB;
+      shunshiS.shunshiSC = shunshiSC;
+
+      RMSFWave.rmsFA = rmsFA;
+      RMSFWave.rmsFB = rsmFB;
+      RMSFWave.rmsFC = rmsFC;
+
+      RMSSWave.rmsSA = rmsSA;
+      RMSSWave.rmsSB = rsmSB;
+      RMSSWave.rmsSC = rmsSC;
+
+      //赋值对应的最大最小值
+      instantF.max = ifmax;
+      instantF.min = ifmin;
+      instantS.max = ismax;
+      instantS.min = ismin;
+      if (step === 0) {
+        instantFAn.max = ifmax;
+        instantFAn.min = ifmin;
+        instantSAn.max = ismax;
+        instantSAn.min = ismin;
+      }
+      RMSF.max = rfmax;
+      RMSF.min = rfmin;
+      RMSS.max = rsmax;
+      RMSS.min = rsmin;
+      //精确到小数位2位
+      rmsvFirstY = rmsvFirstY;
+      rmsvSecondY = rmsvSecondY;
+      RMSFMinDetail.rmsvFirstX = rmsvFirstX;
+      RMSFMinDetail.rmsvFirstY = rmsvFirstY;
+      RMSFMinDetail.firstZhou = firstZhou;
+
+      RMSSMinDetail.rmsvSecondX = rmsvSecondX;
+      RMSSMinDetail.rmsvSecondY = rmsvSecondY;
+      RMSSMinDetail.secondeZhou = secondeZhou;
+      return this.waveData(
+        instantF,
+        instantS,
+        RMSF,
+        RMSS,
+        RMSFMinDetail,
+        RMSSMinDetail,
+        shunshiF,
+        shunshiS,
+        RMSFWave,
+        RMSSWave,
+        title,
+        unit
+      );
+    },
+    //开始画图
+    initWave(waveDatas, time, type, severity, isOpen) {
+      //清除之前增加的div
+      // $("#wave ~ .bx").remove();
+      $("#rms ~ .bx").remove();
+      //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
+      // var height = $(window).height() - 90;
+      var picHeight;
+      var show = true;
+      if (isOpen) {
+        show = false;
+      }
+      //var v = $("#interval").val();
+      var isvisible = false;
+      var cu = [],
+        rmscu = [],
+        rmscm = [],
+        title,
+        unit,
+        max,
+        min;
+      var a = "",
+        b = "",
+        c = "";
+      var adata = [],
+        bdata = [],
+        cdata = [];
+      var radata = [],
+        rbdata = [],
+        rcdata = [];
+      var rmsvX = 0,
+        rmsvY = 0,
+        zhou = 0;
+      // if (null == waveDatas || waveDatas.length === 1) {
+      //   picHeight = height;
+      // } else if (waveDatas.length > 1) {
+      //   picHeight = height * 0.45;
+      // }
+      picHeight = this.vh;
+      //this.waveHeight = picHeight
+      // this.waveHeight = picHeight
+      this.rmsHeight = picHeight;
+      // this.$rms.css("height", picHeight);
+      // this.$rms.css("width", this.vw);
+      // this.rmsHeight = picHeight
+      // $wave.css("height", picHeight);
+      // $rms.css("height", picHeight);
+      var colors = [];
+      if (null == waveDatas) {
+        cu = [];
+        rmscu = [];
+        rmscm = [];
+        title = "该事件暂无波形图";
+      } else if (waveDatas.length > 0) {
+        title = this.titles;
+
+        if (Number(this.eventValue) <= 90) {
+          isvisible = true;
+        }
+        switch (this.iphasic) {
+          case 1:
+            a = waveDatas[0].title.aTitle;
+            if (this.value === 1) {
+              cu = [[0, waveDatas[0].instantF.min]];
+              rmscu = [[0, waveDatas[0].RMSF.min]];
+              rmscm = [[0, waveDatas[0].RMSF.max]];
+              max = waveDatas[0].instantF.max;
+              min = waveDatas[0].instantF.min;
+              adata = waveDatas[0].shunshiF.shunshiFA;
+
+              radata = waveDatas[0].RMSFWave.rmsFA;
+
+              rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX;
+              rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY;
+              zhou = waveDatas[0].RMSFMinDetail.firstZhou;
+            } else {
+              cu = [[0, waveDatas[0].instantS.min]];
+              rmscu = [[0, waveDatas[0].RMSS.min]];
+              rmscm = [[0, waveDatas[0].RMSS.max]];
+              max = waveDatas[0].instantS.max;
+              min = waveDatas[0].instantS.min;
+              adata = waveDatas[0].shunshiS.shunshiSA;
+
+              radata = waveDatas[0].RMSSWave.rmsSA;
+
+              rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX;
+              rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY;
+              zhou = waveDatas[0].RMSSMinDetail.secondeZhou;
+            }
+
+            colors.push("#FFCC00");
+            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("#FFCC00");
+            colors.push("#009900");
+            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("#FFCC00");
+            colors.push("#009900");
+            colors.push("#CC0000");
+            break;
+        }
+        if (waveDatas[0].unit === "电压") {
+          var xdata = this.wp.listRmsData[0][0];
+          if (this.value === 1) {
+            this.fz = [
+              this.wp.listRmsMinData[0][0],
+              (
+                (this.wp.listRmsMinData[0][1] * Number(this.wp.pt)) /
+                1000
+              ).toFixed(2),
+            ];
+            //  (this.fz * Number(this.wp.pt)) / 1000;
+            unit = "kV";
+          } else {
+            this.fz = [
+              this.wp.listRmsMinData[0][0],
+              this.wp.listRmsMinData[0][1],
+            ];
+            unit = "V";
+          }
+        } else {
+          unit = "A";
+        }
+        //把剩余的DIV先拼接好
+        for (var step = 1; step < waveDatas.length; step++) {
+          var rmsId = "rms" + step;
+          var newDivRms = $(
+            ` <div style="height:${this.vh
+            };overflow: hidden;"><div class='bx' id='${rmsId}'  ></div></div>`
+          );
+          newDivRms.insertAfter($("#rmsp"));
+          $("#" + rmsId).css("height", picHeight);
+          $("#" + rmsId).css("width", this.vw);
+        }
+      } else {
+        cu = [];
+        // rmscu = [];
+        title =
+          "变电站名称：" +
+          this.subName +
+          " 监测点名称：" +
+          this.lineName +
+          " 发生时刻：" +
+          this.time +
+          " 暂降(骤升)幅值：" +
+          (this.eventValue * 100).toFixed(0) +
+          "% 持续时间：" +
+          this.persistTime +
+          "s";
+      }
+      //绘制横向第一个波形图
+      //绘制瞬时波形图
+      // 绘制RMS波形图
+      let _this = this;
+
+      var myChartes = echarts.init(document.getElementById("rms"));
+      // console.log("==========", radata);
+      let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+      setTimeout(() => {
+        document.getElementById("rms").style.width = '100%';
+        document.getElementById("rms").style.height = _this.vh;
+      }, 0);
+      var option = {
+        tooltip: {
+          top: "10px",
+          trigger: "axis",
+          borderColor: "grey",
+          formatter: function (params) {
+            var tips = "";
+            tips += "时刻:" + params[0].data[0] + "</br/>";
+
+            for (var i = 0; i < params.length; i++) {
+              if (params[i].seriesName != "暂降触发点") {
+
+                tips +=
+                  params[i].seriesName + ":" + (params[i].value[1] - 0).toFixed(2) + "<br/>";
+              }
+            }
+            return tips;
+          },
+          // axisPointer: {
+          //   type: "cross",
+          //   label: {
+
+          //     color: "#fff",
+          //      fontSize: '0.8rem',
+          //   },
+          // },
+          textStyle: {
+            color: "#fff",
+            fontStyle: "normal",
+            opacity: 0.35,
+            fontSize: 14,
+          },
+          backgroundColor: "rgba(0,0,0,0.35)",
+          borderWidth: 0,
+        },
+        title: {
+          left: "center",
+          text:  title,
+          subtitle: {
+            text: "电压",
+            align: "left",
+          },
+          textStyle: {
+            fontSize: "0.8rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+          },
+        },
+        legend: {
+          left: "70px",
+          top: "20",
+          verticalAlign: "top",
+          enabled: true,
+          itemDistance: 5,
+          textStyle: {
+            fontSize: "0.7rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            rich: {
+              a: {
+                verticalAlign: "middle",
+              },
+            },
+
+            padding: [0, 0, 0, 0], //[上、右、下、左]
+          },
+        },
+        // toolbox: {
+        //   show: step != 1 ? true : false,
+        //   feature: {
+        //     //restore: {},
+        //     saveAsImage: {
+        //       iconStyle: {
+        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
+        //       },
+        //     },
+        //   },
+        // },
+        xAxis: {
+          type: "value",
+          name: "时间\n(ms)",
+          min: _this.wp.listRmsData[0][0],
+          max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
+          boundaryGap: false,
+          title: {
+            text: "ms",
+            textStyle: {
+              fontSize: "0.6rem",
+              color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            },
+            enabled: true,
+            align: "high",
+          },
+          nameTextStyle: {
+            fontSize: "0.6rem",
+          },
+          labels: {
+            formatter: function () {
+              return this.value;
+            },
+          },
+          splitLine: {
+            show: false,
+          },
+          axisTick: {
+            alignWithLabel: true,
+          },
+          axisLine: {
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            // interval: 50,
+            formatter: function (value, index) {
+              if (_this.valA != (value - 0).toFixed(0)) {
+                _this.valA = (value - 0).toFixed(0);
+                return (value - 0).toFixed(0);
+              }
+            },
+            //rotate:39
+          },
+          // data: this.syncExtremes,
+        },
+        yAxis: {
+          type: "value",
+          name: unit,
+          title: {
+            align: "high",
+            offset: 0,
+            text: unit,
+            rotation: 0,
+            y: -10,
+          },
+          max: rmscm[0][1] * 1.06,
+          min: rmscu[0][1] - rmscu[0][1] * 0.04,
+          boundaryGap: [0, "100%"],
+          showLastLabel: true,
+          // max: max.toFixed(2),
+          // min: min.toFixed(2),
+          opposite: false,
+          nameTextStyle: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+          },
+          //minInterval: 1,
+          type: "value",
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            formatter: function (value, index) {
+              return (value - 0).toFixed(2);
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              // 使用深浅的间隔色
+              color: [_this.DColor ? "#fff" : echartsColor.thread],
+              type: "dashed",
+              opacity: 0.5,
+            },
+          },
+        },
+        grid: {
+          left: "1%",
+          right: "45px",
+          bottom: "40px",
+          top: "15%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            height: 13,
+            start: 0,
+            bottom: "20px",
+            end: 100,
+          },
+          {
+            start: 0,
+            height: 13,
+            bottom: "20px",
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: a,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#FFCC00",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: radata,
+          },
+          {
+            name: b,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#009900",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: rbdata,
+          },
+          {
+            name: c,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#CC0000",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: rcdata,
+          },
+          {
+            name: "暂降触发点",
+            type: "scatter",
+            symbol: "image://" + url,
+            itemStyle: {
+              width: 18,
+              height: 18,
+            },
+            data: rmscu,
+          },
+          //   {
+          //     type: 'flags',
+          //     color: '#34c0e2',
+          //     name: '最小暂降幅值',
+          //     cursor: 'pointer',
+          //     visible: isvisible,
+          //     showInLegend: isvisible,
+          //     data: [{
+          //         x: rmsvX,
+          //         title: rmsvY
+          //     }],
+          //     onSeries: zhou,
+          //     shape: 'flag'
+          // }
+          {
+            name: "最小暂降幅值",
+            type: "scatter",
+            symbol: "image://" + url2,
+            itemStyle: {
+              width: 45,
+              height: 45,
+            },
+            label: {
+              show: true,
+              position: [5, -20],
+              color: "#000",
+              fontSize: "14px",
+              fontWeight: "bold",
+              borderType: "solid",
+              borderWidth: 0.5,
+              backgroundColor: "#ffff",
+              borderColor: "#0099FF",
+            },
+            data: [this.fz],
+          },
+        ],
+      };
+      myChartes.setOption(option)
+      // window.echartsArr.push(myChartes);
+      setTimeout(() => {
+        myChartes.resize();
+        this.loading = false;
+      }, 500);
+      //第一个波形图数据绘制完毕后，绘制后续的波形图
+      if (waveDatas !== null && waveDatas.length > 1) {
+        var waveDatasTemp = waveDatas.slice(1);
+        waveDatasTemp.reverse();
+        for (var step = 0; step < waveDatasTemp.length; step++) {
+          var waveDataTemp = waveDatasTemp[step];
+
+          this.drawPics(waveDataTemp, picHeight, step, show, myChartes, rmscm, rmscu, title);
+        }
+      }
+    },
+    //绘制剩余横向的波形图
+    drawPics(waveDataTemp, picHeight, step, show, myChartes1, rmscm, rmscu, title) {
+      step = step + 1;
+      //新建瞬时DIV和RMS波形DIV
+      // var waveId = 'wave' + step;
+      var rmsId = "rms" + step;
+      // var v = $("#interval").val();
+      var a = "",
+        b = "",
+        c = "";
+      var max, min, unit;
+      var adata = [],
+        bdata = [],
+        cdata = [];
+      var radata = [],
+        rbdata = [],
+        rcdata = [];
+      var colors = [];
       switch (this.iphasic) {
         case 1:
-          a = waveDatas[0].title.aTitle;
-          if (this.value === 1) {
-            cu = [[0, waveDatas[0].instantF.min]];
-            rmscu = [[0, waveDatas[0].RMSF.min]];
-            rmscm = [[0, waveDatas[0].RMSF.max]];
-            max = waveDatas[0].instantF.max;
-            min = waveDatas[0].instantF.min;
-            adata = waveDatas[0].shunshiF.shunshiFA;
-
-            radata = waveDatas[0].RMSFWave.rmsFA;
-
-            rmsvX = waveDatas[0].RMSFMinDetail.rmsvFirstX;
-            rmsvY = waveDatas[0].RMSFMinDetail.rmsvFirstY;
-            zhou = waveDatas[0].RMSFMinDetail.firstZhou;
-          } else {
-            cu = [[0, waveDatas[0].instantS.min]];
-            rmscu = [[0, waveDatas[0].RMSS.min]];
-            rmscm = [[0, waveDatas[0].RMSS.max]];
-            max = waveDatas[0].instantS.max;
-            min = waveDatas[0].instantS.min;
-            adata = waveDatas[0].shunshiS.shunshiSA;
-
-            radata = waveDatas[0].RMSSWave.rmsSA;
-
-            rmsvX = waveDatas[0].RMSSMinDetail.rmsvSecondX;
-            rmsvY = waveDatas[0].RMSSMinDetail.rmsvSecondY;
-            zhou = waveDatas[0].RMSSMinDetail.secondeZhou;
-          }
-
-          colors.push("#FFCC00");
+          a = waveDataTemp.title.aTitle;
+          colors.push("yellow");
           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("#FFCC00");
-          colors.push("#009900");
+          a = waveDataTemp.title.aTitle;
+          b = waveDataTemp.title.bTitle;
+          colors.push("yellow");
+          colors.push("green");
           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("#FFCC00");
-          colors.push("#009900");
-          colors.push("#CC0000");
+          a = waveDataTemp.title.aTitle;
+          b = waveDataTemp.title.bTitle;
+          c = waveDataTemp.title.cTitle;
+          colors.push("yellow");
+          colors.push("green");
+          colors.push("red");
           break;
       }
-      if (waveDatas[0].unit === "电压") {
-        var xdata = this.wp.listRmsData[0][0];
+
+      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) {
-          this.fz = [
-            this.wp.listRmsMinData[0][0],
-            (
-              (this.wp.listRmsMinData[0][1] * Number(this.wp.pt)) /
-              1000
-            ).toFixed(2),
-          ];
-          //  (this.fz * Number(this.wp.pt)) / 1000;
           unit = "kV";
         } else {
-          this.fz = [
-            this.wp.listRmsMinData[0][0],
-            this.wp.listRmsMinData[0][1],
-          ];
           unit = "V";
         }
       } else {
         unit = "A";
       }
-      //把剩余的DIV先拼接好
-      for (var step = 1; step < waveDatas.length; step++) {
-        var rmsId = "rms" + step;
-        var newDivRms = $(
-          ` <div style="height:${
-            this.vh
-          };overflow: hidden;"><div class='bx' id='${rmsId}'  ></div></div>`
-        );
-        newDivRms.insertAfter($("#rmsp"));
-        $("#" + rmsId).css("height", picHeight);
-        $("#" + rmsId).css("width", this.vw);
-      }
-    } else {
-      cu = [];
-      // rmscu = [];
-      title =
-        "变电站名称：" +
-        this.subName +
-        " 监测点名称：" +
-        this.lineName +
-        " 发生时刻：" +
-        this.time +
-        " 暂降(骤升)幅值：" +
-        (this.eventValue * 100).toFixed(0) +
-        "% 持续时间：" +
-        this.persistTime +
-        "s";
-    }
-    //绘制横向第一个波形图
-    //绘制瞬时波形图
-    // 绘制RMS波形图
-    let _this = this;
+      //绘制rms波形
+      let _this = this;
 
-    var myChartes = echarts.init(document.getElementById("rms"));
-    // console.log("==========", radata);
-    let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]}
-    setTimeout(() => {
-            document.getElementById("rms").style.width ='100%';
-              document.getElementById("rms").style.height =_this.vh;
-          }, 0);
-    var option = {
-      tooltip: {
-        top: "10px",
-        trigger: "axis",
-        borderColor: "grey",
-        formatter: function (params) {
-          var tips = "";
-          tips += "时刻:" + params[0].data[0] + "</br/>";
+      var myChartes = echarts.init(document.getElementById(rmsId));
+      //debugger
+      if (this.boxoList.systemType == "ZL") {
+        let str = []
+        str = rmsId.split('s')
+        let str1 = Number(str[1])
+        var titlename = ''
+        this.wp.channelNames.forEach((element, i) => {
+          if (i == 4 || i == 7 || i == 10) {
+            if (str1 == 1 && i == 4) {
+              let s = []
+              let s1 = ''
+              s = element.split('A')
+              if (s[0] == 'LI') {
+                s1 = '电网侧-电流'
+              } else {
+                s1 = s[0] + '侧' + s[1]
+              }
 
-          for (var i = 0; i < params.length; i++) {
-            if (params[i].seriesName != "暂降触发点") {
+              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]
+              }
 
-              tips +=
-                params[i].seriesName + ":" + (params[i].value[1]-0).toFixed(2) + "<br/>";
+              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
             }
           }
-          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.35)",
-        borderWidth: 0,
-      },
-      title: {
-        left: "center",
-        text:  "电网侧-电压    "+title,
-        subtitle: {
-          text: "电压",
-          align: "left",
-        },
-        textStyle: {
-          fontSize: "0.8rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-        },
-      },
-      legend: {
-        left: "70px",
-        top: "20",
-        verticalAlign: "top",
-        enabled: true,
-        itemDistance: 5,
-        textStyle: {
-          fontSize: "0.7rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          rich: {
-            a: {
-              verticalAlign: "middle",
-            },
-          },
-
-          padding: [0, 0, 0, 0], //[上、右、下、左]
-        },
-      },
-      // toolbox: {
-      //   show: step != 1 ? true : false,
-      //   feature: {
-      //     //restore: {},
-      //     saveAsImage: {
-      //       iconStyle: {
-      //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
-      //       },
-      //     },
-      //   },
-      // },
-      xAxis: {
-        type: "value",
-        name: "时间\n(ms)",
-        min: _this.wp.listRmsData[0][0],
-        max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
-        boundaryGap: false,
-        title: {
-          text: "ms",
-          textStyle: {
-            fontSize: "0.6rem",
-            color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          },
-          enabled: true,
-          align: "high",
-        },
-        nameTextStyle: {
-          fontSize: "0.6rem",
-        },
-        labels: {
-          formatter: function () {
-            return this.value;
-          },
-        },
-        splitLine: {
-          show: false,
-        },
-        axisTick: {
-          alignWithLabel: true,
-        },
-        axisLine: {
-          lineStyle: {
-            color: _this.DColor ? "#fff" : echartsColor.thread,
-          },
-          onZero: false, //-----------重点
-        },
-        axisLabel: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          // interval: 50,
-          formatter: function (value, index) {
-            if (_this.valA != (value - 0).toFixed(0)) {
-              _this.valA = (value - 0).toFixed(0);
-              return (value - 0).toFixed(0);
-            }
-          },
-          //rotate:39
-        },
-        // data: this.syncExtremes,
-      },
-      yAxis: {
-        type: "value",
-        name: unit,
-        title: {
-          align: "high",
-          offset: 0,
-          text: unit,
-          rotation: 0,
-          y: -10,
-        },
-        max: rmscm[0][1] * 1.06,
-        min: rmscu[0][1] - rmscu[0][1] * 0.04,
-        boundaryGap: [0, "100%"],
-        showLastLabel: true,
-        // max: max.toFixed(2),
-        // min: min.toFixed(2),
-        opposite: false,
-        nameTextStyle: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-        },
-        //minInterval: 1,
-        type: "value",
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: _this.DColor ? "#fff" : echartsColor.thread,
-          },
-          onZero: false, //-----------重点
-        },
-        axisLabel: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          formatter: function (value, index) {
-            return (value - 0).toFixed(2);
-          },
-        },
-        splitLine: {
-          lineStyle: {
-            // 使用深浅的间隔色
-            color: [_this.DColor ? "#fff" : echartsColor.thread],
-            type: "dashed",
-            opacity: 0.5,
-          },
-        },
-      },
-      grid: {
-        left: "1%",
-        right: "45px",
-        bottom: "40px",
-        top: "15%",
-        containLabel: true,
-      },
-      dataZoom: [
-        {
-          type: "inside",
-          height: 13,
-          start: 0,
-          bottom: "20px",
-          end: 100,
-        },
-        {
-          start: 0,
-          height: 13,
-          bottom: "20px",
-          end: 100,
-        },
-      ],
-      series: [
-        {
-          name: a,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#FFCC00",
-          },
-          data: radata,
-        },
-        {
-          name: b,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#009900",
-          },
-          data: rbdata,
-        },
-        {
-          name: c,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#CC0000",
-          },
-          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],
+        });
+      }
+      let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
+      var option = {
+        tooltip: {
+          trigger: "axis",
+          borderColor: "grey",
+          backgroundColor: "#fff",
+          style: {
             color: "#000",
-            fontSize: "14px",
-            fontWeight: "bold",
-            borderType: "solid",
-            borderWidth: 0.5,
-            backgroundColor: "#ffff",
-            borderColor: "#0099FF",
+            fontSize: "15px",
+            padding: 10,
           },
-          data: [this.fz],
-        },
-      ],
-    };
-    myChartes.setOption(option)
-// window.echartsArr.push(myChartes);
-    setTimeout(() => {
-      myChartes.resize();
-      this.loading = false;
-    }, 500);
-    //第一个波形图数据绘制完毕后，绘制后续的波形图
-    if (waveDatas !== null && waveDatas.length > 1) {
-      var waveDatasTemp = waveDatas.slice(1);
-      waveDatasTemp.reverse();
-      for (var step = 0; step < waveDatasTemp.length; step++) {
-        var waveDataTemp = waveDatasTemp[step];
+          formatter: function (params) {
+            // console.log(params)
+            var tips = "";
+            tips += "时刻:" + params[0].data[0] + "</br/>";
 
-        this.drawPics(waveDataTemp, picHeight, step, show, myChartes,rmscm,rmscu,title);
-      }
-    }
-  },
-  //绘制剩余横向的波形图
-  drawPics(waveDataTemp, picHeight, step, show, myChartes1,rmscm,rmscu,title) {
-    step = step + 1;
-    //新建瞬时DIV和RMS波形DIV
-    // var waveId = 'wave' + step;
-    var rmsId = "rms" + step;
-    // var v = $("#interval").val();
-    var a = "",
-      b = "",
-      c = "";
-    var max, min, unit;
-    var adata = [],
-      bdata = [],
-      cdata = [];
-    var radata = [],
-      rbdata = [],
-      rcdata = [];
-    var colors = [];
-    switch (this.iphasic) {
-      case 1:
-        a = waveDataTemp.title.aTitle;
-        colors.push("yellow");
-        colors.push("#fff");
-        colors.push("#fff");
-        break;
-      case 2:
-        a = waveDataTemp.title.aTitle;
-        b = waveDataTemp.title.bTitle;
-        colors.push("yellow");
-        colors.push("green");
-        colors.push("#fff");
-        break;
-      case 3:
-        a = waveDataTemp.title.aTitle;
-        b = waveDataTemp.title.bTitle;
-        c = waveDataTemp.title.cTitle;
-        colors.push("yellow");
-        colors.push("green");
-        colors.push("red");
-        break;
-    }
-
-    if (this.value === 1) {
-      max = waveDataTemp.instantF.max;
-      min = waveDataTemp.instantF.min;
-      adata = waveDataTemp.shunshiF.shunshiFA;
-      bdata = waveDataTemp.shunshiF.shunshiFB;
-      cdata = waveDataTemp.shunshiF.shunshiFC;
-      radata = waveDataTemp.RMSFWave.rmsFA;
-      rbdata = waveDataTemp.RMSFWave.rmsFB;
-      rcdata = waveDataTemp.RMSFWave.rmsFC;
-    } else {
-      max = waveDataTemp.instantS.max;
-      min = waveDataTemp.instantS.min;
-      adata = waveDataTemp.shunshiS.shunshiSA;
-      bdata = waveDataTemp.shunshiS.shunshiSB;
-      cdata = waveDataTemp.shunshiS.shunshiSC;
-      radata = waveDataTemp.RMSSWave.rmsSA;
-      rbdata = waveDataTemp.RMSSWave.rmsSB;
-      rcdata = waveDataTemp.RMSSWave.rmsSC;
-    }
-    if (waveDataTemp.unit === "电压") {
-      if (this.value === 1) {
-        unit = "kV";
-      } else {
-        unit = "V";
-      }
-    } else {
-      unit = "A";
-    }
-    //绘制rms波形
-    let _this = this;
-
-    var myChartes = echarts.init(document.getElementById(rmsId));
-    //debugger
-    if(this.boxoList.systemType == "ZL"){
-    let str =[]
-    str = rmsId.split('s')
-    let str1 = Number(str[1])
-    var titlename =''
-    this.wp.channelNames.forEach((element,i) => {
-      if(i==4 || i==7 ||  i==10){
-         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"]}
-    var option = {
-      tooltip: {
-        trigger: "axis",
-        borderColor: "grey",
-        backgroundColor: "#fff",
-        style: {
-          color: "#000",
-          fontSize: "15px",
-          padding: 10,
-        },
-        formatter: function (params) {
-          // console.log(params)
-          var tips = "";
-          tips += "时刻:" + params[0].data[0] + "</br/>";
-
-          for (var i = 0; i < params.length; i++) {
-            if (params[i].seriesName != "暂降触发点") {
-              tips +=
-                params[i].seriesName + ":" + (params[i].value[1]-0).toFixed(2) + "<br/>";
+            for (var i = 0; i < params.length; i++) {
+              if (params[i].seriesName != "暂降触发点") {
+                tips +=
+                  params[i].seriesName + ":" + (params[i].value[1] - 0).toFixed(2) + "<br/>";
+              }
             }
-          }
-          return tips;
+            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.35)",
+          borderWidth: 0,
         },
-        // axisPointer: {
-        //   type: "cross",
-        //   label: {
-        //     color: "#fff",
-        //      fontSize: '0.8rem',
+        title: {
+          left: "center",
+          text: titlename,
+          textStyle: {
+            fontSize: "0.8rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+          },
+        },
+        legend: {
+          left: "70px",
+          top: "20",
+          verticalAlign: "top",
+          enabled: true,
+          itemDistance: 5,
+          textStyle: {
+            fontSize: "0.7rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            rich: {
+              a: {
+                verticalAlign: "middle",
+              },
+            },
+
+            padding: [0, 0, 0, 0], //[上、右、下、左]
+          },
+        },
+        // toolbox: {
+        //   show: step != 1 ? true : false,
+        //   feature: {
+        //     //restore: {},
+        //     saveAsImage: {
+        //       iconStyle: {
+        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
+        //       },
+        //     },
         //   },
         // },
-        textStyle: {
-          color: "#fff",
-          fontStyle: "normal",
-          opacity: 0.35,
-          fontSize: 14,
-        },
-        backgroundColor: "rgba(0,0,0,0.35)",
-        borderWidth: 0,
-      },
-      title: {
-        left: "center",
-        text: titlename,
-        textStyle: {
-          fontSize: "0.8rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-        },
-      },
-      legend: {
-        left: "70px",
-        top: "20",
-        verticalAlign: "top",
-        enabled: true,
-        itemDistance: 5,
-        textStyle: {
-          fontSize: "0.7rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          rich: {
-            a: {
-              verticalAlign: "middle",
+        xAxis: {
+          type: "value",
+          name: "时间\n(ms)",
+          min: _this.wp.listRmsData[0][0],
+          max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
+          boundaryGap: false,
+          title: {
+            text: "ms",
+            textStyle: {
+              fontSize: "0.6rem",
+              color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            },
+            enabled: true,
+            align: "high",
+          },
+          labels: {
+            formatter: function () {
+              return this.value;
             },
           },
-
-          padding: [0, 0, 0, 0], //[上、右、下、左]
+          nameTextStyle: {
+            fontSize: "0.6rem",
+          },
+          splitLine: {
+            show: false,
+          },
+          axisTick: {
+            alignWithLabel: true,
+          },
+          axisLine: {
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            // interval: 50,
+            formatter: function (value, index) {
+              if (_this.valB != (value - 0).toFixed(0)) {
+                _this.valB = (value - 0).toFixed(0);
+                return (value - 0).toFixed(0);
+              }
+            },
+            //rotate:39
+          },
+          // data: this.syncExtremes,
         },
-      },
-      // 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: {
+        yAxis: {
+          type: "value",
+          name: unit,
+          title: {
+            align: "high",
+            offset: 0,
+            text: unit,
+            rotation: 0,
+            y: -10,
+          },
+          // max: rmscm[0][1] * 1.01,
+          // min: rmscu[0][1] - rmscu[0][1] * 0.01,
+          boundaryGap: [0, "100%"],
+          showLastLabel: true,
+          // max: max.toFixed(2),
+          // min: min.toFixed(2),
+          opposite: false,
+          // axisLabel: {
+          //   formatter: "{value}",
+          // },
+          nameTextStyle: {
             fontSize: "0.6rem",
             color: _this.DColor ? "#fff" : echartsColor.WordColor,
           },
-          enabled: true,
-          align: "high",
-        },
-        labels: {
-          formatter: function () {
-            return this.value;
+          //minInterval: 1,
+          type: "value",
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            formatter: function (value, index) {
+              return (value - 0).toFixed(2);
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              // 使用深浅的间隔色
+              color: [_this.DColor ? "#fff" : echartsColor.thread],
+              type: "dashed",
+              opacity: 0.5,
+            },
           },
         },
-        nameTextStyle: {
-          fontSize: "0.6rem",
+        grid: {
+          left: "1%",
+          right: "45px",
+          bottom: "40px",
+          top: "15%",
+          containLabel: true,
         },
-        splitLine: {
-          show: false,
-        },
-        axisTick: {
-          alignWithLabel: true,
-        },
-        axisLine: {
-          lineStyle: {
-            color: _this.DColor ? "#fff" : echartsColor.thread,
+        dataZoom: [
+          {
+            type: "inside",
+            height: 13,
+            start: 0,
+            bottom: "20px",
+            end: 100,
           },
-          onZero: false, //-----------重点
-        },
-        axisLabel: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          // interval: 50,
-          formatter: function (value, index) {
-            if (_this.valB != (value - 0).toFixed(0)) {
-              _this.valB = (value - 0).toFixed(0);
-              return (value - 0).toFixed(0);
-            }
+          {
+            start: 0,
+            height: 13,
+            bottom: "20px",
+            end: 100,
           },
-          //rotate:39
-        },
-        // data: this.syncExtremes,
-      },
-      yAxis: {
-        type: "value",
-        name: unit,
-        title: {
-          align: "high",
-          offset: 0,
-          text: unit,
-          rotation: 0,
-          y: -10,
-        },
-        // max: rmscm[0][1] * 1.01,
-        // min: rmscu[0][1] - rmscu[0][1] * 0.01,
-        boundaryGap: [0, "100%"],
-        showLastLabel: true,
-        // max: max.toFixed(2),
-        // min: min.toFixed(2),
-        opposite: false,
-        // axisLabel: {
-        //   formatter: "{value}",
-        // },
-        nameTextStyle: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-        },
-        //minInterval: 1,
-        type: "value",
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: _this.DColor ? "#fff" : echartsColor.thread,
+        ],
+        series: [
+          {
+            name: a,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#FFCC00",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: radata,
           },
-          onZero: false, //-----------重点
-        },
-        axisLabel: {
-          fontSize: "0.6rem",
-          color: _this.DColor ? "#fff" : echartsColor.WordColor,
-          formatter: function (value, index) {
-            return (value - 0).toFixed(2);
+          {
+            name: b,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#009900",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: rbdata,
           },
-        },
-        splitLine: {
-          lineStyle: {
-            // 使用深浅的间隔色
-            color: [_this.DColor ? "#fff" : echartsColor.thread],
-            type: "dashed",
-            opacity: 0.5,
+          {
+            name: c,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "average",
+            itemStyle: {
+              color: "#CC0000",
+            },
+            progressive: 500,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 1000,
+                        large: true,
+            data: rcdata,
           },
-        },
-      },
-      grid: {
-        left: "1%",
-        right: "45px",
-        bottom: "40px",
-        top: "15%",
-        containLabel: true,
-      },
-      dataZoom: [
-        {
-          type: "inside",
-          height: 13,
-          start: 0,
-          bottom: "20px",
-          end: 100,
-        },
-        {
-          start: 0,
-          height: 13,
-          bottom: "20px",
-          end: 100,
-        },
-      ],
-      series: [
-        {
-          name: a,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#FFCC00",
-          },
-          data: radata,
-        },
-        {
-          name: b,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#009900",
-          },
-          data: rbdata,
-        },
-        {
-          name: c,
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          sampling: "lttb",
-          itemStyle: {
-            color: "#CC0000",
-          },
-          data: rcdata,
-        },
-      ],
-    };
-    myChartes.setOption(option)
-// window.echartsArr.push(myChartes);
-    setTimeout(() => {
-      myChartes.resize();
-      this.loading = false;
-    }, 500);
-    echarts.connect([myChartes1, myChartes]);
+        ],
+      };
+      myChartes.setOption(option)
+      // window.echartsArr.push(myChartes);
+      setTimeout(() => {
+        myChartes.resize();
+        this.loading = false;
+      }, 500);
+      echarts.connect([myChartes1, myChartes]);
+    },
+    //根据多个值的比较返回其中最大值
+    getMax(temp, tempA, tempB, tempC) {
+      temp = temp > tempA ? temp : tempA;
+      temp = temp > tempB ? temp : tempB;
+      temp = temp > tempC ? temp : tempC;
+      return temp;
+    },
+    //根据多个值的比较返回其中最大值
+    getMaxTwo(temp, tempA, tempB) {
+      temp = temp > tempA ? temp : tempA;
+      temp = temp > tempB ? temp : tempB;
+      return temp;
+    },
+    //根据多个值的比较返回其中最小值
+    getMin(temp, tempA, tempB, tempC) {
+      temp = temp < tempA ? temp : tempA;
+      temp = temp < tempB ? temp : tempB;
+      temp = temp < tempC ? temp : tempC;
+      return temp;
+    },
+    getMinOpen(temp, tempA, tempB) {
+      temp = temp < tempA ? temp : tempA;
+      temp = temp < tempB ? temp : tempB;
+      return temp;
+    },
   },
-  //根据多个值的比较返回其中最大值
-  getMax(temp, tempA, tempB, tempC) {
-    temp = temp > tempA ? temp : tempA;
-    temp = temp > tempB ? temp : tempB;
-    temp = temp > tempC ? temp : tempC;
-    return temp;
-  },
-  //根据多个值的比较返回其中最大值
-  getMaxTwo(temp, tempA, tempB) {
-    temp = temp > tempA ? temp : tempA;
-    temp = temp > tempB ? temp : tempB;
-    return temp;
-  },
-  //根据多个值的比较返回其中最小值
-  getMin(temp, tempA, tempB, tempC) {
-    temp = temp < tempA ? temp : tempA;
-    temp = temp < tempB ? temp : tempB;
-    temp = temp < tempC ? temp : tempC;
-    return temp;
-  },
-  getMinOpen(temp, tempA, tempB) {
-    temp = temp < tempA ? temp : tempA;
-    temp = temp < tempB ? temp : tempB;
-    return temp;
-  },
-},
 };
 </script>
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index 9b4645b..e211319 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -73,9 +73,9 @@ export default {
     created() {
 
         if (this.flag == 1) {
-            this.vh = mainHeight(165).height
+            this.vh = mainHeight(200).height
         } else {
-            this.vh = mainHeight(165, 2).height
+            this.vh = mainHeight(200, 2).height
         }
         this.vw = '100%'
     },
@@ -156,7 +156,7 @@ export default {
                         // "变电站名称：" +
                         // this.boxoList.equipmentName +
                         ' 监测点名称：' +
-                        this.boxoList.equipmentName +
+                        this.boxoList.lineName +
                         ' 发生时刻：' +
                         this.boxoList.startTime +
                         ' 暂降(骤升)幅值：' +
@@ -166,17 +166,16 @@ export default {
                         's'
                 }
                 else if (this.boxoList.systemType == 'WX') {
-                    console.log("🚀 ~ initWaves ~ this.boxoList:", this.boxoList)
                     this.titles =
-                        
+
                         ' 监测点名称：' +
-                            this.boxoList.lineId +
-                            ' 发生时刻：' +
-                            this.boxoList.startTime +
-                            ' 暂降(骤升)幅值：' +
-                            this.boxoList.featureAmplitude==null ? '/' : this.boxoList.featureAmplitude.toFixed(2) +
-                                ' 持续时间：' +
-                                this.boxoList.persistTime==null ? '/' : this.boxoList.persistTime +
+                        this.boxoList.lineName +
+                        ' 发生时刻：' +
+                        this.boxoList.startTime +
+                        ' 暂降(骤升)幅值：' +
+                        (this.boxoList.featureAmplitude ? this.boxoList.featureAmplitude.toFixed(2) : '-') +
+                        '%  持续时间：' +
+                        (this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') +
                         's'
                 } else {
                     this.titles =
@@ -547,6 +546,7 @@ export default {
                 wave.style.height = _this.vh;
             }, 0);
             var option = {
+                animation: false,
                 tooltip: {
                     top: '10px',
                     trigger: 'axis',
@@ -557,6 +557,7 @@ export default {
                         fontSize: '15px',
                         padding: 10
                     },
+                    enterable: true,
                     formatter: function (params) {
                         // console.log(params)
                         var tips = ''
@@ -569,13 +570,7 @@ export default {
                         }
                         return tips
                     },
-                    // axisPointer: {
-                    //   type: "cross",
-                    //   label: {
-                    //     color: "#fff",
-                    //     fontSize: 16,
-                    //   },
-                    // },
+
                     textStyle: {
                         color: '#fff',
                         fontStyle: 'normal',
@@ -583,11 +578,12 @@ export default {
                         fontSize: 14
                     },
                     backgroundColor: 'rgba(0,0,0,0.35)',
-                    borderWidth: 0
+                    borderWidth: 0,
+
                 },
                 title: {
                     left: 'center',
-                    text: '电网侧-电压    ' + title,
+                    text: title,
                     textStyle: {
                         fontSize: '0.8rem',
                         color: _this.DColor ? '#fff' : echartsColor.WordColor
@@ -738,10 +734,15 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#FFCC00'
                         },
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
+                        
+                        large: true,
                         data: adata
                     },
                     {
@@ -749,10 +750,15 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#009900'
                         },
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
+                        
+                        large: true,
                         data: bdata
                     },
                     {
@@ -760,10 +766,15 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#CC0000'
                         },
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
+                        
+                        large: true,
                         data: cdata
                     },
                     {
@@ -774,6 +785,7 @@ export default {
                             width: 18,
                             height: 18
                         },
+                        
                         data: cu
                     }
                 ]
@@ -906,6 +918,7 @@ export default {
             var myChartes = echarts.init(waveIds)
             let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
             var option = {
+                animation: false,
                 tooltip: {
                     trigger: 'axis',
                     borderColor: 'grey',
@@ -921,13 +934,7 @@ export default {
                         }
                         return tips
                     },
-                    // axisPointer: {
-                    //   type: "cross",
-                    //   label: {
-                    //     color: "#fff",
-                    //     fontSize: 16,
-                    //   },
-                    // },
+
                     textStyle: {
                         color: '#fff',
                         fontStyle: 'normal',
@@ -1092,10 +1099,14 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#FFCC00'
                         },
+                        large: true,
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
                         data: adata
                     },
                     {
@@ -1103,10 +1114,14 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#009900'
                         },
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
+                        large: true,
                         data: bdata
                     },
                     {
@@ -1114,10 +1129,14 @@ export default {
                         type: 'line',
                         smooth: true,
                         symbol: 'none',
-                        sampling: 'lttb',
+                        sampling: 'average',
                         itemStyle: {
                             color: '#CC0000'
                         },
+                        progressive:1000,
+                        // 渲染阈值，大于此值则启动渐进渲染
+                        progressiveThreshold: 2000,
+                        large: true,
                         data: cdata
                     }
                 ]
diff --git a/src/layouts/admin/components/popup/password.vue b/src/layouts/admin/components/popup/password.vue
index 0d89310..ac4022c 100644
--- a/src/layouts/admin/components/popup/password.vue
+++ b/src/layouts/admin/components/popup/password.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable width="500px" v-model="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
                 <el-form-item label="校验密码:" prop="password">
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 2fb510d..1b0ebdc 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -68,7 +68,7 @@ const view = ref(true)
 const view2 = ref(false)
 const showBoxi = ref(true)
 const bxactiveName = ref('ssbx')
-const boxoList = ref({})
+const boxoList: any = ref({})
 const wp = ref({})
 const value = ref(1)
 const options = ref([
@@ -108,7 +108,7 @@ const tableStore = new TableStore({
         { title: '事件发生位置', field: 'evtParamPosition', align: 'center' },
         { title: '相别', field: 'evtParamPhase', align: 'center' },
         { title: '持续时间(s)', field: 'evtParamTm', align: 'center' },
-        { title: '暂降深度', field: 'evtParamVVaDepth', align: 'center' },
+        { title: '暂降深度(%)', field: 'evtParamVVaDepth', align: 'center' },
         { title: '发生时刻', field: 'startTime', align: 'center' },
         {
             title: '操作',
@@ -128,6 +128,9 @@ const tableStore = new TableStore({
                     click: async row => {
                         row.loading = true
                         boxoList.value = row
+                        boxoList.value.systemType = 'WX'
+                        boxoList.value.featureAmplitude = row.evtParamVVaDepth != '-' ? (row.evtParamVVaDepth - 0) : null
+                        boxoList.value.persistTime = row.evtParamTm != '-' ? (row.evtParamTm - 0) : null
                         await analyseWave(row.id)
                             .then(res => {
                                 row.loading = false
@@ -163,7 +166,9 @@ const tableStore = new TableStore({
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
             item.loading = false
-            item.evtParamTm = item.evtParamTm.split('s')[0]
+            item.evtParamTm = item.evtParamTm.split('s')[0] != '-' ? (item.evtParamTm.split('s')[0] - 0).toFixed(2) : '-'
+            item.evtParamVVaDepth = item.evtParamVVaDepth.split('%')[0] != "-" ? (item.evtParamVVaDepth.split('%')[0] - 0).toFixed(2) : '-'
+
         })
     }
 })
@@ -193,14 +198,14 @@ deviceTreeOptions.value.map((item: any, index: any) => {
 })
 const sourceChange = (e: any) => {
     tableStore.table.params.deviceTypeId = ''
-        tableStore.table.params.engineeringid = ''
-        tableStore.table.params.projectId = ''
-        tableStore.table.params.deviceId = ''
+    tableStore.table.params.engineeringid = ''
+    tableStore.table.params.projectId = ''
+    tableStore.table.params.deviceId = ''
     if (e) {
         let name = deviceTreeOptions.value.filter((item: any) => {
             return item.id == e[0]
         })[0].name
-      tableStore.table.params.deviceTypeName = name
+        tableStore.table.params.deviceTypeName = name
         if (name == '便携式设备') {
             tableStore.table.params.deviceTypeId = e[0] || ''
             tableStore.table.params.deviceId = e[1] || ''
@@ -267,7 +272,7 @@ const backbxlb = () => {
 onMounted(() => {
     tableStore.index()
 })
-const bxecharts = mainHeight(155).height as any
+const bxecharts = mainHeight(175).height as any
 setTimeout(() => {
     tableStore.table.height = mainHeight(200).height as any
 }, 0)
diff --git a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
index b0f89ba..7ad0bdb 100644
--- a/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
+++ b/src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
@@ -14,12 +14,12 @@
         </div>
         <el-tabs class="home_body" type="border-card" v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="瞬时波形" name="ssbx"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'">
+                :style="'height:' + bxecharts + ';overflow-y: scroll;'">
                 <shushiboxi v-if="isWp && wp && activeName == 'ssbx'" :value="value" :boxoList="boxoList" :wp="wp">
                 </shushiboxi>
             </el-tab-pane>
             <el-tab-pane label="RMS波形" name="rmsbx"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'">
+                :style="'height:' + bxecharts + ';overflow-y: scroll;'">
                 <rmsboxi v-if="isWp && wp && activeName == 'rmsbx'" :value="value" :boxoList="boxoList" :wp="wp">
                 </rmsboxi>
             </el-tab-pane>
@@ -104,7 +104,7 @@ const changeView = () => {
         showBoxi.value = true
     }, 0)
 }
-const bxecharts = mainHeight(195).height as any
+const bxecharts = mainHeight(345).height as any
 
 const handleClick = (tab: any, event: any) => {
     // activeName.value = tab.index
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index ce81f73..d8e7092 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -8,7 +8,7 @@
             @handleHideCharts="isWaveCharts = false"
             :wp="wp"
         />
-        <el-button v-if="isWaveCharts" type="primary" @click="handleBack" :icon="ArrowLeft">返回</el-button>
+        <!-- <el-button v-if="isWaveCharts" type="primary" @click="handleBack" :icon="ArrowLeft">返回</el-button> -->
     </div>
 </template>
 <script lang="ts" setup>
@@ -33,7 +33,7 @@ const waveFormAnalysisRef = ref()
 const headerRef = ref()
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csGroup/deviceDataByType',
-    publicHeight: 210,
+    publicHeight: 215,
     method: 'POST',
     column: [
         // { width: '60', type: 'checkbox', fixed: 'left' },
@@ -54,7 +54,7 @@ const tableStore: any = new TableStore({
             title: '持续时间(s)',
             minWidth: 100,
             formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
+                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
                 return row.cellValue
             }
         },
@@ -91,7 +91,7 @@ const tableStore: any = new TableStore({
                                 row.loading = false
                                 if (res != undefined) {
                                     boxoList.value = row
-                                    // boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'WX'
                                     wp.value = res.data
                                     view.value = false
                                     view2.value = true
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 457eed4..1ef55d0 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -108,14 +108,14 @@
                     <TableHeader :showSearch="false" ref="tableHeaderRef" :key="searchFormIndex"
                         @selectChange="selectChange">
                         <template v-slot:select>
-                            <el-form-item for="-" label="统计指标" label-width="80px">
+                            <el-form-item for="-" label="统计指标">
                                 <el-select collapse-tags collapse-tags-tooltip v-model="searchForm.index"
                                     placeholder="请选择统计指标" multiple :multiple-limit="3">
                                     <el-option v-for="item in indexOptions" :key="item.id" :label="item.name"
                                         :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item for="-" label="值类型" label-width="80px">
+                            <el-form-item for="-" label="值类型">
                                 <el-select style="width: 160px !important" v-model="searchForm.dataLevel">
                                     <el-option value="Primary" label="一次值"></el-option>
                                     <el-option value="Secondary" label="二次值"></el-option>
@@ -256,7 +256,7 @@ const nodeClick = async (e: anyObj) => {
 
     //查询测试项信息
     await getTestRecordInfo(id)
-        .then(res => {
+        .then(async (res) => {
             deviceData.value = res.data
             if (res.data.records.length == 1) {
                 activeName.value = res.data.records[0].id
@@ -269,8 +269,13 @@ const nodeClick = async (e: anyObj) => {
                     }
                 })
             }
+            searchForm.value.index = [indexOptions.value[0].id]
+
             schemeTreeRef.value.getPlanData(deviceData.value)
-            init(true)
+            await setTimeout(() => {
+                init(true)
+            }, 500);
+
             loading.value = false
         })
         .catch(e => {
@@ -429,7 +434,7 @@ const init = (flag: boolean) => {
                                     const xname = params[0].value[0];
                                     let str = `${xname}<br>`;
                                     params.forEach((el, index) => {
-                                        str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1]}${el.value[2]}<br>`;
+                                        str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1] ? (el.value[1] + ' ' + el.value[2]) : '-'}<br>`;
                                     });
                                     return str;
                                 },
@@ -494,7 +499,7 @@ const init = (flag: boolean) => {
 
                                         }
 
-                                        seriesList.push([cc.time, cc.statisticalData?.toFixed(2),cc.unit])
+                                        seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit])
                                     })
 
 
diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue
index abd527a..a6d7b08 100644
--- a/src/views/govern/manage/basic/dictionary.vue
+++ b/src/views/govern/manage/basic/dictionary.vue
@@ -3,45 +3,22 @@
         <TableHeader>
             <template #select>
                 <el-form-item label="数据分类">
-                    <el-select
-                        v-model="tableStore.table.params.dataType"
-                        multiple
-                        filterable
-                        collapse-tags
-                        clearable
-                        placeholder="请选择数据分类"
-                    >
-                        <el-option
-                            v-for="item in DataTypeSelect"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                    <el-select v-model="tableStore.table.params.dataType" multiple filterable collapse-tags clearable
+                        placeholder="请选择数据分类">
+                        <el-option v-for="item in DataTypeSelect" :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.classId"
-                        multiple
-                        filterable
-                        collapse-tags
-                        clearable
-                        placeholder="请选择数据存储"
-                    >
-                        <el-option
-                            v-for="item in DataSelect"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                    <el-select v-model="tableStore.table.params.classId" multiple filterable collapse-tags clearable
+                        placeholder="请选择数据存储">
+                        <el-option v-for="item in DataSelect" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="过滤筛选">
-                    <el-input
-                        v-model="tableStore.table.params.searchValue"
-                        placeholder="数据名称、别名、名称"
-                        clearable
-                    ></el-input>
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="数据名称、别名、名称"
+                        clearable></el-input>
                 </el-form-item>
             </template>
             <template #operation>
@@ -75,18 +52,18 @@ const tableStore = new TableStore({
     url: '/system-boot/csDictData/list',
     method: 'POST',
     column: [
-        { title: '序号', type: 'seq',width:60 },
-        { title: '数据分类', field: 'dataTypeName' , width: 170 },
-        { title: '数据名称', field: 'name' , width: 220 },
-        { title: '别名', field: 'otherName' , width: 220 },
-        { title: '展示名称', field: 'showName' , width: 170 },
-        { title: '相别', field: 'phaseName', width: 80 },
-        { title: '单位', field: 'unit', width: 80 },
-        { title: '基础数据类型', field: 'type', width: 170 },
-        { title: '数据谐波次数', field: 'harmStartEnd', width: 170  },
-        { title: '数据统计方法', field: 'statMethod', width: 170  },
-        { title: '数据存储', field: 'classIdName' , width: 120 },
-        { title: '数据来源', field: 'resourcesIdName' , width: 120 },
+        { title: '序号', type: 'seq', width: 60 },
+        { title: '数据分类', field: 'dataTypeName', minWidth: 170 },
+        { title: '数据名称', field: 'name', minWidth: 220 },
+        { title: '别名', field: 'otherName', minWidth: 220 },
+        { title: '展示名称', field: 'showName', minWidth: 170 },
+        { title: '相别', field: 'phaseName', minWidth: 80 },
+        { title: '单位', field: 'unit', minWidth: 80 },
+        { title: '基础数据类型', field: 'type', minWidth: 170 },
+        { title: '数据谐波次数', field: 'harmStartEnd', minWidth: 170 },
+        { title: '数据统计方法', field: 'statMethod', minWidth: 170 },
+        { title: '数据存储', field: 'classIdName', minWidth: 120 },
+        { title: '数据来源', field: 'resourcesIdName', minWidth: 120 },
         {
             title: '操作',
             align: 'center',
@@ -142,8 +119,8 @@ const tableStore = new TableStore({
 })
 
 tableStore.table.params.searchValue = ''
-tableStore.table.params.dataType = ''
-tableStore.table.params.classId = ''
+tableStore.table.params.dataType = []
+tableStore.table.params.classId = []
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue
index 1035a75..a358649 100644
--- a/src/views/govern/manage/basic/version.vue
+++ b/src/views/govern/manage/basic/version.vue
@@ -127,7 +127,7 @@ const tableStore = new TableStore({
     ],
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
-            item.statusName = item.status === 1 ? '启用' : '禁用'
+            item.statusName = item.status === 1 ? '禁用' : '启用'
             for (let key in item) {
                 if (typeof item[key] !== 'number') {
                     item[key] = item[key] || '/'