diff --git a/package.json b/package.json
index a40a24b..d542df9 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "echarts4": "npm:echarts@^4.9.0",
     "element-plus": "^2.4.4",
     "html2canvas": "^1.4.1",
+    "jquery": "^3.7.1",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
diff --git a/src/api/common.ts b/src/api/common.ts
index d732440..df0d490 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -23,3 +23,10 @@ export function getDeviceTree() {
         method: 'POST'
     })
 }
+// 获取波形数据
+export function analyseWave(params:string) {
+    return createAxios({
+        url: '/cs-harmonic-boot/event/analyseWave?eventId=' + params,
+        method: 'get'
+    })
+}
diff --git a/src/assets/img/dw.png b/src/assets/img/dw.png
new file mode 100644
index 0000000..1e82f6b
Binary files /dev/null and b/src/assets/img/dw.png differ
diff --git a/src/assets/img/point.png b/src/assets/img/point.png
new file mode 100644
index 0000000..34a4d17
Binary files /dev/null and b/src/assets/img/point.png differ
diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
new file mode 100644
index 0000000..29301e7
--- /dev/null
+++ b/src/components/echarts/rmsboxi.vue
@@ -0,0 +1,1544 @@
+<template>
+    <div v-loading="loading" style="position: relative">
+        <div id="boxr">
+            <div id="rmsp" :style="`height:${vh};overflow: hidden;`">
+                <div class="bx" id="rms"></div>
+            </div>
+        </div>
+        <el-button
+            style="position: absolute; right: 10px; top: 0px; z-index: 20000"
+            type="primary"
+            link
+            icon="el-icon-download"
+            title="生成图片"
+            @click="download"
+        >
+            下载
+        </el-button>
+    </div>
+</template>
+<script lang="js">
+import html2canvas from "html2canvas";
+import $ from "jquery";
+import * as echarts from 'echarts'
+import { mainHeight } from '@/utils/layout'
+// url: '@/assets/img/point.png',
+//       url2: ("@/assets/dw.png"),
+import url from '@/assets/img/point.png';
+import url2 from '@/assets/img/dw.png';
+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],
+    },
+  },
+  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(175).height
+        }  else {
+            this.vh =  mainHeight(175,2).height
+        }
+        this.vw = '100%'
+  },
+  mounted() {
+    // this.$wave = $("#wave").eq(0);
+    this.zoom = 1 / document.body.style.zoom;
+    window.addEventListener("resize", () => {
+      this.zoom = 1 / document.body.style.zoom;
+    });
+    // this.$rms = $("#rms").eq(0);
+    this.query();
+  },
+  methods: {
+    download() {
+      // 转换成canvas
+      html2canvas(document.getElementById("boxr"), {
+        scale: 2,
+      }).then(function (canvas) {
+        // 创建a标签，实现下载
+        var creatIMg = document.createElement("a");
+        creatIMg.download = "rms波形.png"; // 设置下载的文件名，
+        creatIMg.href = canvas.toDataURL(); // 下载url
+        creatIMg.click();
+        creatIMg.remove(); // 下载之后把创建的元素删除
+      });
+    },
+    query() {
+      this.loading = true;
+      //                   let from={
+      //         lineId:this.boxoList.lineId,
+      //         timeId:this.boxoList.timeId,
+      //     }
+      //    getMonitorEventAnalyseWave(from).then(res=>{
+      //     this.wp=res.data
+      this.initWaves();
+      //    })
+    },
+    //波形总体数据构造函数
+    waveData(
+      instantF,
+      instantS,
+      RMSF,
+      RMSS,
+      RMSFMinDetail,
+      RMSSMinDetail,
+      shunshiF,
+      shunshiS,
+      RMSFWave,
+      RMSSWave,
+      title,
+      unit
+    ) {
+      /*瞬时一次值最大最小值*/
+      this.instantF = instantF;
+      /*瞬时二次值最大最小值*/
+      this.instantS = instantS;
+      /*RMS一次值最大最小值*/
+      this.RMSF = RMSF;
+      /*RMS二次值最大最小值*/
+      this.RMSS = RMSS;
+      /*RMS一次值最小值具体的X Y周的位置，已经具体的相别*/
+      this.RMSFMinDetail = RMSFMinDetail;
+      /*RMS二次值最小值具体的X Y周的位置，已经具体的相别*/
+      this.RMSSMinDetail = RMSSMinDetail;
+      /*瞬时值一次值3相详细数据*/
+      this.shunshiF = shunshiF;
+      /*瞬时值二次值3相详细数据*/
+      this.shunshiS = shunshiS;
+      /*RMS一次值3相详细数据*/
+      this.RMSFWave = RMSFWave;
+      /*RMS二次值3相详细数据*/
+      this.RMSSWave = RMSSWave;
+      /*三相名称*/
+      this.title = title;
+      /*电压还是电流*/
+      this.unit = unit;
+    },
+    //根据后台查询的数据，清洗数据
+    initWaves() {
+      if (null != this.wp) {
+        if (this.boxoList.systemType == "pms") {
+          this.titles =
+            "变电站名称：" +
+            this.boxoList.powerStationName +
+            " 监测点名称：" +
+            this.boxoList.measurementPointName +
+            " 发生时刻：" +
+            this.boxoList.startTime +
+            " 暂降(骤升)幅值：" +
+            (this.boxoList.featureAmplitude * 100).toFixed(0) +
+            "% 持续时间：" +
+            this.boxoList.duration +
+            "s";
+        } else if(this.boxoList.systemType == "ZL"){
+          this.titles =
+            // "变电站名称：" +
+            // this.boxoList.equipmentName +
+            " 监测点名称：" +
+            this.boxoList.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(
+        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}'  style="zoom:${
+              this.zoom
+            };transform:scale(${
+              1 / this.zoom
+            });transform-origin:0 0;"></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.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            rich: {
+              a: {
+                verticalAlign: "middle",
+              },
+            },
+
+            padding: [0, 0, 0, 0], //[上、右、下、左]
+          },
+        },
+        // toolbox: {
+        //   show: step != 1 ? true : false,
+        //   feature: {
+        //     //restore: {},
+        //     saveAsImage: {
+        //       iconStyle: {
+        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
+        //       },
+        //     },
+        //   },
+        // },
+        xAxis: {
+          type: "value",
+          name: "时间\n(ms)",
+          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: "2.8%",
+          bottom: "40px",
+          top: "15%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            height: 13,
+            start: 0,
+            bottom: "20px",
+            end: 100,
+          },
+          {
+            start: 0,
+            height: 13,
+            bottom: "20px",
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: a,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "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],
+              color: "#000",
+              fontSize: "14px",
+              fontWeight: "bold",
+              borderType: "solid",
+              borderWidth: 0.5,
+              backgroundColor: "#ffff",
+              borderColor: "#0099FF",
+            },
+            data: [this.fz],
+          },
+        ],
+      };
+      myChartes.setOption(option)
+// window.echartsArr.push(myChartes);
+      setTimeout(() => {
+        myChartes.resize();
+        this.loading = false;
+      }, 500);
+      //第一个波形图数据绘制完毕后，绘制后续的波形图
+      if (waveDatas !== null && waveDatas.length > 1) {
+        var waveDatasTemp = waveDatas.slice(1);
+        waveDatasTemp.reverse();
+        for (var step = 0; step < waveDatasTemp.length; step++) {
+          var waveDataTemp = waveDatasTemp[step];
+
+          this.drawPics(waveDataTemp, picHeight, step, show, myChartes,rmscm,rmscu,title);
+        }
+      }
+    },
+    //绘制剩余横向的波形图
+    drawPics(waveDataTemp, picHeight, step, show, myChartes1,rmscm,rmscu,title) {
+      step = step + 1;
+      //新建瞬时DIV和RMS波形DIV
+      // var waveId = 'wave' + step;
+      var rmsId = "rms" + step;
+      // var v = $("#interval").val();
+      var a = "",
+        b = "",
+        c = "";
+      var max, min, unit;
+      var adata = [],
+        bdata = [],
+        cdata = [];
+      var radata = [],
+        rbdata = [],
+        rcdata = [];
+      var colors = [];
+      switch (this.iphasic) {
+        case 1:
+          a = waveDataTemp.title.aTitle;
+          colors.push("yellow");
+          colors.push("#fff");
+          colors.push("#fff");
+          break;
+        case 2:
+          a = waveDataTemp.title.aTitle;
+          b = waveDataTemp.title.bTitle;
+          colors.push("yellow");
+          colors.push("green");
+          colors.push("#fff");
+          break;
+        case 3:
+          a = waveDataTemp.title.aTitle;
+          b = waveDataTemp.title.bTitle;
+          c = waveDataTemp.title.cTitle;
+          colors.push("yellow");
+          colors.push("green");
+          colors.push("red");
+          break;
+      }
+
+      if (this.value === 1) {
+        max = waveDataTemp.instantF.max;
+        min = waveDataTemp.instantF.min;
+        adata = waveDataTemp.shunshiF.shunshiFA;
+        bdata = waveDataTemp.shunshiF.shunshiFB;
+        cdata = waveDataTemp.shunshiF.shunshiFC;
+        radata = waveDataTemp.RMSFWave.rmsFA;
+        rbdata = waveDataTemp.RMSFWave.rmsFB;
+        rcdata = waveDataTemp.RMSFWave.rmsFC;
+      } else {
+        max = waveDataTemp.instantS.max;
+        min = waveDataTemp.instantS.min;
+        adata = waveDataTemp.shunshiS.shunshiSA;
+        bdata = waveDataTemp.shunshiS.shunshiSB;
+        cdata = waveDataTemp.shunshiS.shunshiSC;
+        radata = waveDataTemp.RMSSWave.rmsSA;
+        rbdata = waveDataTemp.RMSSWave.rmsSB;
+        rcdata = waveDataTemp.RMSSWave.rmsSC;
+      }
+      if (waveDataTemp.unit === "电压") {
+        if (this.value === 1) {
+          unit = "kV";
+        } else {
+          unit = "V";
+        }
+      } else {
+        unit = "A";
+      }
+      //绘制rms波形
+      let _this = this;
+
+      var myChartes = echarts.init(document.getElementById(rmsId));
+      //debugger
+      if(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/>";
+              }
+            }
+            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: titlename,
+          textStyle: {
+            fontSize: "0.8rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+          },
+        },
+        legend: {
+          left: "70px",
+          top: "20",
+          verticalAlign: "top",
+          enabled: true,
+          itemDistance: 5,
+          textStyle: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            rich: {
+              a: {
+                verticalAlign: "middle",
+              },
+            },
+
+            padding: [0, 0, 0, 0], //[上、右、下、左]
+          },
+        },
+        // toolbox: {
+        //   show: step != 1 ? true : false,
+        //   feature: {
+        //     //restore: {},
+        //     saveAsImage: {
+        //       iconStyle: {
+        //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
+        //       },
+        //     },
+        //   },
+        // },
+        xAxis: {
+          type: "value",
+          name: "时间\n(ms)",
+          min: _this.wp.listRmsData[0][0],
+          max: _this.wp.listRmsData[_this.wp.listRmsData.length - 1][0] + 1,
+          boundaryGap: false,
+          title: {
+            text: "ms",
+            textStyle: {
+              fontSize: "0.6rem",
+              color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            },
+            enabled: true,
+            align: "high",
+          },
+          labels: {
+            formatter: function () {
+              return this.value;
+            },
+          },
+          nameTextStyle: {
+            fontSize: "0.6rem",
+          },
+          splitLine: {
+            show: false,
+          },
+          axisTick: {
+            alignWithLabel: true,
+          },
+          axisLine: {
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            // interval: 50,
+            formatter: function (value, index) {
+              if (_this.valB != (value - 0).toFixed(0)) {
+                _this.valB = (value - 0).toFixed(0);
+                return (value - 0).toFixed(0);
+              }
+            },
+            //rotate:39
+          },
+          // data: this.syncExtremes,
+        },
+        yAxis: {
+          type: "value",
+          name: unit,
+          title: {
+            align: "high",
+            offset: 0,
+            text: unit,
+            rotation: 0,
+            y: -10,
+          },
+          // max: rmscm[0][1] * 1.01,
+          // min: rmscu[0][1] - rmscu[0][1] * 0.01,
+          boundaryGap: [0, "100%"],
+          showLastLabel: true,
+          // max: max.toFixed(2),
+          // min: min.toFixed(2),
+          opposite: false,
+          // axisLabel: {
+          //   formatter: "{value}",
+          // },
+          nameTextStyle: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+          },
+          //minInterval: 1,
+          type: "value",
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: _this.DColor ? "#fff" : echartsColor.thread,
+            },
+            onZero: false, //-----------重点
+          },
+          axisLabel: {
+            fontSize: "0.6rem",
+            color: _this.DColor ? "#fff" : echartsColor.WordColor,
+            formatter: function (value, index) {
+              return (value - 0).toFixed(2);
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              // 使用深浅的间隔色
+              color: [_this.DColor ? "#fff" : echartsColor.thread],
+              type: "dashed",
+              opacity: 0.5,
+            },
+          },
+        },
+        grid: {
+          left: "1%",
+          right: "2.8%",
+          bottom: "40px",
+          top: "15%",
+          containLabel: true,
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            height: 13,
+            start: 0,
+            bottom: "20px",
+            end: 100,
+          },
+          {
+            start: 0,
+            height: 13,
+            bottom: "20px",
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: a,
+            type: "line",
+            smooth: true,
+            symbol: "none",
+            sampling: "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]);
+    },
+    //根据多个值的比较返回其中最大值
+    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
new file mode 100644
index 0000000..d45a47b
--- /dev/null
+++ b/src/components/echarts/shushiboxi.vue
@@ -0,0 +1,1155 @@
+<template>
+    <div v-loading="loading" class="boxbx" style="position: relative">
+        <div id="boxsj">
+            <div id="shushi" :style="`height:${vh};overflow: hidden;`">
+                <div class="bx" id="wave"></div>
+            </div>
+        </div>
+        <el-button
+            style="position: absolute; right: 10px; top: 0px; z-index: 20000"
+            type="primary"
+            link
+            icon="download"
+            title="生成图片"
+            @click="download"
+        >
+            下载
+        </el-button>
+    </div>
+</template>
+<script lang="js">
+import html2canvas from 'html2canvas'
+import $ from 'jquery'
+import * as echarts from 'echarts'
+import { mainHeight } from '@/utils/layout'
+import url from '@/assets/img/point.png'
+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]
+        }
+    },
+    data() {
+        return {
+            loading: true,
+            tabvalue: this.value,
+            // url: '@/assets/img/point.png',
+            valA: 0,
+            valB: 0,
+            isOpen: false,
+            time: '',
+            type: '',
+            severity: '',
+            iphasic: '',
+            eventValue: '',
+            persistTime: '',
+            lineName: '',
+            subName: '',
+            waveDatas: [],
+            ptpass: '',
+            waveHeight: undefined,
+            rmsHeight: undefined,
+            $wave: undefined,
+            $rms: undefined,
+            color: '#006565',
+            charts: {},
+            arrpoints: [],
+            titles: '',
+            vh: null,
+            vw: null,
+            zoom: ''
+        }
+    },
+    created() {
+
+        if (this.flag == 1) {
+            this.vh = mainHeight(175).height
+        }  else {
+            this.vh =  mainHeight(175,2).height
+        }
+        this.vw = '100%'
+    },
+    watch: {
+        value: function (a, b) {
+            if (a == 2) {
+                // $("#wave1").remove();
+                this.initWaves()
+            } else {
+                $('#wave1').remove()
+                this.initWaves()
+            }
+        }
+    },
+    mounted() {
+    // console.log(`123123`,this.boxoList,this.wp);
+        this.zoom = 1 / document.body.style.zoom
+        window.addEventListener('resize', () => {
+            this.zoom = 1 / document.body.style.zoom
+        })
+        // this.$wave = $('#wave').eq(0)
+        this.$nextTick(() => {
+            this.query()
+        })
+    },
+    methods: {
+        download() {
+            // 转换成canvas
+            html2canvas(document.getElementById('boxsj'), {
+                scale: 2
+            }).then(function (canvas) {
+                // 创建a标签，实现下载
+                var creatIMg = document.createElement('a')
+                creatIMg.download = '瞬间波形.png' // 设置下载的文件名，
+                creatIMg.href = canvas.toDataURL() // 下载url
+                creatIMg.click()
+                creatIMg.remove() // 下载之后把创建的元素删除
+            })
+        },
+        query() {
+            this.loading = true
+            this.initWaves()
+        },
+        //波形总体数据构造函数
+        waveData(instantF, instantS, shunshiF, shunshiS, title, unit) {
+            // console.log(1);
+            /*瞬时一次值最大最小值*/
+            this.instantF = instantF
+            /*瞬时二次值最大最小值*/
+            this.instantS = instantS
+            /*瞬时值一次值3相详细数据*/
+            this.shunshiF = shunshiF
+            /*瞬时值二次值3相详细数据*/
+            this.shunshiS = shunshiS
+            /*三相名称*/
+            this.title = title
+            /*电压还是电流*/
+            this.unit = unit
+        },
+        //根据后台查询的数据，清洗数据
+        initWaves() {
+            if (null != this.wp) {
+                if (this.boxoList.systemType == 'pms') {
+                    this.titles =
+                        '变电站名称：' +
+                        this.boxoList.powerStationName +
+                        ' 监测点名称：' +
+                        this.boxoList.measurementPointName +
+                        ' 发生时刻：' +
+                        this.boxoList.startTime +
+                        ' 暂降(骤升)幅值：' +
+                        (this.boxoList.featureAmplitude * 100).toFixed(0) +
+                        '% 持续时间：' +
+                        this.boxoList.duration +
+                        's'
+                } else if (this.boxoList.systemType == 'ZL') {
+                    this.titles =
+                        // "变电站名称：" +
+                        // this.boxoList.equipmentName +
+                        ' 监测点名称：' +
+                        this.boxoList.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'
+                }
+
+                //首先根据标题的长度，计算出需要绘制几份图（常见的有1张或2张，后期如果出现双路电压电流，便是4张波形图），考虑到波形的相数，实际情况更复杂些
+                //相的数量
+                this.iphasic = this.wp.iphasic
+                if (this.iphasic === 0) {
+                    this.iphasic = 1
+                }
+                var picCounts = (this.wp.waveTitle.length - 1) / this.iphasic
+                this.waveDatas = []
+                //循环筛选需求的数据
+                for (var i = 0; i < picCounts; i++) {
+                    this.fliteWaveData(this.wp, i)
+                    this.waveDatas.push({
+                        instantF :this.instantF,
+                        instantS :this.instantS,
+                        shunshiF :this.shunshiF,
+                        shunshiS :this.shunshiS,
+                        title :this.title,
+                        unit :this.unit,
+
+                    })
+
+                }
+
+                this.time = this.wp.time
+                this.type = this.wp.waveType
+                this.severity = this.wp.yzd
+                //严重度为负，事件为暂升事件
+                if (this.severity < 0) {
+                    this.severity = '/'
+                    this.type = '/'
+                }
+
+                this.initWave(this.waveDatas, this.time, this.type, this.severity, this.isOpen)
+            } else {
+                this.initWave(null, null, null, null, null)
+            }
+        },
+        //获取横向一个波形的全部数据，包括瞬时波形的一次、二次值，如果是电压的话，还需要计算出对应的最大最小值
+        fliteWaveData(wp, step) {
+
+            var shunData = wp.listWaveData
+            var pt = Number(wp.pt) / 1000
+            var ct = Number(wp.ct)
+            var titleList = wp.waveTitle
+            //首先判断当前绘制的是电压还是电流
+            var xishu = pt //默认电压，二次值转一次值乘以pt
+            //三相名称
+            var aTitle = '',
+                bTitle = '',
+                cTitle = '',
+                unit = '电压'
+            //每个波形对应的最大最小值
+            var ifmax, ifmin, ismax, ismin
+
+            var shunshiFA = [],
+                shunshiFB = [],
+                shunshiFC = [],
+                shunshiSA = [],
+                shunshiSB = [],
+                shunshiSC = []
+            //给瞬时赋个初始值
+            if (shunData.length > 0) {
+                if (titleList[this.iphasic * step + 1].substring(0, 1) !== 'U') {
+                    xishu = ct
+                    unit = '电流'
+                }
+                for (var i = 1; i <= this.iphasic; i++) {
+                    switch (i) {
+                        case 1:
+                            aTitle = titleList[this.iphasic * step + i].substring(1)
+                            break
+                        case 2:
+                            bTitle = titleList[this.iphasic * step + i].substring(1)
+                            break
+                        case 3:
+                            cTitle = titleList[this.iphasic * step + i].substring(1)
+                            break
+                    }
+                }
+                if (shunData[0][this.iphasic * step + 1] !== undefined) {
+                    ifmax = shunData[0][this.iphasic * step + 1] * xishu
+                    ifmin = shunData[0][this.iphasic * step + 1] * xishu
+                    ismax = shunData[0][this.iphasic * step + 1]
+                    ismin = shunData[0][this.iphasic * step + 1]
+                }
+
+                //瞬时值--同时还需要获取出瞬时值的一次、二次的最大最小值
+                for (var shun = 0; shun < shunData.length; shun++) {
+                    if (shunData[shun][this.iphasic * step + 1] === undefined) {
+                        break
+                    }
+                    //根据波形数据相的数量来筛选数据
+                    switch (this.iphasic) {
+                        case 1:
+                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
+                            shunshiFA.push([shunData[shun][0], shunFirstA])
+                            ifmax = ifmax > shunFirstA ? ifmax : shunFirstA
+                            ifmin = ifmin < shunFirstA ? ifmin : shunFirstA
+
+                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
+                            shunshiSA.push([shunData[shun][0], shunSecondA])
+                            ismax = ismax > shunSecondA ? ismax : shunSecondA
+                            ismin = ismin < shunSecondA ? ismin : shunSecondA
+                            break
+                        case 2:
+                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
+                            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu
+                            shunshiFA.push([shunData[shun][0], shunFirstA])
+                            shunshiFB.push([shunData[shun][0], shunFirstB])
+                            ifmax = this.getMaxTwo(ifmax, shunFirstA, shunFirstB)
+                            ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstB)
+
+                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
+                            var shunSecondB = shunData[shun][this.iphasic * step + 2]
+                            shunshiSA.push([shunData[shun][0], shunSecondA])
+                            shunshiSB.push([shunData[shun][0], shunSecondB])
+                            ismax = this.getMaxTwo(ismax, shunSecondA, shunSecondB)
+                            ismin = this.getMinOpen(ismin, shunSecondA, shunSecondB)
+                            break
+                        case 3:
+                            var shunFirstA = shunData[shun][this.iphasic * step + 1] * xishu
+                            var shunFirstB = shunData[shun][this.iphasic * step + 2] * xishu
+                            var shunFirstC = shunData[shun][this.iphasic * step + 3] * xishu
+                            shunshiFA.push([shunData[shun][0], shunFirstA])
+                            shunshiFB.push([shunData[shun][0], shunFirstB])
+                            shunshiFC.push([shunData[shun][0], shunFirstC])
+                            ifmax = this.getMax(ifmax, shunFirstA, shunFirstB, shunFirstC)
+                            //如果接线方式是V
+                            if (this.isOpen) {
+                                ifmin = this.getMinOpen(ifmin, shunFirstA, shunFirstC)
+                            } else {
+                                ifmin = this.getMin(ifmin, shunFirstA, shunFirstB, shunFirstC)
+                            }
+
+                            var shunSecondA = shunData[shun][this.iphasic * step + 1]
+                            var shunSecondB = shunData[shun][this.iphasic * step + 2]
+                            var shunSecondC = shunData[shun][this.iphasic * step + 3]
+                            shunshiSA.push([shunData[shun][0], shunSecondA])
+                            shunshiSB.push([shunData[shun][0], shunSecondB])
+                            shunshiSC.push([shunData[shun][0], shunSecondC])
+                            ismax = this.getMax(ismax, shunSecondA, shunSecondB, shunSecondC)
+                            //如果接线方式是V
+                            if (this.isOpen) {
+                                ismin = this.getMinOpen(ismin, shunSecondA, shunSecondC)
+                            } else {
+                                ismin = this.getMin(ismin, shunSecondA, shunSecondB, shunSecondC)
+                            }
+                            break
+                    }
+                }
+            }
+            //瞬时一次值最大最小值
+            var instantFAn = {}
+            var instantSAn = {}
+            //var color;
+
+            var instantF = {}
+            var instantS = {}
+            var shunshiF = {}
+            var shunshiS = {}
+            var title = {}
+
+            //三相名称
+            title.aTitle = aTitle
+            title.bTitle = bTitle
+            title.cTitle = cTitle
+
+            //电流还是电压
+            title.unit = unit
+
+            //每个波形对应的三相数据
+            shunshiFA = shunshiFA.slice(0)
+            shunshiFB = shunshiFB.slice(0)
+            shunshiFC = shunshiFC.slice(0)
+            shunshiSA = shunshiSA.slice(0)
+            shunshiSB = shunshiSB.slice(0)
+            shunshiSC = shunshiSC.slice(0)
+
+            shunshiF.shunshiFA = shunshiFA
+            shunshiF.shunshiFB = shunshiFB
+            shunshiF.shunshiFC = shunshiFC
+
+            shunshiS.shunshiSA = shunshiSA
+            shunshiS.shunshiSB = shunshiSB
+            shunshiS.shunshiSC = shunshiSC
+
+            //赋值对应的最大最小值
+            instantF.max = ifmax
+            instantF.min = ifmin
+            instantS.max = ismax
+            instantS.min = ismin
+            if (step === 0) {
+                instantFAn.max = ifmax
+                instantFAn.min = ifmin
+                instantSAn.max = ismax
+                instantSAn.min = ismin
+            }
+
+
+            return  this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit)
+        },
+        //开始画图
+        initWave(waveDatas, time, type, severity, isOpen) {
+
+            //清除之前增加的div
+            // $("#wave ~ .bx1").remove();
+            $('div.bx1').remove()
+            //设置暂降触发点的位置 一次值与二次值Y轴不同（不是计算出来的）
+            // var height = $(window).height() - 90;
+            var picHeight
+            var show = true
+            if (isOpen) {
+                show = false
+            }
+            //var v = $("#interval").val();
+            var isvisible = false
+            var cu = [],
+                title,
+                unit,
+                max,
+                min
+            var a = '',
+                b = '',
+                c = ''
+            var adata = [],
+                bdata = [],
+                cdata = []
+            picHeight = this.vh
+            // this.$wave.css('height', picHeight)
+            // this.$wave.css('width', this.vw)
+            var colors = []
+            if (null == waveDatas) {
+                cu = []
+                title = '该事件暂无波形图'
+            } else if (waveDatas.length > 0) {
+                title = this.titles
+
+                if (Number(this.eventValue) <= 90) {
+                    isvisible = true
+                }
+                switch (this.iphasic) {
+                    case 1:
+                        a = waveDatas[0].title.aTitle
+                        if (this.value === 1) {
+                            cu = [[0, waveDatas[0].instantF.min]]
+                            max = waveDatas[0].instantF.max
+                            min = waveDatas[0].instantF.min
+                            adata = waveDatas[0].shunshiF.shunshiFA
+                        } else {
+                            cu = [[0, waveDatas[0].instantS.min]]
+                            max = waveDatas[0].instantS.max
+                            min = waveDatas[0].instantS.min
+                            adata = waveDatas[0].shunshiS.shunshiSA
+                        }
+
+                        colors.push('#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]]
+                            max = waveDatas[0].instantF.max
+                            min = waveDatas[0].instantF.min
+                            adata = waveDatas[0].shunshiF.shunshiFA
+                            bdata = waveDatas[0].shunshiF.shunshiFB
+                        } else {
+                            cu = [[0, waveDatas[0].instantS.min]]
+                            max = waveDatas[0].instantS.max
+                            min = waveDatas[0].instantS.min
+                            adata = waveDatas[0].shunshiS.shunshiSA
+                            bdata = waveDatas[0].shunshiS.shunshiSB
+                        }
+                        colors.push('#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]]
+                            max = waveDatas[0].instantF.max
+                            min = waveDatas[0].instantF.min
+                            adata = waveDatas[0].shunshiF.shunshiFA
+                            bdata = waveDatas[0].shunshiF.shunshiFB
+                            cdata = waveDatas[0].shunshiF.shunshiFC
+                        } else {
+                            cu = [[0, waveDatas[0].instantS.min]]
+                            max = waveDatas[0].instantS.max
+                            min = waveDatas[0].instantS.min
+                            adata = waveDatas[0].shunshiS.shunshiSA
+                            bdata = waveDatas[0].shunshiS.shunshiSB
+                            cdata = waveDatas[0].shunshiS.shunshiSC
+                        }
+
+                        colors.push('#FFCC00')
+                        colors.push('#009900')
+                        colors.push('#CC0000')
+                        break
+                }
+
+                if (waveDatas[0].unit === '电压') {
+                    if (this.value === 1) {
+                        unit = 'kV'
+                    } else {
+                        unit = 'V'
+                    }
+                } else {
+                    unit = 'A'
+                }
+                //把剩余的DIV先拼接好
+                for (var step = 1; step < waveDatas.length; step++) {
+                    var waveId = 'wave' + step
+                    var newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;">
+                                        <div class='bx1' id='${waveId}'  style="zoom:${this.zoom};transform:scale(${
+                        1 / this.zoom
+                    });transform-origin:0 0;">
+                                        </div>
+                                    </div>`)
+                    newDivShunshi.insertAfter($('#shushi'))
+                    //第二个图高度宽度
+                    $('#' + waveId).css('height', picHeight)
+                    $('#' + waveId).css('width', this.vw)
+                }
+            } else {
+                cu = []
+                title =
+                    '变电站名称：' +
+                    this.subName +
+                    ' 监测点名称：' +
+                    this.lineName +
+                    ' 发生时刻：' +
+                    this.time +
+                    ' 暂降(骤升)幅值：' +
+                    (this.eventValue * 100).toFixed(0) +
+                    '% 持续时间：' +
+                    this.persistTime +
+                    's'
+            }
+            //绘制横向第一个波形图
+            //绘制瞬时波形图
+            // const echarts = require('echarts')
+            let wave = document.getElementById('wave')
+
+            let _this = this
+            var myChartes = echarts.init(wave)
+            let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]}
+            setTimeout(() => {
+              wave.style.width ='100%';
+                wave.style.height =_this.vh;
+            }, 0);
+            var option = {
+                tooltip: {
+                    top: '10px',
+                    trigger: 'axis',
+                    borderColor: 'grey',
+                    backgroundColor: '#fff',
+                    style: {
+                        color: '#000',
+                        fontSize: '15px',
+                        padding: 10
+                    },
+                    formatter: function (params) {
+                        // console.log(params)
+                        var tips = ''
+                        tips += '时刻:' + params[0].data[0] + '</br/>'
+
+                        for (var i = 0; i < params.length; i++) {
+                            if (params[i].seriesName != '暂降触发点') {
+                                tips += params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
+                            }
+                        }
+                        return tips
+                    },
+                    // axisPointer: {
+                    //   type: "cross",
+                    //   label: {
+                    //     color: "#fff",
+                    //     fontSize: 16,
+                    //   },
+                    // },
+                    textStyle: {
+                        color: '#fff',
+                        fontStyle: 'normal',
+                        opacity: 0.35,
+                        fontSize: 14
+                    },
+                    backgroundColor: 'rgba(0,0,0,0.35)',
+                    borderWidth: 0
+                },
+                title: {
+                    left: 'center',
+                    text: '电网侧-电压    ' + title,
+                    textStyle: {
+                        fontSize: '0.8rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor
+                    }
+                },
+                legend: {
+                    left: '70px',
+                    top: '20',
+                    verticalAlign: 'top',
+                    enabled: true,
+                    itemDistance: 5,
+                    textStyle: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        rich: {
+                            a: {
+                                verticalAlign: 'middle'
+                            }
+                        },
+
+                        padding: [0, 0, 0, 0] //[上、右、下、左]
+                    }
+                },
+                // toolbox: {
+                //   show: step != 1 ? true : false,
+                //   feature: {
+                //     //restore: {},
+                //     saveAsImage: {
+                //       iconStyle: {
+                //         borderColor: _this.DColor ? "#fff" : echartsColor.WordColor,
+                //       },
+                //     },
+                //   },
+                // },
+                xAxis: {
+                    type: 'value',
+                    name: '时间\n(ms)',
+                    boundaryGap: false,
+                    min: _this.wp.listWaveData[0][0],
+                    max: _this.wp.listWaveData[_this.wp.listWaveData.length - 1][0] + 1,
+                    title: {
+                        text: 'ms',
+                        textStyle: {
+                            fontSize: '0.6rem',
+                            color: _this.DColor ? '#fff' : echartsColor.WordColor
+                        },
+                        enabled: true,
+                        align: 'high'
+                    },
+                    splitLine: {
+                        show: false
+                    },
+                    nameTextStyle: {
+                        fontSize: '0.6rem'
+                    },
+                    axisTick: {
+                        alignWithLabel: true
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: _this.DColor ? '#fff' : echartsColor.thread
+                        },
+                        onZero: false //-----------重点
+                    },
+                    axisLabel: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        formatter: function (value, index) {
+                            if (_this.valA != (value - 0).toFixed(0)) {
+                                _this.valA = (value - 0).toFixed(0)
+                                return (value - 0).toFixed(0)
+                            }
+                        }
+                        //rotate:39
+                    }
+                    // data: this.syncExtremes,
+                },
+                yAxis: {
+                    type: 'value',
+                    name: unit,
+                    title: {
+                        align: 'high',
+                        offset: 0,
+                        text: unit,
+                        rotation: 0,
+                        y: -10
+                    },
+
+                    boundaryGap: [0, '100%'],
+                    showLastLabel: true,
+                    max: max.toFixed(2) * 1.1,
+                    min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
+                    opposite: false,
+                    nameTextStyle: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor
+                    },
+                    //minInterval: 1,
+                    type: 'value',
+                    axisLine: {
+                        show: true,
+                        lineStyle: {
+                            color: _this.DColor ? '#fff' : echartsColor.thread
+                        },
+                        onZero: false //-----------重点
+                    },
+                    axisLabel: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        formatter: function (value, index) {
+                            return (value - 0).toFixed(2)
+                        }
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            // 使用深浅的间隔色
+                            color: [_this.DColor ? '#fff' : echartsColor.thread],
+                            type: 'dashed',
+                            opacity: 0.5
+                        }
+                    }
+                },
+                grid: {
+                    left: '1%',
+                    right: '2.8%',
+                    bottom: '40px',
+                    top: '15%',
+                    containLabel: true
+                },
+                dataZoom: [
+                    {
+                        type: 'inside',
+                        height: 13,
+                        start: 0,
+                        bottom: '20px',
+                        end: 100
+                    },
+                    {
+                        start: 0,
+                        height: 13,
+                        bottom: '20px',
+                        end: 100
+                    }
+                ],
+                series: [
+                    {
+                        name: a,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#FFCC00'
+                        },
+                        data: adata
+                    },
+                    {
+                        name: b,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#009900'
+                        },
+                        data: bdata
+                    },
+                    {
+                        name: c,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#CC0000'
+                        },
+                        data: cdata
+                    },
+                    {
+                        name: '暂降触发点',
+                        type: 'scatter',
+                        symbol: 'image://' + url,
+                        itemStyle: {
+                            width: 18,
+                            height: 18
+                        },
+                        data: cu
+                    }
+                ]
+            }
+
+            myChartes.setOption(option)
+            // window.echartsArr.push(myChartes)
+            setTimeout(() => {
+                myChartes.resize()
+                this.loading = false
+            }, 400)
+
+            //第一个波形图数据绘制完毕后，绘制后续的波形图
+            if (waveDatas !== null && waveDatas.length > 1) {
+                let waveDatasTemp = waveDatas.slice(1)
+                waveDatasTemp.reverse()
+                for (var step = 0; step < waveDatasTemp.length; step++) {
+                    var waveDataTemp = waveDatasTemp[step]
+                    this.drawPics(waveDataTemp, picHeight, step, show, myChartes, title)
+                }
+            }
+        },
+        //绘制剩余横向的波形图
+        drawPics(waveDataTemp, picHeight, step, show, myChartes1, title) {
+            let _this = this
+            step = step + 1
+            //新建瞬时DIV
+            var waveId = 'wave' + step
+            var a = '',
+                b = '',
+                c = ''
+            var max, min, unit
+            var adata = [],
+                bdata = [],
+                cdata = []
+            var colors = []
+            switch (this.iphasic) {
+                case 1:
+                    a = waveDataTemp.title.aTitle
+                    colors.push('#FFCC00')
+                    colors.push('#fff')
+                    colors.push('#fff')
+                    break
+                case 2:
+                    a = waveDataTemp.title.aTitle
+                    b = waveDataTemp.title.bTitle
+                    colors.push('#FFCC00')
+                    colors.push('#009900')
+                    colors.push('#fff')
+                    break
+                case 3:
+                    a = waveDataTemp.title.aTitle
+                    b = waveDataTemp.title.bTitle
+                    c = waveDataTemp.title.cTitle
+                    colors.push('#FFCC00')
+                    colors.push('#009900')
+                    colors.push('#CC0000')
+                    break
+            }
+
+            if (this.value === 1) {
+                max = waveDataTemp.instantF.max
+                min = waveDataTemp.instantF.min
+                adata = waveDataTemp.shunshiF.shunshiFA
+                bdata = waveDataTemp.shunshiF.shunshiFB
+                cdata = waveDataTemp.shunshiF.shunshiFC
+            } else {
+                max = waveDataTemp.instantS.max
+                min = waveDataTemp.instantS.min
+                adata = waveDataTemp.shunshiS.shunshiSA
+                bdata = waveDataTemp.shunshiS.shunshiSB
+                cdata = waveDataTemp.shunshiS.shunshiSC
+            }
+            if (waveDataTemp.unit === '电压') {
+                if (this.value === 1) {
+                    unit = 'kV'
+                } else {
+                    unit = 'V'
+                }
+            } else {
+                unit = 'A'
+            }
+            // const echarts = require('echarts')
+            let waveIds = document.getElementById(waveId)
+            if (this.boxoList.systemType == 'ZL') {
+                let str = []
+                str = waveId.split('e')
+                let str1 = Number(str[1])
+                var titlename = ''
+                this.wp.channelNames.forEach((element, i) => {
+                    if (i == 4 || i == 7 || i == 10) {
+                        if (str1 == 1 && i == 4) {
+                            let s = []
+                            let s1 = ''
+                            s = element.split('A')
+                            if (s[0] == 'LI') {
+                                s1 = '电网侧-电流'
+                            } else {
+                                s1 = s[0] + '侧' + s[1]
+                            }
+
+                            titlename = s1 + '    ' + title
+                        }
+                        if (str1 == 2 && i == 7) {
+                            let s = []
+                            let s1 = ''
+                            s = element.split('A')
+                            if (s[0] == 'SU') {
+                                s1 = '负载侧-电压'
+                            } else {
+                                s1 = s[0] + '侧' + s[1]
+                            }
+
+                            titlename = s1 + '    ' + title
+                        }
+                        if (str1 == 3 && i == 10) {
+                            let s = []
+                            let s1 = ''
+                            s = element.split('A')
+                            if (s[0] == 'SI') {
+                                s1 = '负载侧-电流'
+                            } else {
+                                s1 = s[0] + '侧' + s[1]
+                            }
+                            titlename = s1 + '    ' + title
+                        }
+                    }
+                })
+            }
+            var myChartes = echarts.init(waveIds)
+            let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]}
+            var option = {
+                tooltip: {
+                    trigger: 'axis',
+                    borderColor: 'grey',
+                    formatter: function (params) {
+                        // console.log(params)
+                        var tips = ''
+                        tips += '时刻:' + params[0].data[0] + '</br/>'
+
+                        for (var i = 0; i < params.length; i++) {
+                            if (params[i].seriesName != '暂降触发点') {
+                                tips += params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '<br/>'
+                            }
+                        }
+                        return tips
+                    },
+                    // axisPointer: {
+                    //   type: "cross",
+                    //   label: {
+                    //     color: "#fff",
+                    //     fontSize: 16,
+                    //   },
+                    // },
+                    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.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        rich: {
+                            a: {
+                                verticalAlign: 'middle'
+                            }
+                        },
+
+                        padding: [0, 0, 0, 0] //[上、右、下、左]
+                    }
+                },
+                // toolbox: {
+                //     show: step != 1 ? true : false,
+                //     feature: {
+                //         //restore: {},
+                //         saveAsImage: {
+                //             iconStyle: {
+                //                 borderColor: _this.DColor ? '#fff' : echartsColor.WordColor
+                //             }
+                //         }
+                //     }
+                // },
+                xAxis: {
+                    type: 'value',
+                    name: '时间\n(ms)',
+                    boundaryGap: false,
+                    min: _this.wp.listWaveData[0][0],
+                    max: _this.wp.listWaveData[_this.wp.listWaveData.length - 1][0] + 1,
+                    title: {
+                        text: 'ms',
+                        textStyle: {
+                            fontSize: '0.6rem',
+                            color: _this.DColor ? '#fff' : echartsColor.WordColor
+                        },
+                        enabled: true,
+                        align: 'high'
+                    },
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        alignWithLabel: true
+                    },
+                    axisLine: {
+                        lineStyle: {
+                            color: _this.DColor ? '#fff' : echartsColor.thread
+                        },
+                        onZero: false //-----------重点
+                    },
+                    nameTextStyle: {
+                        fontSize: '0.6rem'
+                    },
+                    axisLabel: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        formatter: function (value, index) {
+                            if (_this.valB != (value - 0).toFixed(0)) {
+                                _this.valB = (value - 0).toFixed(0)
+                                return (value - 0).toFixed(0)
+                            }
+                        }
+                        //rotate:39
+                    }
+                    // data: this.syncExtremes,
+                },
+                yAxis: {
+                    type: 'value',
+                    name: unit,
+                    title: {
+                        align: 'high',
+                        offset: 0,
+                        text: unit,
+                        rotation: 0,
+                        y: -10
+                    },
+                    boundaryGap: [0, '100%'],
+                    showLastLabel: true,
+                    max: max.toFixed(2) * 1.1,
+                    min: min.toFixed(2) > 0 ? min.toFixed(2) - min.toFixed(2) * 0.1 : min.toFixed(2) * 1.1,
+                    opposite: false,
+                    // axisLabel: {
+                    //   formatter: "{value}",
+                    // },
+                    nameTextStyle: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor
+                    },
+                    //minInterval: 1,
+                    type: 'value',
+                    axisLine: {
+                        show: true,
+                        lineStyle: {
+                            color: _this.DColor ? '#fff' : echartsColor.thread
+                        },
+                        onZero: false //-----------重点
+                    },
+                    axisLabel: {
+                        fontSize: '0.6rem',
+                        color: _this.DColor ? '#fff' : echartsColor.WordColor,
+                        formatter: function (value, index) {
+                            return (value - 0).toFixed(2)
+                        }
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            // 使用深浅的间隔色
+                            color: [_this.DColor ? '#fff' : echartsColor.thread],
+                            type: 'dashed',
+                            opacity: 0.5
+                        }
+                    }
+                },
+                grid: {
+                    left: '1%',
+                    right: '2.8%',
+                    bottom: '40px',
+                    top: '15%',
+                    containLabel: true
+                },
+                dataZoom: [
+                    {
+                        type: 'inside',
+                        height: 13,
+                        start: 0,
+                        bottom: '20px',
+                        end: 100
+                    },
+                    {
+                        start: 0,
+                        height: 13,
+                        bottom: '20px',
+                        end: 100
+                    }
+                ],
+                series: [
+                    {
+                        name: a,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#FFCC00'
+                        },
+                        data: adata
+                    },
+                    {
+                        name: b,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#009900'
+                        },
+                        data: bdata
+                    },
+                    {
+                        name: c,
+                        type: 'line',
+                        smooth: true,
+                        symbol: 'none',
+                        sampling: 'lttb',
+                        itemStyle: {
+                            color: '#CC0000'
+                        },
+                        data: cdata
+                    }
+                ]
+            }
+            myChartes.setOption(option)
+            // window.echartsArr.push(myChartes)
+            setTimeout(() => {
+                myChartes.resize()
+                this.loading = false
+            }, 400)
+            echarts.connect([myChartes1, myChartes])
+        },
+        //根据多个值的比较返回其中最大值
+        getMax(temp, tempA, tempB, tempC) {
+            temp = temp > tempA ? temp : tempA
+            temp = temp > tempB ? temp : tempB
+            temp = temp > tempC ? temp : tempC
+            return temp
+        },
+        //根据多个值的比较返回其中最大值
+        getMaxTwo(temp, tempA, tempB) {
+            temp = temp > tempA ? temp : tempA
+            temp = temp > tempB ? temp : tempB
+            return temp
+        },
+        //根据多个值的比较返回其中最小值
+        getMin(temp, tempA, tempB, tempC) {
+            temp = temp < tempA ? temp : tempA
+            temp = temp < tempB ? temp : tempB
+            temp = temp < tempC ? temp : tempC
+            return temp
+        },
+        getMinOpen(temp, tempA, tempB) {
+            temp = temp < tempA ? temp : tempA
+            temp = temp < tempB ? temp : tempB
+            return temp
+        }
+    }
+}
+</script>
+
+
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 6578b71..3c87a94 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -69,6 +69,7 @@
                     </template>
                 </Column>
             </template>
+            <slot name="columns"></slot>
         </vxe-table>
     </div>
 
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index 23776b0..e6dbe9d 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -1,16 +1,25 @@
-.vxe-table--body-wrapper::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
+.vxe-table--body-wrapper,
+.boxbx {
+    &::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        height: 3px;
+        background-color: var(--el-color-primary) !important;
+        border-radius: 30px !important;
+    }
 }
 
-.vxe-table--body-wrapper::-webkit-scrollbar-thumb {
-    border-radius: 5px;
-    height: 3px;
-    background-color: var(--el-color-primary) !important;
-    border-radius: 30px !important;
-}
+// .vxe-table--body-wrapper::-webkit-scrollbar-thumb {
+//     border-radius: 5px;
+//     height: 3px;
+//     background-color: var(--el-color-primary) !important;
+//     border-radius: 30px !important;
+// }
 
 .vxe-header--row {
     background: var(--el-color-primary);
     color: var(--el-color-white);
-}
\ No newline at end of file
+}
diff --git a/src/utils/layout.ts b/src/utils/layout.ts
index 31f8288..db46840 100644
--- a/src/utils/layout.ts
+++ b/src/utils/layout.ts
@@ -7,7 +7,7 @@ import { useConfig } from '@/stores/config'
  * @param extra main高度额外减去的px数,可以实现隐藏原有的滚动条
  * @returns CSSProperties
  */
-export function mainHeight(extra = 0): CSSProperties {
+export function mainHeight(extra = 0,divided =1): CSSProperties {
     let height = extra
     const adminLayoutMainExtraHeight: anyObj = {
         Default: 60,
@@ -21,7 +21,7 @@ export function mainHeight(extra = 0): CSSProperties {
     }
 
     return {
-        height: 'calc(100vh - ' + height.toString() + 'px)'
+        height: 'calc((100vh - ' + height.toString() + 'px) / '+ divided+')'
     }
 }
 
diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue
index 9982293..19edfa8 100644
--- a/src/views/govern/alarm/Device.vue
+++ b/src/views/govern/alarm/Device.vue
@@ -103,7 +103,9 @@ const sourceChange = (e: any) => {
 onMounted(() => {
     tableStore.index()
 })
-
+setTimeout(() => {
+    tableStore.table.height = mainHeight(190).height as any
+}, 0)
 const addMenu = () => {}
 </script>
 <style></style>
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index d41c5d3..e4e3a09 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -102,7 +102,9 @@ const sourceChange = (e: any) => {
 onMounted(() => {
     tableStore.index()
 })
-
+setTimeout(() => {
+    tableStore.table.height = mainHeight(190).height as any
+}, 0)
 const addMenu = () => {}
 </script>
 <style></style>
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 375dba8..14d6462 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -1,56 +1,132 @@
 <template>
-    <TableHeader datePicker ref="refheader">
-        <template v-slot:select>
-            <el-form-item label="数据来源">
-                <el-cascader
-                    placeholder="请选择数据来源"
-                    @change="sourceChange"
-                    :options="props.deviceTree"
-                    :show-all-levels="false"
-                    :props="{ checkStrictly: true }"
-                    clearable
-                ></el-cascader>
-                <!-- <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
-            </el-form-item>
-            <el-form-item label="级别">
-                <el-select v-model="tableStore.table.params.level" placeholder="请选择级别" clearable>
+    <div ref="refheader" v-show="view">
+        <TableHeader datePicker>
+            <template v-slot:select>
+                <el-form-item label="数据来源">
+                    <el-cascader
+                        placeholder="请选择数据来源"
+                        @change="sourceChange"
+                        :options="props.deviceTree"
+                        :show-all-levels="false"
+                        :props="{ checkStrictly: true }"
+                        clearable
+                    ></el-cascader>
+                    <!-- <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
+                </el-form-item>
+                <el-form-item label="级别">
+                    <el-select v-model="tableStore.table.params.level" placeholder="请选择级别" clearable>
+                        <el-option
+                            v-for="item in rankOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!-- <div style="height: 300px;"> -->
+        <Table :isGroup="true">
+            <template v-slot:columns>
+                <vxe-column title="操作" min-width="15px">
+                    <template v-slot:default="scoped">
+                        <!-- {{ scoped.row.onlineRate === 3.14159 ? '/' : scoped.row.onlineRate }} -->
+                        <el-button
+                            :icon="Tickets"
+                            size="small"
+                            type="primary"
+                            v-if="scoped.row.wavePath && scoped.row.evtParamTm < 20"
+                            @click="getboxin(scoped.row)"
+                        >
+                            波形分析
+                        </el-button>
+                        <el-button v-else size="small" :icon="Tickets" type="info" :disabled="true">暂无波形</el-button>
+                    </template>
+                </vxe-column>
+            </template>
+            >
+        </Table>
+    </div>
+    <div style="padding: 10px" v-if="!view">
+        <el-row>
+            <el-col :span="12">
+                <span v-if="view2" style="font-size: 14px; font-weight: ; line-height: 30px">值类型选择:</span>
+                <el-select v-if="view2" @change="changeView" v-model="value" placeholder="请选择值类型">
                     <el-option
-                        v-for="item in rankOptions"
+                        v-for="item in options"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
                     ></el-option>
                 </el-select>
-            </el-form-item>
-        </template>
-    </TableHeader>
-    <!-- <div style="height: 300px;"> -->
-    <Table ref="tableRef" :isGroup="true" />
-    <!-- </div> -->
+            </el-col>
+            <el-col :span="12">
+                <el-button
+                    v-if="view2"
+                    @click="backbxlb"
+                    type="primary"
+                    class="el-icon-refresh-right"
+                    style="float: right"
+                >
+                    返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <el-tabs v-if="view2" v-model="bxactiveName" @tab-click="bxhandleClick">
+            <el-tab-pane
+                label="瞬时波形"
+                name="ssbx"
+                class="boxbx"
+                :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+            >
+                <shushiboxi
+                    v-if="bxactiveName == 'ssbx' && showBoxi"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :wp="wp"
+                ></shushiboxi>
+            </el-tab-pane>
+            <el-tab-pane label="RMS波形" name="rmsbx" :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+                <rmsboxi
+                    v-if="bxactiveName == 'rmsbx' && showBoxi"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :wp="wp"
+                ></rmsboxi>
+            </el-tab-pane>
+        </el-tabs>
+        <!-- <xiebofenxi  ref="child"  :bxshuju="bxshuju" @backfh="back"></xiebofenxi>  -->
+    </div>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
+import { Tickets } from '@element-plus/icons-vue'
 import TableHeader from '@/components/table/header/index.vue'
+import shushiboxi from '@/components/echarts/shushiboxi.vue'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+
 import { mainHeight } from '@/utils/layout'
 
 const props = defineProps(['deviceTree'])
 
 const refheader = ref()
-const deviceTree = ref([])
-const tabsList = ref([
+const view = ref(true)
+const view2 = ref(false)
+const showBoxi = ref(true)
+const bxactiveName = ref('ssbx')
+const boxoList = ref({})
+const wp = ref({})
+const value = ref(1)
+const options = ref([
     {
-        label: '设备告警',
-        name: 3
+        value: 1,
+        label: '一次值'
     },
     {
-        label: '稳态越限告警',
-        name: 1
-    },
-    {
-        label: '暂态事件',
-        name: 0
+        value: 2,
+        label: '二次值'
     }
 ])
 const rankOptions = ref([
@@ -75,14 +151,18 @@ const tableStore = new TableStore({
         { title: '工程名称', field: 'engineeringName', align: 'center' },
         { title: '项目名称', field: 'projectName', align: 'center' },
         { title: '设备名称', field: 'equipmentName', align: 'center' },
-        { title: '事件描述', field: 'code', align: 'center' },
-        { title: '事件发生位置', field: 'showName', align: 'center' },
-        { title: '相别', field: 'startTime', align: 'center' },
-        { title: '持续时间', field: 'startTime', align: 'center' },
-        { title: '暂降深度', field: 'startTime', align: 'center' },
-        { title: '发生时刻', field: 'startTime', align: 'center' },
-        { title: '操作', field: 'startTime', align: 'center' }
-    ]
+        { title: '事件描述', field: 'showName', align: 'center' },
+        { title: '事件发生位置', field: 'evtParamPosition', align: 'center' },
+        { title: '相别', field: 'evtParamPhase', align: 'center' },
+        { title: '持续时间(s)', field: 'evtParamTm', align: 'center' },
+        { title: '暂降深度', field: 'evtParamVVaDepth', align: 'center' },
+        { title: '发生时刻', field: 'startTime', align: 'center' }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.evtParamTm = item.evtParamTm.split('s')[0]
+        })
+    }
 })
 
 provide('tableStore', tableStore)
@@ -92,22 +172,56 @@ provide('tableStore', tableStore)
 tableStore.table.params.engineeringid = ''
 tableStore.table.params.projectId = ''
 tableStore.table.params.deviceId = ''
-tableStore.table.params.type = 1
+tableStore.table.params.type = 0
 tableStore.table.params.eventIds = []
 tableStore.table.params.status = ''
 tableStore.table.params.target = []
 tableStore.table.params.userId = ''
-
+import { analyseWave } from '@/api/common'
 const sourceChange = (e: any) => {
     tableStore.table.params.engineeringid = e[0] || ''
     tableStore.table.params.projectId = e[1] || ''
     tableStore.table.params.deviceId = e[2] || ''
 }
-
+const getboxin = async (row: any) => {
+    boxoList.value = row
+    await analyseWave(row.id).then(res => {
+        if (res != undefined) {
+            wp.value = res.data
+            view.value = false
+            view2.value = true
+        }
+    })
+}
+const changeView = () => {
+    showBoxi.value = false
+    setTimeout(() => {
+        showBoxi.value = true
+    }, 0)
+}
+const bxhandleClick = (tab: any) => {
+    if (tab.name == 'ssbx') {
+        bxactiveName.value = 'ssbx'
+    } else if (tab.name == 'rmsbx') {
+        bxactiveName.value = 'rmsbx'
+    }
+    //  console.log(tab, event);
+}
+const backbxlb = () => {
+    view.value = true
+    view2.value = false
+    setTimeout(() => {
+    tableStore.table.height = mainHeight(190).height as any
+}, 0)
+}
 onMounted(() => {
     tableStore.index()
 })
+const bxecharts = mainHeight(175).height as any
+setTimeout(() => {
+    tableStore.table.height = mainHeight(190).height as any
+}, 0)
 
 const addMenu = () => {}
 </script>
-<style></style>
+<style scoped lang="scss"></style>
diff --git a/src/views/govern/alarm/cope.vue b/src/views/govern/alarm/cope.vue
new file mode 100644
index 0000000..71a2442
--- /dev/null
+++ b/src/views/govern/alarm/cope.vue
@@ -0,0 +1,135 @@
+<template>
+    <TableHeader datePicker ref="refheader">
+        <template v-slot:select>
+            <el-form-item label="数据来源">
+                <el-cascader
+                    placeholder="请选择数据来源"
+                    @change="sourceChange"
+                    :options="props.deviceTree"
+                    :show-all-levels="false"
+                    :props="{ checkStrictly: true }"
+                    clearable
+                ></el-cascader>
+                <!-- <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入设备名称" /> -->
+            </el-form-item>
+            <el-form-item label="级别">
+                <el-select v-model="tableStore.table.params.level" placeholder="请选择级别" clearable>
+                    <el-option
+                        v-for="item in rankOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+    </TableHeader>
+    <!-- <div style="height: 300px;"> -->
+    <!-- <Table ref="tableRef" :isGroup="true" /> -->
+    <div :style="{ height: tableHeight }" v-loading="tableLoading">
+        <vxe-table :data="tableStore.table.data" v-bind="defaultAttribute" height="auto" auto-resize>
+            <vxe-column
+                v-for="item in tableStore.table.column"
+                :field="item.field"
+                :title="item.title"
+                :min-width="item.width"
+                :sortable="item.sortable"
+            ></vxe-column>
+            <vxe-column title="操作" min-width="220px">
+                <template v-slot:default="scoped">
+                    <!-- {{ scoped.row.onlineRate === 3.14159 ? '/' : scoped.row.onlineRate }} -->
+                    <el-button  icon="el-icon-s-marketing" type="primary"  v-if="scoped.row.wavePath && scoped.row.evtParamTm<20" @click="getboxin(scoped.row)">波形分析</el-button>
+                            <el-button v-else  icon="el-icon-s-marketing" type="info"  :disabled="true">暂无波形</el-button>
+                            </template>
+
+            </vxe-column>
+        </vxe-table>
+        <el-pagination
+            :currentPage="tableStore.table.params!.pageNum"
+            :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes"
+            background
+            :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
+            :total="tableStore.table.total"
+            @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"
+        ></el-pagination>
+    </div>
+    
+    <!-- </div> -->
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+
+const props = defineProps(['deviceTree'])
+
+const refheader = ref()
+const tableLoading = ref(false)
+
+const rankOptions = ref([
+    {
+        value: '1',
+        label: '1级'
+    },
+    {
+        value: '2',
+        label: '2级'
+    },
+    {
+        value: '3',
+        label: '3级'
+    }
+])
+
+const tableStore = new TableStore({
+    url: '/cs-harmonic-boot/eventUser/queryEventpage',
+    method: 'POST',
+    column: [
+        { title: '工程名称', field: 'engineeringName', align: 'center' },
+        { title: '项目名称', field: 'projectName', align: 'center' },
+        { title: '设备名称', field: 'equipmentName', align: 'center' },
+        { title: '事件描述', field: 'showName', align: 'center' },
+        { title: '事件发生位置', field: 'evtParamPosition', align: 'center' },
+        { title: '相别', field: 'evtParamPhase', align: 'center' },
+        { title: '持续时间', field: 'evtParamTm', align: 'center' },
+        { title: '暂降深度', field: 'evtParamVVaDepth', align: 'center' },
+        { title: '发生时刻', field: 'startTime', align: 'center' },
+        { title: '操作', field: '', align: 'center' }
+    ]
+})
+
+provide('tableStore', tableStore)
+//   "target": [],
+//   "type": "",
+//   "userId": ""
+tableStore.table.params.engineeringid = ''
+tableStore.table.params.projectId = ''
+tableStore.table.params.deviceId = ''
+tableStore.table.params.type = 1
+tableStore.table.params.eventIds = []
+tableStore.table.params.status = ''
+tableStore.table.params.target = []
+tableStore.table.params.userId = ''
+
+const sourceChange = (e: any) => {
+    tableStore.table.params.engineeringid = e[0] || ''
+    tableStore.table.params.projectId = e[1] || ''
+    tableStore.table.params.deviceId = e[2] || ''
+}
+// 波形分析
+const getboxin=()=>{
+
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const tableHeight = mainHeight(225).height
+const addMenu = () => {}
+</script>
+<style></style>
diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue
index e222455..d9e4ad2 100644
--- a/src/views/govern/alarm/index.vue
+++ b/src/views/govern/alarm/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <el-tabs v-model="activeName" class="demo-tabs">
+        <el-tabs v-model="activeName" type="card" class="demo-tabs">
             <el-tab-pane label="设备告警" name="1">
                 <Device v-if="activeName == '1'" :deviceTree="deviceTree" />
             </el-tab-pane>