Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

.gitignore

@@ -10,4 +10,6 @@ package-lock.json
 .py
 .py/
 .idea
-.idea/
+.idea/
+public/static/cesium/Assets/Textures/temp
+public/static/cesium/Assets/Textures/temp/

package.json

@@ -12,7 +12,6 @@
   "dependencies": {
     "@antv/x6": "^1.24.4",
     "@arcgis/core": "^4.19.3",
-    "@open-wc/webpack-import-meta-loader": "^0.4.7",
     "animate.css": "3.5",
     "axios": "^0.21.1",
     "cesium": "^1.78.0",
@@ -38,7 +37,8 @@
     "vue-axios": "^3.2.4",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.0",
+    "@open-wc/webpack-import-meta-loader": "git+https://github.com/KmjKoishi/webpack-import-meta-loader-fixed.git"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

public/index.html

@@ -15,6 +15,7 @@
       }
     }
   </script>
+  <script src="./static/js/hlslib/hls.min.js"></script>
   <style type="text/css">
     #ie_dialog {
       width: 350px;

public/static/config/modeConfig.js

@@ -7,14 +7,23 @@ let baseURL = null;
 // websocket 服务器地址
 let websocketUrl = null;
 
+// 3D 地球瓦片路径
+let tilesUrl = null;
+// 3D 地球最大支持放大到多少级
+const tilesMaxLevel = 18;
+
 // 适配器地址
 const adapterUrl = "http://10.155.32.4:8011/";
 
 if (localTest) {
     baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
-        // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+    // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+
+    tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {
     baseURL = "http://10.155.32.4:8082/" // 正式环境
+
+    tilesUrl = "http://10.155.32.4:8070/zhfx/new_tiles";
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";
@@ -22,5 +31,7 @@ websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket"
 window.__MODE__ = {
     baseURL,
     websocketUrl,
-    adapterUrl
+    adapterUrl,
+    tilesUrl,
+    tilesMaxLevel
 };

src/App.vue

@@ -249,7 +249,16 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
     </div>
   </div>
   <login-page v-if="!showSisView && !isLogined" @onLogin="login" />
-  <sisView v-if="showSisView" />
+  <div v-else-if="!isLogined" class="login">
+    <login-page />
+  </div>
+  <!-- <login-page v-if="!showSisView && !isLogined" @onLogin="login" /> -->
+   <!-- <div v-else-if="token == ''">
+    {{token}}
+ <login-page  @onLogin="login" />
+   </div> -->
+ 
+  <sisView v-else-if="showSisView" />
 </template>
 
 <script>

src/api/axios.js

@@ -15,6 +15,7 @@ axios.defaults.withCredentials = true;
     baseURL: "http://192.168.10.23:8082/", // 请求服务器地址 + 端口，可缺省
     subUrl: "api/repassword", // 请求接口地址，必传项
     timeout: 3000, // 请求超时时间，默认 3s ，可缺省
+    body: { id: "151", name: "张三" }, // 请求体所携带的 Body ，如果后端要求 Body 传参的话需要携带此参数，且请求方式需为 POST
     data: { name: "admin", pasword: "123456" }, // 请求所携带参数，默认为空，可缺省
     success (res) {
       // 请求成功的回调
@@ -65,47 +66,87 @@ export function requestData(options) {
       params.append(key, options.data[key]);
     }
 
-    // 发起请求
-    XHRReq({
-      url: options.subUrl,
-      method: options.method || 'GET',
-      params,
-    }).then(response => {
-      if (options.showLoading) {
-        BASE.closeLoading();
-      }
-      if (response.code === 501) { // 用户类请求错误code (账号密码错误、用户锁定、token过期等)
-
-        localStorage.removeItem('authToken');
-        BASE.showMsg({
-          msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
-        });
-
-        // window.location.reload();
-        // window.__STATICVUE__.$router.replace('/login');
-
-      } else if (response.data.code === 200) { // 请求成功 code
-
-        options.success && options.success(response.data);
-        resolve(response);
-
-      } else { // 其他code
-
-        BASE.showMsg({
-          msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
-        });
-
-      }
-    }).catch(error => {
-
-      if (options.showLoading) {
-        BASE.closeLoading();
-      }
-
-      options.fail && options.fail(error);
-      reject(error);
-
-    });
+    if (options.body) {
+      let url = (options.baseURL || window.__MODE__.baseURL || '/api/') + options.subUrl
+      axios[options.method.toLowerCase()](url, options.body, { params: options.data || {} }).then(response => {
+        if (options.showLoading) {
+          BASE.closeLoading();
+        }
+        if (response.code === 501) { // 用户类请求错误code (账号密码错误、用户锁定、token过期等)
+
+          localStorage.removeItem('authToken');
+          BASE.showMsg({
+            msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
+          });
+
+          // window.location.reload();
+          // window.__STATICVUE__.$router.replace('/login');
+
+        } else if (response.data.code === 200 || response.data.length > 0) { // 请求成功 code
+
+          options.success && options.success(response.data);
+          resolve(response);
+
+        } else { // 其他code
+          BASE.closeLoading();
+          BASE.showMsg({
+            msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
+          });
+
+        }
+      }).catch(error => {
+
+        if (options.showLoading) {
+          BASE.closeLoading();
+        }
+
+        options.fail && options.fail(error);
+        reject(error);
+
+      });
+    } else {
+      // 发起请求
+      XHRReq({
+        url: options.subUrl,
+        method: options.method || 'GET',
+        params
+      }).then(response => {
+        if (options.showLoading) {
+          BASE.closeLoading();
+        }
+        if (response.code === 501) { // 用户类请求错误code (账号密码错误、用户锁定、token过期等)
+
+          localStorage.removeItem('authToken');
+          BASE.showMsg({
+            msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
+          });
+
+          // window.location.reload();
+          // window.__STATICVUE__.$router.replace('/login');
+
+        } else if (response.data.code === 200 || response.data.length > 0) { // 请求成功 code
+
+          options.success && options.success(response.data);
+          resolve(response);
+
+        } else { // 其他code
+          BASE.closeLoading();
+          BASE.showMsg({
+            msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
+          });
+
+        }
+      }).catch(error => {
+
+        if (options.showLoading) {
+          BASE.closeLoading();
+        }
+
+        options.fail && options.fail(error);
+        reject(error);
+
+      });
+    }
   });
 }
 

src/components/chart/combination/area-line-chart-2.vue

@@ -0,0 +1,484 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+  name: "multiple-bar-chart",
+  componentName: "multiple-bar-chart",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "800px",
+    },
+    lineData: {
+      type: Array,
+      default: () => [
+        {
+          text: "日发电量",
+          yAxisIndex: 0,
+          value: [
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "2",
+              value: 2,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "4",
+              value: 3,
+            },
+            {
+              text: "5",
+              value: 3,
+            },
+            {
+              text: "6",
+              value: 3,
+            },
+            {
+              text: "7",
+              value: 3,
+            },
+            {
+              text: "8",
+              value: 3,
+            },
+            {
+              text: "9",
+              value: 3,
+            },
+            {
+              text: "10",
+              value: 3,
+            },
+            {
+              text: "11",
+              value: 3,
+            },
+            {
+              text: "12",
+              value: 3,
+            },
+            {
+              text: "13",
+              value: 3,
+            },
+            {
+              text: "14",
+              value: 3,
+            },
+            {
+              text: "15",
+              value: 3,
+            },
+            {
+              text: "16",
+              value: 3,
+            },
+          ],
+        },
+        {
+          text: "上网电量",
+          yAxisIndex: 1,
+          value: [
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "2",
+              value: 2,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "4",
+              value: 3,
+            },
+            {
+              text: "5",
+              value: 4,
+            },
+            {
+              text: "6",
+              value: 5,
+            },
+            {
+              text: "7",
+              value: 6,
+            },
+            {
+              text: "8",
+              value: 7,
+            },
+            {
+              text: "9",
+              value: 8,
+            },
+            {
+              text: "10",
+              value: 7,
+            },
+            {
+              text: "11",
+              value: 9,
+            },
+            {
+              text: "12",
+              value: 2,
+            },
+            {
+              text: "13",
+              value: 3,
+            },
+            {
+              text: "14",
+              value: 5,
+            },
+            {
+              text: "15",
+              value: 12,
+            },
+            {
+              text: "16",
+              value: 11,
+            },
+          ],
+        },
+      ],
+    },
+    areaData: {
+      type: Array,
+      default: () => [
+        {
+          name: "1",
+          start: 0,
+          end: 100,
+          state: "green",
+        },
+        {
+          name: "1",
+          start: 100,
+          end: 200,
+          state: "red",
+        },
+        {
+          name: "1",
+          start: 200,
+          end: 300,
+          state: "yellow",
+        },
+        {
+          name: "2",
+          start: 300,
+          end: 800,
+          state: "green",
+        },
+        {
+          name: "3",
+          start: 800,
+          end: 9000,
+          state: "green",
+        },
+      ],
+    },
+    // 单位
+    units: {
+      type: Array,
+      default: () => ["健康趋势", "风机健康状态数量"],
+    },
+    // 显示 legend
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+    // 颜色
+    color: {
+      type: Array,
+      default: () => ["#323E6F", "#1DA0D7", "#02BB4C", "#DB5520", "#EDB32F", "#EDEB2F"],
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+    };
+  },
+  computed: {
+    legend() {
+      let data = [];
+      this.lineData.forEach((value, index) => {
+        data.push(value.text);
+      });
+      return data;
+    },
+    xAxisData() {
+      let data = [];
+      if (this.lineData.length > 0)
+        this.lineData[0].value.forEach((value, index) => {
+          data.push(value.text);
+        });
+      return data;
+    },
+    yAxisData() {
+      let result = [];
+      this.units.forEach((value, index) => {
+        let data = {
+          type: "value",
+          name: value,
+          axisLabel: {
+            formatter: "{value} ",
+            color: partten.getColor("gray"),
+          },
+          axisLine: {
+            type: "dashed",
+            lineStyle: {
+              color: partten.getColor("gray"),
+            },
+            width: 5,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitLine: {
+            lineStyle: {
+              type: "dashed",
+              dashOffset: 10,
+              color: partten.getColor("gray") + 80,
+            },
+          },
+        };
+        result.push(data);
+      });
+
+      result.push({
+        data: [this.areaData[0].name],
+        axisLabel: { show: false },
+      });
+
+      return result;
+    },
+    areaChartData() {
+      let data = [];
+      for (var i = 0; i < this.areaData.length; i++) {
+        let item = this.areaData[i];
+        var color = item.state;
+        data.push({
+          name: item.name,
+          value: [item.start, item.end, item.end - item.start],
+          itemStyle: {
+            normal: {
+              color: color,
+            },
+          },
+          exData: item,
+        });
+      }
+      return data;
+    },
+    areaMax() {
+      let max = 0;
+      this.areaData.forEach((value) => {
+        if (max < value.end) max = value.end;
+      });
+      return max;
+    },
+  },
+  methods: {
+    renderItem(params, api) {
+      var start = api.coord([api.value(0)]);
+      var end = api.coord([api.value(1)]);
+      var height = api.size([0, 1])[1];
+
+      var rectShape = echarts.graphic.clipRectByRect(
+        {
+          x: start[0],
+          y: start[1] - height / 2,
+          width: end[0] - start[0],
+          height: height,
+        },
+        {
+          x: params.coordSys.x,
+          y: params.coordSys.y,
+          width: params.coordSys.width,
+          height: params.coordSys.height,
+        }
+      );
+
+      return (
+        rectShape && {
+          type: "rect",
+          transition: ["shape"],
+          shape: rectShape,
+          style: api.style(),
+        }
+      );
+    },
+    initChart() {
+      let that = this;
+      let chart = echarts.init(this.$el);
+
+      let option = {
+        color: this.color,
+        grid: {
+          left: 40,
+          right: 40,
+          bottom: 40,
+          top: 32,
+          containLabel: true,
+        },
+        tooltip: {
+          show: true,
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            color: "#fff",
+            fontSize: 14,
+          },
+        },
+        legend: {
+          show: this.showLegend,
+          data: this.legend,
+          right: 120,
+          icon: "ract",
+          itemWidth: 8,
+          itemHeight: 8,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            color: partten.getColor("grayl"),
+            fontSize: 12,
+          },
+        },
+        xAxis: [
+          {
+            type: "category",
+            axisLabel: {
+              color: partten.getColor("gray"),
+            },
+            axisLine: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            data: this.xAxisData,
+          },
+          {
+            show: false,
+            min: 0,
+            max: this.areaMax,
+            axisLabel: {
+              show: false,
+              formatter: function(val) {
+                return Math.max(0, val - 0) + " ms";
+              },
+            },
+          },
+        ],
+        yAxis: this.yAxisData,
+        series: [],
+      };
+
+      // line data
+      if (this.lineData.length > 0) {
+        this.lineData.forEach((value, index) => {
+          option.series.push({
+            name: value.text,
+            type: "line",
+            data: value.value,
+            smooth: true, //平滑展示
+            yAxisIndex: value.yAxisIndex,
+            // lineStyle: {
+            //   color: partten.getColor("green"),
+            // },
+            // itemStyle: {
+            //   color: partten.getColor("green"),
+            // },
+          });
+        });
+      }
+
+      // 区域
+      if (this.areaData && this.areaData.length > 0) {
+        option.series.push({
+          type: "custom",
+          renderItem: this.renderItem,
+          yAxisIndex: this.units.length,
+          xAxisIndex: 1,
+          itemStyle: {
+            opacity: 0.2,
+          },
+          tooltip: {
+            show: false,
+            formatter: function(params) {
+              return params.marker + params.name + ": " + params.value[2] + "s";
+            },
+          },
+          encode: {
+            x: [1, 2],
+            y: 0,
+          },
+          data: this.areaChartData,
+        });
+      }
+
+      chart.setOption(option);
+
+      return chart;
+    },
+  },
+  emits: {
+    areaClick: null,
+  },
+  created() {
+    this.id = "pie-chart-" + util.newGUID();
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
+      let that = this;
+      let chart = this.initChart();
+      chart.on("click", function(e, p) {
+        if (e.seriesType == "custom") {
+          that.$emit("areaClick", { data: e.data.exData });
+        }
+      });
+    });
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+};
+</script>
+
+<style lang="less">
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/components/chart/line/multiple-y-line-chart-normal.vue

@@ -295,7 +295,8 @@ export default {
             });
         },
         xdata() {
-            return this.list[0].value.map((t) => {
+            console.log('this.list[0].value:',this.list)
+            return this.list[0]?.value.map((t) => {
                 return t.text;
             });
         },
@@ -303,6 +304,7 @@ export default {
             let result = [];
             let p = {left: 0, right: 0};
             this.yAxises.forEach((item, index) => {
+                console.log('yitem:',item)
                 result.push({
                     type: "value",
                     name: `${item.name}${item.unit}`,
@@ -332,13 +334,16 @@ export default {
                 });
                 p[item.position]++;
             });
-
+console.log('yResult:',result)
             return result;
+            
         },
         series() {
             let result = [];
-
+           console.log('list:',this.list)
             this.list.forEach((value, index) => {
+                console.log('seriesValue:',value)
+                console.log('seriesIndex:',index)
                 result.push({
                     name: value.title,
                     type: "line",
@@ -368,7 +373,9 @@ export default {
 
             let option = this.option();
             chart.clear();
+          
             chart.setOption(option);
+              console.log('111111111111111111111',option);
 
             this.resize = function() {
                 chart.resize();
@@ -429,6 +436,7 @@ export default {
             const chart = echarts.getInstanceByDom(this.$el);
             chart.clear();
             let option = this.option();
+            console.log('111111111111111111111',option);
             chart.setOption(option);
         },
     },

src/components/chart/radar/normal-radar-chart.vue

@@ -23,8 +23,8 @@ export default {
     },
     // 标题
     title: {
-      type: String,
-      default: "标题",
+      type: Array,
+      default: () => ["-", "-"],
     },
     // 值
     value: {
@@ -66,24 +66,34 @@ export default {
             borderWidth: 0.5,
           },
         },
+        {
+          areaStyle: {
+            color: "rgba(165,228,175, 0.9)",
+          },
+          lineStyle: {
+            color: "rgba(255,255,255, 0.85)",
+          },
+          itemStyle: {
+            color: "rgba(165,228,175, 0.5)",
+            borderColor: "rgba(255,255,255, 0.5)",
+            borderWidth: 0.5,
+          },
+        },
       ],
     };
   },
-  computed: {
-    series() {
+  methods: {
+    renderValue() {
       let result = [];
       this.value.forEach((value, index) => {
         result.push({
-          name: this.title,
+          name: this.title[index],
           type: "radar",
           data: value.data,
         });
       });
-
       return result;
     },
-  },
-  methods: {
     initChart() {
       let chart = echarts.init(this.$el);
 
@@ -96,9 +106,12 @@ export default {
               maxValue = value;
             }
           });
-          item.areaStyle = this.lineStyles[index % this.lineStyles.length].areaStyle;
-          item.lineStyle = this.lineStyles[index % this.lineStyles.length].lineStyle;
-          item.itemStyle = this.lineStyles[index % this.lineStyles.length].itemStyle;
+          item.areaStyle =
+            this.lineStyles[index % this.lineStyles.length].areaStyle;
+          item.lineStyle =
+            this.lineStyles[index % this.lineStyles.length].lineStyle;
+          item.itemStyle =
+            this.lineStyles[index % this.lineStyles.length].itemStyle;
         });
       maxValue *= 1.5;
 
@@ -340,7 +353,7 @@ export default {
             indicator: indicator,
           },
         ],
-        series: this.series,
+        series: this.renderValue(),
       };
 
       chart.setOption(option);

src/components/chart/radar/radar-chart.vue

@@ -24,7 +24,7 @@ export default {
     // 标题
     title: {
       type: String,
-      default: "标题",
+      default: "",
     },
     // 值
     value: {
@@ -122,6 +122,14 @@ export default {
             color: "#fff",
             fontSize: util.vh(16),
           },
+          position: function(pos, params, dom, rect, size) {
+            // 鼠标在左侧时 tooltip 显示到右侧，鼠标在右侧时 tooltip 显示到左侧。
+            var obj = { top: 60 };
+            obj[["left", "right"][+(pos[0] < size.viewSize[0] / 2)]] = 5;
+            return obj;
+          },
+          extraCssText: "position: absolute; margin-top:-20%;",
+          // extraCssText: "max-width:140px;position:sticky;top:0;left:0"
         },
         radar: [
           // 最低层 90
@@ -367,5 +375,6 @@ export default {
   height: 100%;
   display: block;
   margin: auto;
+  position: relative;
 }
 </style>

src/components/coms/cards/percent-card-2.vue

@@ -85,6 +85,7 @@ export default {
       font-size: @fontsize-s;
       font-weight: 600;
       margin-bottom: 1.1111vh;
+      white-space: nowrap;
 
       .value-text {
         margin-right: 0.741vh;

src/components/coms/table/table3.vue

@@ -16,6 +16,7 @@
       :width="col.width"
       :min-width="col.minWidth"
       :sortable="col.sortable"
+      :sort-orders="sortOrder"
       :sort-by="col.field + '.count'"
       :show-overflow-tooltip="!col.slot"
       :fixed="col.fixed"
@@ -39,7 +40,7 @@
     v-if="pageable"
     @current-change="handleCurrentChange"
     :current-page="currentPage"
-    :page-size="pageSize"
+    v-modal:page-size="selfPageSize"
     :total="data.total"
     v-bind="elPaggingProps"
   >
@@ -88,6 +89,12 @@ export default {
         };
       },
     },
+    sortOrder: {
+      type: Array,
+      default: () => {
+        return ["descending", "ascending", null];
+      },
+    },
   },
   // 自定义事件
   emits: {
@@ -135,6 +142,12 @@ export default {
       if (this.pageable) return this.currentPage * this.pageSize;
       else return this.data.data.length;
     },
+    // sortOrder: {
+    //   type: Array,
+    //   default: () => {
+    //     return ["descending", "ascending", null];
+    //   },
+    // },
   },
   // 函数
   methods: {
@@ -157,6 +170,7 @@ export default {
   },
   created() {
     // 创建后
+    this.selfPageSize = this.pageSize;
   },
   beforeMount() {
     // 渲染前

src/components/other/cesium/index.vue

@@ -71,8 +71,7 @@ export default {
   data() {
     return {
       viewer: null,
-      url: "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII",
-      // url: "http://localhost:8082/static/cesium/Assets/Textures/NaturalEarthII",
+      url: window.__MODE__.tilesUrl,
       publicPath: "./",
       initPosition: [106.0231304, 37.73323706, 0],
 
@@ -135,7 +134,7 @@ export default {
         imageryProvider: new Cesium.TileMapServiceImageryProvider({
           url: that.url,
           fileExtension: "jpg",
-          maximumLevel: 13,
+          maximumLevel: window.__MODE__.tilesMaxLevel,
         }),
       });
 
@@ -221,6 +220,19 @@ export default {
           } else {
             this.geoJSON();
             this.windtShow = true;
+            this.viewer.camera.flyTo({
+              // fromDegrees()将经纬度和高程转换为世界坐标
+              destination: Cesium.Cartesian3.fromDegrees(
+                106.052978,
+                33.122394,
+                400000
+              ),
+              orientation: {
+                heading: Cesium.Math.toRadians(0.0), // 方向
+                pitch: Cesium.Math.toRadians(-45.0), // 倾斜角度
+                roll: 0,
+              },
+            });
             wtTree.forEach((ele) => {
               this.addFengjiModel(
                 Cesium.Cartesian3.fromDegrees(ele.lng, ele.lat, 1650)
@@ -360,10 +372,10 @@ export default {
           h
         ),
         //duration:5, // 设置飞行持续时间，默认会根据距离来计算
-        complete: function () {
+        complete() {
           // 到达位置后执行的回调函数
         },
-        cancle: function () {
+        cancle() {
           // 如果取消飞行则会调用此函数
         },
         pitchAdjustHeight: -90, // 如果摄像机飞越高于该值，则调整俯仰俯仰的俯仰角度，并将地球保持在视口中。
@@ -412,7 +424,7 @@ export default {
           minimumPixelSize: 100,
           // 模型最大刻度
           maximumSize: 100,
-          //设置模型最大放大大小
+          // 设置模型最大放大大小
           maximumScale: 150,
           // 模型是否可见
           show: true,
@@ -425,7 +437,10 @@ export default {
           // 仅用于调试。显示模型绘制时的边界球。
           debugShowBoundingVolume: false,
           scale: 0.05,
-          runAnimations: true, //是否运行模型中的动画效果
+          // 是否运行模型中的动画效果
+          runAnimations: true, 
+          // 模型贴地
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
         },
         // 添加描述
         description: "风机模型",
@@ -605,8 +620,6 @@ export default {
     position: relative;
   }
 }
-</style>
-<style lang="less">
 .menu {
   .el-dropdown-menu {
     background: rgba(0, 0, 0, 0.5) !important;
@@ -618,4 +631,4 @@ export default {
 .heatmap-canvas {
   pointer-events: none;
 }
-</style>
+</style>

src/components/other/clock/index.vue

@@ -39,7 +39,7 @@ export default {
     this.drawCoolClock();
     this.timer = setInterval(() => {
       this.drawCoolClock();
-    }, 30);
+    }, 150);
   },
 
   unmounted() {

src/components/other/healthReport/index.vue

@@ -142,7 +142,7 @@
           <normal-line-chart :list="qxpcls" />
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">对风偏差：</el-form-item>
@@ -194,7 +194,7 @@
           />
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">切入切出：</el-form-item>
@@ -227,7 +227,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -253,19 +253,15 @@
               yhbjcount.tdgtime
             }}分钟。
           </el-form-item>
-          <el-form-item class="text-indent-2" v-if="bjyhcount.length > 0"
-            >其中以{{ bjyhcount[0].yhmx }}发生频次最高，为{{
-              bjyhcount[0].count
-            }}次；{{ bjyhcount[1].yhmx }}次之，为{{ bjyhcount[1].count }}次；{{
-              bjyhcount[2].yhmx
-            }}第三，为{{ bjyhcount[0].count }}次。
+          <el-form-item class="text-indent-2" v-if="bjyhcount.length > 0">
+			<font v-if="bjyhcount[0].yhmx">其中以{{ bjyhcount[0].yhmx }}发生频次最高，为{{ bjyhcount[0].count }}次；</font>
+			<font v-if="bjyhcount[1].yhmx">{{ bjyhcount[1].yhmx }}次之，为{{ bjyhcount[1].count }}次；</font>
+			<font v-if="bjyhcount[2].yhmx">{{ bjyhcount[2].yhmx }}第三，为{{ bjyhcount[0].count }}次。</font>
           </el-form-item>
-          <el-form-item class="text-indent-2"
-            >其中以{{ bjyhcount[3].yhmx }}发生时长最长，为{{
-              bjyhcount[3].times
-            }}分钟；{{ bjyhcount[4].yhmx }}次之，为{{
-              bjyhcount[4].yhmx
-            }}分钟；{{ bjyhcount[5].yhmx }}第三，为{{ bjyhcount[5].yhmx }}分钟。
+          <el-form-item class="text-indent-2" >
+			<font v-if="bjyhcount[3].yhmx">其中以{{ bjyhcount[3].yhmx }}发生时长最长，为{{ bjyhcount[3].times }}分钟；</font>
+			<font v-if="bjyhcount[4].yhmx">{{ bjyhcount[4].yhmx }}次之，为{{ bjyhcount[4].yhmx }}分钟；</font>
+			<font v-if="bjyhcount[5].yhmx">{{ bjyhcount[5].yhmx }}第三，为{{ bjyhcount[5].yhmx }}分钟。</font>
           </el-form-item>
           <div class="logHead">部件隐患对比（次|分钟）</div>
           <el-table
@@ -338,7 +334,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">故障分类：</el-form-item>
@@ -392,7 +388,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -432,7 +428,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -463,7 +459,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">发电机：</el-form-item>
@@ -492,7 +488,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -521,7 +517,7 @@
           >
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2">齿轮箱：</el-form-item>
@@ -616,7 +612,7 @@
             <el-table-column prop="scz" label="实测值"></el-table-column>
             <el-table-column prop="df" label="得分"></el-table-column>
           </el-table>
-
+ 
           <el-form-item class="imp fw text-indent-2">震动监测：</el-form-item>
           <el-form-item class="text-indent-2">时域分析分析法</el-form-item>
           <el-form-item class="text-indent-2"
@@ -642,7 +638,7 @@
           >
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -696,7 +692,7 @@
           </el-table>
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"
@@ -743,7 +739,7 @@
               :label="sbklyls[0].date"
             ></el-table-column>
           </el-table>
-
+ 
           <el-form-item class="imp fw text-indent-2"
             >2、设备可利用率</el-form-item
           >
@@ -827,7 +823,7 @@
           <div class="logHead">
             {{ datas.year }}年{{ datas.month }}月性能评价明细
           </div>
-
+ 
           <table
             border="1"
             class="xnpjfx"
@@ -867,7 +863,7 @@
           </table>
         </el-form>
       </div>
-
+ 
       <div class="textBox" v-if="Number(datas.isrecommend) == 1">
         <el-form>
           <el-form-item class="imp fw"><b>推荐检修方案</b></el-form-item>
@@ -879,7 +875,7 @@
             >中频：{{ datas.mediatefrequency }}</el-form-item
           >
           <el-form-item class="m-b-10 text-indent-4"
-            >低频：{{ datas.fowfrequency }}</el-form-item
+            >低频：{{ datas.fowfrequency == 'null'?'暂无数据':datas.fowfrequency }}</el-form-item
           >
           <el-form-item class="text-indent-2"
             >推荐检修理由：{{ datas.reason }}</el-form-item
@@ -918,7 +914,7 @@
           >
         </el-form>
       </div>
-
+ 
       <div class="textBox">
         <el-form>
           <el-form-item class="fw" style="margin: 10px 0; text-align: center"
@@ -929,7 +925,7 @@
     </div>
   </el-dialog>
 </template>
-
+ 
 <script>
 import DoubleLineChart from "@com/chart/line/double-line-chart.vue";
 // import ScatterLineChart from "@com/chart/combination/scatter-line-chart.vue";
@@ -1001,12 +997,18 @@ export default {
         {
           title: "曲线偏差率",
           yAxisIndex: 0,
-          value: [],
+          value: [{
+              text: "1",
+              value: 0,
+            }],
         },
         {
           title: "基准值",
           yAxisIndex: 0,
-          value: [],
+          value: [{
+              text: "1",
+              value: 0,
+            },],
         },
       ],
       // 隐患部件频次统计
@@ -1106,7 +1108,7 @@ export default {
       xnpjmx: [],
       pjmxs: [],
       wttragetreportcharts: [],
-
+ 
       zhrank: 2,
       // 维修换件频次
       wxhjpc: [
@@ -1605,7 +1607,7 @@ export default {
       reqData: {},
     };
   },
-
+ 
   props: {
     show: {
       type: Boolean,
@@ -1631,7 +1633,6 @@ export default {
       $(".bjyhdb .el-table__header-wrapper table .is-group tr").eq(1).remove();
     },
     yhmxdbMethod({ row, column, rowIndex, columnIndex }) {
-      // 	console.log(rowIndex + "==" + columnIndex)
       if (rowIndex < 8) {
         if (rowIndex === 0 && columnIndex === 0) {
           return [8, 1];
@@ -1687,20 +1688,20 @@ export default {
         "健康评价报告概述"
       );
     },
-
+ 
     // 关闭弹窗
     dialogClosed() {
       this.dialogVisible = false;
       this.$emit("closed", false);
     },
-
+ 
     // 改变列颜色
     columnStyle({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         return "background:rgb(204,255,255);";
       }
     },
-
+ 
     // 获取报告详情
     getReport() {
       let that = this;
@@ -1721,7 +1722,7 @@ export default {
             that.datas = res.data;
             that.healthreport = res.data.healthreport;
             that.randomInitDate();
-
+ 
             that.qxpcls = [];
             // 功率曲线拟合
             let glqxnh = [
@@ -1736,7 +1737,7 @@ export default {
                 value: [],
               },
             ];
-            res.data.healthreport.nhglqxs.forEach((item) => {
+            res.data.healthreport.nhglqxs && res.data.healthreport.nhglqxs.forEach((item) => {
               if (Number(item.speed) % 1 == 0) {
                 glqxnh[0].value.push({
                   text: item.speed,
@@ -1749,7 +1750,7 @@ export default {
               }
             });
             that.glqxnh = glqxnh;
-
+ 
             //曲线偏差率
             let qxpcls = [
               {
@@ -1763,21 +1764,25 @@ export default {
                 value: [],
               },
             ];
-            let qxpcl = res.data.healthreport.qxpcls.sort(that.compare("date"));
-            if (qxpcl != null && qxpcl != undefined) {
-              for (var i = qxpcl.length - 1; i >= 0; i--) {
-                qxpcls[0].value.push({
-                  text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
-                  value: Number(qxpcl[i].qxpcl).toFixed(2),
-                });
-                qxpcls[1].value.push({
-                  text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
-                  value: Number(qxpcl[i].jzz).toFixed(2),
-                });
-              }
-              that.qxpcls = qxpcls;
-            }
-
+			console.log(11111,res.data.healthreport.qxpcls)
+			if(res.data.healthreport.qxpcls){
+				let qxpcl = res.data.healthreport.qxpcls.sort(that.compare("date"));
+				if (qxpcl != null && qxpcl != undefined) {
+				  for (var i = qxpcl.length - 1; i >= 0; i--) {
+				    qxpcls[0].value.push({
+				      text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
+				      value: Number(qxpcl[i].qxpcl).toFixed(2),
+				    });
+				    qxpcls[1].value.push({
+				      text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
+				      value: Number(qxpcl[i].jzz).toFixed(2),
+				    });
+				  }
+				  that.qxpcls = qxpcls;
+				  console.log(11111,that.qxpcls)
+				}
+			}
+ 
             // 对风偏差
             that.dfpc = [];
             let dfpc = {
@@ -1803,21 +1808,21 @@ export default {
                 },
               ],
             };
-            res.data.healthreport.nipples.forEach((item) => {
+            res.data.healthreport.nipples && res.data.healthreport.nipples.forEach((item) => {
               let obj = {
                 text: item.pcl,
                 value: item.count,
               };
               dfpc.nipples[0].value.push(obj);
             });
-            res.data.healthreport.dfpclpowers.forEach((item) => {
+            res.data.healthreport.dfpclpowers && res.data.healthreport.dfpclpowers.forEach((item) => {
               let obj = {
                 text: item.power,
                 value: item.dfpcl,
               };
               dfpc.dfpclpowers[0].value.push(obj);
             });
-            res.data.healthreport.dfpclSpeeds.forEach((item) => {
+            res.data.healthreport.dfpclSpeeds && res.data.healthreport.dfpclSpeeds.forEach((item) => {
               let obj = {
                 text: item.speed,
                 value: item.dfpcl,
@@ -1825,7 +1830,7 @@ export default {
               dfpc.dfpclSpeeds[0].value.push(obj);
             });
             that.dfpc = dfpc;
-
+ 
             // 部件隐患对比
             that.bjyhdbs = [];
             that.bjyhdbs = res.data.healthreport.bjyhdbs;
@@ -1877,7 +1882,7 @@ export default {
                 }
                 if (that.yhmxdbs2.length == 3) break;
               }
-
+ 
               // 部件隐患数据频次时长统计
               let ybmxdj1 = Object.assign([], ybmxdj);
               let ybmxdj2 = Object.assign([], ybmxdj);
@@ -1893,17 +1898,16 @@ export default {
                 that.bjyhcount.push(array2[2]);
               }
             }
-
             //切入切出对比
             that.qrqcs = [];
-            res.data.healthreport.qrqcs.forEach((item) => {
+            res.data.healthreport.qrqcs && res.data.healthreport.qrqcs.forEach((item) => {
               item.xfqr = item.xfqr == null ? 0 : item.xfqr.toFixed(2);
               item.xfqc = item.xfqc == null ? 0 : item.xfqc.toFixed(2);
               item.dfqr = item.dfqr == null ? 0 : item.dfqr.toFixed(2);
               item.dfqc = item.dfqc == null ? 0 : item.dfqc.toFixed(2);
               that.qrqcs.push(item);
             });
-
+ 
             //设备可利用率
             let sbklyls = res.data.healthreport.sbklyls;
             that.sbklyls = sbklyls;
@@ -1959,7 +1963,7 @@ export default {
               that.sbklyls2.push(sbklyls5);
               that.sbklyls2.push(sbklyls6);
               that.sbklyls2.push(sbklyls7);
-
+ 
               // 风能利用率
               let fnlyl = res.data.healthreport.fnlyls;
               let fnlyl1 = {
@@ -2026,17 +2030,17 @@ export default {
               that.fnlyls.push(fnlyl8);
               that.fnlyls.push(fnlyl9);
             }
-
+ 
             // 故障分类
             that.faultclass = res.data.healthreport.faultclass.sort(
               that.compare("monthwarningnum")
             );
-
+ 
             // 功率对部件温度影响
             that.partwds = [];
             let partwds = res.data.healthreport.partwds;
             let partwd = [];
-            partwds.forEach((item, i) => {
+            partwds && partwds.forEach((item, i) => {
               let bj = "";
               if (item.part == "zk") {
                 bj = "主控";
@@ -2057,7 +2061,7 @@ export default {
               } else if (item.part.indexOf("cf")) {
                 bj = "测风系统";
               }
-
+ 
               partwd.push({
                 bj: bj,
                 wdcd: item.type,
@@ -2074,7 +2078,7 @@ export default {
               });
             });
             that.partwds = partwd;
-
+ 
             // 性能评价结果
             that.xnpjjg = [];
             let pjmxs = res.data.healthreport.pjjgs;
@@ -2107,7 +2111,7 @@ export default {
                 that.xnpjjg.push(xnpj3);
               }
             }
-
+ 
             // 评价结果明细
             that.xnpjmx = [];
             let pjmx = res.data.healthreport.pjmxs[0];
@@ -2307,7 +2311,7 @@ export default {
                 ],
               },
             ];
-
+ 
             // 部件劣化状态4张图表
             let fdj = [
                 {
@@ -2337,8 +2341,8 @@ export default {
                   value: [],
                 },
               ];
-
-            res.data.healthreport.wttragetreportcharts.forEach((item) => {
+ 
+            res.data.healthreport.wttragetreportcharts && res.data.healthreport.wttragetreportcharts.forEach((item) => {
               var recorddate = new Date(item.recorddate).formatDate(
                 "yyyy-MM-dd hh:mm"
               );
@@ -2493,7 +2497,7 @@ export default {
       this.bjzb.push(obj14);
     },
   },
-
+ 
   watch: {
     show(value) {
       this.dialogVisible = value;
@@ -2507,66 +2511,66 @@ export default {
   },
 };
 </script>
-
+ 
 <style lang="less" scoped>
 .cDialog {
   position: relative;
-
+ 
   .pdfDom {
     padding: 30px 50px;
   }
-
+ 
   .title {
     text-align: center;
     font-size: 24px;
     font-weight: 700;
   }
-
+ 
   .tableBox {
     width: 100%;
     display: flex;
     justify-content: space-between;
     align-items: center;
-
+ 
     .l,
     .r {
       width: 49%;
       align-self: flex-start;
     }
-
+ 
     .fw {
       font-weight: 700;
     }
   }
-
+ 
   .infoBox {
     margin-top: 10px;
     font-size: 16px;
-
+ 
     .red {
       color: #f25656;
     }
-
+ 
     .purple {
       color: rgb(112, 88, 209);
     }
-
+ 
     .info {
       color: #1595fa;
     }
-
+ 
     p {
       text-indent: 2em;
     }
   }
-
+ 
   .textBox {
     width: 100%;
     margin-top: 10px;
     font-size: 16px;
   }
 }
-
+ 
 .logHead {
   display: flex;
   width: 100%;
@@ -2577,52 +2581,52 @@ export default {
   justify-content: center;
   margin-top: 15px;
 }
-
+ 
 .border-b {
   border-bottom: 1px solid #c0ccda;
 }
-
+ 
 .p-5 {
   padding: 5px;
 }
-
+ 
 .m-b-10 {
   margin-bottom: 10px;
 }
-
+ 
 .text-indent-2 {
   text-indent: 2em;
 }
-
+ 
 .text-indent-4 {
   text-indent: 4em;
 }
 </style>
-
+ 
 <style lang="less">
 .cDialog {
   .cell {
     text-align: center;
   }
-
+ 
   .el-dialog__body {
     max-height: 850px;
     overflow-y: scroll;
     padding: 0;
   }
-
+ 
   .el-form-item.imp {
     .el-form-item__content {
       font-size: 24px;
     }
   }
-
+ 
   .el-form-item {
     margin-bottom: 0;
   }
-
+ 
   .el-table td {
     color: black;
   }
 }
-</style>
+</style>

src/router/index.js

@@ -775,10 +775,25 @@ component:() => import("../views/MalfunctionWarning/MalfunctionWarning.vue")
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
-{
-	path: "/others/otherComponent",
-	name: "otherComponent",
-	component: () => import("../views/Others/otherComponent.vue")
+{//故障样本库
+	path: "/others/gz",
+	name: "gz",
+	component: () => import("../views/Others/gz.vue")
+},
+{//性能样本库
+	path: "/others/xn",
+	name: "xn",
+	component: () => import("../views/Others/xn.vue")
+},
+{//预警样本库
+	path: "/others/yj",
+	name: "yj",
+	component: () => import("../views/Others/yj.vue")
+},
+{//智能样本库
+	path: "/others/zn",
+	name: "zn",
+	component: () => import("../views/Others/zn.vue")
 },
 // 报警中心-SCADA报警
 {

src/tools/basicTool.js

@@ -13,7 +13,7 @@ export default {
    * @param {String} msg 消息提示的内容
    * @param {String} type 消息提示的类型，可选值为 ['success(成功)','warning(警告)','error(错误)',或者直接传入空字符串]，默认 error
    */
-  showMsg (options) {
+  showMsg(options) {
     ElMessage({
       showClose: (options.showClose == true || options.showClose == false) ? options.showClose : false,
       center: (options.center == true || options.center == false) ? options.center : true,
@@ -32,7 +32,7 @@ export default {
    * @param {String} text 蒙版上显示的提示文本
    * @param {String} background 蒙版的背景颜色，写死 50% 透明度的纯黑色
    */
-  showLoading (opt) {
+  showLoading(opt) {
     let options = opt || {};
     loadingStatus = ElLoading.service({
       target: options.target || 'body',
@@ -48,7 +48,7 @@ export default {
    * 获取标签上的自定义属性
    * @param {any} node 传入 字符串 或 标准DOM对象 或 jQuery DOM对象 ，函数自动判断传入的类型并返回其 dataset 属性。
    */
-  getCurrentData (node) {
+  getCurrentData(node) {
     // 如果传入的是 jQuery 对象
     if (window.jQuery && node instanceof jQuery) {
       return node[0].dataset;
@@ -76,7 +76,7 @@ export default {
   /**
    * 关闭loading
    */
-  closeLoading () {
+  closeLoading() {
     loadingStatus.close();
   },
 
@@ -84,7 +84,7 @@ export default {
    * 深拷贝 json 数组
    * @param {Array} jsonArray 传入 Json 数组，返回一个指向新指针拷贝份数据
    */
-  deepCopy (jsonArray) {
+  deepCopy(jsonArray) {
     return JSON.parse(JSON.stringify(jsonArray));
   },
 
@@ -93,14 +93,14 @@ export default {
    * @param {String} key 需要找到的 ID
    * @param {Array} treeData 树形 Array
    */
-  getTreeDeepArr (key, treeData) {
+  getTreeDeepArr(key, treeData) {
 
     let arr = []; // 在递归时操作的数组
     let returnArr = []; // 存放结果的数组
     let depth = 0; // 定义全局层级
 
     // 定义递归函数
-    function childrenEach (childrenData, depthN) {
+    function childrenEach(childrenData, depthN) {
 
       for (var j = 0; j < childrenData.length; j++) {
 
@@ -138,7 +138,7 @@ export default {
    * 获取数据的类型
    * @param {any} options 传入一个数据，返回其类型 (object, array, string, number等)
    */
-  getType (options) {
+  getType(options) {
     return Object.prototype.toString.call(options).slice(8, Object.prototype.toString.call(options).length - 1).toLowerCase();
   },
 
@@ -151,7 +151,7 @@ export default {
    * @param {Number} speed 滚动到指定位置需要的时间 (动画时间)，默认 200
    * @param {Function} success 滚动执行完毕后的回调函数
    */
-  scrollTo (options) {
+  scrollTo(options) {
     if (!options || !options.el) {
       this.showMsg({
         msg: 'scrollTo() 方法需要传入 el 属性'
@@ -175,7 +175,7 @@ export default {
    * @param {Object} tableData 用于规定表格表头和内容的 Object
    * @param {String} excelName 导出的文件名
    */
-  exportExcel (tableData, excelName) {
+  exportExcel(tableData, excelName) {
     const { export_json_to_excel } = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
     let tHeader = []; // 上面设置Excel的表格第一行的标题       
     let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值   
@@ -194,10 +194,22 @@ export default {
     export_json_to_excel(tHeader, data, (excelName || "导出的Excel")); // 最后一个是表名字
   },
 
+  /**
+   * 导出多个 sheet 的单独表格
+   * @param {Array} thArray sheet 的表头，需传入二维数组
+   * @param {Array} dataArray 表格数据，需传入二维数组
+   * @param {Array} sheetNameArray sheet 的名称
+   * @param {String} fileName 导出的文件名称
+   */
+  exportMultiple(thArray, dataArray, sheetNameArray, fileName) {
+    const { exportMultiple } = require('@tools/excel/Export2Excel.js');
+    exportMultiple(thArray, dataArray, sheetNameArray, fileName);
+  },
+
 
 
   // JS 触发全屏功能
-  requestFullscreen () {
+  requestFullscreen() {
     //全屏
     const docElm = document.documentElement;
     //W3C
@@ -225,7 +237,7 @@ export default {
    * 颜色进制转换  16 <--> 10 互转
    * @param {String} colorStr 传入一个颜色字符串， 16进制 或者 10进制 ，返回转换后的结果，例：传入 #1890ff ，返回 rgb(24, 144, 255)，反之亦然
    */
-  replaceColor (colorStr) {
+  replaceColor(colorStr) {
     if (!colorStr) return '';
 
     let colorString = colorStr.replace(/#|rgb|\(|\)|\|;|\s+/g, "");
@@ -261,7 +273,7 @@ export default {
   },
 
   elCkeck: {
-    isNumber (rule, value, callback) {
+    isNumber(rule, value, callback) {
       if (value === '') {
         callback(new Error('该值不可为空'));
       } else if (!/^(-?\d+)(\.\d+)?$/.test(value)) {

src/tools/excel/Export2Excel.js

@@ -4,7 +4,7 @@ require('script-loader!file-saver');
 require('./Blob.js');//转二进制用  这边要写你的blob的实际地址
 require('script-loader!xlsx/dist/xlsx.core.min');
 
-function generateArray (table) {
+function generateArray(table) {
   var out = [];
   var rows = table.querySelectorAll('tr');
   var ranges = [];
@@ -54,13 +54,13 @@ function generateArray (table) {
   return [out, ranges];
 };
 
-function datenum (v, date1904) {
+function datenum(v, date1904) {
   if (date1904) v += 1462;
   var epoch = Date.parse(v);
   return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
 }
 
-function sheet_from_array_of_arrays (data, opts) {
+function sheet_from_array_of_arrays(data, opts) {
   var ws = {};
   var range = {
     s: {
@@ -102,29 +102,27 @@ function sheet_from_array_of_arrays (data, opts) {
   return ws;
 }
 
-function Workbook () {
+function Workbook() {
   if (!(this instanceof Workbook)) return new Workbook();
   this.SheetNames = [];
   this.Sheets = {};
 }
 
-function s2ab (s) {
+function s2ab(s) {
   var buf = new ArrayBuffer(s.length);
   var view = new Uint8Array(buf);
   for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
   return buf;
 }
 
-export function export_table_to_excel (id) {
+export function export_table_to_excel(id) {
   var theTable = document.getElementById(id);
-  console.log('a')
   var oo = generateArray(theTable);
   var ranges = oo[1];
 
   /* original data */
   var data = oo[0];
   var ws_name = "风机数据";
-  console.log(data);
 
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);
@@ -148,10 +146,9 @@ export function export_table_to_excel (id) {
   }), "test.xlsx")
 }
 
-function formatJson (jsonData) {
-  console.log(jsonData)
+function formatJson(jsonData) {
 }
-export function export_json_to_excel (th, jsonData, defaultTitle) {
+export function export_json_to_excel(th, jsonData, defaultTitle) {
 
   /* original data */
 
@@ -178,51 +175,100 @@ export function export_json_to_excel (th, jsonData, defaultTitle) {
   }), title + ".xlsx")
 };
 
-export function export_blob (th, jsonData,defaultTitle) {
+export function export_blob(th, jsonData, defaultTitle) {
   var data = jsonData;
   data.unshift(th);
   var ws_name = "风机数据";
   var wb = new Workbook(),
-  ws = sheet_from_array_of_arrays(data);
+    ws = sheet_from_array_of_arrays(data);
   /* add worksheet to workbook */
   wb.SheetNames.push(ws_name);
   wb.Sheets[ws_name] = ws;
-  var wbout = XLSX.write(wb, {bookType: 'xlsx',bookSST: false,type: 'binary'});
-  
-  if(defaultTitle){//只渲染一个excel
-  	saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}),defaultTitle+".xlsx")
-  }else{//返回多个blob
-  	var aaa = new Blob([s2ab(wbout)], {type: 'text/plain'});
-  	return aaa;
+  var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
+
+  if (defaultTitle) {//只渲染一个excel
+    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), defaultTitle + ".xlsx")
+  } else {//返回多个blob
+    var aaa = new Blob([s2ab(wbout)], { type: 'text/plain' });
+    return aaa;
   }
 };
 
 export function export_more_blob(th, jsonData, defaultTitle) {
-    var data = jsonData;
-    //添加标题
-    for (var i = 0; i < th.length; i++) {
-      data[i].unshift(th[i])
-    }
-    //这里是定义sheet的名称 有几个sheet就加几个
-    var ws_name = ["日上网电量","上网功率","测风塔数据"];
-    var wb = new Workbook(),ws=[];
-    //数据转换
-    for (var j = 0; j < th.length; j++) {
-      ws.push(sheet_from_array_of_arrays(data[j]))
-    }
-    /* add worksheet to workbook */
-    //生成多个sheet
-    for (var k = 0; k < th.length; k++) {
-      wb.SheetNames.push(ws_name[k])
-      wb.Sheets[ws_name[k]] = ws[k]
-    }
-	
-    var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
-    
-	if(defaultTitle){//只渲染一个excel
-		saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}),defaultTitle+".xlsx")
-	}else{//返回多个blob
-		var aaa = new Blob([s2ab(wbout)], {type: 'text/plain'});
-		return aaa;
-	}
-} 
+  var data = jsonData;
+  //添加标题
+  for (var i = 0; i < th.length; i++) {
+    data[i].unshift(th[i])
+  }
+  //这里是定义sheet的名称 有几个sheet就加几个
+  var ws_name = ["日上网电量", "上网功率", "测风塔数据"];
+  var wb = new Workbook(), ws = [];
+  //数据转换
+  for (var j = 0; j < th.length; j++) {
+    ws.push(sheet_from_array_of_arrays(data[j]))
+  }
+  /* add worksheet to workbook */
+  //生成多个sheet
+  for (var k = 0; k < th.length; k++) {
+    wb.SheetNames.push(ws_name[k])
+    wb.Sheets[ws_name[k]] = ws[k]
+  }
+
+  var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
+
+  if (defaultTitle) {//只渲染一个excel
+    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), defaultTitle + ".xlsx")
+  } else {//返回多个blob
+    var aaa = new Blob([s2ab(wbout)], { type: 'text/plain' });
+    return aaa;
+  }
+}
+
+export function exportMultiple(thArray, dataArray, sheetNameArray, fileName = "导出的Excel") {
+
+  let ws_name = sheetNameArray;
+  let wb = new Workbook();
+  let ws = [];
+  let filterArray = [];
+
+  const formatJson = function (filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+  };
+
+  thArray.forEach((pEle, pIndex) => {
+    ws.push([]);
+    dataArray[pIndex].unshift(pEle);
+    filterArray.push([]);
+    pEle.forEach(cEle => {
+      filterArray[pIndex].push(cEle.field);
+    });
+  });
+
+  thArray.forEach((pEle, pIndex) => {
+    const data = formatJson(filterArray[pIndex], dataArray[pIndex]);
+    ws[pIndex].push(sheet_from_array_of_arrays(data));
+    wb.SheetNames.push(ws_name[pIndex]);
+    wb.Sheets[ws_name[pIndex]] = ws[pIndex][0];
+  });
+
+
+  let cellKes = []
+  for (var i = 0; i < 26; i++) {
+    cellKes.push(String.fromCharCode(65 + i));
+  }
+
+  let idx = 0;
+  ws.forEach((pEle, pIndex) => {
+    idx = 0
+    thArray[pIndex].forEach(thEle => {
+      pEle.forEach(cEle => {
+        cEle[cellKes[idx] + 1] = { v: thEle.name, t: "s" }
+        idx++;
+      });
+    });
+  });
+
+  let wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
+  saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), fileName + ".xlsx");
+
+}

src/views/About.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script>
-// import ListBarChart from "../components/chart/bar/list-bar-chart.vue";
+import ListBarChart from "../components/chart/bar/list-bar-chart.vue";
 import HealthReport from "@com/other/healthReport/index.vue";
 import FJ from "@com/other/fj/index.vue";
 import clock from "@com/other/clock/index.vue";
@@ -79,7 +79,7 @@ export default {
     HealthReport,
     FJ,
     clock,
-    cesium
+    cesium,
   },
 
   created() {
@@ -97,6 +97,46 @@ export default {
     this.tableData = tableData;
   },
 
+  mounted() {
+    let thArray = [
+      [
+        { field: "name", name: "表1姓名" },
+        { field: "age", name: "表1年龄" },
+        { field: "sex", name: "表1性别" },
+      ],
+      [
+        { field: "name", name: "表2姓名" },
+        { field: "age", name: "表2年龄" },
+        { field: "sex", name: "表2性别" },
+      ],
+      [
+        { field: "name", name: "表3姓名" },
+        { field: "age", name: "表3年龄" },
+        { field: "sex", name: "表3性别" },
+      ],
+    ];
+
+    let dataArray = [
+      [
+        { name: "张三", age: 12, sex: "男" },
+        { name: "李四", age: 19, sex: "男" },
+      ],
+      [
+        { name: "王五", age: 9, sex: "女" },
+        { name: "赵六", age: 21, sex: "男" },
+      ],
+      [
+        { name: "吴七", age: 26, sex: "男" },
+        { name: "沈八", age: 17, sex: "女" },
+        { name: "刘九", age: 18, sex: "女" },
+      ],
+    ];
+
+    let sheetNameArray=["这是sheet-1","这是sheet-2","这是sheet-3"]
+
+    this.BASE.exportMultiple(thArray, dataArray, sheetNameArray, "单表格多sheet示例");
+  },
+
   methods: {
     showDialog() {
       this.show = true;

src/views/Decision/Decision1.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="decision-page-1">
-    <!-- 查询样式统一处理 样式在 assets/styles/form.less 文件中 -->
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">

src/views/Decision/Decision1Mx.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="decision-page-1">
-		<!-- 查询样式统一处理 样式在 assets/styles/form.less 文件中 -->
 		<div class="query mg-b-8">
 			<div class="query-items">
 				<div class="query-item">

src/views/Decision/Decision2.vue

@@ -178,6 +178,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -728,7 +729,6 @@ export default {
         baseURL: "http://10.155.32.4:9001/",
         subUrl: "benchmarking/wplist",
         success(res) {
-			that.value1.push(res.data[0].id);
         //   that.value2.push(res.data[0].id);
           that.ChangZhan = res.data;
           //  that.AjaxCommon();

src/views/Decision/Decision2Cjdb.vue

@@ -129,6 +129,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/Decision2Cndb.vue

@@ -111,6 +111,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+        :title="[windNum, windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -650,7 +651,6 @@ export default {
         subUrl: "benchmarking/wplist",
         success(res) {
           that.ChangZhan = res.data;
-          that.value1 = res.data[0].id;
         },
       });
     },
@@ -899,7 +899,6 @@ export default {
           ],
         },
       ];
-
       var analyis = [],
         gzssdl = [],
         jxssdl = [],

src/views/Decision/Decision2Xldb.vue

@@ -160,6 +160,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/Decision2Xmdb.vue

@@ -140,6 +140,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -151,7 +152,7 @@
 
 <script>
 import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
-import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
+import DualPieChart from "./dual-pie-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import Table from "../../components/coms/table/table.vue";
@@ -682,7 +683,6 @@ export default {
         baseURL: "http://10.155.32.4:9001/",
         subUrl: "benchmarking/wplist",
         success(res) {
-          that.value1.push(res.data[0].id);
           that.ChangZhan = res.data;
           that.AjaxCommon();
         },

src/views/Decision/Decision3.vue

@@ -163,6 +163,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/Decision4.vue

@@ -54,6 +54,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
+		:title="[windNum,windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"

src/views/Decision/dayinfo.vue

@@ -8,7 +8,7 @@
 					</span>
 				</div>
 				<div class="chart-body">
-					<normal-radar-chart :height="'500px'" :value="radarValue" />
+					<normal-radar-chart :height="'500px'" :value="radarValue" :tltle="['windNum','windNum2']"/>
 				</div>
 			</div>
 			<div class="left">

src/views/Decision/dual-pie-chart.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+  name: "dsah-pie",
+  componentName: "dsah-pie",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "18.519vh",
+    },
+    // 内部饼图数据
+    innerData: {
+      type: Array,
+      default: () => [
+        {
+          value: 700,
+          unit: "个",
+          name: "行业大类1",
+        },
+        {
+          value: 679,
+          unit: "个",
+          name: "行业大类2",
+        },
+        {
+          value: 1548,
+          unit: "个",
+          name: "行业大类3",
+        },
+      ],
+    },
+    // 外部饼图数据
+    outerData: {
+      type: Array,
+      default: () => [
+        {
+          value: 310,
+          unit: "个",
+          name: "邮件营销",
+        },
+        {
+          value: 234,
+          unit: "个",
+          name: "联盟广告",
+        },
+        {
+          value: 335,
+          unit: "个",
+          name: "视频广告",
+        },
+        {
+          value: 548,
+          unit: "个",
+          name: "百度",
+        },
+        {
+          value: 351,
+          unit: "个",
+          name: "谷歌",
+        },
+      ],
+    },
+    // 颜色
+    color: {
+      type: String,
+      default: "green",
+    },
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+    };
+  },
+  computed: {},
+  methods: {
+    initChart() {
+      let that = this;
+      let legend1 = this.innerData.map((v) => v.name);
+      let legend2 = this.outerData.map((v) => v.name);
+      let legendData = [...legend1, ...legend2];
+
+      let option = {
+        color: ["#1893ce", "#edbf00", "#039178", "#ae4802", "#ea8b00"],
+        tooltip: {
+          trigger: "item",
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            color: "#fff",
+            fontSize: util.vh(16),
+          },
+        },
+        grid: {
+          top: 32,
+          left: 60,
+          right: 40,
+          bottom: 24,
+        },
+        legend: {
+          show: this.showLegend,
+          orient: "vertical", //纵向图例
+          right: "16",
+          bottom: 32,
+          itemWidth: 15,
+          itemHeight: 15,
+          formatter: (name) => {
+            if (that.innerData.length) {
+              const item = that.innerData.filter((item) => item.name === name)[0];
+              return `{name|${name}：}{value| ${item.value}}`;
+            }
+          },
+          //icon: 'circle',
+          itemGap: 12, //图例item间距
+          textStyle: {
+            color: partten.getColor("gray"),
+            fontSize: util.vh(14),
+            rich: {
+              name: {
+                color: partten.getColor("gray"),
+                fontSize: 12,
+              },
+              value: {
+                color: partten.getColor("grayl"),
+                fontSize: 12,
+              },
+            },
+          },
+          data: legend1,
+        },
+        series: [
+          {
+            name: "",
+            type: "pie",
+            center: ["20%", "50%"],
+            radius: [0, "35%"],
+            itemStyle: {
+              normal: {},
+            },
+            label: {
+              normal: {
+                show: false,
+              },
+            },
+            labelLine: {
+              normal: {
+                show: false,
+              },
+            },
+            data: this.innerData,
+          },
+          {
+            name: "",
+            type: "pie",
+            center: ["20%", "50%"],
+            radius: ["55%", "95%"],
+            data: this.outerData,
+            labelLine: {
+              normal: {
+                // length: 40,
+                // length2: 120,
+                lineStyle: {
+                  color: "#fff",
+                  fontSize: util.vh(14),
+                },
+              },
+            },
+            itemStyle: {
+              normal: {
+                borderWidth: util.vh(14),
+                borderColor: "#071812",
+              },
+            },
+            label: {
+              normal: {
+                formatter: (params) => {
+                  return "{percent|" + params.percent.toFixed(2) + "%}";
+                },
+                padding: [0, 0, 0, 0],
+                rich: {
+                  color: "#ffffff" + "cc",
+                  percent: {
+                    fontSize: util.vh(14),
+                    color: "#ffffff" + "cc",
+                  },
+                },
+              },
+            },
+          },
+        ],
+      };
+
+      this.chart.setOption(option);
+    },
+  },
+  created() {
+    this.id = "pie-chart-" + util.newGUID();
+  },
+  mounted() {
+    this.$el.style.width = this.width;
+    this.$el.style.height = this.height;
+    this.chart = echarts.init(this.$el);
+    this.initChart();
+  },
+  updated() {
+    this.initChart();
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.chart {
+  width: 100%;
+  height: 100%;
+  display: block;
+  margin: auto;
+}
+</style>

src/views/HealthControl/Health0.vue

@@ -67,7 +67,7 @@
               <div class="fan-code-label font-md gray-l" style="margin-left:100px">中频：</div>
               <div class="fan-code-value font-md green">{{stoptypemap && stoptypemap.top2type}}</div>
               <div class="fan-code-label font-md gray-l" style="margin-left:65px">低频：</div>
-              <div class="fan-code-value font-md green">{{stoptypemap && stoptypemap.top3type}}</div>
+              <div class="fan-code-value font-md green">{{stoptypemap && (stoptypemap.top3type == 'null'?'暂无数据':stoptypemap.top3type)}}</div>
             </div>
             <!-- <span class="svg-icon svg-icon-white svg-icon-md mg-l-16">
               <SvgIcon svgid="svg-wind-site"></SvgIcon>

src/views/HealthControl/Health3.vue

@@ -46,7 +46,7 @@
             </div>
           </div>
           <div class="dashboard">
-            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.yfdl" />
+            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.yczqlmonth" />
             <div class="lengends">
               <div class="item">
                 <span class="label">本月发电量</span>
@@ -56,7 +56,7 @@
               <div class="item">
                 <span class="label">本月预测电量</span>
                 <span class="lengend green"></span>
-                <span class="value">{{sourceMap.yczqlmonth}}</span>
+                <span class="value">{{sourceMap.ycdl1month}}</span>
               </div>
             </div>
           </div>

src/views/HealthControl/Health5.vue

@@ -72,17 +72,16 @@ export default {
         subUrl: "healthmain/findHealthMatrixMap",
         success(res) {
           if (res.code == 200) {
-            //以下解析顺序不可变
+            that.stationsList.push(res.data.fczbmap.MHS_FDC)
             that.stationsList.push(res.data.fczbmap.NSS_FDC)
-            that.stationsList.push(res.data.fczbmap.XS_FDC)
-            that.stationsList.push(res.data.fczbmap.SBQ_FDC)
             that.stationsList.push(res.data.fczbmap.QS_FDC)
-            that.stationsList.push(res.data.fczbmap.MHS_FDC)
+            that.stationsList.push(res.data.fczbmap.SBQ_FDC)
+            that.stationsList.push(res.data.fczbmap.XS_FDC)
+            that.windturbineList.push(res.data.fjmap[0]) //麻黄山
             that.windturbineList.push(res.data.fjmap[1]) //牛首山
-            that.windturbineList.push(res.data.fjmap[4]) //香山
-            that.windturbineList.push(res.data.fjmap[3]) //石板泉
             that.windturbineList.push(res.data.fjmap[2]) //青山
-            that.windturbineList.push(res.data.fjmap[0]) //麻黄山
+            that.windturbineList.push(res.data.fjmap[3]) //石板泉
+            that.windturbineList.push(res.data.fjmap[4]) //香山
           }
         },
       });

src/views/HealthControl/HealthTab1.vue

@@ -75,7 +75,7 @@
         </div>
       </panel>
     </div>
-    <health-report :show="reportshow" :params="reportparams" @closed="closed" />
+    <health-report :show="reportshow" :params="reportparams" @closed="closed" ref="eport"/>
   </div>
 </template>
 
@@ -146,11 +146,13 @@ export default {
     },
     // 查看健康报告
     onClickReport(item) {
+		let recorddate = new Date(item.createdate).formatDate("yyyy-MM-dd");
       this.reportshow = true;
       this.reportparams = {
         wtId: item.wtid,
         recorddate: new Date(item.createdate).formatDate("yyyy-MM-dd"),
       };
+	  // this.$refs.eport.getReport(item.wtid,recorddate);
     },
     // 关闭健康报告
     closed() {

src/views/HealthControl/HealthTab2.vue

@@ -45,7 +45,7 @@
       </panel>
     </div>
   </div>
-  <health-report :show="reportshow" :params="reportparams" @closed="closed" />
+  <health-report :show="reportshow" :params="reportparams" @closed="closed"/>
 </template>
 
 <script>

src/views/Home/Home.vue

@@ -188,7 +188,7 @@
                   </td>
                   <td class="value green">
                      <!-- {{ wpId === "0" ? jczbmap.jpeyhl  : gxkmap.nyxxs }} -->
-                    {{ wpId === "0" ? jczbmap.jpeyhl * 10000 : gxkmap.nyxxs }}
+                    {{ wpId === "0" ? jczbmap.jpeyhl : gxkmap.nyxxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
@@ -203,7 +203,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jpeyht  : gxkmap.ndxkyss }} -->
-                     {{ wpId === "0" ? (jczbmap.jpeyht * 10000).toFixed(0) : gxkmap.ndxkyss }}
+                     {{ wpId === "0" ? jczbmap.jpeyht : gxkmap.ndxkyss }}
                   </td>
                   <!-- <td class="unit gray">{{ wpId === "0" ? "万吨" : "%" }}</td> -->
                   <td class="unit gray">{{ wpId === "0" ? "吨" : "%" }}</td>
@@ -214,7 +214,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jys  : gxkmap.ngzxs }} -->
-                     {{ wpId === "0" ? (jczbmap.jys * 10000).toFixed(0) : gxkmap.ngzxs }}
+                     {{ wpId === "0" ? jczbmap.jys : gxkmap.ngzxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}
@@ -229,7 +229,7 @@
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jybm  : gxkmap.ndjxs }} -->
-                      {{ wpId === "0" ? jczbmap.jybm * 10000 : gxkmap.ndjxs }}
+                      {{ wpId === "0" ? jczbmap.jybm : gxkmap.ndjxs }}
                   </td>
                   <!-- <td class="unit gray">
                     {{ wpId === "0" ? "万吨" : "小时" }}

src/views/MalfunctionWarning/MalfunctionWarning.vue

@@ -4,17 +4,17 @@
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
-          <div class="lable">场站：</div>
+          <div class="lable">算法类型：</div>
           <div class="search-input">
             <el-select
               v-model="value1"
-              @change="ChangZhanChange(value1)"
+              @change="algorithmChange(value1)"
               clearable
               placeholder="请选择"
               popper-class="select"
             >
               <el-option
-                v-for="item in ChangZhan"
+                v-for="item in algorithm"
                 :key="item.id"
                 :value="item.id"
                 :label="item.name"
@@ -34,39 +34,42 @@
       <button
         class="btn"
         :class="TypeClass == 1 ? 'green' : ''"
-        @click="TypeClick(1)"
+        @click="TypeClick(1,'sjdr')"
       >
-        风场
+        数据导入
       </button>
       <button
         class="btn"
         :class="TypeClass == 2 ? 'green' : ''"
-        @click="TypeClick(2)"
+        @click="TypeClick(2,'sjfl')"
       >
-        项目
+       数据分类
       </button>
       <button
         class="btn"
         :class="TypeClass == 3 ? 'green' : ''"
-        @click="TypeClick(3)"
+        @click="TypeClick(3,'mxxl')"
       >
-        集电线路
+        模型训练
+      </button>
+        <button
+        class="btn"
+        :class="TypeClass == 4 ? 'green' : ''"
+        @click="TypeClick(4,'mxdc')"
+      >
+        模型导出
+      </button>
+        <button
+        class="btn"
+        :class="TypeClass == 5 ? 'green' : ''"
+        @click="TypeClick(5,'mxcc')"
+      >
+        模型存储
       </button>
     </div>
     <el-row :type="'flex'" class="content">
-      <el-col :span="12" class="pd-r-8">
-        <toolbar-panel title="风机绩效榜" :showLine="false">
-          <!-- <bar-line-chart
-            :height="'calc(100vh - 180px)'"
-            :bardata="bardata"
-            :lineData="lineData"
-            :color="barColor"
-            lineName="理论发电量"
-          /> -->
-        </toolbar-panel>
-      </el-col>
       <el-col :span="12" class="pd-l-8">
-        <panel :title="'项目列表'" :showLine="false">
+        <panel :title="'训练记录'" :showLine="false">
           <!-- <div class="project-table">
             <Table :data="tableData" :height="'calc(80vh - 50px)'">
               <template v-slot:tr v-if="tableData.data.length > 0">
@@ -110,6 +113,85 @@
           </div> -->
         </panel>
       </el-col>
+      <el-col :span="12" class="pd-l-8">
+        <panel :title="'故障预警'" :showLine="false">
+           <el-scrollbar>
+      <div class="panel-box">
+        <div v-for="(mItem,mIndex) in exportModels" :key="mIndex">
+          <!-- <div class="panel-title">
+            <div class="panel-title-name">
+              <i class="svg-icon svg-icon-sm svg-icon-green">
+                <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
+              </i>
+              <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
+              <div
+                class="sub-title-item"
+                v-for="(data, index) of tables[0].subTitleDatas"
+                :key="index"
+              >
+                <span class="sub-title">{{ data.text }}</span>
+                <span class="sub-count" :class="data.color">{{
+                  sourceMap.fczbmap[pItem[pIndex].wpId][data.key]
+                }}</span>
+              </div>
+            </div>
+          </div> -->
+          <div class="panel-body">
+            <div
+              class="card"
+            >
+              <div class="card-panel">
+                <div class="card-left">
+                  <div class="tag"></div>
+                  <div class="icon">
+                    <span
+                      class="svg-icon svg-icon-sm"
+      
+                    >
+                      
+                    </span>
+                  </div>
+                </div>
+                <div class="card-right">
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                      
+                    >
+                    
+                    </i>
+                    <span></span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                     
+                    >
+                     
+                    </i>
+                    <span></span>
+                  </div>
+
+                  <div class="num">
+                    <i
+                      class="svg-icon svg-icon-sm"
+                     
+                    >
+                    
+                    </i>
+                    <span></span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          </div>
+
+      </div>
+    </el-scrollbar>
+        </panel>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -122,10 +204,59 @@ export default{
     partten,
   },
   data(){
-      return{}
+      return{
+        algorithm:[], //算法
+        value1:[],
+         TypeClass: 1, //数据导入，数据分类，模型训练，模型导出，模型存储 的按钮颜色，默认第一个
+      exportModels:[]
+      }
+  },
+  created(){
+    this.algorithmVal()
+    this.exportModels = [
+     {
+       modelName:'2019dbscan.pkl',
+       modelId:'dbscan'
+     },  {
+       modelName:'2020mdjl.pkl',
+       modelId:'mdjl'
+     }
+     ]
+    
+  },
+  methods:{
+    algorithmVal(){
+      let that = this;
+      let algorithmArr = [{
+        id:"dbscan",
+        name:"DBscan"
+      },{
+        id:"mdjl",
+        name:"密度聚类"
+      }];
+      that.algorithm = algorithmArr;
+    },
+    algorithmChange(val){
+       this.TypeClass = "";
+       this.value1 = val;
+    },
+    TypeClick(val,btnType){
+      // console.log(val,btnType)
+      this.TypeClass = val;
+      if(btnType == 'sjdr'){
+
+      }else if(btnType == 'sjfl'){
+
+      }else if(btnType == 'mxxl'){
+
+      }else if(btnType == 'mxdc'){
+           
+      }else if(btnType == 'mxcc'){
+
+      }
+    }
   },
-  created(){},
-  methods:{},
+
 }
 </script>
 <style lang="less">

src/views/NewPages/alarm-center-1.vue

@@ -69,10 +69,9 @@
     <panel-3 class="table-panel">
       <table-3 :data="tableData" :height="'85vh'">
         <template v-for="(item, i) in column" :key="i" #[item]="scope">
-          <div class="bar">
+          <div class="bar" @click="showChart(scope)">
             <div
               class="bar-percent"
-              @click="showChart()"
               :style="{
                 width:
                   (scope.data.count &&
@@ -85,10 +84,9 @@
               >{{ scope.data.count && scope.data.count }} 次数</span
             >
           </div>
-          <div class="bar">
+          <div class="bar" @click="showChart(scope)">
             <div
               class="bar-percent"
-              @click="showChart()"
               :style="{
                 width:
                   (scope.data.count &&
@@ -105,17 +103,38 @@
       </table-3>
     </panel-3>
     <el-dialog
-      :title="'对比'"
+      :title="dialogTitle"
       v-model="dialogVisible"
       width="70%"
       top="10vh"
       custom-class="modal"
       :close-on-click-modal="false"
     >
+      <div class="searchForm">
+        <div class="choose">
+          <button class="btn green">等间隔</button>
+          <!-- <button :class="chooseStatus?'btn green':'btn'" @click="switchChange(1,'original')">原始数据</button> -->
+        </div>
+        <el-select
+          v-if="!chooseStatus"
+          @change="switchChange(selectValue)"
+          class="inputs"
+          v-model="selectValue"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in timeoptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
       <multiple-y-line-chart-normal
         height="500px"
-        :list="Powertrend"
-        :yAxises="PowertrendYAxises"
+        :list="Analysis"
+        :yAxises="AnalysisYAxises"
         :showLegend="true"
       />
     </el-dialog>
@@ -125,36 +144,72 @@
 <script>
 import Panel3 from "../../components/coms/panel/panel3.vue";
 import Table3 from "../../components/coms/table/table3.vue";
-import MultipleYLineChartNormal from "../../components/chart/line/multiple-y-line-chart-normal.vue";
+import MultipleYLineChartNormal from "./multiple-y-line-chart-normal.vue";
+import BASE from '@tools/basicTool.js';
 export default {
   components: { Panel3, Table3, MultipleYLineChartNormal },
   data() {
     return {
+      dialogTitle: "",
+      chooseStatus: false,
       dialogVisible: false,
+      chooseTime: [],
       wpvalue: "",
-      Powertrend: [
+      wpid: "",
+      wtId: "",
+      descName: "",
+      AnalysisName: "",
+      AnalysisUnit: "",
+      Analysis: [
         {
           title: "",
           yAxisIndex: 0, // 使用单位
           value: [],
         },
       ],
-      PowertrendYAxises: [
+      AnalysisYAxises: [
         {
-          name: "功率",
-          min: 0,
-          max: null,
-          unit: "(万kWh)",
+          name: "",
+          min: "",
+          max: "",
+          unit: "",
           position: "left",
         },
         {
-          name: "风速",
-          min: 0,
-          max: 25,
-          unit: "(m/s)",
+          name: "",
+          min: "",
+          max: "",
+          unit: "",
           position: "right",
         },
       ],
+      selectValue: "60",
+      timeoptions: [
+        {
+          value: "60",
+          label: "一分钟",
+        },
+        {
+          value: "300",
+          label: "五分钟",
+        },
+        {
+          value: "600",
+          label: "十分钟",
+        },
+        {
+          value: "1800",
+          label: "三十分钟",
+        },
+        {
+          value: "3600",
+          label: "一小时",
+        },
+        {
+          value: "86400",
+          label: "一天",
+        },
+      ],
       wpoptions: "",
       options: [],
       cascaderOptions: [],
@@ -221,32 +276,16 @@ export default {
       enddate: new Date(new Date()).formatDate("yyyy-MM-dd"),
       tableData: {
         column: [
-          {
-            name: "风机编号",
-            field: "name",
-          },
+          { name: "风机编号", field: "name" },
           {
             name: "主轴温度温差大于8度",
             field: "v1",
             align: "left",
             slot: true,
           },
-          {
-            name: "浆叶角过小",
-            field: "v2",
-            align: "left",
-            slot: true,
-          },
-        ],
-        data: [
-          {
-            name: "MG01_01",
-            v1: {
-              count: 12,
-              time: 0,
-            },
-          },
+          { name: "浆叶角过小", field: "v2", align: "left", slot: true },
         ],
+        data: [{ name: "MG01_01", v1: { count: 12, time: 0 } }],
       },
     };
   },
@@ -257,250 +296,241 @@ export default {
   },
   methods: {
     //对比
-    showChart() {
+    showChart(column) {
       let that = this;
-      that.dialogVisible = true;
-      let Powertrend = [
-        {
-          title: "实发功率",
-          smooth: true,
-          value: [],
-        },
-        {
-          title: "理论功率",
-          smooth: true,
-          value: [],
-        },
-        {
-          title: "保证功率",
-          smooth: true,
-          value: [],
-        },
-        {
-          title: "4小时预测功率",
-          smooth: true,
-          value: [],
-        },
-        {
-          title: "24小时预测功率",
-          smooth: true,
-          value: [],
+      that.dialogTitle = column.column.name;
+      that.wtId = column.row.name;
+      that.descName = column.column.name;
+      
+      that.requestDetailData(
+        that.wpvalue,
+        that.startdate,
+        that.enddate,
+        60,
+        column.row.name,
+        column.column.name
+      );
+    },
+    requestDetailData(station, startTs, endTs, interval, wtId, name) {
+      let that = this;
+      BASE.showLoading();
+      that.API.requestData({
+        method: "GET",
+        subUrl: "/analysis/detail",
+        data: {
+          // station: that.wpvalue,
+          // startTs: new Date(that.startdate).getTime(),
+          // endTs: new Date(that.enddate).getTime(),
+          // // interval: 360,
+          // interval:1,
+          // wtId: column.row.name,
+          // name: column.column.name,
+          station: station,
+          startTs: new Date(new Date(startTs).formatDate("yyyy/MM/dd")).getTime(),
+          endTs: new Date(new Date(endTs).formatDate("yyyy/MM/dd")).getTime(),
+          interval: interval,
+          wtId: wtId,
+          name: name,
         },
-        {
-          title: "平均风速",
-          smooth: true,
-          value: [],
+        success(res) {
+          if (res.data.length == 1) {
+            that.dialogVisible = true;
+            BASE.closeLoading();
+            let yaxises = [
+              {
+                name: "",
+                min: 0,
+                max: null,
+                unit: "",
+                position: "left",
+              },
+            ];
+            // yaxises.name = res.data[0].name;
+            yaxises.unit = res.data[0].unit;
+            that.AnalysisYAxises = yaxises;
+            let aKey1 = ["doubleValue"];
+            let aList1 = [
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+            ];
+            aKey1.forEach((keyEle, keyIndex) => {
+              aList1[keyIndex].title = res.data[keyIndex].name;
+              res.data[keyIndex].data.forEach((rEle) => {
+                aList1[keyIndex].value.push({
+                  text: new Date(rEle.ts).formatDate("hh:mm"),
+                  value: rEle.doubleValue,
+                });
+              });
+            });
+            that.Analysis = aList1;
+          } else if (res.data.length == 2) {
+            that.dialogVisible = true;
+            BASE.closeLoading();
+            let aKey2 = ["doubleValue", "doubleValue"];
+            let aList2 = [
+              {
+                title: "",
+                //  yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+            ];
+            let yaxises1 = [
+              {
+                name: "",
+                min: 0,
+                max: null,
+                unit: "",
+                position: "left",
+              },
+              {
+                name: "",
+                min: 0,
+                max: null,
+                unit: "",
+                position: "right",
+              },
+            ];
+            yaxises1.forEach((aEle, aIndex) => {
+              res.data.forEach((rEle) => {
+                // aEle.name = rEle.name;
+                aEle.unit = rEle.unit;
+              });
+            });
+            that.AnalysisYAxises = yaxises1;
+            aKey2.forEach((keyEle, keyIndex) => {
+              aList2[keyIndex].title = res.data[keyIndex].name;
+              res.data[keyIndex].data.forEach((rEle) => {
+                aList2[keyIndex].value.push({
+                  text: new Date(rEle.ts).formatDate("hh:mm"),
+                  value: rEle.doubleValue,
+                });
+              });
+            });
+            // res.data.forEach((rEle,rIndex)=>{
+            // })
+            // aKey2.forEach((keyEle, keyIndex) => {
+            //   res.data.forEach((rEle) => {
+            //     // alist2[keyIndex].yAxisIndex = keyIndex;
+            //     aList2[keyIndex].title = res.data[keyIndex].name;
+            //     rEle.data.forEach((tEle,tIndex) => {
+            //       aList2[keyIndex].value.push({
+            //         text: new Date(tEle.ts).formatDate("hh:mm"),
+            //         // value: tEle[keyEle],
+            //         // value:res.data[keyIndex].data[tIndex].doubleValue
+
+            //       });
+            //     });
+            //   });
+            // });
+
+            that.Analysis = aList2;
+          } else if (res.data.length == 4) {
+            that.dialogVisible = true;
+            BASE.closeLoading();
+            let aKey4 = [
+              "doubleValue",
+              "doubleValue",
+              "doubleValue",
+              "doubleValue",
+            ];
+            let aList4 = [
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+              {
+                title: "",
+                // yAxisIndex:"",
+                smooth: true,
+                value: [],
+              },
+            ];
+            let yaxises2 = [
+              {
+                name: "",
+                min: 0,
+                max: null,
+                unit: "",
+                position: "left",
+              },
+              {
+                name: "",
+                min: 0,
+                max: null,
+                unit: "",
+                position: "right",
+              },
+            ];
+            yaxises2.forEach((aEle, aIndex) => {
+              res.data.forEach((rEle) => {
+                // aEle.name = rEle.name;
+                aEle.unit = rEle.unit;
+              });
+            });
+            that.AnalysisYAxises = yaxises2;
+            aKey4.forEach((keyEle, keyIndex) => {
+              aList4[keyIndex].title = res.data[keyIndex].name;
+              res.data[keyIndex].data.forEach((rEle) => {
+                aList4[keyIndex].value.push({
+                  text: new Date(rEle.ts).formatDate("hh:mm"),
+                  value: rEle.doubleValue,
+                });
+              });
+            });
+            that.Analysis = aList4;
+          } else if (res.data.length == 0) {
+            that.dialogVisible = false;
+            BASE.closeLoading();
+            that.BASE.showMsg({
+              type: "warning",
+              msg: "暂无数据",
+            });
+          }
         },
-      ];
-      let glKey = ["value2", "value1", "value5", "value4", "value7", "value6"];
-      let resData = {
-        glvos: [
-          {
-            time: 1631721600000,
-            timestr: null,
-            value1: 17,
-            value2: 9.18,
-            value3: 11,
-            value4: 7.27,
-            value5: 16,
-            value6: 1.95,
-            value7: 0,
-            value8: null,
-            value9: 31,
-            value10: null,
-            value11: null,
-            value12: null,
-            value13: null,
-            speed: null,
-            name: null,
-            url: null,
-            aName: null,
-            desc: null,
-            datefomat: null,
-            minRange: null,
-            pointInterval: null,
-            year: null,
-            month: null,
-            day: null,
-            id: null,
-            hours: null,
-            minutes: null,
-            seconds: null,
-            beginDate: null,
-            endDate: null,
-            beginDateDay: null,
-            endDateDay: null,
-            value: null,
-            valueObjVo: null,
-          },
-          {
-            time: 1631725200000,
-            timestr: null,
-            value1: 14,
-            value2: 5.17,
-            value3: 8,
-            value4: 0.1,
-            value5: 12,
-            value6: 2.49,
-            value7: 11.94,
-            value8: null,
-            value9: 29,
-            value10: null,
-            value11: null,
-            value12: null,
-            value13: null,
-            speed: null,
-            name: null,
-            url: null,
-            aName: null,
-            desc: null,
-            datefomat: null,
-            minRange: null,
-            pointInterval: null,
-            year: null,
-            month: null,
-            day: null,
-            id: null,
-            hours: null,
-            minutes: null,
-            seconds: null,
-            beginDate: null,
-            endDate: null,
-            beginDateDay: null,
-            endDateDay: null,
-            value: null,
-            valueObjVo: null,
-          },
-          {
-            time: 1631728800000,
-            timestr: null,
-            value1: 13,
-            value2: 5.07,
-            value3: 8,
-            value4: 0.07,
-            value5: 11,
-            value6: 2.32,
-            value7: 0,
-            value8: null,
-            value9: 26,
-            value10: null,
-            value11: null,
-            value12: null,
-            value13: null,
-            speed: null,
-            name: null,
-            url: null,
-            aName: null,
-            desc: null,
-            datefomat: null,
-            minRange: null,
-            pointInterval: null,
-            year: null,
-            month: null,
-            day: null,
-            id: null,
-            hours: null,
-            minutes: null,
-            seconds: null,
-            beginDate: null,
-            endDate: null,
-            beginDateDay: null,
-            endDateDay: null,
-            value: null,
-            valueObjVo: null,
-          },
-          {
-            time: 1631732400000,
-            timestr: null,
-            value1: 11,
-            value2: 3.3,
-            value3: 6,
-            value4: 0,
-            value5: 9,
-            value6: 2.28,
-            value7: 0,
-            value8: null,
-            value9: 21,
-            value10: null,
-            value11: null,
-            value12: null,
-            value13: null,
-            speed: null,
-            name: null,
-            url: null,
-            aName: null,
-            desc: null,
-            datefomat: null,
-            minRange: null,
-            pointInterval: null,
-            year: null,
-            month: null,
-            day: null,
-            id: null,
-            hours: null,
-            minutes: null,
-            seconds: null,
-            beginDate: null,
-            endDate: null,
-            beginDateDay: null,
-            endDateDay: null,
-            value: null,
-            valueObjVo: null,
-          },
-          {
-            time: 1631736000000,
-            timestr: null,
-            value1: 3.91,
-            value2: 1.67,
-            value3: 1.91,
-            value4: 0.3,
-            value5: 2.91,
-            value6: 1.88,
-            value7: 0,
-            value8: null,
-            value9: 9,
-            value10: null,
-            value11: null,
-            value12: null,
-            value13: null,
-            speed: null,
-            name: null,
-            url: null,
-            aName: null,
-            desc: null,
-            datefomat: null,
-            minRange: null,
-            pointInterval: null,
-            year: null,
-            month: null,
-            day: null,
-            id: null,
-            hours: null,
-            minutes: null,
-            seconds: null,
-            beginDate: null,
-            endDate: null,
-            beginDateDay: null,
-            endDateDay: null,
-            value: null,
-            valueObjVo: null,
-          },
-         
-        ],
-     
-      };
-      glKey.forEach((keyEle, keyIndex) => {
-        resData.glvos.forEach((cEle) => {
-          Powertrend[keyIndex].value.push({
-            text: new Date(cEle.time).formatDate("hh:mm"),
-            value: cEle[keyEle],
-          });
-        });
       });
-
-      that.Powertrend = Powertrend;
     },
-    tabSelect(tab) {},
+    //切换数据类型
+    switchChange(interval,status) {
+      if(status === 'interval') {
+        this.chooseStatus = false
+        this.selectValue = '60'
+      }else if(status === 'original'){
+        this.chooseStatus = true
+      }
+      this.requestDetailData(
+          this.wpvalue,
+          this.startdate,
+          this.enddate,
+          interval,
+          this.wtId,
+          this.descName
+        );
+    },
 
     async search() {
       const { data } = await this.API.requestData({
@@ -550,7 +580,6 @@ export default {
       });
       ////////
       const resData = data.data;
-      console.log("resData:", resData);
       // const resData =this.resdata;
       const column = this.columnObj;
       let dataAll = []; // 总数据集合
@@ -559,6 +588,8 @@ export default {
           name: Object.keys(e)[0],
         };
         let wpid = Object.keys(e)[0];
+        this.wpid = wpid;
+
         e[wpid].forEach((k) => {
           column.forEach((c) => {
             if (k.alertText == c.name) {
@@ -632,7 +663,6 @@ export default {
           root[f].fobj = fobj;
         }
       }
-      console.log("cascaderOptions:", cascaderOptions);
       this.cascaderOptions = cascaderOptions;
     },
   },
@@ -667,5 +697,14 @@ export default {
       }
     }
   }
+  .searchForm {
+    display: flex;
+    margin-left: 36px;
+    flex-direction: row-reverse;
+    .inputs {
+      width: 15%;
+      margin-right: 18px;
+    }
+  }
 }
 </style>

src/views/NewPages/area-line-chart.vue

@@ -201,7 +201,7 @@ export default {
     units: {
       type: Array,
       // default: () => ["健康趋势", "风机健康状态数量"],
-       default: () => ["(实时功率)", "(风速)"],
+      default: () => ["(实时功率)", "(风速)"],
     },
     // 显示 legend
     showLegend: {
@@ -211,24 +211,31 @@ export default {
     // 颜色
     color: {
       type: Array,
-      default: () => ["#323E6F", "#1DA0D7", "#02BB4C", "#DB5520", "#EDB32F", "#EDEB2F"],
+      default: () => [
+        "#323E6F",
+        "#1DA0D7",
+        "#02BB4C",
+        "#DB5520",
+        "#EDB32F",
+        "#EDEB2F",
+      ],
     },
   },
-  data () {
+  data() {
     return {
       id: "",
       chart: null,
     };
   },
   computed: {
-    legend () {
+    legend() {
       let data = [];
       this.lineData.forEach((value, index) => {
         data.push(value.text);
       });
       return data;
     },
-    xAxisData () {
+    xAxisData() {
       let data = [];
       if (this.lineData.length > 0)
         this.lineData[0].value.forEach((value, index) => {
@@ -236,7 +243,7 @@ export default {
         });
       return data;
     },
-    areaChartData () {
+    areaChartData() {
       let data = [];
       for (var i = 0; i < this.areaData.length; i++) {
         let item = this.areaData[i];
@@ -254,7 +261,7 @@ export default {
       }
       return data;
     },
-    areaMax () {
+    areaMax() {
       let max = 0;
       this.areaData.forEach((value) => {
         if (max < value.end) max = value.end;
@@ -263,7 +270,7 @@ export default {
     },
   },
   methods: {
-    renderItem (params, api) {
+    renderItem(params, api) {
       var start = api.coord([api.value(0)]);
       var end = api.coord([api.value(1)]);
       var height = api.size([0, 1])[1];
@@ -292,9 +299,7 @@ export default {
         }
       );
     },
-    initChart () {
-      console.log("units:",this.units)
-      console.log("areaData:",this.areaData)
+    initChart() {
       let that = this;
       let chart = echarts.init(this.$el);
 
@@ -336,15 +341,14 @@ export default {
         xAxis: [
           {
             type: "category",
-             name: this.units[2],
+            name: this.units[2],
             axisLabel: {
-              
               color: partten.getColor("gray"),
             },
             // axisLine: {
             //   show: false,
             // },
-               axisLine: {
+            axisLine: {
               type: "dashed",
               lineStyle: {
                 color: partten.getColor("gray"),
@@ -368,9 +372,10 @@ export default {
             },
           },
         ],
-        yAxis: [{
-           type: "value",
-        },
+        yAxis: [
+          {
+            type: "value",
+          },
           {
             type: "value",
             name: this.units[0],
@@ -400,6 +405,12 @@ export default {
             data: [this.areaData[0].name],
             axisLabel: { show: false },
           },
+          {
+            name: "风速",
+            type: "value",
+            min: 0,
+            max: 30,
+          },
         ],
         series: [],
       };
@@ -407,13 +418,12 @@ export default {
       // line data
       if (this.lineData.length > 0) {
         this.lineData.forEach((value, index) => {
-          console.log('valueTEXT:',value)
           option.series.push({
             name: value.text,
             type: "line",
             data: value.value,
             smooth: true, //平滑展示
-            yAxisIndex: 0,
+            yAxisIndex: value.yAxisIndex,
             // lineStyle: {
             //   color: partten.getColor("green"),
             // },
@@ -456,23 +466,23 @@ export default {
   emits: {
     areaClick: null,
   },
-  created () {
+  created() {
     this.id = "pie-chart-" + util.newGUID();
   },
-  mounted () {
+  mounted() {
     this.$nextTick(() => {
       this.$el.style.width = this.width;
       this.$el.style.height = this.height;
       let that = this;
       let chart = this.initChart();
-      chart.on("click", function(e, p) {
+      chart.on("click", function (e, p) {
         if (e.seriesType == "custom") {
           that.$emit("areaClick", { data: e.data.exData });
         }
       });
     });
   },
-  updated () {
+  updated() {
     this.$nextTick(() => {
       this.initChart();
     });

src/views/NewPages/dj1.vue

@@ -726,6 +726,7 @@
 
 <script>
 import AreaLineChart from "./area-line-chart.vue";
+// import AreaLineChart from "../../components/chart/line/multiple-y-line-chart-normal.vue";
 // import AreaLineChart from "../../components/chart/combination/area-line-chart.vue";
 // import MultipleBarLineChart1 from "./multiple-bar-line-chart.vue";
 import MultipleBarLineChart from "../../components/chart/combination/multiple-bar-line-chart.vue";
@@ -1070,23 +1071,21 @@ export default {
           let lostChartData = [
             {
               text: "实发功率",
-              value: [
-                {
-                  text: "1",
-                  value: 1,
-                },
-              ],
+              yAxisIndex: 0,
+              value: [],
             },
             {
               text: "保证功率",
+              yAxisIndex: 0,
               value: [],
             },
             {
               text: "风速",
+              yAxisIndex: 3,
               value: [],
             },
           ];
-          const lostChartUnit = ["实发功率", "保证功率", "风速", "状态"];
+          const lostChartUnit = ["实发功率", "保证功率", "风速"];
 
           keyArray.forEach((key, keyIndex) => {
             res.data.forEach((ele) => {
@@ -1416,13 +1415,30 @@ export default {
           };
 
           if (res.data.data) {
-			  mgtData.indicator = ["北", "北北西", "北西", "西北西", "西", "西南西", "南西", "南南西", "南", "南南东", "东南", "东南东","东", "东北东", "北东", "北北东"]
+            mgtData.indicator = [
+              "北",
+              "北北西",
+              "北西",
+              "西北西",
+              "西",
+              "西南西",
+              "南西",
+              "南南西",
+              "南",
+              "南南东",
+              "东南",
+              "东南东",
+              "东",
+              "东北东",
+              "北东",
+              "北北东",
+            ];
             res.data.data.forEach((ele) => {
               // mgtData.indicator.push(ele.name);
               mgtData.data[0].value.push(ele.data1);
             });
           }
-
+          mgtData.data[0].value.reverse();
           that[dataKey] = mgtData;
         },
       });

src/views/NewPages/multiple-y-line-chart-normal.vue

@@ -0,0 +1,483 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+  name: "multiple-y-line-chart-normal",
+  componentName: "multiple-y-line-chart-normal",
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "13.889vh",
+    },
+    // 数据
+    list: {
+      type: Array,
+      default: () => [
+        {
+          title: "机舱震动x方向",
+          yAxisIndex: 0,
+          value: [
+            {
+              text: "-0.003",
+              value: -0.003,
+            },
+            {
+              text: "-0.002",
+              value: -0.002,
+            },
+            {
+              text: "-0.003",
+              value: -0.006,
+            },
+            {
+              text: "-0.003",
+              value: -0.003,
+            },
+            {
+              text: "-0.002",
+              value: -0.002,
+            },
+            {
+              text: "-0.003",
+              value: -0.006,
+            },
+            {
+              text: "-0.003",
+              value: -0.003,
+            },
+            {
+              text: "-0.002",
+              value: -0.002,
+            },
+            {
+              text: "-0.003",
+              value: -0.006,
+            },
+          ],
+        },
+        {
+          title: "机舱震动y方向",
+          yAxisIndex: 1,
+          value: [
+            {
+              text: "-0.01",
+              value: -0.01,
+            },
+            {
+              text: "-0.005",
+              value: -0.005,
+            },
+            {
+              text: "-0.008",
+              value: -0.008,
+            },
+            {
+              text: "-0.01",
+              value: -0.01,
+            },
+            {
+              text: "-0.005",
+              value: -0.005,
+            },
+            {
+              text: "-0.008",
+              value: -0.008,
+            },
+            {
+              text: "-0.01",
+              value: -0.01,
+            },
+            {
+              text: "-0.005",
+              value: -0.005,
+            },
+            {
+              text: "-0.008",
+              value: -0.008,
+            },
+          ],
+        },
+        {
+          title: "机舱震动最大偏移值",
+          yAxisIndex: 2,
+          value: [
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "0.05",
+              value: 0.05,
+            },
+            {
+              text: "0.5",
+              value: 0.5,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "0.05",
+              value: 0.05,
+            },
+            {
+              text: "0.5",
+              value: 0.5,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "0.05",
+              value: 0.05,
+            },
+            {
+              text: "0.5",
+              value: 0.5,
+            },
+          ],
+        },
+        {
+          title: "风速1",
+          yAxisIndex: 3,
+          value: [
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "5",
+              value: 5,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "5",
+              value: 5,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "5",
+              value: 5,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+          ],
+        },
+        {
+          title: "风速2",
+          yAxisIndex: 4,
+          value: [
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "2",
+              value: 2,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "2",
+              value: 2,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+            {
+              text: "1",
+              value: 1,
+            },
+            {
+              text: "2",
+              value: 2,
+            },
+            {
+              text: "3",
+              value: 1,
+            },
+          ],
+        },
+      ],
+    },
+    showLegend: {
+      type: Boolean,
+      default: false,
+    },
+    // 轴
+    yAxises: {
+      type: Array,
+      default: () => [
+        {
+          name: "机舱震动x方向",
+          min: -0.01,
+          max: 0,
+          unit: "",
+          position: "left",
+        },
+        {
+          name: "机舱震动y方向",
+          min: -0.01,
+          max: 0,
+          unit: "",
+          position: "right",
+        },
+        {
+          name: "机舱震动最大偏移值",
+          min: 0,
+          max: 1,
+          unit: "",
+          position: "left",
+        },
+        {
+          name: "风速1",
+          min: 0,
+          max: 10,
+          unit: "",
+          position: "right",
+        },
+        {
+          name: "风速2",
+          min: 0,
+          max: 10,
+          unit: "",
+          position: "left",
+        },
+      ],
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+      color: ["#323E6F", "#1DA0D7", "#05BB4C", "#EDB32F", "#DB5520"],
+    };
+  },
+  computed: {
+    legend() {
+      return this.list.map((t) => {
+        return t.title;
+      });
+    },
+    xdata() {
+      console.log("this.list[0].value:", this.list);
+      if (this.list.length > 1) {
+        // this.list[1].value.forEach((lEle, lIndex) => {
+        //   console.log(
+        //     this.list[1].value.indexOf(
+        //       this.list[1].value[lIndex].text == "00:00"
+        //     )
+        //   );
+        // });
+        return this.list[1]?.value.map((t) => {
+          return t.text;
+        });
+      } else if (this.list.length == 1) {
+        return this.list[0]?.value.map((t) => {
+          return t.text;
+        });
+      }
+    },
+    yAxis() {
+      let result = [];
+      let p = { left: 0, right: 0 };
+      this.yAxises.forEach((item, index) => {
+        console.log("yitem:", item);
+        result.push({
+          type: "value",
+          name: `${item.name}${item.unit}`,
+          nameLocation: p[item.position] % 2 == 0 ? "end" : "start",
+          nameGap: 10,
+          min: item.min,
+          max: item.max,
+          position: item.position,
+          offset: p[item.position] * 50,
+          axisLabel: {
+            formatter: "{value}",
+            fontSize: 12,
+          },
+          //分格线
+          splitLine: {
+            lineStyle: {
+              color: partten.getColor("gray"),
+              type: "dashed",
+            },
+          },
+          axisLine: {
+            show: true,
+          },
+          axisTick: {
+            show: true,
+          },
+        });
+        p[item.position]++;
+      });
+      console.log("yResult:", result);
+      return result;
+    },
+    series() {
+      let result = [];
+      console.log("list:", this.list);
+      this.list.forEach((value, index) => {
+        result.push({
+          name: value.title,
+          type: "line",
+          smooth: true,
+          zlevel: index,
+          lineStyle: {
+            normal: {
+              color: this.color[index],
+              width: 1,
+            },
+          },
+          showSymbol: false,
+          yAxisIndex: value.yAxisIndex,
+          data: value.value.map((t) => {
+            return t.value;
+          }),
+        });
+      });
+
+      return result;
+    },
+  },
+  methods: {
+    resize() {},
+    initChart() {
+      const chart = echarts.init(this.$el);
+
+      let option = this.option();
+      chart.clear();
+
+      chart.setOption(option);
+      this.resize = function () {
+        chart.resize();
+      };
+
+      window.addEventListener("resize", this.resize);
+    },
+    option: function () {
+      return {
+        color: this.color,
+        tooltip: {
+          trigger: "axis",
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+        },
+        legend: {
+          show: this.showLegend,
+          data: this.legend,
+          top: "top",
+          icon: "circle",
+          itemWidth: 6,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            color: partten.getColor("grayl"),
+            fontSize: 12,
+          },
+        },
+        grid: {
+          top: 27,
+          left: 16,
+          right: 16,
+          bottom: 0,
+          containLabel: true,
+        },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: false,
+            axisLabel: {
+              interval:
+                Number((this.xdata.length / 8).toFixed(0)) > 2
+                  ? Number((this.xdata.length / 8).toFixed(0))
+                  : 0,
+              showMinLabel: true,
+              showMaxLabel: true,
+              formatter: "{value}",
+              fontSize: 12,
+              textStyle: {
+                color: partten.getColor("gray"),
+              },
+            },
+            data: this.xdata,
+          },
+        ],
+        yAxis: this.yAxis,
+        series: this.series,
+      };
+    },
+    reload: function () {
+      const chart = echarts.getInstanceByDom(this.$el);
+      chart.clear();
+      let option = this.option();
+      chart.setOption(option);
+    },
+  },
+  created() {
+    this.id = "pie-chart-" + util.newGUID();
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$el.style.width = this.width;
+      this.$el.style.height = this.height;
+      this.initChart();
+    });
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
+};
+</script>
+
+<style lang="less">
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/views/Others/gz.vue

@@ -0,0 +1,721 @@
+<template>
+  <el-scrollbar height="92vh" v-if="gzCgd == 1">
+    <div class="query mg-b-8">
+      <div class="query-items">
+        <div class="query-item">
+          <div class="lable">场站：</div>
+          <div class="search-input">
+            <el-select
+              v-model="station"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in ChangZhan"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">故障：</div>
+          <div class="search-input">
+            <el-select
+              v-model="widget"
+              multiple
+              collapse-tags
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in BuJian"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">风机型号：</div>
+          <div class="search-input">
+            <el-select
+              v-model="model"
+              multiple
+              collapse-tags
+              clearable
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in fjxh"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">时间：</div>
+          <div class="search-input">
+            <el-date-picker
+              v-model="time"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+        <div class="query-actions">
+          <button class="btn" @click="query()">查询</button>
+          <button class="btn" @click="addEdit()">新增</button>
+        </div>
+      </div>
+    </div>
+    <el-row :type="'flex'" class="content">
+      <el-col :span="24">
+        <ComTable
+          :data="tableData"
+          :pageSize="pageSize"
+          @onPagging="onChangePage"
+          height="84vh"
+          v-loading="tableLoading"
+          element-loading-text="拼命加载中"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+        ></ComTable>
+      </el-col>
+    </el-row>
+    <el-dialog
+      :title="isvisiableType == 1 ? '新增' : '编辑'"
+      v-model="isvisiable"
+      width="45%"
+      top="15vh"
+      custom-class="modal"
+      :close-on-click-modal="false"
+      :before-close="onClickDialogClose"
+      class="isvisiable"
+    >
+      <!-- 这里是新增或编辑 -->
+      <el-row type="flex" class="mb10">
+        <el-col :span="12">
+          <div>样本：</div>
+          <el-select
+            v-model="tableTag"
+            placeholder="请选择样本"
+            popper-class="select"
+            class="w"
+          >
+            <el-option
+              v-for="item in tableTagArr"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <div>风机型号：</div>
+          <el-select
+            v-model="tableModel"
+            placeholder="请选择风机型号"
+            popper-class="select"
+            class="w"
+          >
+            <el-option
+              v-for="item in fjxh"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row type="flex" class="mb10">
+        <el-col :span="12">
+          <div>故障：</div>
+          <el-select
+            v-model="tableFaulttype"
+            placeholder="请选择故障"
+            popper-class="select"
+            class="w"
+          >
+            <el-option
+              v-for="item in BuJian"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            >
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          <div>时间：</div>
+          <el-date-picker
+            v-model="tableTime"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            class="w"
+          >
+          </el-date-picker>
+        </el-col>
+      </el-row>
+      <el-row type="flex" class="mb10">
+        <el-col :span="12">
+          <div>故障原因：</div>
+          <el-input
+            placeholder="请输入故障原因"
+            v-model="tableSymptom"
+            :value="tableSymptom"
+          >
+          </el-input>
+        </el-col>
+        <el-col :span="12">
+          <div>风机厂商：</div>
+          <el-input
+            placeholder="请输入风机厂商"
+            v-model="tableManufacturer"
+            :value="tableManufacturer"
+          >
+          </el-input>
+        </el-col>
+      </el-row>
+      <el-row type="flex" class="mb10">
+        <el-col :span="12">
+          <div>风机编号：</div>
+          <el-input
+            placeholder="请输入风机编号"
+            v-model="tableWindturbineid"
+            :value="tableWindturbineid"
+          >
+          </el-input>
+        </el-col>
+      </el-row>
+      <el-row type="flex" justify="end">
+        <div class="query-actions" style="margin-top: 15px">
+          <button class="btn" @click="onClickDialogClose">取消</button>
+          <button class="btn" @click="dialogSave">保存</button>
+        </div>
+      </el-row>
+    </el-dialog>
+  </el-scrollbar>
+  <el-scrollbar height="92vh" v-else>
+    <Cgd :data="gzCgdData" @gzCgdClick="gzCgdClick" />
+  </el-scrollbar>
+</template>
+
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+	import Cgd from "./gzCgd.vue";
+	export default {
+		components: {
+			ComTable,
+			Cgd
+		},
+		data() {
+			const that = this;
+			return {
+				tableTagArr:[{
+					label: '正样本',
+					value: 0
+				},
+				{
+					label: '负样本',
+					value: 1
+				}],
+				queryType: false, //没有改变select时，点击查询无效
+				pageIndex: 1,
+				pageSize: 20,
+				gzCgd: 1, //传感点组件隐藏或显示
+				gzCgdData: '', //传感点参数
+				BuJian: [{
+					label: '部件1',
+					value: '1'
+				}, {
+					label: '部件2',
+					value: '2'
+				}],
+				ChangZhan: [{
+					label: '麻黄山风电场',
+					value: 'MHS_FDC'
+				}],
+				fjxh: [{
+					label: '类型1',
+					value: '1'
+				}],
+				fjxhArr: [{
+					id: "MHS_FDC",
+					value: ['UP77', 'UP82', 'UP105']
+				}],
+				widget: [],
+				model: [],
+				time: [],
+				station: '',
+				tableFaulttype: "",
+				tableTag: "",
+				tableModel: "",
+				tableTime: "",
+				tableSymptom: "",
+				tableManufacturer: "",
+				tableWindturbineid: "",
+				tableCategory: "",//隐藏保存部分
+				tableRemark: "",
+				tableFaultcode: "",
+				tableId: "",
+				tableSymptomcode:"",
+				tableStationen:"",
+				isvisiable: false,
+				isvisiableType: 1, //新增为1，编辑为2
+				tableData: {
+					column: [{
+							name: "序号",
+							field: "index",
+							is_light: false,
+							width: '50px',
+						},
+						{
+							name: "样本",
+							field: "tableTag",
+							is_light: false,
+							width: '100px',
+						},
+						{
+							name: "风机型号",
+							field: "tableModel",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "故障",
+							field: "tableFaulttype",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "时间",
+							field: "tableTime",
+							is_light: false,
+							width: '350px',
+						},
+						{
+							name: "故障原因",
+							field: "tableSymptom",
+							is_light: false,
+							width: '350px',
+						},
+						{
+							name: "风机厂商",
+							field: "tableManufacturer",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "风机编号",
+							field: "tableWindturbineid",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "操作",
+							is_light: false,
+							width: '200px',
+							template: () => {
+								return (
+									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='config'>传感点</el-button>&nbsp"
+								);
+							},
+							click(e, row) {
+								that.onClickOption(e, row);
+							},
+						},
+					],
+					data: [{
+						index: 1,
+						tableTag: 0,
+						tableFaulttype: "MG01-01",
+						tableModel: "0.1000",
+						tableTime: "0.1000",
+						tableSymptom: "0.1000",
+						tableManufacturer: "0.1000",
+						tableWindturbineid: "0.1000",
+						value: '这里放隐藏值1',
+						is_light: false,
+					}],
+				}
+			};
+		},
+		methods: {
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.10.4:9002/",
+					subUrl: "benchmarking/wplist",
+					data: {
+						wpId: that.stationId,
+						startTs: that.startDate,
+						endTs: that.endDate,
+						pageNum: that.pageIndex,
+						pageSize: that.pageSize,
+					},
+					success(res) {
+						var dataTab = [];
+						if (res.data) {
+							res.data.list.forEach(item => {
+								dataTab.push({ //表格
+									recodedata: that.formatTime(item.recodedata),
+									region: item.region,
+								})
+							})
+							that.tableData.data = dataTab;
+							that.tableData.total = res.data.total;
+						} else {
+							that.tableData.data = [];
+							that.tableData.total = 0;
+						}
+						that.tableLoading = false;
+					},
+				});
+			},
+			onChangePage(params) {
+				this.pageIndex = params.pageIndex;
+				this.pageSize = params.pageSize;
+				this.getTable();
+			},
+			startAjax() {
+				var that = this;
+				// that.time = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
+				that.time = [new Date((new Date() - 3600 * 1000 * 24 * 360)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.ChangZhan = res.data;
+						// that.station = res.data[0].name
+						that.station = res.data[1].name
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/widget/condition",
+					success(res) {
+						let keys = Object.keys(res.data[0]);
+						let bujian = [],
+							widget = [];
+						keys.forEach((ele, index) => {
+							bujian.push({
+								label: res.data[0]. [ele],
+								value: ele
+							})
+							widget.push(ele)
+						})
+
+						that.widget = widget;
+						that.BuJian = bujian;
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/station/all",
+					success(res) {
+						let fjxhArr = [];
+						let model = [],
+							fjxh = [];
+						res.data.forEach(ele => {
+							fjxhArr.push({
+								id: ele.id,
+								value: ele.model.split("/")
+							})
+							if (ele.id == "MHS_FDC") {
+								model = ele.model.split("/");
+								model.forEach(ele => {
+									fjxh.push({
+										label: ele,
+										value: ele
+									})
+								})
+							}
+						})
+						that.fjxhArr = fjxhArr;
+						that.model = model;
+						that.fjxh = fjxh;
+					},
+				});
+			},
+			query() {
+				if (this.queryType) {
+					this.list();
+				}
+			},
+			addEdit() {
+				this.isvisiableType = 1;
+				this.tableFaulttype = '';
+				this.tableModel = '';
+				this.tableTime = '';
+				this.tableSymptom = '';
+				this.tableManufacturer = '';
+				this.tableWindturbineid = '';
+				
+				// this.tableCategory: data[i].category,
+				// this.tableRemark: data[i].remark,
+				// this.tableFaultcode: data[i].faultcode,
+				// this.tableId: data[i].id,
+				// this.tableSymptomcode:data[i].Symptomcode,
+				// this.tableStationen:data[i].stationen
+				
+				this.isvisiable = true;
+			},
+			onClickOption(e, row) { // 操作按钮
+				let that = this;
+				if ("delete" == e.target.getAttribute("value")) {
+					that
+						.$confirm("确认删除此条样本数据？", "提示", {
+							confirmButtonText: "删除",
+							cancelButtonText: "取消"
+						})
+						.then((_) => {
+							console.log('ok')
+							// that.requestDelete(row);
+						})
+						.catch((_) => {});
+				}
+				if ("edit" == e.target.getAttribute("value")) {
+					that.isvisiableType = 2;
+					that.$nextTick(() => {
+						let tableTime = row.tableTime.split(" - ");
+						that.tableTag = row.tableTag;
+						that.BuJian.forEach(ele => {
+							if (ele.value == row.tableFaultcode) {
+								that.tableFaulttype = ele.label
+							}
+						})
+						that.tableModel = row.tableModel;
+						that.tableTime = [Date.parse(new Date(tableTime[0])),Date.parse(new Date(tableTime[1]))];
+						that.tableSymptom = row.tableSymptom;
+						that.tableManufacturer = row.tableManufacturer;
+						that.tableWindturbineid = row.tableWindturbineid;
+						
+						that.tableCategory= row.tableCategory;
+						that.tableRemark= row.tableRemark;
+						that.tableFaultcode= row.tableFaultcode;
+						that.tableId= row.tableId;
+						that.tableSymptomcode= row.tableSymptomcode;
+						that.tableStationen= row.tableStationen;
+					});
+					that.isvisiable = true;
+				}
+				if ("config" == e.target.getAttribute("value")) { //传感点
+					that.gzCgdData = row.value;
+					that.gzCgd = 2;
+				}
+			},
+			onClickDialogClose() { // 弹窗右上角关闭按钮
+				this.isvisiable = false;
+				this.isvisiableType = 1;
+			},
+			dialogSave() {
+				let that = this;
+				let tableTag = '';
+				// if (typeof that.tableTag.valueOf() == 'string') {
+				// 	that.tableTagArr.forEach(ele => {
+				// 		if (ele.label == that.tableTag) {
+				// 			tableTag = ele.value
+				// 		}
+				// 	})
+				// }
+				
+				that.tableTime[0] = that.formatDate(that.tableTime[0].valueOf());
+				that.tableTime[1] = that.formatDate(that.tableTime[1].valueOf());
+
+				that.API.requestData({
+					method: "POST",
+					baseURL: "http://192.168.1.18:9002/",
+					headers:{
+						'Content-Type': 'application/json;charset=utf-8',
+					},
+					subUrl: "case/item/edit",
+					body:{
+						category: that.tableCategory,
+						endtime: that.tableTime[1],
+						faultcode: that.tableFaultcode,
+						faulttype: that.tableFaulttype,
+						id: that.tableId,
+						manufacturer: that.tableManufacturer,
+						model: that.tableModel,
+						remark: that.tableRemark,
+						starttime: that.tableTime[0],
+						stationen: that.tableStationen,
+						symptom: that.tableSymptom,
+						symptomcode: that.tableSymptomcode,
+						tag: that.tableTag =="正样本" ? 0 : 1,
+						windturbineid: that.tableWindturbineid
+					},
+					success(res) {
+						console.log(res)
+					},
+				});
+			},
+			gzCgdClick(data) {
+				this.gzCgd = data;
+			},
+			formatDate(date) {
+				var date = new Date(date);
+				var YY = date.getFullYear() + '-';
+				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+				return YY + MM + DD + " " + hh + mm + ss;
+			},
+			list() {
+				var that = this;
+				let station = '',
+					widget = ''
+				if (typeof that.time[0].valueOf() != 'string') {
+					that.time[0] = that.formatDate(that.time[0].valueOf())
+				}
+				if (typeof that.time[1].valueOf() != 'string') {
+					that.time[1] = that.formatDate(that.time[1].valueOf())
+				}
+				if (typeof that.station.valueOf() == 'string') {
+					that.ChangZhan.forEach(ele => {
+						if (ele.name == that.station) {
+							station = ele.id
+						}
+					})
+				}
+				if (typeof that.widget.valueOf() == 'string') {
+					that.BuJian.forEach(ele => {
+						if (ele.label == that.widget) {
+							widget = ele.value
+						}
+					})
+				}
+				if (that.model.length == 0) {
+					that.BASE.showMsg({
+						type: "warning",
+						msg: "请选择风机型号",
+					});
+					return
+				}
+				if (that.widget.length == 0) {
+					that.BASE.showMsg({
+						type: "warning",
+						msg: "请选择部件",
+					});
+					return
+				}
+				that.API.requestData({
+					showLoading: true,
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "case/fault/all",
+					data: {
+						widget: widget ? widget : that.widget,
+						station: station ? station : that.station,
+						model: that.model,
+						st: that.time[0].valueOf(),
+						et: that.time[1].valueOf()
+					},
+					success(res) {
+						if (res.code == 200) {
+							console.log(res)
+							that.tableData.data = [];
+							if (res.data.length) {
+								let data = res.data;
+								for (var i = 0; i < data.length; i++) {
+									let obj = {
+										index: i + 1,
+										tableTag: data[i].tag == 0 ? '正样本' : '负样本',
+										tableFaulttype: data[i].faulttype,
+										tableModel: data[i].model,
+										tableTime: data[i].starttime + ' - ' + data[i].endtime,
+										tableSymptom: data[i].symptom,
+										tableManufacturer: data[i].manufacturer,
+										tableWindturbineid: data[i].windturbineid,
+										
+										tableCategory: data[i].category,
+										tableRemark: data[i].remark,
+										tableFaultcode: data[i].faultcode,
+										tableId: data[i].id,
+										tableSymptomcode:data[i].symptomcode,
+										tableStationen:data[i].stationen
+									};
+									that.tableData.data.push(obj);
+								}
+							}
+						}
+					},
+				});
+			},
+			dialogData(){
+				// this.tableFaulttypeArr
+			}
+		},
+		created() {
+			let that = this;
+			that.startAjax();
+			setTimeout(function() {
+				that.list()
+			}, 500)
+		},
+		watch: {
+			station(res) {
+				let fjxh = [];
+				this.fjxhArr.forEach(ele => {
+					if (ele.id == res) {
+						ele.value.forEach(ele2 => {
+							fjxh.push({
+								label: ele2,
+								value: ele2
+							})
+						})
+						this.model = ele.value;
+					}
+				})
+				this.fjxh = fjxh;
+				this.queryType = true;
+			},
+			widget() {
+				this.queryType = true;
+			},
+			model() {
+				this.queryType = true;
+			},
+			time() {
+				this.queryType = true;
+			},
+		},
+	};
+</script>
+
+<style lang="less" scoped>
+.mb10 {
+  margin-bottom: 10px;
+}
+.el-select.w {
+  width: 100%;
+}
+// .el-range-editor.w{width: 100%;}
+</style>

src/views/Others/gzCgd.vue

@@ -0,0 +1,332 @@
+<template>
+	<div>
+		<el-row type="flex">
+			<div class="query-actions">
+				<button class="btn" @click="addEdit">新增</button>
+				<button class="btn" @click="back">返回</button>
+			</div>
+		</el-row>
+		<el-row :type="'flex'" class="content">
+			<el-col :span="24">
+				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
+					v-loading="tableLoading" element-loading-text="拼命加载中"
+					element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
+			</el-col>
+		</el-row>
+		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
+			:close-on-click-modal="false" :before-close="onClickDialogClose">
+			<!-- 这里是新增或编辑 -->
+			<el-row type="flex">
+				<el-col :span="12">
+					字段1：
+					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1"></el-input>
+				</el-col>
+				<el-col :span="12">
+					字段2：
+					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex">
+				<el-col :span="12">
+					字段3：
+					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
+					</el-input>
+				</el-col>
+				<el-col :span="12">
+					字段4：
+					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex" justify="end">
+				<div class="query-actions" style="margin-top: 15px;">
+					<button class="btn" @click="onClickDialogClose">取消</button>
+					<button class="btn" @click="dialogSave()">保存</button>
+				</div>
+			</el-row>
+		</el-dialog>
+		
+		<!-- 原始数据start -->
+		<el-dialog title="原始数据" v-model="yssjDialog" width="70%" top="15vh" custom-class="modal"
+			:close-on-click-modal="false" :before-close="yssjDialogClose">
+			
+			<div class="query mg-b-8">
+				<div class="query-items">
+					<div class="query-item">
+						<div class="lable">时间：</div>
+						<div class="search-input">
+							<el-date-picker v-model="value3" type="datetimerange" range-separator="至"
+								start-placeholder="开始日期" end-placeholder="结束日期">
+							</el-date-picker>
+						</div>
+					</div>
+					<div class="query-item">
+						<div class="lable">等间隔：</div>
+						<div class="search-input">
+							<el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
+								<el-option v-for="item in TingJiLeiXing" :key="item.value" :value="item.value"
+									:label="item.label">
+								</el-option>
+							</el-select>
+						</div>
+					</div>
+					<div class="query-actions">
+						<button class="btn" @click="query()">查询</button>
+					</div>
+				</div>
+			</div>
+			<tab :data="tabData" @select="select" />
+			<el-row type="flex" v-if="currTab == 1">
+				<el-col :span="24">
+					<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
+						v-loading="tableLoading" element-loading-text="拼命加载中"
+						element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
+				</el-col>
+			</el-row>
+			<el-row type="flex" v-if="currTab == 2">
+				<el-col :span="24">
+					<double-line-chart :height="'200px'" />
+				</el-col>
+			</el-row>
+		</el-dialog>
+		<!-- 原始数据end -->
+	</div>
+</template>
+
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+	import DoubleLineChart from "@/components/chart/line/double-line-chart.vue";
+	import Tab from "@/components/coms/tabs/tab.vue";
+	export default {
+		components: {
+			ComTable,DoubleLineChart,Tab
+		},
+		data() {
+			const that = this;
+			return {
+				currTab:1,
+				tabData:[{ id: "1", text: "表格"}, { id: "2", text: "图表", }],
+				value2: '',
+				value3: [],
+				pageIndex: 1,
+				pageSize: 20,
+				myInput1: "",
+				myInput2: "",
+				myInput3: "",
+				myInput4: "",
+				isvisiable: false,
+				yssjDialog:false,
+				isvisiableType: 1, //新增为1，编辑为2
+				tableData: {
+					column: [{
+							name: "序号",
+							field: "index",
+							is_light: false,
+						},
+						{
+							name: "字段1",
+							field: "myInput1",
+							is_light: false,
+						},
+						{
+							name: "字段2",
+							field: "myInput2",
+							is_light: false,
+						},
+						{
+							name: "字段3",
+							field: "myInput3",
+							is_light: false,
+						},
+						{
+							name: "字段4",
+							field: "myInput4",
+							is_light: false,
+						},
+						{
+							name: "操作",
+							is_light: false,
+							width: 100,
+							template: () => {
+								return (
+									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='config'>原始数据</el-button>&nbsp"
+								);
+							},
+							click(e, row) {
+								that.onClickOption(e, row);
+							},
+						},
+					],
+					data: [{
+							index: 1,
+							myInput1: "MG01-01",
+							myInput2: "0.1000",
+							myInput3: "0.1000",
+							myInput4: "0.1000",
+							value: '这里放隐藏值1',
+							is_light: false,
+						},
+						{
+							index: 2,
+							myInput1: "MG01-02",
+							myInput2: "2",
+							myInput3: "23",
+							myInput4: "24",
+							value: '这里放隐藏值2',
+							is_light: false,
+						},
+					],
+				}
+			};
+		},
+		props: {
+			data: {
+				type: String
+			},
+		},
+		methods: {
+			select(data) {
+			  // console.log(data);
+			  this.currTab = parseInt(data.id);
+			},
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					data: {
+						wpId: that.stationId,
+						startTs: that.startDate,
+						endTs: that.endDate,
+						pageNum: that.pageIndex,
+						pageSize: that.pageSize,
+					},
+					success(res) {
+						var dataTab = [];
+						if (res.data) {
+							res.data.list.forEach(item => {
+								dataTab.push({ //表格
+									recodedata: that.formatTime(item.recodedata),
+									region: item.region,
+									weather: item.weather,
+									maximumtem: item.maximumtem,
+									minimumtem: item.minimumtem,
+									sunrise: item.sunrise,
+									sunset: item.sunset,
+									weather1: item.weather1,
+									weather2: item.weather2,
+									temperature1: item.temperature1,
+									temperature2: item.temperature2,
+									realfeel1: item.realfeel1,
+									realfeel2: item.realfeel2,
+									precipitation1: item.precipitation1,
+									precipitation2: item.precipitation2,
+									winddirection1: item.winddirection1,
+									winddirection2: item.winddirection2,
+									speed1: item.speed1,
+									speed2: item.speed2
+								})
+							})
+							that.tableData.data = dataTab;
+							that.tableData.total = res.data.total;
+						} else {
+							that.tableData.data = [];
+							that.tableData.total = 0;
+						}
+						that.tableLoading = false;
+					},
+				});
+			},
+			onChangePage(params) {
+				this.pageIndex = params.pageIndex;
+				this.pageSize = params.pageSize;
+				this.getTable();
+			},
+			addEdit() {
+				this.isvisiableType = 1;
+				this.myInput1 = '';
+				this.myInput2 = '';
+				this.myInput3 = '';
+				this.myInput4 = '';
+				this.isvisiable = true;
+			},
+			onClickOption(e, row) { // 操作按钮
+				let that = this;
+				console.log(row.value) //通过这个value去执行相关操作
+				if ("delete" == e.target.getAttribute("value")) {
+					that
+						.$confirm("确认删除此条样本数据？", "提示", {
+							confirmButtonText: "删除",
+							cancelButtonText: "取消"
+						})
+						.then((_) => {
+							console.log('ok')
+							// that.requestDelete(row);
+						})
+						.catch((_) => {});
+				}
+				if ("edit" == e.target.getAttribute("value")) {
+					that.isvisiableType = 2;
+					that.$nextTick(() => {
+						that.myInput1 = row.myInput1;
+						that.myInput2 = row.myInput2;
+						that.myInput3 = row.myInput3;
+						that.myInput4 = row.myInput4;
+					});
+					that.isvisiable = true;
+				}
+				if ("config" == e.target.getAttribute("value")) { //原始数据
+					that.yssjDialog=true;
+				}
+			},
+			onClickDialogClose() { // 弹窗右上角关闭按钮
+				this.isvisiable = false;
+				this.isvisiableType = 1;
+			},
+			yssjDialogClose(){//原始数据
+				this.yssjDialog = false;
+			},
+			dialogSave() {
+				console.log(this.myInput1)
+				// myInput1: "",
+				// myInput2: "",
+				// myInput3: "",
+				// myInput4: "",
+			},
+			back() {
+				this.$emit('gzCgdClick', 1);
+			},
+			query() {
+				var that = this;
+				console.log(that.value2)
+				console.log(that.value3)
+				if(that.value3){
+					that.value3[0].valueOf()//开始时间
+					that.value3[1].valueOf()//结束时间
+				}
+				
+				// that.API.requestData({
+				// 	method: "GET",
+				// 	baseURL: "http://10.155.32.4:9001/",
+				// 	subUrl: "benchmarking/wplist",
+				// 	success(res) {
+				// 		that.ChangZhan = res.data;
+				// 	},
+				// });
+			},
+		},
+		created() {
+			// console.log(this.data)//上个页面的参数
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponent.vue

@@ -1,165 +1,76 @@
 <template>
-	<tab :data="tabData" @select="select" />
 	<el-row>
 		<el-col :span="3">
-			<el-tree :data="elTreeData.data[currTab]" :props="elTreeData.defaultProps" @node-click="handleNodeClick"></el-tree>
+			<el-tree :data="elTreeData.data" :props="elTreeData.defaultProps" @node-click="handleNodeClick" default-expand-all highlight-current :expand-on-click-node="false"></el-tree>
 		</el-col>
 		<el-col :span="21">
-			<tab :data="tabData2[currTab]" @select="select2" />
-			<Fj v-if="currTab == 0" :currTab="currTab2" height="85vh"/>
-			<Syz v-if="currTab == 1" :currTab="currTab2" height="85vh"/>
+			<Gz v-if="currTab == 'ybk1'" height="92vh" />
+			<Xn v-if="currTab == 'ybk2'" height="92vh" />
+			<Yj v-if="currTab == 'ybk3'" height="92vh" />
+			<Zn v-if="currTab == 'ybk4'" height="92vh" />
 		</el-col>
 	</el-row>
 </template>
 
 <script>
-	import Tab from "../../components/coms/tabs/tab.vue";
-	import Fj from "./otherComponentFj.vue";
-	import Syz from "./otherComponentSyz.vue";
+	import $ from "jquery";
+	import Gz from "./gz.vue";
+	import Xn from "./xn.vue";
+	import Yj from "./yj.vue";
+	import Zn from "./zn.vue";
 	export default {
-		components: {Tab,Fj,Syz},
+		components: {
+			Gz,
+			Xn,
+			Yj,
+			Zn
+		},
 		data() {
 			return {
-				currTab: 0,
-				currTab2: 0,
-				tabData: [{
-						id: "0",
-						text: "风机",
-					},
-					{
-						id: "1",
-						text: "升压站",
-					}
-				],
-				tabData2: [
-					[{
-							id: "0",
-							text: "位置",
-						},
-						{
-							id: "1",
-							text: "技术参数",
-						},
-						{
-							id: "2",
-							text: "预防性维护",
-						},
-						{
-							id: "3",
-							text: "设备历史",
-						},
-						{
-							id: "4",
-							text: "设备维护操作记录",
-						}
-					],
-					[{
-							id: "0",
-							text: "位置2",
-						},
-						{
-							id: "1",
-							text: "技术参数",
-						},
-						{
-							id: "2",
-							text: "预防性维护",
-						},
-						{
-							id: "3",
-							text: "设备历史",
-						},
-						{
-							id: "4",
-							text: "设备维护操作记录",
-						}
-					],
-				],
+				currTab: 'ybk1',
 				elTreeData: {
-					data: [[{
-							label: "一级 1",
+					data: [{
+							label: "样本库",
 							children: [{
-								label: "二级 1-1",
-								children: [{
-									label: "三级 1-1-1",
-								}, ],
-							}, ],
+								label: "故障样本库",
+								id: 'ybk1'
+							}, {
+								label: "性能下降样本库",
+								id: 'ybk2'
+							}, {
+								label: "预警分析样本库",
+								id: 'ybk3'
+							}, {
+								label: "智能营销样本库",
+								id: 'ybk4'
+							}],
 						},
 						{
-							label: "一级 2",
+							label: "基础库",
 							children: [{
-									label: "二级 2-1",
-									children: [{
-										label: "三级 2-1-1",
-									}, ],
-								},
-								{
-									label: "二级 2-2",
-									children: [{
-										label: "三级 2-2-1",
-									}, ],
-								},
-							],
+								label: "风机",
+								id: 'jck1'
+							}, {
+								label: "升压站",
+								id: 'jck2'
+							}, {
+								label: "场站",
+								id: 'jck3'
+							}, {
+								label: "逆变器",
+								id: 'jck4'
+							}, {
+								label: "测点",
+								id: 'jck5'
+							}, {
+								label: "风机类型",
+								id: 'jck6'
+							}],
 						},
 						{
-							label: "一级 3",
-							children: [{
-									label: "二级 3-1",
-									children: [{
-										label: "三级 3-1-1",
-									}, ],
-								},
-								{
-									label: "二级 3-2",
-									children: [{
-										label: "三级 3-2-1",
-									}, ],
-								},
-							],
+							label: "知识库",
 						},
 					],
-					[{
-							label: "mw一级 1",
-							children: [{
-								label: "二级 1-1",
-								children: [{
-									label: "三级 1-1-1",
-								}, ],
-							}, ],
-						},
-						{
-							label: "一级 2",
-							children: [{
-									label: "二级 2-1",
-									children: [{
-										label: "三级 2-1-1",
-									}, ],
-								},
-								{
-									label: "二级 2-2",
-									children: [{
-										label: "三级 2-2-1",
-									}, ],
-								},
-							],
-						},
-						{
-							label: "一级 3",
-							children: [{
-									label: "二级 3-1",
-									children: [{
-										label: "三级 3-1-1",
-									}, ],
-								},
-								{
-									label: "二级 3-2",
-									children: [{
-										label: "三级 3-2-1",
-									}, ],
-								},
-							],
-						},
-					]],
 					defaultProps: {
 						children: "children",
 						label: "label",
@@ -168,24 +79,42 @@
 			};
 		},
 		methods: {
-			select(data) {
-				if (data.id != this.currTab) {
-					this.currTab = parseInt(data.id);
-					this.currTab2 = 0;
+			handleNodeClick(a) {
+				if (a.id) {
+					this.currTab = a.id;
 				}
 			},
-			select2(data) {
-				console.log(data)
-				this.currTab2 = parseInt(data.id);
-			},
+			treeItem(){
+				this.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002",
+					subUrl: "/basic/station/all",
+					success(res) {
+						console.log(res)
+					}
+				});
+			}
 		},
 		created() {
-
+			
+		},
+		mounted() {
+			this.treeItem();
+			// jq实现的tree默认第一个节点选中
+			$('.el-tree .el-tree-node__children').eq(0).find('.el-tree-node').eq(0).addClass('is-current');
+			$('.el-tree .el-tree-node__children .el-tree-node').click(function(){
+				$(this).siblings().removeClass('is-current')
+			})
 		},
-		mounted() {},
 	};
 </script>
 
-<style lang="less" scoped>
-
+<style lang="less">
+	.el-tree{
+		.el-tree-node__children {
+			.el-tree-node__content{cursor: pointer;}
+			.el-tree-node.is-current{background-color: #0F3C25;}
+		}
+		.el-tree-node__content{cursor: auto;}
+	}
 </style>

src/views/Others/otherComponentFj.vue

@@ -1,49 +0,0 @@
-<template>
-	<el-scrollbar v-if="currTab == 0" :height="height">
-	 风机1
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 1" :height="height">
-	 2
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 2" :height="height">
-	 3
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 3" :height="height">
-	 4
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 4" :height="height">
-	 5
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/otherComponentSyz.vue

@@ -1,49 +0,0 @@
-<template>
-	<el-scrollbar v-if="currTab == 0" :height="height">
-	升压站 1
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 1" :height="height">
-	 2
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 2" :height="height">
-	 3
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 3" :height="height">
-	 4
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 4" :height="height">
-	 5
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/xn.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机2
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/yj.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机3
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/zn.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机4
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/SandTable/SandTable.vue

@@ -48,7 +48,7 @@
     </div>
     <div class="sand-table-right" v-if="showPanel">
       <PanelSand class="right-panel" title="视频监控">
-        <el-row v-for="(pItem, pIndex) in videoArray" :key="pIndex">
+        <!-- <el-row v-for="(pItem, pIndex) in videoArray" :key="pIndex">
           <el-col
             :span="12"
             class="pre-img-box"
@@ -65,6 +65,32 @@
               :src="cItem.url + cItem.token"
               v-if="cItem.switch"
             />
+          </el-col> -->
+        <el-row v-for="(pItem, pIndex) in videoArray1" :key="pIndex">
+          <el-col
+            :span="12"
+            class="pre-img-box"
+            v-for="(cItem, cIndex) in pItem"
+            :key="cIndex"
+            @click="openVideoDialog1(cItem)"
+          >
+            <div class="mask"></div>
+            <hlsVideo
+              class="pre-img videoBoxiframe"
+              width="95%"
+              height="8.657vh"
+              :code="cItem.code"
+              :class="cItem.class"
+              v-if="cItem.switch"
+            />
+            <!-- <iframe
+              class="pre-img videoBoxiframe"
+              :class="cItem.class"
+              width="95%"
+              height="8.657vh"
+              src="http://192.168.1.18:1935/hls/NSS_FDC_ZK/index.m3u8"
+              v-if="cItem.switch"
+            /> -->
           </el-col>
         </el-row>
       </PanelSand>
@@ -421,11 +447,17 @@
         videoDialogClass = 'modal animated a1 bounceIn';
       "
     >
-      <iframe
+      <!-- <iframe
         class="videoBoxiframe"
         width="95%"
         height="800px"
         :src="dialogVideoUrl"
+      /> -->
+      <hlsVideo
+        class="videoBoxiframe"
+        width="95%"
+        height="800px"
+        :code="dialogVideoUrl"
       />
     </el-dialog>
   </div>
@@ -445,6 +477,7 @@ import DoubleLineChart from "@com/chart/line/double-line-chart.vue";
 import Col from "@com/coms/grid/col.vue";
 import Row from "@com/coms/grid/row.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
+import hlsVideo from "./component/hls.vue";
 
 export default {
   // 名称
@@ -464,6 +497,7 @@ export default {
     Col,
     Row,
     SvgIcon,
+    hlsVideo,
   },
   // 数据
   data() {
@@ -500,6 +534,32 @@ export default {
       gxkmap: {},
       tableItem: {},
       mapSource: {},
+      videoArray1: [
+        // [
+        //   { code: "NSS_FDC_ZK", class: "", switch: true },
+        //   { code: "NSS_FDC_ZK", class: "", switch: true },
+        // ],
+        // [
+        //   { code: "NSS_FDC_ZK", class: "", switch: true },
+        //   { code: "QS_FDC_ZK", class: "", switch: true },
+        // ],
+        // [
+        //   { code: "QS_FDC_ZK", class: "", switch: true },
+        //   { code: "QS_FDC_ZK", class: "", switch: true },
+        // ],
+        [
+          { code: "SBQ_FDC_SC", class: "", switch: true },
+          { code: "NSS_FDC_SC", class: "", switch: true },
+        ],
+        [
+          { code: "QS_FDC_SC", class: "", switch: true },
+          { code: "MHS_FDC_SC", class: "", switch: true },
+        ],
+        [
+          { code: "XS_FDC_SC", class: "", switch: true },
+          { code: "PL_GDC_SC", class: "", switch: true },
+        ],
+      ],
       videoArray: [
         [
           {
@@ -655,6 +715,13 @@ export default {
       }
     },
 
+    openVideoDialog1(item) {
+      if (item.code) {
+        this.dialogVideoUrl = item.code;
+        this.showVideoDialog = true;
+      }
+    },
+
     getWtInfo() {
       let that = this;
       that.API.requestData({
@@ -743,7 +810,6 @@ export default {
           stationid: that.wpId,
         },
         success(res) {
-			console.log(res)
           let warnChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];
@@ -888,16 +954,33 @@ export default {
     },
 
     // 点击风场或者光伏
-    clickMapItem(videoArray) {
-      this.videoArray.forEach((pEle, pIndex) => {
+    clickMapItem(videoArray, wpId) {
+      this.wpId = wpId;
+      // this.videoArray.forEach((pEle, pIndex) => {
+      //   pEle.forEach((cEle, cIndex) => {
+      //     setTimeout(() => {
+      //       // 设置隐藏动画
+      //       cEle.class = "animated a1 flipOutX";
+      //       setTimeout(() => {
+      //         // 修改 token
+      //         cEle.token =
+      //           "?token=" + videoArray[pIndex + cIndex] + "&autoplay=true";
+      //         setTimeout(() => {
+      //           // 设置显示动画
+      //           cEle.class = "animated a1 flipInX";
+      //         }, 150);
+      //       }, 350);
+      //     }, (pIndex + cIndex + pIndex) * 150);
+      //   });
+      // });
+      this.videoArray1.forEach((pEle, pIndex) => {
         pEle.forEach((cEle, cIndex) => {
           setTimeout(() => {
             // 设置隐藏动画
             cEle.class = "animated a1 flipOutX";
             setTimeout(() => {
               // 修改 token
-              cEle.token =
-                "?token=" + videoArray[pIndex + cIndex] + "&autoplay=true";
+              cEle.code = videoArray[pIndex + cIndex];
               setTimeout(() => {
                 // 设置显示动画
                 cEle.class = "animated a1 flipInX";
@@ -906,6 +989,11 @@ export default {
           }, (pIndex + cIndex + pIndex) * 150);
         });
       });
+      this.getWtInfo();
+      this.getWpHealthInfo();
+      this.getTop4Info();
+      this.getWarnMGT();
+      this.getRepertoryMGT();
     },
 
     // 页面跳转

src/views/SandTable/component/ThreeModel1.vue

@@ -154,14 +154,17 @@ export default {
           position: null,
           name: "麻黄山",
           clickName: function () {
-            that.clickMapItem([
-              "MHS_FDC_SC",
-              "MG01_01_TD",
-              "MG01_02_TD",
-              "MG01_03_TD",
-              "MG01_04_TD",
-              "MG01_05_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "MHS_FDC_SC",
+                "MG01_01_TD",
+                "MG01_02_TD",
+                "MG01_03_TD",
+                "MG01_04_TD",
+                "MG01_05_TD",
+              ],
+              "MHS_FDC"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[0].position);
@@ -170,14 +173,17 @@ export default {
             this.lsl = this.htmlLayer[0].lsl;
             this.csl = this.htmlLayer[0].csl;
             this.gzsl = this.htmlLayer[0].gzsl;
-            that.clickMapItem([
-              "MHS_FDC_SC",
-              "MG01_01_TD",
-              "MG01_02_TD",
-              "MG01_03_TD",
-              "MG01_04_TD",
-              "MG01_05_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "MHS_FDC_SC",
+                "MG01_01_TD",
+                "MG01_02_TD",
+                "MG01_03_TD",
+                "MG01_04_TD",
+                "MG01_05_TD",
+              ],
+              "MHS_FDC"
+            );
           },
         },
         // 牛首山
@@ -195,14 +201,17 @@ export default {
           position: null,
           name: "牛首山",
           clickName: function () {
-            that.clickMapItem([
-              "NSS_FDC_SC",
-              "NG01_27_TD",
-              "NG01_28_TD",
-              "NG01_30_TD",
-              "NG01_31_TD",
-              "NG01_32_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "NSS_FDC_SC",
+                "NG01_27_TD",
+                "NG01_28_TD",
+                "NG01_30_TD",
+                "NG01_31_TD",
+                "NG01_32_TD",
+              ],
+              "NSS_FDC"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[1].position);
@@ -211,14 +220,17 @@ export default {
             this.lsl = this.htmlLayer[1].lsl;
             this.csl = this.htmlLayer[1].csl;
             this.gzsl = this.htmlLayer[1].gzsl;
-            that.clickMapItem([
-              "NSS_FDC_SC",
-              "NG01_27_TD",
-              "NG01_28_TD",
-              "NG01_30_TD",
-              "NG01_31_TD",
-              "NG01_32_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "NSS_FDC_SC",
+                "NG01_27_TD",
+                "NG01_28_TD",
+                "NG01_30_TD",
+                "NG01_31_TD",
+                "NG01_32_TD",
+              ],
+              "NSS_FDC"
+            );
           },
         },
         // 青山
@@ -236,14 +248,17 @@ export default {
           position: null,
           name: "青山",
           clickName: function () {
-            that.clickMapItem([
-              "QS_FDC_SC",
-              "QG01_67_TD",
-              "QG01_69_TD",
-              "QG01_71_TD",
-              "QG01_72_TD",
-              "QG01_73_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "QS_FDC_SC",
+                "QG01_67_TD",
+                "QG01_69_TD",
+                "QG01_71_TD",
+                "QG01_72_TD",
+                "QG01_73_TD",
+              ],
+              "QS_FDC"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[2].position);
@@ -252,14 +267,17 @@ export default {
             this.lsl = this.htmlLayer[2].lsl;
             this.csl = this.htmlLayer[2].csl;
             this.gzsl = this.htmlLayer[2].gzsl;
-            that.clickMapItem([
-              "QS_FDC_SC",
-              "QG01_67_TD",
-              "QG01_69_TD",
-              "QG01_71_TD",
-              "QG01_72_TD",
-              "QG01_73_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "QS_FDC_SC",
+                "QG01_67_TD",
+                "QG01_69_TD",
+                "QG01_71_TD",
+                "QG01_72_TD",
+                "QG01_73_TD",
+              ],
+              "QS_FDC"
+            );
           },
         },
         // 石板泉
@@ -277,14 +295,17 @@ export default {
           position: null,
           name: "石板泉",
           clickName: function () {
-            that.clickMapItem([
-              "SBQ_FDC_SC",
-              "SG01_01_TD",
-              "SG01_02_TD",
-              "SG01_03_TD",
-              "SG01_04_TD",
-              "SG01_05_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "SBQ_FDC_SC",
+                "SG01_01_TD",
+                "SG01_02_TD",
+                "SG01_03_TD",
+                "SG01_04_TD",
+                "SG01_05_TD",
+              ],
+              "SBQ_FDC"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[3].position);
@@ -293,14 +314,17 @@ export default {
             this.lsl = this.htmlLayer[3].lsl;
             this.csl = this.htmlLayer[3].csl;
             this.gzsl = this.htmlLayer[3].gzsl;
-            that.clickMapItem([
-              "SBQ_FDC_SC",
-              "SG01_01_TD",
-              "SG01_02_TD",
-              "SG01_03_TD",
-              "SG01_04_TD",
-              "SG01_05_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "SBQ_FDC_SC",
+                "SG01_01_TD",
+                "SG01_02_TD",
+                "SG01_03_TD",
+                "SG01_04_TD",
+                "SG01_05_TD",
+              ],
+              "SBQ_FDC"
+            );
           },
         },
         // 香山
@@ -318,14 +342,17 @@ export default {
           position: null,
           name: "香山",
           clickName: function () {
-            that.clickMapItem([
-              "XS_FDC_SC",
-              "XG01_26_TD",
-              "XG01_27_TD",
-              "XG01_29_TD",
-              "XG01_30_TD",
-              "XG01_31_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "XS_FDC_SC",
+                "XG01_26_TD",
+                "XG01_27_TD",
+                "XG01_29_TD",
+                "XG01_30_TD",
+                "XG01_31_TD",
+              ],
+              "XS_FDC"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[4].position);
@@ -334,14 +361,17 @@ export default {
             this.lsl = this.htmlLayer[4].lsl;
             this.csl = this.htmlLayer[4].csl;
             this.gzsl = this.htmlLayer[4].gzsl;
-            that.clickMapItem([
-              "XS_FDC_SC",
-              "XG01_26_TD",
-              "XG01_27_TD",
-              "XG01_29_TD",
-              "XG01_30_TD",
-              "XG01_31_TD",
-            ]);
+            that.clickMapItem(
+              [
+                "XS_FDC_SC",
+                "XG01_26_TD",
+                "XG01_27_TD",
+                "XG01_29_TD",
+                "XG01_30_TD",
+                "XG01_31_TD",
+              ],
+              "XS_FDC"
+            );
           },
         },
         // 大武口
@@ -464,14 +494,17 @@ export default {
           position: null,
           name: "国电大厦",
           clickName: function () {
-            that.clickMapItem([
-              "SBQ_FDC_SC",
-              "NSS_FDC_SC",
-              "QS_FDC_SC",
-              "MHS_FDC_SC",
-              "XS_FDC_SC",
-              "PL_GDC_SC",
-            ]);
+            that.clickMapItem(
+              [
+                "SBQ_FDC_SC",
+                "NSS_FDC_SC",
+                "QS_FDC_SC",
+                "MHS_FDC_SC",
+                "XS_FDC_SC",
+                "PL_GDC_SC",
+              ],
+              "0"
+            );
           },
           clickFan: () => {
             this.showFanInfo(this.htmlLayer[10].position);
@@ -480,14 +513,17 @@ export default {
             this.lsl = this.htmlLayer[10].lsl;
             this.csl = this.htmlLayer[10].csl;
             this.gzsl = this.htmlLayer[10].gzsl;
-            that.clickMapItem([
-              "SBQ_FDC_SC",
-              "NSS_FDC_SC",
-              "QS_FDC_SC",
-              "MHS_FDC_SC",
-              "XS_FDC_SC",
-              "PL_GDC_SC",
-            ]);
+            that.clickMapItem(
+              [
+                "SBQ_FDC_SC",
+                "NSS_FDC_SC",
+                "QS_FDC_SC",
+                "MHS_FDC_SC",
+                "XS_FDC_SC",
+                "PL_GDC_SC",
+              ],
+              "0"
+            );
           },
         },
       ],
@@ -565,8 +601,8 @@ export default {
       }
     },
     // 点击风场或者光伏传回点击的值
-    clickMapItem(videoArray = []) {
-      this.$emit("clickMapItem", videoArray);
+    clickMapItem(videoArray = [], wpId = "") {
+      this.$emit("clickMapItem", videoArray, wpId);
     },
     // Vector3 to screen
     vector3ToScreen: function (position) {

src/views/SandTable/component/hls.vue

@@ -0,0 +1,138 @@
+<template>
+  <video
+    class="hlsVideo"
+    ref="hlsVideo"
+    autoplay
+    muted
+    :style="'width:' + width + ';height:' + height"
+    v-if="code"
+  ></video>
+</template>
+
+<script>
+export default {
+  // 名称
+  name: "Hls",
+  // 使用组件
+  components: {},
+  // 传入参数
+  props: {
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "100%",
+    },
+    code: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: {},
+  // 数据
+  data() {
+    return {
+      socket: null,
+      isReady: false,
+      devs: [],
+      hls: null,
+      currDevCode: null,
+    };
+  },
+  // 函数
+  methods: {
+    _play: function () {
+      if (Hls.isSupported()) {
+        var self = this;
+        self.$nextTick(function () {
+          var video = self.$refs.hlsVideo;
+          self.hls && self.hls.destroy();
+          video.volume = 1.0;
+          self.hls = new Hls();
+          self.hls.on(Hls.Events.MANIFEST_PARSED, () => {
+            self.$refs.video.play();
+          });
+          self.hls.loadSource(
+            // `http://192.168.10.25:1935/hls/${self.currDevCode}/index.m3u8`
+            `http://192.168.1.18:1935/hls/${self.code}/index.m3u8`
+          );
+          self.hls.attachMedia(video);
+        });
+      }
+    },
+    onReady() {
+      this.send({ action: "loadDevs" });
+    },
+    onDevChoosed(index) {
+      this.currDevCode = this.devs[index].code;
+      this._play();
+    },
+    onMessage(data) {
+      var result = eval(data);
+      if (result.code === "fail") {
+        if (result.message) {
+          this.$message.error(result.message);
+        } else {
+          this.$message.error("操作失败");
+        }
+      } else if (result.action == "loadDevs") {
+        this.devs = result.object;
+      }
+
+      console.log("result", result);
+    },
+    send(message) {
+      if (!this.isReady) {
+        alert("this socket is not ready!");
+        return;
+      }
+      this.socket.send(JSON.stringify(message));
+    },
+  },
+  // 生命周期钩子
+  beforeCreate() {
+    // 创建前
+  },
+  created() {
+    // 创建后
+    var self = this;
+    if (window.WebSocket) {
+      self.socket = new WebSocket("ws://" + window.location.host + "/api.ws");
+      //建立websocket连接
+      self.socket.onopen = function () {
+        self.isReady = self.socket.readyState == 1;
+        self.onReady();
+      };
+      self.socket.onmessage = function (event) {
+        var data = JSON.parse(event.data);
+        self.onMessage(data);
+      };
+      self.socket.onclose = function (event) {
+        self.isReady = false;
+      };
+      self._play();
+    }
+  },
+  beforeMount() {
+    // 渲染前
+  },
+  mounted() {
+    // 渲染后
+  },
+  beforeUpdate() {},
+  updated() {},
+  watch: {
+    code() {
+      this._play();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.hlsVideo {
+  object-fit: fill;
+}
+</style>

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -10,22 +10,29 @@ export class BoosterStation {
 			"qs3uakv110l": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3ubkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0002" },
 			"qs3uckv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0003" },
-			"qs3uabkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009" },
+			"qs3uabkv110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0024" },
+			"qs3Fhz110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0012" },
 			"qs3uakv110r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0001" },
 			"qs3laa110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0004" },
 			"qs3pmw110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0013" },
 			"qs3qmvar110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0014" },
+			"qs3cos110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0016" },
+			"qs3uabkvr110": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0009" },
 			"qs3uakv35r": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0053" },
 			"qs3laa35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0056" },
 			"qs3pmw35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0116" },
 			"qs3qmvar35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0117" },
+			"qs3uakv35rb": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0059" },
+			"qs3laa35b": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0062" },
+			"qs3pmw35b": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0123" },
+			"qs3qmvar35b": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0124" },
 			"qs3uakv35l": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0537" },
 			"qs3ubkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0538" },
 			"qs3uckv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0539" },
 			"qs3uabkv35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
+			"qs3fhz35": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0639" },
 			"qs3ymwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0162" },
 			"qs3rzwd": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0161" },
-			"qs3dw": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0155" },
 			"qs3uabkvc": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0573" },
 			"qs3ubckv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0574" },
 			"qs3ucakv": { tag: "SLDQ.NX_GD_QSF_DQ_P1_L1_001_AI0575" },
@@ -628,6 +635,10 @@ export class BoosterStation {
 			"mhsymwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0258" },
 			"mhsrzwdzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0050" },
 			//补
+			"mhsuakvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0033" },
+			"mhsubkvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0034" },
+			"mhsuckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0035" },
+			"mhs3u0kvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0040" },
 			"mhsuabkvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0037" },
 			"mhsubckvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0038" },
 			"mhsucakvzb1": { tag: "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0039" },

src/views/WindSite/components/boosterstation/dwk.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1681.668px"
               height="806.571px"
-              viewBox="0 80 1718.668 806.571"
+              viewBox="0 0 1718.668 806.571"
               enable-background="new 0 0 1681.668 806.571"
               xml:space="preserve"
             >
@@ -178,7 +178,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5445,7 +5445,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5545,7 +5545,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5645,7 +5645,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5745,7 +5745,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5845,7 +5845,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5941,7 +5941,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left:5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/boosterstation/mch.vue

@@ -259,7 +259,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -273,7 +273,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -307,7 +307,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -321,7 +321,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -822,7 +822,7 @@
 								</text>
 								<text transform="matrix(0.9268 0 0 1 399.4001 419.3252)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.1235">
-									-5
+									-1
 								</text>
 								<text transform="matrix(0.9268 0 0 1 454.9011 419.0723)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.1235">
@@ -974,22 +974,6 @@
 
 								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
 									x1="443.452" y1="445.257" x2="446.306" y2="445.257"></line>
-								<text transform="matrix(0.9268 0 0 1 456.1941 482.8877)" fill="#FFFFFF"
-									font-family="'MicrosoftYaHei'" font-size="11.1235">
-									-05
-								</text>
-								<rect x="444.206" y="451.9" fill="#CAA51A" width="2.25" height="17.702"></rect>
-								<rect x="422.035" y="451.9" fill="#CAA51A" width="24.139" height="2.25"></rect>
-								<rect x="444.743" y="492.637" fill="#AAAAAA" width="2.855" height="7.871"></rect>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="440.407" y1="501.594" x2="451.935" y2="501.594"></line>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="442.786" y1="505.234" x2="449.557" y2="505.234"></line>
-
-								<line fill="none" stroke="#AAAAAA" stroke-width="1.6" stroke-miterlimit="10"
-									x1="444.746" y1="509.072" x2="447.6" y2="509.072"></line>
 								<rect x="418.851" y="488.23" fill="#CAA51A" width="2.25" height="19.676"></rect>
 								<path fill="none" stroke="#CAA51A" stroke-width="2.2" stroke-miterlimit="10"
 									d="M409.642,479.065   c0,5.708,4.627,10.334,10.334,10.334s10.334-4.626,10.334-10.334c0-5.707-4.627-10.334-10.334-10.334">
@@ -2796,15 +2780,7 @@
 										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
 											x1="451.688" y1="410.451" x2="444.875" y2="421.033"></line>
 									</g>
-									<g id="_x31_21-0on_2_">
-										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
-											x1="437.728" y1="472.156" x2="454.614" y2="472.156"></line>
-										<path fill="#AAAAAA"
-											d="M446.669,485.781c1.434,0,2.602,1.166,2.602,2.604c0,1.434-1.167,2.6-2.602,2.6     c-1.437,0-2.603-1.166-2.603-2.6C444.065,486.948,445.234,485.781,446.669,485.781 M446.669,483.879     c-2.488,0-4.507,2.016-4.507,4.506c0,2.484,2.019,4.504,4.507,4.504c2.485,0,4.506-2.02,4.506-4.504     C451.174,485.895,449.154,483.879,446.669,483.879L446.669,483.879z">
-										</path>
-										<line fill="none" stroke="#AAAAAA" stroke-width="1.5" stroke-miterlimit="10"
-											x1="452.981" y1="474.27" x2="446.171" y2="484.852"></line>
-									</g>
+									
 								</g>
 							</g>
 						</svg>
@@ -2869,7 +2845,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left:5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/boosterstation/nss.vue

@@ -7,9 +7,115 @@
 
 						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1932.596px" height="894.189px"
-							viewBox="-30 70 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
+							viewBox="-30 0 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
 							xml:space="preserve">
 							<g id="other">
+								<g xmlns="http://www.w3.org/2000/svg" id="add">
+										<g id="_x31_11">
+											<g id="newMWsvg">
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="744.836" cy="35.147" r="8.612"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="730.26" cy="21.228" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="733.683,25.549 730.685,22.389       727.703,25.359     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="730.623" y1="22.305" x2="730.794" y2="16.907"/>
+												<polygon fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="743.067,39.21 748.728,36.279       743.327,33.154     "/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="744.836" cy="21.228" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="748.259,25.549 745.26,22.389       742.279,25.359     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="745.199" y1="22.305" x2="745.37" y2="16.907"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="730.26" cy="35.147" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="733.683,39.468 730.685,36.308       727.703,39.278     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="730.623" y1="36.224" x2="730.794" y2="30.826"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="738.09" cy="48.393" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="741.513,52.714 738.515,49.554       735.533,52.524     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="738.453" y1="49.47" x2="738.624" y2="44.072"/>
+											</g>
+											<g>
+												
+													<rect x="673.431" y="70.988" transform="matrix(1 0.0082 -0.0082 1 0.6161 -5.6702)" fill="#9F1A59" width="39.991" height="2.981"/>
+												<g>
+													<g>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="783.15" y1="78.717" x2="783.249" y2="66.687"/>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="786.483" y1="76.26" x2="786.54" y2="69.197"/>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="789.805" y1="74.908" x2="789.84" y2="70.604"/>
+													</g>
+												</g>
+												
+													<rect x="712.146" y="63.072" transform="matrix(1 0.0084 -0.0084 1 0.6393 -6.0142)" fill="#CAA51A" width="2.547" height="19.448"/>
+												
+													<rect x="752.134" y="63.399" transform="matrix(1 0.0082 -0.0082 1 0.6283 -6.2071)" fill="#CAA51A" width="2.547" height="19.449"/>
+												
+													<rect x="721.916" y="71.343" transform="matrix(1 0.0082 -0.0082 1 0.6215 -6.0342)" fill="#9F1A59" width="29.617" height="2.981"/>
+												
+													<rect x="737.579" y="57.119" transform="matrix(1 0.0086 -0.0086 1 0.5744 -6.3162)" fill="#9F1A59" width="1.941" height="13.726"/>
+												
+													<rect x="761.681" y="71.087" transform="matrix(1 0.0082 -0.0082 1 0.62 -6.2882)" fill="#9F1A59" width="13.239" height="2.98"/>
+												
+													<rect x="774.921" y="71.175" transform="matrix(1 0.0082 -0.0082 1 0.6219 -6.385)" fill="#40B9B0" width="8.278" height="2.98"/>
+												
+													<rect x="759.958" y="63.463" transform="matrix(1 0.008 -0.008 1 0.6135 -6.1223)" fill="#CAA51A" width="2.549" height="19.449"/>
+												
+													<rect x="719.971" y="63.135" transform="matrix(1 0.0082 -0.0082 1 0.6248 -5.9398)" fill="#CAA51A" width="2.548" height="19.449"/>
+											</g>
+										</g>
+										<g id="_x31_11_1_">
+											<g id="newMWsvg_1_">
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="1331.365" cy="35.035" r="8.612"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="1316.789" cy="21.116" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="1320.213,25.437 1317.214,22.277       1314.232,25.247     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="1317.152" y1="22.193" x2="1317.323" y2="16.795"/>
+												<polygon fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="1329.597,39.098 1335.258,36.167       1329.855,33.042     "/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="1331.365" cy="21.116" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="1334.788,25.437 1331.789,22.277       1328.809,25.247     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="1331.729" y1="22.193" x2="1331.898" y2="16.795"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="1316.789" cy="35.035" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="1320.213,39.356 1317.214,36.196       1314.232,39.166     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="1317.152" y1="36.112" x2="1317.323" y2="30.714"/>
+												<circle fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" cx="1324.619" cy="48.281" r="8.611"/>
+												<polyline fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" points="1328.043,52.602 1325.044,49.442       1322.063,52.412     "/>
+												
+													<line fill="none" stroke="#A9165D" stroke-width="1.2" stroke-miterlimit="10" x1="1324.982" y1="49.358" x2="1325.153" y2="43.96"/>
+											</g>
+											<g>
+												
+													<rect x="1259.96" y="70.876" transform="matrix(1 0.0082 -0.0082 1 0.6348 -10.4684)" fill="#9F1A59" width="39.991" height="2.981"/>
+												<g>
+													<g>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="1369.68" y1="78.605" x2="1369.777" y2="66.575"/>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="1373.012" y1="76.148" x2="1373.069" y2="69.085"/>
+														
+															<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10" x1="1376.334" y1="74.796" x2="1376.369" y2="70.493"/>
+													</g>
+												</g>
+												
+													<rect x="1298.675" y="62.96" transform="matrix(1 0.0084 -0.0084 1 0.6594 -10.9629)" fill="#CAA51A" width="2.547" height="19.448"/>
+												
+													<rect x="1338.664" y="63.287" transform="matrix(1 0.0082 -0.0082 1 0.6475 -11.0434)" fill="#CAA51A" width="2.547" height="19.449"/>
+												
+													<rect x="1308.445" y="71.231" transform="matrix(1 0.0082 -0.0082 1 0.6403 -10.8403)" fill="#9F1A59" width="29.616" height="2.981"/>
+												
+													<rect x="1324.108" y="57.007" transform="matrix(1 0.0086 -0.0086 1 0.595 -11.3341)" fill="#9F1A59" width="1.941" height="13.726"/>
+												
+													<rect x="1348.21" y="70.976" transform="matrix(1 0.0082 -0.0082 1 0.6387 -11.0901)" fill="#9F1A59" width="13.24" height="2.98"/>
+												
+													<rect x="1361.45" y="71.064" transform="matrix(1 0.0082 -0.0082 1 0.6407 -11.1932)" fill="#40B9B0" width="8.279" height="2.98"/>
+												
+													<rect x="1346.488" y="63.351" transform="matrix(1 0.008 -0.008 1 0.6316 -10.8414)" fill="#CAA51A" width="2.549" height="19.449"/>
+												
+													<rect x="1306.5" y="63.023" transform="matrix(1 0.0082 -0.0082 1 0.6436 -10.77)" fill="#CAA51A" width="2.549" height="19.449"/>
+											</g>
+										</g>
+									</g>
 								<path fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
 									d="M1420.582,668.486"></path>
 								<g>
@@ -1733,11 +1839,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 54.8938 641.6475)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									31-0
 								</text>
 								<text transform="matrix(1 0 0 1 135.5364 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									312-1
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -1754,7 +1860,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 135.5364 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									312-3
 								</text>
 								<g>
 									<rect x="8.706" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -1898,11 +2004,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 218.0364 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									313-1
 								</text>
 								<text transform="matrix(1 0 0 1 218.0364 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									313-3
 								</text>
 								<g>
 									<rect x="172.682" y="801.938" fill="#44426C" width="72.314" height="20.817" />
@@ -1941,11 +2047,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 299.0305 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									314-1
 								</text>
 								<text transform="matrix(1 0 0 1 299.0305 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									314-3
 								</text>
 								<g>
 									<rect x="253.676" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -1984,17 +2090,17 @@
 								</text>
 								<text transform="matrix(1 0 0 1 382.345 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									315-1
 								</text>
 								<text transform="matrix(1 0 0 1 382.345 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									315-3
 								</text>
 								<g>
 									<rect x="335.99" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 345.6023 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#1电容器
+										315备用
 									</text>
 								</g>
 								<rect x="370.141" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
@@ -2029,17 +2135,17 @@
 								</text>
 								<text transform="matrix(1 0 0 1 464.7073 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									316-1
 								</text>
 								<text transform="matrix(1 0 0 1 464.7073 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									316-3
 								</text>
 								<g>
 									<rect x="418.353" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 427.9646 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#1电抗器
+										316补偿器
 									</text>
 								</g>
 								<g>
@@ -2067,7 +2173,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 545.7805 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									317-1
 								</text>
 								<rect x="533.575" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="533.582" y="556.988" fill="#CAA51A" width="2.25" height="131.657" />
@@ -2095,11 +2201,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 702.4919 641.6475)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									32-0
 								</text>
 								<text transform="matrix(1 0 0 1 783.1345 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									321-2
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2116,7 +2222,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 783.1345 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									321-3
 								</text>
 								<g>
 									<rect x="656.304" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -2139,7 +2245,7 @@
 								<rect x="690.544" y="564.406" fill="#CAA51A" width="20.5" height="2.25" />
 								<text transform="matrix(1 0 0 1 786.0857 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									321-0
 								</text>
 								<rect x="771.93" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="793.037" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2261,11 +2367,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 865.6345 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									322-2
 								</text>
 								<text transform="matrix(1 0 0 1 865.6345 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									322-3
 								</text>
 								<g>
 									<rect x="820.28" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -2278,7 +2384,7 @@
 								<rect x="853.438" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 868.5857 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									322-0
 								</text>
 								<rect x="854.43" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="875.537" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2304,11 +2410,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 946.6292 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									323-2
 								</text>
 								<text transform="matrix(1 0 0 1 946.6292 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									323-3
 								</text>
 								<g>
 									<rect x="901.273" y="801.938" fill="#44426C" width="72.314" height="20.817" />
@@ -2321,7 +2427,7 @@
 								<rect x="934.431" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 949.5803 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									323-0
 								</text>
 								<rect x="935.425" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="956.531" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2347,24 +2453,24 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									325-2
 								</text>
 								<text transform="matrix(1 0 0 1 1029.9426 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									325-3
 								</text>
 								<g>
 									<rect x="983.588" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 993.1985 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#2电容器
+										325备用
 									</text>
 								</g>
 								<rect x="1017.739" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1017.744" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1032.8938 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									325-0
 								</text>
 								<rect x="1018.739" y="668.229" fill="#CAA51A" width="2.25" height="104.678" />
 								<rect x="1039.846" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2392,17 +2498,17 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1112.304 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									326-2
 								</text>
 								<text transform="matrix(1 0 0 1 1112.304 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									326-3
 								</text>
 								<g>
 									<rect x="1065.949" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 1075.5618 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#2电抗器
+										326补偿器
 									</text>
 								</g>
 								<g>
@@ -2416,7 +2522,7 @@
 								<rect x="1100.108" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1115.2551 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									326-0
 								</text>
 								<rect x="1101.1" y="668.229" fill="#CAA51A" width="2.25" height="104.678" />
 								<rect x="1122.207" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2430,7 +2536,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1193.3782 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-2
+									327-2
 								</text>
 								<rect x="1181.174" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1181.182" y="556.988" fill="#CAA51A" width="2.25" height="131.657" />
@@ -2458,11 +2564,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1349.8743 641.6475)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									35-0
 								</text>
 								<text transform="matrix(1 0 0 1 1430.5168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-5
+									351-5
 								</text>
 								<g>
 									<line fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2479,7 +2585,7 @@
 								</g>
 								<text transform="matrix(1 0 0 1 1430.5168 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									351-3
 								</text>
 								<g>
 									<rect x="1303.688" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -2502,7 +2608,7 @@
 								<rect x="1337.928" y="564.406" fill="#CAA51A" width="20.5" height="2.25" />
 								<text transform="matrix(1 0 0 1 1433.468 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									351-0
 								</text>
 								<rect x="1419.313" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="1440.42" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2624,11 +2730,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-5
+									353-5
 								</text>
 								<text transform="matrix(1 0 0 1 1513.0168 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									353-3
 								</text>
 								<g>
 									<rect x="1467.662" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -2641,7 +2747,7 @@
 								<rect x="1500.821" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1515.968 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									353-0
 								</text>
 								<rect x="1501.813" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="1522.92" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2667,11 +2773,11 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-5
+									354-5
 								</text>
 								<text transform="matrix(1 0 0 1 1594.011 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									354-3
 								</text>
 								<g>
 									<rect x="1548.656" y="801.938" fill="#44426C" width="72.313" height="20.817" />
@@ -2684,7 +2790,7 @@
 								<rect x="1581.814" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1596.9622 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									354-0
 								</text>
 								<rect x="1582.809" y="668.229" fill="#CAA51A" width="2.25" height="123.418" />
 								<rect x="1603.916" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2710,24 +2816,24 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-5
+									355-5
 								</text>
 								<text transform="matrix(1 0 0 1 1677.3254 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									355-3
 								</text>
 								<g>
 									<rect x="1630.973" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 1640.5833 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#3电容器
+										355备用
 									</text>
 								</g>
 								<rect x="1665.123" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1665.129" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1680.2766 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									355-0
 								</text>
 								<rect x="1666.123" y="668.229" fill="#CAA51A" width="2.25" height="104.678" />
 								<rect x="1687.23" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2755,17 +2861,17 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1759.6887 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-1
+									356-1
 								</text>
 								<text transform="matrix(1 0 0 1 1759.6887 663.8584)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-3
+									356-3
 								</text>
 								<g>
 									<rect x="1713.334" y="801.938" fill="#44426C" width="72.313" height="20.817" />
 									<text transform="matrix(1 0 0 1 1722.9446 816.4912)" fill="#FFFFFF"
 										font-family="'MicrosoftYaHei'" font-size="12.5667">
-										#3电抗器
+										356补偿器
 									</text>
 								</g>
 								<g>
@@ -2779,7 +2885,7 @@
 								<rect x="1747.492" y="556.988" fill="#CAA51A" width="2.25" height="88.418" />
 								<text transform="matrix(1 0 0 1 1762.6399 761.8877)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-0
+									356-0
 								</text>
 								<rect x="1748.484" y="668.229" fill="#CAA51A" width="2.25" height="104.678" />
 								<rect x="1769.592" y="688.646" fill="#CAA51A" width="2.25" height="20.5" />
@@ -2793,7 +2899,7 @@
 								</text>
 								<text transform="matrix(1 0 0 1 1840.761 550.1611)" fill="#FFFFFF"
 									font-family="'MicrosoftYaHei'" font-size="11.9907">
-									-5
+									357-5
 								</text>
 								<rect x="1828.559" y="521.988" fill="#CAA51A" width="2.25" height="11.584" />
 								<rect x="1828.564" y="556.988" fill="#CAA51A" width="2.25" height="131.657" />
@@ -2831,7 +2937,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -10.5789 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											Mw
+											kW
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2843,7 +2949,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -15.6868 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											MVar
+											kVar
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2879,7 +2985,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1606.0286 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kW)
+											(MW)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2893,7 +2999,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1600.3196 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kVar)
+											(MVar)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -5455,7 +5561,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left:5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/boosterstation/pl1.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1848.938px"
               height="829.936px"
-              viewBox="0 80 1848.938 829.936"
+              viewBox="0 0 1848.938 829.936"
               enable-background="new 0 0 1848.938 829.936"
               xml:space="preserve"
             >
@@ -512,7 +512,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 296.7874)"
@@ -538,7 +538,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 319.0725)"
@@ -1335,7 +1335,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 297.5061)"
@@ -1361,7 +1361,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 319.7913)"
@@ -2013,7 +2013,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3103 297.5061)"
@@ -2039,7 +2039,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3098 319.7913)"
@@ -2165,7 +2165,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 298.51)"
@@ -2191,7 +2191,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 320.7952)"
@@ -2847,7 +2847,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 298.51)"
@@ -2873,7 +2873,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 320.7952)"
@@ -3442,7 +3442,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2288 298.51)"
@@ -3468,7 +3468,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2268 320.7952)"
@@ -4180,7 +4180,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 139.5452)"
@@ -4206,7 +4206,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 161.8303)"
@@ -4304,7 +4304,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8752 129.2971)"
@@ -4330,7 +4330,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8733 151.5823)"
@@ -4468,7 +4468,7 @@
                   font-family="'MicrosoftYaHei'"
                   font-size="15"
                 >
-                  输出功率(kW):
+                  输出功率(MM):
                 </text>
               </g>
               <g id="arrow">
@@ -5553,7 +5553,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left:5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/boosterstation/pl2.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1853.732px" height="885.063px"
-							viewBox="0 80 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
+							viewBox="0 0 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
 							xml:space="preserve">
 							<g id="other_1_">
 								<path fill="none" stroke="#42B0A8" stroke-width="2.5" stroke-miterlimit="10"
@@ -130,7 +130,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 166.8015 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 188.2629 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -162,7 +162,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 927.3142 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 948.7742 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -258,7 +258,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1720.8406 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1742.3005 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -290,7 +290,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1591.4314 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -306,7 +306,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1585.7214 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -3650,7 +3650,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left:5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/boosterstation/xh.vue

@@ -11,7 +11,7 @@
         y="0px"
         width="1918px"
         height="879.725px"
-        viewBox="0 80 1918 879.725"
+        viewBox="0 0 1918 879.725"
         enable-background="new 0 0 1918 879.725"
         xml:space="preserve"
       >
@@ -110,7 +110,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1048.5251 88.1272)"
@@ -676,7 +676,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 234.0979)"
@@ -702,7 +702,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 256.3821)"
@@ -816,7 +816,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 388.0686)"
@@ -842,7 +842,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 410.3547)"
@@ -956,7 +956,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 493.3762)"
@@ -982,7 +982,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 515.6604)"
@@ -1096,7 +1096,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 352.1238 523.7493)"
@@ -1194,7 +1194,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 352.0559)"
@@ -1220,7 +1220,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 374.343)"
@@ -1318,7 +1318,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 352.0559)"
@@ -1344,7 +1344,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 374.343)"
@@ -2711,7 +2711,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1243.8181 374.343)"
@@ -2835,7 +2835,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1458.8123 489.2522)"
@@ -2959,7 +2959,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1669.8123 489.2522)"
@@ -8218,7 +8218,7 @@
                 font-family="'MicrosoftYaHei'"
                 font-size="12.1437"
               >
-                (kW)
+                (MM)
               </text>
               <text
                 transform="matrix(1 0 0 1 45.3665 864.7239)"

src/views/WindSite/components/boosterstation/xs.vue

@@ -11,7 +11,7 @@
         y="0px"
         width="1788.209px"
         height="848.758px"
-        viewBox="0 80 1788.209 848.758"
+        viewBox="0 0 1788.209 848.758"
         enable-background="new 0 0 1788.209 848.758"
         xml:space="preserve"
       >
@@ -2213,7 +2213,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 189.844)"
@@ -2248,7 +2248,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 210.2727)"
@@ -3136,7 +3136,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MW)
+              (kW)
             </text>
             <text
               transform="matrix(1 0 0 1 49.9114 819.7336)"
@@ -3171,7 +3171,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 49.9109 840.1604)"
@@ -10646,7 +10646,8 @@ export default {
 
 <style scoped>
 .svg {
-  width: 100%;
-  height: 100%;
+	margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/generalappearance/dwk.vue

@@ -1768,7 +1768,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left: 5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/generalappearance/mch.vue

@@ -1475,7 +1475,6 @@
 		methods: {
 			// 渲染每个机箱的表格参数
 			renderData(data = {}) {
-				
 				let fmtNumber=function(num){
 					return parseInt(num)
 				};
@@ -1499,7 +1498,6 @@
 						// 渲染电柜参数数据
 						const spKey = fmtNumber(key.replace(/[^0-9]/gi, ""));
 						const dgDom = $("#_x23_" + spKey).find("text");
-						
 						if (dgDom && key.indexOf("dl") !== -1) {
 							dgDom.eq(0).html(item);
 						} else if (dgDom && key.indexOf("dy") !== -1) {
@@ -1571,7 +1569,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left: 5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/generalappearance/mhs.vue

@@ -1723,7 +1723,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/generalappearance/nss.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="-60 110 1580.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1497.576px" height="815.74px" viewBox="-60 0 1580.576 815.74" enable-background="new 0 0 1497.576 815.74" xml:space="preserve">
             <g id="other">
             	<g>
             		<text transform="matrix(1 0 0 1 36.5847 21.1748)" fill="#FFFFFF" font-family="'MicrosoftYaHeiLight'" font-size="12.3679">运</text>
@@ -3748,7 +3748,8 @@ export default {
 }
 
 .svg {
-  width: 85%;
-  height: 100%;
+  margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/generalappearance/pl1.vue

@@ -1156,7 +1156,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left: 5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/generalappearance/pl2.vue

@@ -1966,7 +1966,8 @@
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left: 5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/generalappearance/qs.vue

@@ -3502,7 +3502,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/generalappearance/sbq.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 86 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 46 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
             <g id="other">
             	<g opacity="0.6">
             		<path opacity="0.4" fill="#114832" enable-background="new    " d="M44.605,133.222c0,0.709-0.574,1.281-1.283,1.281H8.933    c-0.709,0-1.283-0.572-1.283-1.281v-22.84c0-0.709,0.574-1.281,1.283-1.281h34.392c0.709,0,1.282,0.572,1.282,1.281    L44.605,133.222L44.605,133.222z"></path>
@@ -4440,7 +4440,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/generalappearance/xh.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 						<svg class="svg" version="1.0" id="图层_1" xmlns="http://www.w3.org/2000/svg"
 							xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1374px" height="557.86px"
-							viewBox="0 90 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
+							viewBox="0 40 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
 							<g id="other">
 								<polygon fill="#B6065C" points="1314.454,24.469 1322.343,5.755 1330.232,24.472 	" />
 								<rect x="1321.816" y="24.5" fill="#B6065C" width="1.375" height="49.073" />
@@ -15181,7 +15181,8 @@ YII=" transform="matrix(0.24 0 0 0.24 1183.2881 191.6758)"></image>
 	}
 
 	.svg {
-		width: 100%;
-		height: 100%;
+		margin-left: 5%;
+		width: 90%;
+		height: 90%;
 	}
 </style>

src/views/WindSite/components/generalappearance/xs.vue

@@ -11,10 +11,10 @@
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
               x="0px"
-              y="0px"
+              y="30px"
               width="1399.132px"
               height="800px"
-              viewBox="0 65 1399.132 629.341"
+              viewBox="0 35 1399.132 629.341"
               enable-background="new 0 0 1399.132 629.341"
               xml:space="preserve"
             >
@@ -7233,7 +7233,8 @@ export default {
 }
 
 .svg {
-  width: 100%;
-  height: 100%;
+  margin-left: 5%;
+  width: 90%;
+  height: 90%;
 }
 </style>

src/views/WindSite/components/previewPicture.vue

@@ -96,7 +96,7 @@ export default {
       isChange: true,
       // 图片显示默认大小
       width: "1600px",
-      height: "1000px",
+      height: "800px",
       // 可缩小倍数,为空则可无限缩小
       minification: 3,
       // 可放大倍数 为空则可无限放大
@@ -693,7 +693,7 @@ export default {
       color: white;
     }
 
-    &/deep/.el-button {
+    .el-button {
       z-index: 2;
       position: absolute;
       bottom: 60px;

src/views/WindSite/pages/GeneralAppearance.vue

@@ -57,6 +57,7 @@
 			<PL1 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL01_GC'" />
 			<PL2 class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'PL02_GC'" />
 			<MCH class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'MCH_GDC'" />
+			<HZJ class="general-appearance-body" :data="fjmap" :zmmap="zmmap" v-if="wpId === 'HZJ_GDC'" />
 		</div>
 	</div>
 </template>
@@ -73,6 +74,7 @@
 	import PL1 from "../components/generalappearance/pl1.vue";
 	import PL2 from "../components/generalappearance/pl2.vue";
 	import MCH from "../components/generalappearance/mch.vue";
+	import HZJ from "../components/generalappearance/hzj.vue";
 	export default {
 		// 名称
 		name: "GeneralAppearance",
@@ -88,7 +90,8 @@
 			DWK,
 			PL1,
 			PL2,
-			MCH
+			MCH,
+			HZJ
 		},
 		// 数据
 		data() {

src/views/WindSite/pages/Map.vue

@@ -445,6 +445,7 @@ export default {
       display: flex;
       align-items: center;
       margin-left: 16px;
+      width: 140px;
 
       .sub-title {
         font-size: 13px;

src/views/layout/Menu.vue

@@ -919,6 +919,33 @@ export default {
                 },
               ],
             },
+			{
+			  text: "样本库",
+			  icon: "svg-预警记录",
+			  path: "/others/gz",
+			  children: [
+			    {
+			      text: "故障样本库",
+			      icon: "svg-matrix",
+			      path: "/others/gz",
+			    },
+			    {
+			      text: "性能下降样本库",
+			      icon: "svg-matrix",
+			      path: "/others/xn",
+			    },
+			    {
+			      text: "预警分析样本库",
+			      icon: "svg-matrix",
+			      path: "/others/yj",
+			    },
+			    {
+			      text: "智能营销样本库",
+			      icon: "svg-matrix",
+			      path: "/others/zn",
+			    }
+			  ],
+			},
           ],
         }
       ],

src/views/layout/login-page.vue

@@ -5,7 +5,7 @@
       :src="url"
       :fit="fit"
     ></el-image> -->
-    <img src="../../assets/sislogo.png" />
+    <!-- <img src="../../assets/sislogo.png" /> -->
     <el-form class="mg-b-16">
       <el-form-item class="mg-b-8">
         <el-input v-model="username" placeholder="请输入登录名"></el-input>

src/views/malfunctionRecall/components/fault-diagnosis.vue

@@ -597,156 +597,6 @@ export default {
                         ["2021/07/01 10:00:00", 296],
                         ["2021/07/01 15:00:00", 87],
                         ["2021/07/01 20:00:00", 273],
-                        ["2021/07/02 00:00:00", 129],
-                        ["2021/07/02 05:00:00", 121],
-                        ["2021/07/02 10:00:00", 65],
-                        ["2021/07/02 15:00:00", 215],
-                        ["2021/07/02 20:00:00", 245],
-                        ["2021/07/03 00:00:00", 288],
-                        ["2021/07/03 05:00:00", 256],
-                        ["2021/07/03 10:00:00", 47],
-                        ["2021/07/03 15:00:00", 207],
-                        ["2021/07/03 20:00:00", 237],
-                        ["2021/07/04 00:00:00", 68],
-                        ["2021/07/04 05:00:00", 186],
-                        ["2021/07/04 10:00:00", 126],
-                        ["2021/07/04 15:00:00", 207],
-                        ["2021/07/04 20:00:00", 59],
-                        ["2021/07/05 00:00:00", 328],
-                        ["2021/07/05 05:00:00", 72],
-                        ["2021/07/05 10:00:00", 54],
-                        ["2021/07/05 15:00:00", 114],
-                        ["2021/07/05 20:00:00", 167],
-                        ["2021/07/06 00:00:00", 164],
-                        ["2021/07/06 05:00:00", 176],
-                        ["2021/07/06 10:00:00", 59],
-                        ["2021/07/06 15:00:00", 196],
-                        ["2021/07/06 20:00:00", 208],
-                        ["2021/07/07 00:00:00", 80],
-                        ["2021/07/07 05:00:00", 119],
-                        ["2021/07/07 10:00:00", 228],
-                        ["2021/07/07 15:00:00", 80],
-                        ["2021/07/07 20:00:00", 182],
-                        ["2021/07/08 00:00:00", 152],
-                        ["2021/07/08 05:00:00", 119],
-                        ["2021/07/08 10:00:00", 236],
-                        ["2021/07/08 15:00:00", 45],
-                        ["2021/07/08 20:00:00", 36],
-                        ["2021/07/09 00:00:00", 34],
-                        ["2021/07/09 05:00:00", 280],
-                        ["2021/07/09 10:00:00", 63],
-                        ["2021/07/09 15:00:00", 53],
-                        ["2021/07/09 20:00:00", 226],
-                        ["2021/07/10 00:00:00", 56],
-                        ["2021/07/10 05:00:00", 234],
-                        ["2021/07/10 10:00:00", 301],
-                        ["2021/07/10 15:00:00", 106],
-                        ["2021/07/10 20:00:00", 80],
-                        ["2021/07/11 00:00:00", 280],
-                        ["2021/07/11 05:00:00", 277],
-                        ["2021/07/11 10:00:00", 104],
-                        ["2021/07/11 15:00:00", 76],
-                        ["2021/07/11 20:00:00", 321],
-                        ["2021/07/12 00:00:00", 93],
-                        ["2021/07/12 05:00:00", 109],
-                        ["2021/07/12 10:00:00", 100],
-                        ["2021/07/12 15:00:00", 128],
-                        ["2021/07/12 20:00:00", 87],
-                        ["2021/07/13 00:00:00", 179],
-                        ["2021/07/13 05:00:00", 189],
-                        ["2021/07/13 10:00:00", 140],
-                        ["2021/07/13 15:00:00", 109],
-                        ["2021/07/13 20:00:00", 156],
-                        ["2021/07/14 00:00:00", 173],
-                        ["2021/07/14 05:00:00", 213],
-                        ["2021/07/14 10:00:00", 331],
-                        ["2021/07/14 15:00:00", 84],
-                        ["2021/07/14 20:00:00", 339],
-                        ["2021/07/15 00:00:00", 157],
-                        ["2021/07/15 05:00:00", 225],
-                        ["2021/07/15 10:00:00", 198],
-                        ["2021/07/15 15:00:00", 46],
-                        ["2021/07/15 20:00:00", 62],
-                        ["2021/07/16 00:00:00", 189],
-                        ["2021/07/16 05:00:00", 159],
-                        ["2021/07/16 10:00:00", 295],
-                        ["2021/07/16 15:00:00", 52],
-                        ["2021/07/16 20:00:00", 238],
-                        ["2021/07/17 00:00:00", 341],
-                        ["2021/07/17 05:00:00", 269],
-                        ["2021/07/17 10:00:00", 126],
-                        ["2021/07/17 15:00:00", 275],
-                        ["2021/07/17 20:00:00", 101],
-                        ["2021/07/18 00:00:00", 348],
-                        ["2021/07/18 05:00:00", 83],
-                        ["2021/07/18 10:00:00", 225],
-                        ["2021/07/18 15:00:00", 42],
-                        ["2021/07/18 20:00:00", 234],
-                        ["2021/07/19 00:00:00", 239],
-                        ["2021/07/19 05:00:00", 265],
-                        ["2021/07/19 10:00:00", 213],
-                        ["2021/07/19 15:00:00", 219],
-                        ["2021/07/19 20:00:00", 52],
-                        ["2021/07/20 00:00:00", 79],
-                        ["2021/07/20 05:00:00", 287],
-                        ["2021/07/20 10:00:00", 340],
-                        ["2021/07/20 15:00:00", 267],
-                        ["2021/07/20 20:00:00", 321],
-                        ["2021/07/21 00:00:00", 176],
-                        ["2021/07/21 05:00:00", 222],
-                        ["2021/07/21 10:00:00", 311],
-                        ["2021/07/21 15:00:00", 82],
-                        ["2021/07/21 20:00:00", 58],
-                        ["2021/07/22 00:00:00", 186],
-                        ["2021/07/22 05:00:00", 186],
-                        ["2021/07/22 10:00:00", 312],
-                        ["2021/07/22 15:00:00", 62],
-                        ["2021/07/22 20:00:00", 40],
-                        ["2021/07/23 00:00:00", 119],
-                        ["2021/07/23 05:00:00", 314],
-                        ["2021/07/23 10:00:00", 45],
-                        ["2021/07/23 15:00:00", 308],
-                        ["2021/07/23 20:00:00", 227],
-                        ["2021/07/24 00:00:00", 54],
-                        ["2021/07/24 05:00:00", 165],
-                        ["2021/07/24 10:00:00", 337],
-                        ["2021/07/24 15:00:00", 278],
-                        ["2021/07/24 20:00:00", 35],
-                        ["2021/07/25 00:00:00", 169],
-                        ["2021/07/25 05:00:00", 344],
-                        ["2021/07/25 10:00:00", 223],
-                        ["2021/07/25 15:00:00", 309],
-                        ["2021/07/25 20:00:00", 227],
-                        ["2021/07/26 00:00:00", 303],
-                        ["2021/07/26 05:00:00", 102],
-                        ["2021/07/26 10:00:00", 238],
-                        ["2021/07/26 15:00:00", 210],
-                        ["2021/07/26 20:00:00", 198],
-                        ["2021/07/27 00:00:00", 180],
-                        ["2021/07/27 05:00:00", 168],
-                        ["2021/07/27 10:00:00", 310],
-                        ["2021/07/27 15:00:00", 210],
-                        ["2021/07/27 20:00:00", 257],
-                        ["2021/07/28 00:00:00", 316],
-                        ["2021/07/28 05:00:00", 52],
-                        ["2021/07/28 10:00:00", 202],
-                        ["2021/07/28 15:00:00", 201],
-                        ["2021/07/28 20:00:00", 150],
-                        ["2021/07/29 00:00:00", 84],
-                        ["2021/07/29 05:00:00", 267],
-                        ["2021/07/29 10:00:00", 199],
-                        ["2021/07/29 15:00:00", 249],
-                        ["2021/07/29 20:00:00", 140],
-                        ["2021/07/30 00:00:00", 56],
-                        ["2021/07/30 05:00:00", 50],
-                        ["2021/07/30 10:00:00", 147],
-                        ["2021/07/30 15:00:00", 158],
-                        ["2021/07/30 20:00:00", 318],
-                        ["2021/07/31 00:00:00", 290],
-                        ["2021/07/31 05:00:00", 338],
-                        ["2021/07/31 10:00:00", 176],
-                        ["2021/07/31 15:00:00", 90],
-                        ["2021/07/31 20:00:00", 136]
                     ],
                 },
                 {
@@ -758,156 +608,6 @@ export default {
                         ["2021/07/01 10:00:00", 313],
                         ["2021/07/01 15:00:00", 230],
                         ["2021/07/01 20:00:00", 264],
-                        ["2021/07/02 00:00:00", 272],
-                        ["2021/07/02 05:00:00", 310],
-                        ["2021/07/02 10:00:00", 176],
-                        ["2021/07/02 15:00:00", 182],
-                        ["2021/07/02 20:00:00", 248],
-                        ["2021/07/03 00:00:00", 241],
-                        ["2021/07/03 05:00:00", 225],
-                        ["2021/07/03 10:00:00", 360],
-                        ["2021/07/03 15:00:00", 222],
-                        ["2021/07/03 20:00:00", 237],
-                        ["2021/07/04 00:00:00", 252],
-                        ["2021/07/04 05:00:00", 164],
-                        ["2021/07/04 10:00:00", 320],
-                        ["2021/07/04 15:00:00", 194],
-                        ["2021/07/04 20:00:00", 319],
-                        ["2021/07/05 00:00:00", 155],
-                        ["2021/07/05 05:00:00", 328],
-                        ["2021/07/05 10:00:00", 104],
-                        ["2021/07/05 15:00:00", 157],
-                        ["2021/07/05 20:00:00", 223],
-                        ["2021/07/06 00:00:00", 156],
-                        ["2021/07/06 05:00:00", 345],
-                        ["2021/07/06 10:00:00", 352],
-                        ["2021/07/06 15:00:00", 108],
-                        ["2021/07/06 20:00:00", 167],
-                        ["2021/07/07 00:00:00", 354],
-                        ["2021/07/07 05:00:00", 338],
-                        ["2021/07/07 10:00:00", 232],
-                        ["2021/07/07 15:00:00", 359],
-                        ["2021/07/07 20:00:00", 304],
-                        ["2021/07/08 00:00:00", 271],
-                        ["2021/07/08 05:00:00", 307],
-                        ["2021/07/08 10:00:00", 315],
-                        ["2021/07/08 15:00:00", 280],
-                        ["2021/07/08 20:00:00", 302],
-                        ["2021/07/09 00:00:00", 356],
-                        ["2021/07/09 05:00:00", 196],
-                        ["2021/07/09 10:00:00", 222],
-                        ["2021/07/09 15:00:00", 317],
-                        ["2021/07/09 20:00:00", 292],
-                        ["2021/07/10 00:00:00", 314],
-                        ["2021/07/10 05:00:00", 311],
-                        ["2021/07/10 10:00:00", 292],
-                        ["2021/07/10 15:00:00", 104],
-                        ["2021/07/10 20:00:00", 297],
-                        ["2021/07/11 00:00:00", 235],
-                        ["2021/07/11 05:00:00", 293],
-                        ["2021/07/11 10:00:00", 224],
-                        ["2021/07/11 15:00:00", 137],
-                        ["2021/07/11 20:00:00", 136],
-                        ["2021/07/12 00:00:00", 144],
-                        ["2021/07/12 05:00:00", 150],
-                        ["2021/07/12 10:00:00", 267],
-                        ["2021/07/12 15:00:00", 156],
-                        ["2021/07/12 20:00:00", 201],
-                        ["2021/07/13 00:00:00", 214],
-                        ["2021/07/13 05:00:00", 324],
-                        ["2021/07/13 10:00:00", 352],
-                        ["2021/07/13 15:00:00", 117],
-                        ["2021/07/13 20:00:00", 157],
-                        ["2021/07/14 00:00:00", 166],
-                        ["2021/07/14 05:00:00", 228],
-                        ["2021/07/14 10:00:00", 344],
-                        ["2021/07/14 15:00:00", 281],
-                        ["2021/07/14 20:00:00", 224],
-                        ["2021/07/15 00:00:00", 358],
-                        ["2021/07/15 05:00:00", 200],
-                        ["2021/07/15 10:00:00", 148],
-                        ["2021/07/15 15:00:00", 352],
-                        ["2021/07/15 20:00:00", 246],
-                        ["2021/07/16 00:00:00", 340],
-                        ["2021/07/16 05:00:00", 126],
-                        ["2021/07/16 10:00:00", 205],
-                        ["2021/07/16 15:00:00", 221],
-                        ["2021/07/16 20:00:00", 280],
-                        ["2021/07/17 00:00:00", 127],
-                        ["2021/07/17 05:00:00", 149],
-                        ["2021/07/17 10:00:00", 162],
-                        ["2021/07/17 15:00:00", 297],
-                        ["2021/07/17 20:00:00", 168],
-                        ["2021/07/18 00:00:00", 292],
-                        ["2021/07/18 05:00:00", 100],
-                        ["2021/07/18 10:00:00", 110],
-                        ["2021/07/18 15:00:00", 265],
-                        ["2021/07/18 20:00:00", 185],
-                        ["2021/07/19 00:00:00", 265],
-                        ["2021/07/19 05:00:00", 354],
-                        ["2021/07/19 10:00:00", 106],
-                        ["2021/07/19 15:00:00", 206],
-                        ["2021/07/19 20:00:00", 113],
-                        ["2021/07/20 00:00:00", 193],
-                        ["2021/07/20 05:00:00", 144],
-                        ["2021/07/20 10:00:00", 359],
-                        ["2021/07/20 15:00:00", 335],
-                        ["2021/07/20 20:00:00", 239],
-                        ["2021/07/21 00:00:00", 230],
-                        ["2021/07/21 05:00:00", 357],
-                        ["2021/07/21 10:00:00", 317],
-                        ["2021/07/21 15:00:00", 264],
-                        ["2021/07/21 20:00:00", 355],
-                        ["2021/07/22 00:00:00", 284],
-                        ["2021/07/22 05:00:00", 326],
-                        ["2021/07/22 10:00:00", 184],
-                        ["2021/07/22 15:00:00", 315],
-                        ["2021/07/22 20:00:00", 102],
-                        ["2021/07/23 00:00:00", 206],
-                        ["2021/07/23 05:00:00", 292],
-                        ["2021/07/23 10:00:00", 273],
-                        ["2021/07/23 15:00:00", 156],
-                        ["2021/07/23 20:00:00", 282],
-                        ["2021/07/24 00:00:00", 146],
-                        ["2021/07/24 05:00:00", 129],
-                        ["2021/07/24 10:00:00", 270],
-                        ["2021/07/24 15:00:00", 330],
-                        ["2021/07/24 20:00:00", 302],
-                        ["2021/07/25 00:00:00", 205],
-                        ["2021/07/25 05:00:00", 132],
-                        ["2021/07/25 10:00:00", 124],
-                        ["2021/07/25 15:00:00", 182],
-                        ["2021/07/25 20:00:00", 147],
-                        ["2021/07/26 00:00:00", 319],
-                        ["2021/07/26 05:00:00", 221],
-                        ["2021/07/26 10:00:00", 126],
-                        ["2021/07/26 15:00:00", 299],
-                        ["2021/07/26 20:00:00", 164],
-                        ["2021/07/27 00:00:00", 293],
-                        ["2021/07/27 05:00:00", 337],
-                        ["2021/07/27 10:00:00", 159],
-                        ["2021/07/27 15:00:00", 256],
-                        ["2021/07/27 20:00:00", 118],
-                        ["2021/07/28 00:00:00", 193],
-                        ["2021/07/28 05:00:00", 138],
-                        ["2021/07/28 10:00:00", 273],
-                        ["2021/07/28 15:00:00", 217],
-                        ["2021/07/28 20:00:00", 274],
-                        ["2021/07/29 00:00:00", 138],
-                        ["2021/07/29 05:00:00", 223],
-                        ["2021/07/29 10:00:00", 338],
-                        ["2021/07/29 15:00:00", 340],
-                        ["2021/07/29 20:00:00", 205],
-                        ["2021/07/30 00:00:00", 293],
-                        ["2021/07/30 05:00:00", 170],
-                        ["2021/07/30 10:00:00", 103],
-                        ["2021/07/30 15:00:00", 147],
-                        ["2021/07/30 20:00:00", 231],
-                        ["2021/07/31 00:00:00", 305],
-                        ["2021/07/31 05:00:00", 359],
-                        ["2021/07/31 10:00:00", 115],
-                        ["2021/07/31 15:00:00", 215],
-                        ["2021/07/31 20:00:00", 224]
                     ],
                 }
             ],
@@ -1018,9 +718,10 @@ export default {
         requestValue(points){
             let that = this;
             that.API.requestData({
+				showLoading: true,
                 method: "POST",
                 subUrl: "/fault/getFaultPlayback",
-                timeout: 8000,
+                timeout: 20000,
                 data: {
                     wtId: that.value1,
                     pointids: points,
@@ -1116,6 +817,7 @@ export default {
         initEchart(){
             this.yAxis = [];
             this.lineData = [];
+			let lineData=[];
             this.checkValue.forEach((item, index) => {
                 let uniformcode = item.substring(0, item.indexOf("$"));
                 let name = item.substring(item.indexOf("$") + 1);
@@ -1142,9 +844,9 @@ export default {
                     value.push(obj)
                 })
                 data.value = value
-
-                this.lineData.push(data);
+				lineData.push(data);
             })
+			this.lineData=lineData;
         },
     },
     watch: {

src/views/malfunctionRecall/index.vue

@@ -112,7 +112,7 @@
         :close-on-click-modal="false"
         :before-close="onClickDialogClose"
       >
-        <fault-diagnosis :data="rowitem"/>
+        <fault-diagnosis :data="rowitem" ref="rowitemS" :key="componentKey"/>
       </el-dialog>
     </div>
   </div>
@@ -127,6 +127,7 @@ export default {
   data() {
     const that = this;
     return {
+	componentKey:0,
       value1: "",
       value2: "",
       wpId: "",
@@ -321,8 +322,9 @@ export default {
     },
     // 回放按钮
     onClickOption(row) {
-      this.rowitem = row
+      this.rowitem = row;
       this.dialogVisible = true;
+	  this.componentKey += 1;
     },
     // 关闭弹窗
     onClickDialogClose() {

src/views/report/ExportExcel.vue

@@ -1,410 +1,509 @@
 <template>
-	<div class="ExportExcel">
-		<el-row style="margin-bottom: 15px;padding-bottom: 15px;border-bottom: 2px solid #EEE8D5;">
-			<el-col :span="12">
-				<button class="btn" :class="templateId == 1?'green':''" @click="typeClick(1)">单机数据模板</button>
-				<button class="btn" :class="templateId == 2?'green':''" @click="typeClick(2)">上网电量及功率、测风塔数据模板</button>
-			</el-col>
-			<el-col :span="12">
-				<el-row justify="end">
-					<button class="btn green" @click="allExport()">一键导出</button>
-				</el-row>
-			</el-col>
-		</el-row>
-		<table class="com-table">
-			<thead>
-				<tr>
-					<th>
-						场站
-					</th>
-					<th>
-						<input class='t2' type='checkbox' @click="rqCheck" checked='checked'/>
-						日期
-					</th>
-					<th>
-						<input class='t2' type='checkbox' @click="sjCheck" checked='checked'/>
-						时间间隔(s)
-					</th>
-					<th width="120px">
-						操作
-					</th>
-				</tr>
-			</thead>
-			<el-scrollbar>
-				<tbody>
-					<tr v-for="(row, index) of tableData" :key="index">
-						<td>
-							{{row.fdc}}
-						</td>
-						<td class="excelPickerTd">
-							<el-date-picker v-model="value1[index]" type="daterange" @change='value1Change(index)' range-separator="至"
-								start-placeholder="开始日期" end-placeholder="结束日期" class="mr15">
-							</el-date-picker>
-						</td>
-						<td>
-							<el-input placeholder="请输入时间间隔" type='number' v-model="inputVal[index]" @change='inputValChange(index)'></el-input>
-						</td>
-						<td width="120px">
-							<el-button type='text' style='cursor: pointer;' @click="thisExport(index)">导出
-							</el-button>
-						</td>
-					</tr>
-				</tbody>
-			</el-scrollbar>
-		</table>
-	</div>
+  <div class="ExportExcel">
+    <el-row
+      style="
+        margin-bottom: 15px;
+        padding-bottom: 15px;
+        border-bottom: 2px solid #eee8d5;
+      "
+    >
+      <el-col :span="12">
+        <button
+          class="btn"
+          :class="templateId == 1 ? 'green' : ''"
+          @click="typeClick(1)"
+        >
+          单机数据模板
+        </button>
+        <button
+          class="btn"
+          :class="templateId == 2 ? 'green' : ''"
+          @click="typeClick(2)"
+        >
+          上网电量及功率、测风塔数据模板
+        </button>
+      </el-col>
+      <el-col :span="12">
+        <el-row justify="end">
+          <button class="btn green" @click="allExport()">一键导出</button>
+        </el-row>
+      </el-col>
+    </el-row>
+    <table class="com-table">
+      <thead>
+        <tr>
+          <th>场站</th>
+          <th>
+            <input
+              class="t2"
+              type="checkbox"
+              @click="rqCheck"
+              checked="checked"
+            />
+            日期
+          </th>
+          <th>
+            <input
+              class="t2"
+              type="checkbox"
+              @click="sjCheck"
+              checked="checked"
+            />
+            时间间隔(s)
+          </th>
+          <th width="120px">操作</th>
+        </tr>
+      </thead>
+      <el-scrollbar>
+        <tbody>
+          <tr v-for="(row, index) of tableData" :key="index">
+            <td>
+              {{ row.fdc }}
+            </td>
+            <td class="excelPickerTd">
+              <el-date-picker
+                v-model="value1[index]"
+                type="monthrange"
+                @change="value1Change(index)"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                class="mr15"
+              >
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input
+                placeholder="请输入时间间隔"
+                type="number"
+                v-model="inputVal[index]"
+                @change="inputValChange(index)"
+              ></el-input>
+            </td>
+            <td width="120px">
+              <el-button
+                type="text"
+                style="cursor: pointer"
+                @click="thisExport(index)"
+                >导出
+              </el-button>
+            </td>
+          </tr>
+        </tbody>
+      </el-scrollbar>
+    </table>
+  </div>
 </template>
 
 <script>
-	import JsZip from 'jszip';
-	import {
-		export_blob,
-		export_more_blob
-	} from "@tools/excel/Export2Excel.js";
-	import BASE from "@tools/basicTool.js";
-	export default {
-		components: {
-			JsZip
-		},
-		data() {
-			const that = this;
-			return {
-				single:false,//单击导出状态【点击后，用于判断其状态，为true时，loading显示】
-				rqChecked:true,//日期单击checkbox状态【为true时，下方任意日期选择与当前选择同步】
-				sjChecked:true,//时间间隔checkbox状态【为true时，下方任意时间选择与当前选择同步】
-				tableData: [],//表格数据
-				value1: [],//日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
-				inputVal: [],//时间同上
-				startTs: [],//起始时间，通过下标去找对应的时间
-				endTs: [],//结束时间
-				muBan: {
-					type1: ['数据时间', 'scada风速（m/s）', 'scada功率（kW）', '是否故障（故障=1，不故障=0）', '是否限电（限电=1，不限电=0）'],
-					type2: [
-						['数据时间', '日报上网电量（mWh）'],
-						['数据时间', '上网功率（kW）'],
-						['数据时间', '轮毂高度平均风速（m/s）', '轮毂高度平均风向（°）', '温度（℃）', '压强（hPa）', '湿度（%）']
-					],
-				},
-				templateId: 1,//模板默认为1
-				stations: [],//场站名
-				paths: [],//excel的所有数据，最终给zip传
-				pathName: [],//excel的名字
-				zipNames: [],
-				tempArrayS: [],//模板2时，遍历里面的数据
-			}
-		},
-		created() {
-			this.tableVal();
-		},
-		methods: {
-			value1Change(index){//日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
-				if(this.rqChecked){
-					var date = this.value1[index];
-					this.value1 = [];
-					this.tableData.forEach((ele, index) => {
-						this.value1.push(date);
-						this.time(index, date);
-					})
-				}
-			},
-			inputValChange(index){
-				if(this.sjChecked){
-					var sj = this.inputVal[index];
-					this.inputVal = [];
-					this.tableData.forEach((ele, index) => {
-						this.inputVal.push(sj);
-					})
-				}
-			},
-			rqCheck(){
-				this.rqChecked=event.target.checked
-			},
-			sjCheck(){
-				this.sjChecked=event.target.checked
-			},
-			typeClick(a){//模板切换，改变按钮颜色
-				this.templateId = a;
-			},
-			thisExport(index) {//当前导出，index为下标
-				let that = this;
-				that.single = true;
-				// 下面的是通过下标找到对应的数据,请求ajax
-				that.time(index, that.value1[index]);
-				that.stations[index] = that.tableData[index].value;
-				that.allExportF(0, index);
-			},
-			tableVal() {
-				let that = this;
-				that.API.requestData({
-					method: "GET",
-					subUrl: "export/databases",
-					success(res) {
-						if (res.code === 200) {
-							const arr3 = [];
-							const arr4 = [];
-							var data = []; //项目列表
-							res.data.forEach((item,index) => {
-								const value = Object.keys(item)[0];
-								arr3.push(value);
-								arr4.push(item[value]);
-								data.push({
-									fdc: item[value],
-									value: value,
-								});
-								that.inputVal.push(1800);
-							})
-							that.stations = arr3;
-							that.zipNames = arr4;
-							that.tableData = data;
-							that.defaultValue1();
-						}
-					},
-				});
-			},
-			defaultValue1() { //默认时间区间
-				const end = new Date();
-				const start = new Date();
-				start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-				/////////////
-				var nowDate = new Date();
-				var year = nowDate.getFullYear();
-				var month = nowDate.getMonth();
-				var day = nowDate.getDate();
+import JsZip from "jszip";
+import { export_blob, export_more_blob } from "@tools/excel/Export2Excel.js";
+import BASE from "@tools/basicTool.js";
+export default {
+  components: {
+    JsZip,
+  },
+  data() {
+    const that = this;
+    return {
+      single: false, //单击导出状态【点击后，用于判断其状态，为true时，loading显示】
+      rqChecked: true, //日期单击checkbox状态【为true时，下方任意日期选择与当前选择同步】
+      sjChecked: true, //时间间隔checkbox状态【为true时，下方任意时间选择与当前选择同步】
+      tableData: [], //表格数据
+      value1: [], //日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
+      inputVal: [], //时间同上
+      startTs: [], //起始时间，通过下标去找对应的时间
+      endTs: [], //结束时间
+      muBan: {
+        type1: [
+          "数据时间",
+          "scada风速（m/s）",
+          "scada功率（kW）",
+          "是否故障（故障=1，不故障=0）",
+          "是否限电（限电=1，不限电=0）",
+        ],
+        type2: [
+          ["数据时间", "日报上网电量（mWh）"],
+          ["数据时间", "上网功率（kW）"],
+          [
+            "数据时间",
+            "轮毂高度平均风速（m/s）",
+            "轮毂高度平均风向（°）",
+            "温度（℃）",
+            "压强（hPa）",
+            "湿度（%）",
+          ],
+        ],
+      },
+      templateId: 1, //模板默认为1
+      stations: [], //场站名
+      paths: [], //excel的所有数据，最终给zip传
+      pathName: [], //excel的名字
+      zipNames: [],
+      tempArrayS: [], //模板2时，遍历里面的数据
+    };
+  },
+  created() {
+    this.tableVal();
+  },
+  methods: {
+    value1Change(index) {
+      //日期数组，默认一个月的，当用户改变某一个时，找到对应下标去改数据
+      if (this.rqChecked) {
+        var date = this.value1[index];
+        this.value1 = [];
+        this.tableData.forEach((ele, index) => {
+          this.value1.push(date);
+          this.time(index, date);
+        });
+      }
+    },
+    inputValChange(index) {
+      if (this.sjChecked) {
+        var sj = this.inputVal[index];
+        this.inputVal = [];
+        this.tableData.forEach((ele, index) => {
+          this.inputVal.push(sj);
+        });
+      }
+    },
+    rqCheck() {
+      this.rqChecked = event.target.checked;
+    },
+    sjCheck() {
+      this.sjChecked = event.target.checked;
+    },
+    typeClick(a) {
+      //模板切换，改变按钮颜色
+      this.templateId = a;
+    },
+    thisExport(index) {
+      //当前导出，index为下标
+      let that = this;
+      that.single = true;
+      // 下面的是通过下标找到对应的数据,请求ajax
+      that.time(index, that.value1[index]);
+      that.stations[index] = that.tableData[index].value;
+      that.allExportF(0, index);
+    },
+    tableVal() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "export/databases",
+        success(res) {
+          if (res.code === 200) {
+            const arr3 = [];
+            const arr4 = [];
+            var data = []; //项目列表
+            res.data.forEach((item, index) => {
+              const value = Object.keys(item)[0];
+              arr3.push(value);
+              arr4.push(item[value]);
+              data.push({
+                fdc: item[value],
+                value: value,
+              });
+              that.inputVal.push(1800);
+            });
+            that.stations = arr3;
+            that.zipNames = arr4;
+            that.tableData = data;
+            that.defaultValue1();
+          }
+        },
+      });
+    },
+    defaultValue1() {
+      //默认时间区间
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      /////////////
+      var nowDate = new Date();
+      var year = nowDate.getFullYear();
+      var month = nowDate.getMonth();
+      var day = nowDate.getDate();
 
-				this.tableData.forEach((ele, index) => {
-					this.value1.push([start, end]);
-					this.time(index, [start, end]);
-				})
-			},
-			formatJson(filterVal, jsonData) {//模板1时，转数据格式
-				return jsonData.map(v => filterVal.map(j => v[j]));
-			},
-			allExport() {//一键导出
-				this.allExportF(0);
-			},
-			allExportF(_index, thisIndex) {//_index递归递增，thisIndex单击导出【下标】
-				BASE.showLoading({text:'正在导出，请耐心等待...'});
-				const that = this;
-				if (that.stations[_index]) {
-					that.API.requestData({
-						method: "GET",
-						subUrl: "export/history/all",
-						data: {
-							templateId: that.templateId,
-							startTs: thisIndex!=undefined ? that.startTs[thisIndex] : that.startTs[_index],
-							endTs: thisIndex!=undefined ? that.endTs[thisIndex] + 86400000 : that.endTs[_index] + 86400000,
-							interval: thisIndex!=undefined ? that.inputVal[thisIndex] : that.inputVal[_index],
-							station: thisIndex!=undefined ? that.stations[thisIndex] : that.stations[_index]
-						},
-						success(res) {
-							if (res.code == 200) {
-								if (thisIndex!=undefined) {//单击导出
-									if (that.templateId == 1) {//模板1
-										that.export(res.data, 0, that.zipNames[thisIndex]);
-									} else if (that.templateId == 2) {//模板2
-										that.exportMuban2(res.data, 0, that.zipNames[thisIndex]);
-									}
-								} else {//一键导出
-									if (that.templateId == 1) {
-										that.export(res.data, 0, that.zipNames[_index], ++_index);
-									} else if (that.templateId == 2) {
-										that.exportMuban2(res.data, 0, that.zipNames[_index], ++_index);
-									}
-								}
-							}
-						}
-					});
-				}
-			},
-			export (data, _index, zipName, deepIndex) {
-				// deepIndex判断单击或一键
-				const that = this;
-				let tHeader = that.muBan['type' + that.templateId];
-				var dataKey = Object.keys(data);
-				var key = dataKey[_index];
-				if (key) {
-					let tempObject = {};
-					let tempArray = [];
-					const dataLength = data[key].length;
+      this.tableData.forEach((ele, index) => {
+        this.value1.push([start, end]);
+        this.time(index, [start, end]);
+      });
+    },
+    formatJson(filterVal, jsonData) {
+      //模板1时，转数据格式
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    allExport() {
+      //一键导出
+      this.allExportF(0);
+    },
+    allExportF(_index, thisIndex) {
+      //_index递归递增，thisIndex单击导出【下标】
+      const that = this;
+      var loadingName =
+        thisIndex != undefined
+          ? "正在导出" + that.zipNames[thisIndex]
+          : that.zipNames[_index] != undefined
+          ? "正在导出" + that.zipNames[_index]
+          : "正在合成压缩包";
+      BASE.showLoading({ text: loadingName + "，请耐心等待..." });
+      if (that.stations[_index]) {
+        that.API.requestData({
+          method: "GET",
+          subUrl: "export/history/all",
+          data: {
+            templateId: that.templateId,
+            startTs:
+              thisIndex != undefined
+                ? that.startTs[thisIndex]
+                : that.startTs[_index],
+            endTs:
+              thisIndex != undefined
+                ? that.endTs[thisIndex] + 86400000
+                : that.endTs[_index] + 86400000,
+            interval:
+              thisIndex != undefined
+                ? that.inputVal[thisIndex]
+                : that.inputVal[_index],
+            station:
+              thisIndex != undefined
+                ? that.stations[thisIndex]
+                : that.stations[_index],
+          },
+          success(res) {
+            if (res.code == 200) {
+              if (thisIndex != undefined) {
+                //单击导出
+                if (that.templateId == 1) {
+                  //模板1
+                  that.export(res.data, 0, that.zipNames[thisIndex]);
+                } else if (that.templateId == 2) {
+                  //模板2
+                  that.exportMuban2(res.data, 0, that.zipNames[thisIndex]);
+                }
+              } else {
+                //一键导出
+                if (that.templateId == 1) {
+                  that.export(res.data, 0, that.zipNames[_index], ++_index);
+                } else if (that.templateId == 2) {
+                  that.exportMuban2(
+                    res.data,
+                    0,
+                    that.zipNames[_index],
+                    ++_index
+                  );
+                }
+              }
+            }
+          },
+        });
+      }
+    },
+    export(data, _index, zipName, deepIndex) {
+      // deepIndex判断单击或一键
+      const that = this;
+      let tHeader = that.muBan["type" + that.templateId];
+      var dataKey = Object.keys(data);
+      var key = dataKey[_index];
+      if (key) {
+        let tempObject = {};
+        let tempArray = [];
+        const dataLength = data[key].length;
 
-					let filterVal = [];
-					data[key][0].forEach((pEle, pIndex) => {
-						for (let i = 0; i < dataLength; i++) {
-							tempObject[String(i)] = data[key][i][pIndex];
-						}
-						tempArray.push(tempObject)
-						tempObject = {};
-					})
+        let filterVal = [];
+        data[key][0].forEach((pEle, pIndex) => {
+          for (let i = 0; i < dataLength; i++) {
+            tempObject[String(i)] = data[key][i][pIndex];
+          }
+          tempArray.push(tempObject);
+          tempObject = {};
+        });
 
-					data[key][0].forEach((ele, index) => {
-						filterVal.push(index);
-					});
-					that.paths.push(export_blob(tHeader, that.formatJson(filterVal, tempArray))); //传blob
-					var str = key.split('_');
-					that.pathName.push(str[0].substring(0,2)+str[1]); //excel的名字
-					_index++;
-					
-					if (deepIndex!=undefined) {
-						setTimeout(() => {
-							that.export(data, _index, zipName, deepIndex);
-						}, 500);
-						if (dataKey.length == _index) { //当长度一致时，向zip塞值
-							var thisPath = that.paths,
-								thisPathName = that.pathName;
-							that.paths = [];
-							that.pathName = [];
-							that.zipOut(thisPath, thisPathName, zipName, deepIndex)
-						}
-					} else {
-						setTimeout(() => {
-							that.export(data, _index, zipName);
-						}, 500);
-						if (dataKey.length == _index) { //当长度一致时，向zip塞值
-							var thisPath = that.paths,
-								thisPathName = that.pathName;
-							that.paths = [];
-							that.pathName = [];
-							that.zipOut(thisPath, thisPathName, zipName)
-						}
-					}
-				}
-			},
-			exportMuban2(data, _index, excelName, deepIndex) {
-				const that = this;
-				var dataKey = Object.keys(data);
-				let tHeader = that.muBan['type' + that.templateId];
-				var key = dataKey[_index];
-				if (key) {
-					let tempObject = {};
-					let tempArray = [];
-					const dataLength = data[key].length;
-					data[key][0].forEach((pEle, pIndex) => {
-						for (let i = 0; i < dataLength; i++) {
-							tempObject[String(i)] = data[key][i][pIndex];
-						}
-						tempArray.push(tempObject)
-						tempObject = {};
-					})
+        data[key][0].forEach((ele, index) => {
+          filterVal.push(index);
+        });
+        that.paths.push(
+          export_blob(tHeader, that.formatJson(filterVal, tempArray))
+        ); //传blob
+        var str = key.split("_");
+        that.pathName.push(str[0].substring(0, 2) + str[1]); //excel的名字
+        _index++;
 
-					that.tempArrayS.push(tempArray);
-					_index++;
-					if (dataKey.length == that.tempArrayS.length) {
-						let obj = [];
-						that.tempArrayS.forEach((ele, index) => {
-							obj[index] = [];
-							ele.forEach((ele2, index2) => {
-								var key = Object.keys(ele2)
-								var arr = [];
-								key.forEach((ele3, index3) => {
-									arr.push(ele2[ele3])
-								})
-								obj[index][index2] = arr;
-								arr = [];
-							})
-						})
-						if (deepIndex!=undefined) {
-							that.paths.push(export_more_blob(tHeader, obj)); //传blob
-							that.pathName.push(excelName); //excel的名字
-							that.tempArrayS = [];
-							that.allExportF(deepIndex);
-						} else {
-							that.paths.push(export_more_blob(tHeader, obj, excelName)); //只渲染一个excel
-							BASE.closeLoading();
-						}
-					}
-					if (deepIndex!=undefined) {
-						that.exportMuban2(data, _index, excelName, deepIndex);
-						if (that.stations.length == deepIndex && _index == 1) { //当长度一致时，向zip塞值，_index只让执行第一次
-							var thisPath = that.paths,
-								thisPathName = that.pathName;
-							that.tempArrayS = [];
-							that.paths = [];
-							that.pathName = [];
-							that.zipOut(thisPath, thisPathName, '风电场_上网电量&功率&测风塔数据')
-							BASE.closeLoading();
-						}
-					}else{
-						that.exportMuban2(data, _index, excelName);
-						if (that.stations.length && _index == 1) { //当长度一致时，向zip塞值，_index只让执行第一次
-							var thisPath = that.paths,
-								thisPathName = that.pathName;
-							that.tempArrayS = [];
-							that.paths = [];
-							that.pathName = [];
-							BASE.closeLoading();
-						}
-					}
-				}
-			},
-			zipOut(paths, pathName, zipName, deepIndex) {
-				// paths 所有blob
-				// pathName 所有excel文件名
-				// zipName zip的包名
-				// deepIndex 执行ajax下标，当zipOut方法执行完后，再执行allExportF
-				const that = this;
-				var zip = new JsZip();
-				paths.forEach((item, index) => {
-					const arr_name = item // 下载文件, 并存成ArrayBuffer对象
-					const file_name = pathName[index] + '.xlsx' // 获取文件名
-					zip.file(file_name, arr_name, {
-						binary: true
-					}) // 逐个添加文件
-				})
-				zip.generateAsync({
-						type: 'blob',
-					})
-					.then(function(content) {
-						// 下载的文件名
-						var filename = zipName + '.zip'
-						// 创建隐藏的可下载链接
-						var eleLink = document.createElement('a')
-						eleLink.download = filename
-						eleLink.style.display = 'none'
-						// 下载内容转变成blob地址
-						eleLink.href = URL.createObjectURL(content)
-						// 触发点击
-						document.body.appendChild(eleLink)
-						eleLink.click()
-						// 然后移除
-						document.body.removeChild(eleLink)
-						if (deepIndex) {
-							that.allExportF(deepIndex); //递归，去执行ajax
-							if(that.stations.length == deepIndex){
-								BASE.closeLoading();
-							}
-						}else if(that.single){
-							BASE.closeLoading();
-							that.single = false;
-						}
-					})
-			},
-			time(index, val) {//时间转时间戳
-				this.startTs[index] = Date.parse(new Date(val[0]));
-				this.endTs[index] = Date.parse(new Date(val[1]) + 86400000);
-			},
-		},
-	}
+        if (deepIndex != undefined) {
+          setTimeout(() => {
+            that.export(data, _index, zipName, deepIndex);
+          }, 1000);
+          if (dataKey.length == _index) {
+            //当长度一致时，向zip塞值
+            var thisPath = that.paths,
+              thisPathName = that.pathName;
+            that.paths = [];
+            that.pathName = [];
+            that.zipOut(thisPath, thisPathName, zipName, deepIndex);
+          }
+        } else {
+          setTimeout(() => {
+            that.export(data, _index, zipName);
+          }, 1000);
+          if (dataKey.length == _index) {
+            //当长度一致时，向zip塞值
+            var thisPath = that.paths,
+              thisPathName = that.pathName;
+            that.paths = [];
+            that.pathName = [];
+            that.zipOut(thisPath, thisPathName, zipName);
+          }
+        }
+      }
+    },
+    exportMuban2(data, _index, excelName, deepIndex) {
+      const that = this;
+      var dataKey = Object.keys(data);
+      let tHeader = that.muBan["type" + that.templateId];
+      var key = dataKey[_index];
+      if (key) {
+        let tempObject = {};
+        let tempArray = [];
+        const dataLength = data[key].length;
+        data[key][0].forEach((pEle, pIndex) => {
+          for (let i = 0; i < dataLength; i++) {
+            tempObject[String(i)] = data[key][i][pIndex];
+          }
+          tempArray.push(tempObject);
+          tempObject = {};
+        });
+
+        that.tempArrayS.push(tempArray);
+        _index++;
+        if (dataKey.length == that.tempArrayS.length) {
+          let obj = [];
+          that.tempArrayS.forEach((ele, index) => {
+            obj[index] = [];
+            ele.forEach((ele2, index2) => {
+              var key = Object.keys(ele2);
+              var arr = [];
+              key.forEach((ele3, index3) => {
+                arr.push(ele2[ele3]);
+              });
+              obj[index][index2] = arr;
+              arr = [];
+            });
+          });
+          if (deepIndex != undefined) {
+            that.paths.push(export_more_blob(tHeader, obj)); //传blob
+            that.pathName.push(excelName); //excel的名字
+            that.tempArrayS = [];
+            that.allExportF(deepIndex);
+          } else {
+            that.paths.push(export_more_blob(tHeader, obj, excelName)); //只渲染一个excel
+            BASE.closeLoading();
+          }
+        }
+        if (deepIndex != undefined) {
+          that.exportMuban2(data, _index, excelName, deepIndex);
+          if (that.stations.length == deepIndex && _index == 1) {
+            //当长度一致时，向zip塞值，_index只让执行第一次
+            var thisPath = that.paths,
+              thisPathName = that.pathName;
+            that.tempArrayS = [];
+            that.paths = [];
+            that.pathName = [];
+            that.zipOut(
+              thisPath,
+              thisPathName,
+              "风电场_上网电量&功率&测风塔数据"
+            );
+            BASE.closeLoading();
+          }
+        } else {
+          that.exportMuban2(data, _index, excelName);
+          if (that.stations.length && _index == 1) {
+            //当长度一致时，向zip塞值，_index只让执行第一次
+            var thisPath = that.paths,
+              thisPathName = that.pathName;
+            that.tempArrayS = [];
+            that.paths = [];
+            that.pathName = [];
+            BASE.closeLoading();
+          }
+        }
+      }
+    },
+    zipOut(paths, pathName, zipName, deepIndex) {
+      // paths 所有blob
+      // pathName 所有excel文件名
+      // zipName zip的包名
+      // deepIndex 执行ajax下标，当zipOut方法执行完后，再执行allExportF
+      const that = this;
+      var zip = new JsZip();
+      paths.forEach((item, index) => {
+        const arr_name = item; // 下载文件, 并存成ArrayBuffer对象
+        const file_name = pathName[index] + ".xlsx"; // 获取文件名
+        zip.file(file_name, arr_name, {
+          binary: true,
+        }); // 逐个添加文件
+      });
+      zip
+        .generateAsync({
+          type: "blob",
+        })
+        .then(function (content) {
+          // 下载的文件名
+          var filename = zipName + ".zip";
+          // 创建隐藏的可下载链接
+          var eleLink = document.createElement("a");
+          eleLink.download = filename;
+          eleLink.style.display = "none";
+          // 下载内容转变成blob地址
+          eleLink.href = URL.createObjectURL(content);
+          // 触发点击
+          document.body.appendChild(eleLink);
+          eleLink.click();
+          // 然后移除
+          document.body.removeChild(eleLink);
+          if (deepIndex) {
+            that.allExportF(deepIndex); //递归，去执行ajax
+            if (that.stations.length == deepIndex) {
+              BASE.closeLoading();
+            }
+          } else if (that.single) {
+            BASE.closeLoading();
+            that.single = false;
+          }
+        });
+    },
+    time(index, val) {
+      //时间转时间戳
+      this.startTs[index] = Date.parse(new Date(val[0]));
+      this.endTs[index] = Date.parse(new Date(val[1]) + 86400000);
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	.excelPickerTd input {
-		flex: 1;
-	}
-	.el-date-editor--daterange.mr15{
-		    border: 1px solid rgba(96, 103, 105, 0.2);
-		    height: 33px;
-		    padding: 0 8px;
-		    width: 369px;
-			input{
-				background-color: transparent;
-				color: white;
-			}
-			.el-range-separator{
-				color: white;
-			}
-	}
-	.com-table td{
-		color: white !important;
-	}
-	.t2{top: 2px;position: relative !important;}
+.excelPickerTd input {
+  flex: 1;
+}
+.el-date-editor--daterange.mr15 {
+  border: 1px solid rgba(96, 103, 105, 0.2);
+  height: 33px;
+  padding: 0 8px;
+  width: 369px;
+  input {
+    background-color: transparent;
+    color: white;
+  }
+  .el-range-separator {
+    color: white;
+  }
+}
+.com-table td {
+  color: white !important;
+}
+.t2 {
+  top: 2px;
+  position: relative !important;
+}
 </style>

src/views/sisView/index.vue

@@ -1,84 +1,84 @@
 <template>
   <div class="sisViewBox">
     <div class="viewItem">
-      <clock :width="330" :height="280" />
+      <clock :width="330" :height="300" />
       <div class="viewTitle">综<br /><br />合<br /><br />参<br /><br />数</div>
-      <div class="contentBox" style="height: 280px;">
+      <div class="contentBox" style="height: 300px">
         <div class="contentItem">
           <div class="itemName size5">装机容量</div>
-          <div class="itemNum">{{items.zjrl}}</div>
+          <div class="itemNum">{{ items.zjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName size6">安全天数</div>
-          <div class="itemNum">{{items.aqts}}</div>
+          <div class="itemNum">{{ items.aqts }}</div>
           <div class="itemUnit">天</div>
           <div class="itemName size5">总功率</div>
-          <div class="itemNum">{{items.zgl}}</div>
+          <div class="itemNum">{{ items.zgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName size5">日发电量</div>
-          <div class="itemNum">{{items.rfdl}}</div>
+          <div class="itemNum">{{ items.rfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">年利用小时</div>
-          <div class="itemNum">{{items.nlyxs}}</div>
+          <div class="itemNum">{{ items.nlyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">年发电量</div>
-          <div class="itemNum">{{items.nfdl}}</div>
+          <div class="itemNum">{{ items.nfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName size5">上网电量</div>
-          <div class="itemNum">{{items.swdl}}</div>
+          <div class="itemNum">{{ items.swdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">月利用小时</div>
-          <div class="itemNum">{{items.ylyxs}}</div>
+          <div class="itemNum">{{ items.ylyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">月发电量</div>
-          <div class="itemNum">{{items.yfdl}}</div>
+          <div class="itemNum">{{ items.yfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">复位及时率</div>
-          <div class="itemNum">{{items.fwjsl}}</div>
+          <div class="itemNum">{{ items.fwjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size6">年计划电量</div>
-          <div class="itemNum">{{items.njhdl}}</div>
+          <div class="itemNum">{{ items.njhdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size5">年完成率</div>
-          <div class="itemNum">{{items.nwcl}}</div>
+          <div class="itemNum">{{ items.nwcl }}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">转换及时率</div>
-          <div class="itemNum">{{items.zhjsl}}</div>
+          <div class="itemNum">{{ items.zhjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size6">月计划电量</div>
-          <div class="itemNum">{{items.yjhdl}}</div>
+          <div class="itemNum">{{ items.yjhdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size5">月完成率</div>
-          <div class="itemNum">{{items.ywcl}}</div>
+          <div class="itemNum">{{ items.ywcl }}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">消缺及时率</div>
-          <div class="itemNum">{{items.xqjsl}}</div>
+          <div class="itemNum">{{ items.xqjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">综合厂用电率</div>
-          <div class="itemNum">{{items.zhcydl}}</div>
+          <div class="itemNum">{{ items.zhcydl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size5">月M&nbsp;T&nbsp;B&nbsp;F</div>
-          <div class="itemNum">{{items.ymtbf}}</div>
+          <div class="itemNum">{{ items.ymtbf }}</div>
           <div class="itemUnit">小时</div>
         </div>
         <div class="contentItem">
           <div class="itemName">风能利用率</div>
-          <div class="itemNum">{{items.fnlyl}}</div>
+          <div class="itemNum">{{ items.fnlyl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">设备可利用率</div>
-          <div class="itemNum">{{items.sbklyl}}</div>
+          <div class="itemNum">{{ items.sbklyl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size5">月可靠性</div>
-          <div class="itemNum">{{items.ykkx}}</div>
+          <div class="itemNum">{{ items.ykkx }}</div>
           <div class="itemUnit">%</div>
         </div>
       </div>
@@ -88,108 +88,108 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{items.fdzjrl}}</div>
+          <div class="itemNum">{{ items.fdzjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">实时风速</div>
-          <div class="itemNum">{{items.fdssfs}}</div>
+          <div class="itemNum">{{ items.fdssfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{items.fdyfdl}}</div>
+          <div class="itemNum">{{ items.fdyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{items.fdnfdl}}</div>
+          <div class="itemNum">{{ items.fdnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{items.fdrfdl}}</div>
+          <div class="itemNum">{{ items.fdrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum">{{items.fdssgl}}</div>
+          <div class="itemNum">{{ items.fdssgl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.fdylyxs}}</div>
+          <div class="itemNum">{{ items.fdylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.fdnlyxs}}</div>
+          <div class="itemNum">{{ items.fdnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{items.fdswdl}}</div>
+          <div class="itemNum">{{ items.fdswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">总欠发</div>
-          <div class="itemNum">{{items.fdzqf}}</div>
+          <div class="itemNum">{{ items.fdzqf }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">牛发电量</div>
-          <div class="itemNum">{{items.nssfdl}}</div>
+          <div class="itemNum">{{ items.nssfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛欠发</div>
-          <div class="itemNum">{{items.nssqf}}</div>
+          <div class="itemNum">{{ items.nssqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛风速</div>
-          <div class="itemNum">{{items.nssfs}}</div>
+          <div class="itemNum">{{ items.nssfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">牛功率</div>
-          <div class="itemNum">{{items.nssgl}}</div>
+          <div class="itemNum">{{ items.nssgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">麻发电量</div>
-          <div class="itemNum">{{items.mhsfdl}}</div>
+          <div class="itemNum">{{ items.mhsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻欠发</div>
-          <div class="itemNum">{{items.mhsqf}}</div>
+          <div class="itemNum">{{ items.mhsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻风速</div>
-          <div class="itemNum">{{items.mhsfs}}</div>
+          <div class="itemNum">{{ items.mhsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">麻功率</div>
-          <div class="itemNum">{{items.mhsgl}}</div>
+          <div class="itemNum">{{ items.mhsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">青发电量</div>
-          <div class="itemNum">{{items.qsfdl}}</div>
+          <div class="itemNum">{{ items.qsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青欠发</div>
-          <div class="itemNum">{{items.qsqf}}</div>
+          <div class="itemNum">{{ items.qsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青风速</div>
-          <div class="itemNum">{{items.qsfs}}</div>
+          <div class="itemNum">{{ items.qsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">青功率</div>
-          <div class="itemNum">{{items.qsgl}}</div>
+          <div class="itemNum">{{ items.qsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">石发电量</div>
-          <div class="itemNum">{{items.sbqfdl}}</div>
+          <div class="itemNum">{{ items.sbqfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石欠发</div>
-          <div class="itemNum">{{items.sbqqf}}</div>
+          <div class="itemNum">{{ items.sbqqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石风速</div>
-          <div class="itemNum">{{items.sbqfs}}</div>
+          <div class="itemNum">{{ items.sbqfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">石功率</div>
-          <div class="itemNum">{{items.sbqgl}}</div>
+          <div class="itemNum">{{ items.sbqgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">香发电量</div>
-          <div class="itemNum">{{items.xsfdl}}</div>
+          <div class="itemNum">{{ items.xsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香欠发</div>
-          <div class="itemNum">{{items.xsqf}}</div>
+          <div class="itemNum">{{ items.xsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香风速</div>
-          <div class="itemNum">{{items.xsfs}}</div>
+          <div class="itemNum">{{ items.xsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">香功率</div>
-          <div class="itemNum">{{items.xsgl}}</div>
+          <div class="itemNum">{{ items.xsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -199,90 +199,90 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{items.gfzjrl}}</div>
+          <div class="itemNum">{{ items.gfzjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">日照强度</div>
-          <div class="itemNum">{{items.gfrzqd}}</div>
+          <div class="itemNum">{{ items.gfrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum">{{items.gfssgl}}</div>
+          <div class="itemNum">{{ items.gfssgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{items.gfrfdl}}</div>
+          <div class="itemNum">{{ items.gfrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{items.gfyfdl}}</div>
+          <div class="itemNum">{{ items.gfyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{items.gfnfdl}}</div>
+          <div class="itemNum">{{ items.gfnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{items.gfswdl}}</div>
+          <div class="itemNum">{{ items.gfswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.gfylyxs}}</div>
+          <div class="itemNum">{{ items.gfylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
-           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.gfnlyxs}}</div>
+          <div class="itemName">利用小时</div>
+          <div class="itemNum">{{ items.gfnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">武发电量</div>
-          <div class="itemNum">{{items.dwkfdl}}</div>
+          <div class="itemNum">{{ items.dwkfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">武日强度</div>
-          <div class="itemNum">{{items.dwkrzqd}}</div>
+          <div class="itemNum">{{ items.dwkrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">武功率</div>
-          <div class="itemNum">{{items.dwkgl}}</div>
+          <div class="itemNum">{{ items.dwkgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">平发电量</div>
-          <div class="itemNum">{{items.plfdl}}</div>
+          <div class="itemNum">{{ items.plfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">平日强度</div>
-          <div class="itemNum">{{items.plrzqd}}</div>
+          <div class="itemNum">{{ items.plrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">平功率</div>
-          <div class="itemNum">{{items.plgl}}</div>
+          <div class="itemNum">{{ items.plgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">宣发电量</div>
-          <div class="itemNum">{{items.xhfdl}}</div>
+          <div class="itemNum">{{ items.xhfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">宣日强度</div>
-          <div class="itemNum">{{items.xhrzqd}}</div>
+          <div class="itemNum">{{ items.xhrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">宣功率</div>
-          <div class="itemNum">{{items.xhgl}}</div>
+          <div class="itemNum">{{ items.xhgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">马发电量</div>
-          <div class="itemNum">{{items.mchfdl}}</div>
+          <div class="itemNum">{{ items.mchfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">马日强度</div>
-          <div class="itemNum">{{items.mchrzqd}}</div>
+          <div class="itemNum">{{ items.mchrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">马功率</div>
-          <div class="itemNum">{{items.mchgl}}</div>
+          <div class="itemNum">{{ items.mchgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">海发电量</div>
-          <div class="itemNum">{{items.hzjfdl}}</div>
+          <div class="itemNum">{{ items.hzjfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">海日强度</div>
-          <div class="itemNum">{{items.hzjrzqd}}</div>
+          <div class="itemNum">{{ items.hzjrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">海功率</div>
-          <div class="itemNum">{{items.hzjgl}}</div>
+          <div class="itemNum">{{ items.hzjgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -305,8 +305,9 @@ export default {
   // 数据
   data() {
     return {
-		items:{}
-	};
+      items: {},
+      timmer: null,
+    };
   },
 
   // 函数
@@ -319,34 +320,43 @@ export default {
           .css("height", viewTitle.eq(i).parent(".viewItem").css("height"));
       }
     },
-	viewAjax() {
-	  var that = this;
-	  that.API.requestData({
-	    method: "GET",
-	    subUrl: "http://10.155.32.4:8034/bigscreen/list",
-	    success(res) {
-			var keys = Object.keys(res.data);
-			var items = res.data;
-			keys.forEach(ele=>{
-				if(items[ele].toFixed(2).split('.')[1] == '00'){
-					items[ele] = items[ele].toFixed(2).split('.')[0]
-				}else{
-					items[ele] = items[ele].toFixed(2)
-				}
-			})
-			that.items = items;
-	    },
-	  });
-	},
+
+    viewAjax() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "http://10.155.32.4:8034/bigscreen/list",
+        success(res) {
+          let keys = Object.keys(res.data);
+          let items = res.data;
+          keys.forEach((ele) => {
+            if (items[ele].toFixed(2).split(".")[1] == "00") {
+              items[ele] = items[ele].toFixed(2).split(".")[0];
+            } else {
+              items[ele] = items[ele].toFixed(2);
+            }
+          });
+          that.items = items;
+        },
+      });
+    },
   },
 
   created() {
-	  this.viewAjax();
-	  setInterval(() => {this.viewAjax()},1000);
+    this.viewAjax();
+    this.timmer = setInterval(() => {
+      this.viewAjax();
+    }, 6000);
   },
+
   mounted() {
     this.resetViewTitleHeight();
   },
+
+  unmounted() {
+    clearInterval(this.timmer);
+    this.timmer = null;
+  },
 };
 </script>
 
@@ -363,10 +373,15 @@ export default {
     display: flex;
     justify-content: start;
     align-items: center;
-    margin: 10px 0;
+    margin: 15px 0 0 0;
 
     &:first-child {
-      margin: 0 0 10px 0;
+      margin: 0;
+	  .contentItem {
+		  .itemNum {
+			width: 157px !important;
+		  }
+	  }
     }
 
     .viewTitle {
@@ -398,15 +413,15 @@ export default {
         justify-content: start;
         align-items: center;
         padding: 2px 0;
-		
-		.size5{
-			width: 165px;
-		}
-		
-		.size6{
-			width: 195px;
-		}
-		
+
+        .size5 {
+          width: 165px;
+        }
+
+        .size6 {
+          width: 195px;
+        }
+
         .itemName {
           min-width: 136px;
           padding: 0 10px;
@@ -418,7 +433,7 @@ export default {
           font-family: Arial, Helvetica, sans-serif;
           color: red;
           width: 187px;
-		  margin-left: 15px;
+          margin-left: 15px;
         }
 
         .itemUnit {

src/views/warn/czjl.vue

@@ -1,279 +1,230 @@
 <template>
-  <div class="knowledge-2">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select" @change="(wpId) => { getWt(wpId, true); }">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">风机：</div>
-          <div class="search-input">
-            <el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">类型：</div>
-          <div class="search-input">
-            <el-select v-model="type" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="query-item">
-            <div class="lable">开始日期：</div>
-            <div class="search-input">
-              <el-date-picker v-model="value1" @change="BeginChange(value1)" type="date" value-format="YYYY-MM-DD"
-                placeholder="选择日期" popper-class="date-select">
-              </el-date-picker>
-            </div>
-          </div>
-          <div class="query-item">
-            <div class="lable">结束日期：</div>
-            <div class="search-input">
-              <el-date-picker v-model="value2" @change="EndChange(value2)" type="date" value-format="YYYY-MM-DD"
-                placeholder="选择日期" popper-class="date-select">
-              </el-date-picker>
-              <div class="unit svg-icon svg-icon-gray">
-                <svg-icon :svgid="''" />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions" style="margin-right: 1500px">
-        <button class="btn green" @click="onClickSearch">查询的</button>
-      </div>
-    </div>
-    <div>
-      <ComTable :data="tableData" height="85vh"></ComTable>
-    </div>
-  </div>
+	<div class="knowledge-2">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">场站：</div>
+					<div class="search-input">
+						<el-select v-model="wpId" clearable placeholder="请选择" popper-class="select"
+							@change="(wpId) => { getWt(wpId, true); }">
+							<el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">风机：</div>
+					<div class="search-input">
+						<el-select v-model="wtId" clearable placeholder="请选择" popper-class="select">
+							<el-option v-for="item in wtArray" :key="item.id" :value="item.id" :label="item.name" />
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="query-item">
+						<div class="lable">开始日期：</div>
+						<div class="search-input">
+							<el-date-picker v-model="value1" type="datetimerange" range-separator="至"
+								start-placeholder="开始日期" end-placeholder="结束日期">
+							</el-date-picker>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="query-actions" style="margin-right: 1500px">
+				<button class="btn green" @click="exportCsv">导出</button>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content">
+			<el-col :span="24">
+				<ComTable :data="tableData" height="85vh"></ComTable>
+			</el-col>
+		</el-row>
+	</div>
 </template>
 
 <script>
-import ComTable from "@com/coms/table/table.vue";
-
-export default {
-  components: { ComTable },
-  data () {
-    return {
-      value1: "",
-      value2: "",
-      wpId: "",
-      wpArray: [],
-      wpName: "",
-      wtId: "",
-      type: "",
-      typeArray: [
-
-        {
-          id: 4,
-          name: '维护'
-        },
-        {
-          id: 2,
-          name: '故障'
-        }],
-      tableData: {
-        column: [
-          {
-            name: "场站",
-            field: "wpName",
-            is_num: true,
-            is_light: false,
-          },
-          {
-            name: "机组",
-            field: "wtName",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "开始时刻",
-            field: "stopTime",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "结束时刻",
-            field: "startTime",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "停机小时数(h)",
-            field: "stopHours",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "状态",
-            field: "statusName",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "停机类型",
-            field: "warnDesc",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "损失电量(kWh)",
-            field: "lossPower",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "报警信息",
-            field: "handleWay",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [],
-      },
-    };
-  },
-  created () {
-    // this.requestSafeList();
-    this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
-    this.value2 = this.getTime(2);
-    this.getWp();
-    this.requestSafeList();
-  },
-  methods: {
-    getTime (val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-      var date = new Date();
-      var year = date.getFullYear(),
-        month = date.getMonth() + 1,
-        day = date.getDate();
-      month >= 1 && month <= 9 ? (month = '0' + month) : '';
-      day >= 0 && day <= 9 ? (day = '0' + day) : '';
-      var begin = year + '-' + month + '-01';
-      var end = year + '-' + month + '-' + day;
-      if (val == 1) {
-        return begin;
-      } else if (val == 2) {
-        return end;
-      }
-    },
-    // 获取风场
-    getWp (reGetWp) {
-      let that = this;
-      that.API.requestData({
-        baseURL: "http://10.155.32.4:9001",
-        subUrl: "benchmarking/wplist",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = res.data[0].id;
-          that.wpName = res.data[0].wpName;
-          that.getWt(that.wpId, reGetWp);
-        }
-      });
-    },
-
-    // 获取风机
-    getWt (wpid, reGetWp) {
-      let that = this;
-      if (that.wpId) {
-        that.API.requestData({
-          method: "GET",
-          baseURL: "http://10.155.32.4:9001",
-          subUrl: "benchmarking/wtList",
-          data: {
-            wpid
-          },
-          success (res) {
-            that.wtArray = res.data;
-            // that.wtId = res.data[0].id;
-          }
-        });
-      }
-    },
-    BeginChange (vl) {
-      this.value1 = vl;
-    },
-    EndChange (vl) {
-      this.value2 = vl;
-    },
-    typeChange (vl) {
-      this.type = vl;
-    },
-    // 搜索按钮
-    onClickSearch () {
-      this.requestSafeList();
-    },
-    // 获取停机事件
-    requestSafeList () {
-      let that = this;
-
-      let data = {
-        tablepar: {
-          pageNum: 1,
-          pageSize: 1000,
-        },
-        beginDate: that.value1,
-        endDate: that.value2,
-        wpId: that.wpId,
-      };
-
-      if (that.wtId != '') data.wtId = that.wtId;
-      if (that.type != '') data.type = that.type;
-
-      this.API.requestData({
-        method: "POST",
-        subUrl: "/event/getShutdownevent",
-        data,
-        success (res) {
-          if (res.code == 200) {
-            that.tableData.data = [];
-            if (res.data.list.length) {
-              let data = res.data.list;
-              for (var i = 0; i < data.length; i++) {
-                let obj = {
-                  wpName: data[i].wpName,
-                  wtName: data[i].wtName,
-                  stopTime: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-
-                  stopHours: data[i].stopHours,
-                  statusName: data[i].statusName,
-                  warnDesc: data[i].warnDesc,
-                  lossPower: data[i].lossPower,
-                  handleWay: data[i].handleWay,
-
-                };
-                if (data[i].startTime) obj.startTime = new Date(data[i].startTime).formatDate("yyyy-MM-dd hh:mm:ss");
-                that.tableData.data.push(obj);
-              }
-            }
-
-          }
-        },
-      });
-    },
-  },
-};
+	import ComTable from "@com/coms/table/table.vue";
+	import Papa from 'papaparse';
+	export default {
+		components: {
+			ComTable,
+			Papa
+		},
+		data() {
+			return {
+				value1: [],
+				wpId: "",
+				wpArray: [],
+				wpName: "",
+				wtId: "",
+				tableData: {
+					column: [{
+							name: "编号",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "转换时间",
+							field: "zhsj",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "操作类型",
+							field: "ConversionName",
+							is_num: false,
+							is_light: false,
+						}
+					],
+					data: [],
+				},
+			};
+		},
+		created() {
+			this.getWp();
+			this.value1 = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"),new Date().formatDate("yyyy-MM-dd")];
+		},
+		methods: {
+			exportCsv() {
+				let data = this.tableData;
+				let arrName = [];
+				let dataArr = [];
+				data.column.forEach(item =>{
+					arrName.push(item.name)
+				})
+				data.data.forEach(ele=>{
+					let i = 0;
+					let obj = {};
+					for(var j in ele){
+						obj[arrName[i++]] = ele[j]
+					}
+					dataArr.push(obj)
+				})
+				var csv = Papa.unparse(dataArr);
+				//定义文件内容，类型必须为Blob 否则createObjectURL会报错
+				let content = new Blob([csv]);
+				//生成url对象
+				let urlObject = window.URL || window.webkitURL || window;
+				let url = urlObject.createObjectURL(content);
+				//生成<a></a>DOM元素
+				let el = document.createElement("a");
+				//链接赋值
+				el.href = url;
+				el.download = "操作类型.cvs";
+				//必须点击否则不会下载
+				el.click();
+				//移除链接释放资源
+				urlObject.revokeObjectURL(url);
+			},
+			formatDate(date) {
+			  var date = new Date(date);
+			  var YY = date.getFullYear() + '-';
+			  var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+			  var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+			  var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+			  var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+			  var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+			  return YY + MM + DD +" "+hh + mm + ss;
+			},
+			// 获取风场
+			getWp() {
+				let that = this;
+				that.API.requestData({
+					baseURL: "http://10.155.32.4:9001",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.wpArray = res.data;
+						that.wpId = res.data[0].id;
+						that.wpName = res.data[0].wpName;
+						that.getWt(that.wpId);
+					}
+				});
+			},
+			// 获取风机
+			getWt(wpid) {
+				let that = this;
+				if (that.wpId) {
+					that.API.requestData({
+						method: "GET",
+						baseURL: "http://10.155.32.4:9001/",
+						subUrl: "benchmarking/wtList",
+						data: {
+							wpid
+						},
+						success(res) {
+							that.wtArray = res.data;
+							that.wtId = res.data[0].id;
+						}
+					});
+				}
+			},
+			// 获取停机事件
+			requestSafeList(wpId,wtid) {
+				let that = this;
+				if(wpId && wtid){
+					that.wpId = wpId;
+					that.wtid = wtid;
+				}
+				if(typeof that.value1[0].valueOf() != 'string'){
+					that.value1[0] = that.formatDate(that.value1[0].valueOf())
+				}
+				if(typeof that.value1[1].valueOf() != 'string'){
+					that.value1[1] = that.formatDate(that.value1[1].valueOf())
+				}
+				let data = {
+					WindPowerStation: that.wpId,
+					wtid:that.wtid,
+					beginDate: that.value1[0].valueOf(),
+					endDate: that.value1[1].valueOf(),
+				};
+				that.API.requestData({
+					showLoading:true,
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "operationrecord/czlb",
+					data,
+					success(res) {
+						if (res.code == 200) {
+							that.tableData.data = [];
+							if (res.data.length) {
+								let data = res.data;
+								for (var i = 0; i < data.length; i++) {
+									let obj = {
+										index: i+1,
+										zhsj: data[i].zhsj,
+										ConversionName: data[i].ConversionName,
+									};
+									that.tableData.data.push(obj);
+								}
+							}
+						}
+					},
+				});
+			},
+		},
+		watch:{
+			wtId(e){
+				this.requestSafeList(this.wpId,e);
+			},
+			value1(){
+				this.requestSafeList(this.wpId,this.wtId);
+			}
+		}
+	};
 </script>
 
 <style lang="less" scope>
-@titleGray: #9ca5a8;
-@rowGray: #606769;
-@darkBack: #536268;
-.knowledge-2 {
-  .el-select {
-    width: 200px;
-  }
-  .el-input {
-    width: 200px;
-  }
-}
+	@titleGray: #9ca5a8;
+	@rowGray: #606769;
+	@darkBack: #536268;
+
+	.knowledge-2 {
+		.el-select {
+			width: 200px;
+		}
+
+		.el-input {
+			width: 200px;
+		}
+	}
 </style>

src/views/warn/ztzhjl.vue

@@ -20,47 +20,24 @@
 					</div>
 				</div>
 				<div class="query-item">
-					<div class="lable">类型：</div>
-					<div class="search-input">
-						<el-select v-model="type" clearable placeholder="请选择" popper-class="select">
-							<el-option v-for="item in typeArray" :key="item.id" :value="item.id" :label="item.name" />
-						</el-select>
-					</div>
-				</div>
-				<div class="query-item">
 					<div class="query-item">
 						<div class="lable">开始日期：</div>
 						<div class="search-input">
-							<el-date-picker v-model="value1" @change="BeginChange(value1)" type="date"
-								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-							</el-date-picker>
-						</div>
-					</div>
-					<div class="query-item">
-						<div class="lable">结束日期：</div>
-						<div class="search-input">
-							<el-date-picker v-model="value2" @change="EndChange(value2)" type="date"
-								value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+							<el-date-picker v-model="value1" type="datetimerange" range-separator="至"
+								start-placeholder="开始日期" end-placeholder="结束日期">
 							</el-date-picker>
-							<div class="unit svg-icon svg-icon-gray">
-								<svg-icon :svgid="''" />
-							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 			<div class="query-actions" style="margin-right: 1500px">
-				<button class="btn green" @click="onClickSearch">查询</button>
 				<button class="btn green" @click="exportCsv">导出</button>
 			</div>
 		</div>
 		<el-row :type="'flex'" class="content">
-			<el-col :span="12">
+			<el-col :span="24">
 				<ComTable :data="tableData" height="85vh"></ComTable>
 			</el-col>
-			<el-col :span="12">
-
-			</el-col>
 		</el-row>
 	</div>
 </template>
@@ -75,24 +52,11 @@
 		},
 		data() {
 			return {
-				value1: "",
-				value2: "",
+				value1: [],
 				wpId: "",
 				wpArray: [],
 				wpName: "",
 				wtId: "",
-				type: "",
-				typeArray: [
-
-					{
-						id: 4,
-						name: '维护'
-					},
-					{
-						id: 2,
-						name: '故障'
-					}
-				],
 				tableData: {
 					column: [{
 							name: "编号",
@@ -129,11 +93,8 @@
 			};
 		},
 		created() {
-			// this.requestSafeList();
-			this.value1 = new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd");
-			this.value2 = this.getTime(2);
 			this.getWp();
-			this.requestSafeList();
+			this.value1 = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"),new Date().formatDate("yyyy-MM-dd")];
 		},
 		methods: {
 			exportCsv() {
@@ -161,29 +122,24 @@
 				let el = document.createElement("a");
 				//链接赋值
 				el.href = url;
-				el.download = "文件导出.cvs";
+				el.download = "状态转换记录.cvs";
 				//必须点击否则不会下载
 				el.click();
 				//移除链接释放资源
 				urlObject.revokeObjectURL(url);
 			},
-			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-				var date = new Date();
-				var year = date.getFullYear(),
-					month = date.getMonth() + 1,
-					day = date.getDate();
-				month >= 1 && month <= 9 ? (month = '0' + month) : '';
-				day >= 0 && day <= 9 ? (day = '0' + day) : '';
-				var begin = year + '-' + month + '-01';
-				var end = year + '-' + month + '-' + day;
-				if (val == 1) {
-					return begin;
-				} else if (val == 2) {
-					return end;
-				}
+			formatDate(date) {
+			  var date = new Date(date);
+			  var YY = date.getFullYear() + '-';
+			  var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+			  var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+			  var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+			  var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+			  var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+			  return YY + MM + DD +" "+hh + mm + ss;
 			},
 			// 获取风场
-			getWp(reGetWp) {
+			getWp() {
 				let that = this;
 				that.API.requestData({
 					baseURL: "http://10.155.32.4:9001",
@@ -192,13 +148,12 @@
 						that.wpArray = res.data;
 						that.wpId = res.data[0].id;
 						that.wpName = res.data[0].wpName;
-						that.getWt(that.wpId, reGetWp);
+						that.getWt(that.wpId);
 					}
 				});
 			},
-
 			// 获取风机
-			getWt(wpid, reGetWp) {
+			getWt(wpid) {
 				let that = this;
 				if (that.wpId) {
 					that.API.requestData({
@@ -210,62 +165,50 @@
 						},
 						success(res) {
 							that.wtArray = res.data;
-							// that.wtId = res.data[0].id;
+							that.wtId = res.data[0].id;
 						}
 					});
 				}
 			},
-			BeginChange(vl) {
-				this.value1 = vl;
-			},
-			EndChange(vl) {
-				this.value2 = vl;
-			},
-			typeChange(vl) {
-				this.type = vl;
-			},
-			// 搜索按钮
-			onClickSearch() {
-				this.requestSafeList();
-			},
 			// 获取停机事件
-			requestSafeList() {
+			requestSafeList(wpId,wtid) {
 				let that = this;
-
+				if(wpId && wtid){
+					that.wpId = wpId;
+					that.wtid = wtid;
+				}
+				if(typeof that.value1[0].valueOf() != 'string'){
+					that.value1[0] = that.formatDate(that.value1[0].valueOf())
+				}
+				if(typeof that.value1[1].valueOf() != 'string'){
+					that.value1[1] = that.formatDate(that.value1[1].valueOf())
+				}
 				let data = {
-					tablepar: {
-						pageNum: 1,
-						pageSize: 1000,
-					},
-					beginDate: that.value1,
-					endDate: that.value2,
-					wpId: that.wpId,
+					WindPowerStation: that.wpId,
+					wtid:that.wtid,
+					beginDate: that.value1[0].valueOf(),
+					endDate: that.value1[1].valueOf(),
 				};
-
-				if (that.wtId != '') data.wtId = that.wtId;
-				if (that.type != '') data.type = that.type;
-
-				this.API.requestData({
-					method: "POST",
-					subUrl: "/event/getShutdownevent",
+				that.API.requestData({
+					showLoading:true,
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "operationrecord/zhlb",
 					data,
 					success(res) {
 						if (res.code == 200) {
 							that.tableData.data = [];
-							if (res.data.list.length) {
-								let data = res.data.list;
-								// for (var i = 0; i < data.length; i++) {
-								// 	let obj = {
-								// 		index: i,
-								// 		time: data[i].,
-								// 		qType: data[i].,
-								// 		hType: new Date(data[i].stopTime).formatDate("yyyy-MM-dd hh:mm:ss"),
-								// 		glfj: data[i].,
-								// 	};
-								// 	if (data[i].startTime) obj.startTime = new Date(data[i].startTime).formatDate(
-								// 		"yyyy-MM-dd hh:mm:ss");
-								// 	that.tableData.data.push(obj);
-								// }
+							if (res.data.length) {
+								let data = res.data;
+								for (var i = 0; i < data.length; i++) {
+									let obj = {
+										index: i+1,
+										time: data[i].zhsj,
+										qType: data[i].beforeConversionName,
+										hType: data[i].AfterConversionName,
+										glfj: data[i].wtid,
+									};
+									that.tableData.data.push(obj);
+								}
 							}
 
 						}
@@ -273,6 +216,14 @@
 				});
 			},
 		},
+		watch:{
+			wtId(e){
+				this.requestSafeList(this.wpId,e);
+			},
+			value1(){
+				this.requestSafeList(this.wpId,this.wtId);
+			}
+		}
 	};
 </script>