update

src/App.vue

@@ -231,6 +231,9 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
           </g>
           <g id="图层_4"></g>
         </svg>
+
+        <!-- <div class="second-box">国电电力河北新能源开发有限公司</div> -->
+
       </div>
       <div class="header-menu-body">
         <Header @onMenuClick="HeaderMenuClick" />
@@ -519,6 +522,15 @@ body {
     .header-title {
       margin: auto;
       color: #fff;
+      display: flex;
+      // align-items: center;
+    }
+    .second-box{
+      width:  11.37vw;
+      // background-color: #05bb4c;
+      height: 50px;
+
+
     }
     .header-menu-body {
       flex-grow: 1;

src/api/cockpit/matrix/index.js

@@ -1,4 +1,8 @@
 import request from "../../../tools/request";
+import axios from "axios";
+// const CancelToken = axios.CancelToken;
+// const source = CancelToken.source();
+
 //获取驾驶舱基础信息
 const findBasicDataInfo = (data) => {
     return request({

src/api/economic/index.js

@@ -420,16 +420,17 @@ const requestData1 = (data) => {
 //znzhfx.vue
 const singleanalysisSingleanalysisSub = (data) => {
     return request({
-        url: `/consumer/singleanalysis/singleanalysisSub`,
-        method: "post",
-        data: data
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/singleanalysis/singleanalysisSub?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
+        method: "get",
     });
 };
 const singleanalysisSingleanalysisChart = (data) => {
     return request({
-        url: `/consumer/singleanalysis/singleanalysisChart`,
-        method: "post",
-        data: data
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/singleanalysis/singleanalysisChart?wtId=${data.wtId}&year=${data.year}&month=${data.month}`,
+        method: "get",
+      
     });
 };
 // 单机月度分析

src/api/wisdomOverhaul/energy/index.js

@@ -78,6 +78,15 @@ const leaderboardCurvefittingmainList = (data) => {
         method: "post",
     });
 };
+const requestData = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `${data.subUrl}?type=${data.data.type}&wtId=${data.data.wtId}&year=${data.data.year}&month=${data.data.month}`,
+        method: `${data.method}`,
+    });
+};
+
+
 
 
 
@@ -95,6 +104,7 @@ export default {
     powersaturationPowersaturationlist,
     powersaturationPowersaturationchart,
     leaderboardCurvefittingmainList,
+    requestData,
 
 
 

src/api/wisdomOverhaul/health/index.js

@@ -11,9 +11,16 @@ const recommen = (url, data) => {
         baseURL: process.env.VUE_APP_Matrix,
         url: `${url}?rid=${data.rid}`,
         method: "post",
-        data: data
     });
 };
+const recommenALL = (url, data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `${url}?typeid=${data.typeid}`,
+        method: "post",
+    });
+};
+
 const findAllChartjz = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
@@ -168,14 +175,49 @@ const healthreportHealthReport = (data) => {
         method: "get",
     });
 };
-
-
+// 故障回溯
+const faultQueryPointVos = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `fault/queryPointVos?wtId=${data.wtId}&bjtype=${data.bjtype}&cdtype=${data.cdtype}`,
+        method: "get",
+    });
+};
+const faultGetFaultPlayback = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `fault/getFaultPlayback?wtId=${data.wtId}&pointids=${data.pointids}&stopTime=${data.stopTime}`,
+        method: "get",
+    });
+};
+const healthsubFindWtHealthInfo1 = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `/health/findWtHealthInfo1?wtId=${data.wtId}`,
+        method: "get",
+    });
+};
+const healthsubFindWtHealthInfo2 = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `health/findWtHealthInfo2?wtId=${data.wtId}`,
+        method: "get",
+    });
+};
+const healthsubFindWtHealthInfo3 = (data) => {
+    return request({
+        baseURL: process.env.VUE_APP_Matrix,
+        url: `health/findWtHealthInfo3?wtId=${data.wtId}`,
+        method: "get",
+    });
+};
 
 
 
 export default {
     requestRecommen,
     recommen,
+    recommenALL,
     findAllChartjz,
     recommenRecommenConfirmedList,
     powercompareWindturbineAjax,
@@ -198,4 +240,13 @@ export default {
     healthsubGetWeatherRealDay5Info,
     healthsubFindWtHisValueForBj,
     healthreportHealthReport,
+    faultQueryPointVos,
+    faultGetFaultPlayback,
+    healthsubFindWtHealthInfo1,
+    healthsubFindWtHealthInfo2,
+    healthsubFindWtHealthInfo3,
+
+
+
+    
 }

src/api/wisdomOverhaul/index.js

@@ -3,8 +3,8 @@ import request from "../../tools/request";
 const sandtableFindWtInfo = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `sandtable/findWtInfo?wpId=${data.wpId}`,
-        method: "POST",
+        url: `/sandtable/findWtInfo?wpId=${data.wpId}`,
+        method: "get",
     });
 };
 const sandtableJudgeWpHealth = (data) => {
@@ -17,28 +17,28 @@ const sandtableJudgeWpHealth = (data) => {
 const queryAlltotal = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `alarm/count/query/alltotal?stationid=${data.stationid}`,
+        url: `/alarm/getAlarmAllTotal?stId=${data.stationid}`,
         method: "get",
     });
 };
 const countAlltotal = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `shutdown/count/alltotal?stId=${data.stId}`,
+        url: `/alarm/getShutdownAllTotal?stId=${data.stId}`,
         method: "get",
     });
 };
 const inventoryGroupcount = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `inventory/groupcount?stId=${data.stId}`,
+        url: `/reliability/groupcount?stId=${data.stId}`,
         method: "get",
     });
 };
 const equoperationrecordEquupdatecount = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `equoperationrecord/equupdatecount?stId=${data.stId}`,
+        url: `/reliability/equupdatecount?stId=${data.stId}`,
         method: "get",
     });
 };

src/api/wisdomOverhaul/reliability/index.js

@@ -16,11 +16,11 @@ const countQuery = (showLoading,data) => {
     });
 };
 // 预警分析
-const radarGzfx = (showLoading,data) => {
+const radarGzfx = (data,showLoading) => {
     return request({
         showLoading,
         baseURL: process.env.VUE_APP_Matrix,
-        url: `radar/gzfx?stId=${data.stId}&Date=${data.Date}`,
+        url: `health/radar/gzfx?stationid=${data.wpid}&date=${data.Date}`,
         method: "get",
     });
 };

src/api/wisdomOverhaul/windResources/index.js

@@ -2,7 +2,7 @@ import request from "../../../tools/request";
 const scatterAjax = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&wpId=${data.month}&month=${data.month}`,
+        url: `scatter/scatterAjax?wpId=${data.wpId}&pjId=${data.pjId}&lnId=${data.lnId}&year=${data.year}&month=${data.month}`,
         method: "get",
     });
 };
@@ -23,7 +23,7 @@ const lineWpIdAjax = (data) => {
 const getWinddirection = (data) => {
     return request({
         baseURL: process.env.VUE_APP_Matrix,
-        url: `winddirection/getWinddirection?wpId=${data.wpId}&recorddate=${data.recorddate}`,
+        url: `scatter/getWinddirection?wpId=${data.wpId}&recorddate=${data.recorddate}`,
         method: "get",
     });
 };

src/assets/styles/theme/light/light-qt.less

@@ -251,7 +251,7 @@
     //样本库-知识库
     .el-table th.el-table__cell>.cell {
         color: @black;
-        height: 3.8vh;
+        // height: 3.8vh;
         padding-top: 0.6vh;
     }
     .el-time-panel__footer{

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

@@ -28,8 +28,12 @@
 import PercentBar from "../../chart/bar/percent-bar.vue";
 export default {
     created() {
+   
     
     },
+    mounted(){
+
+    },
   components: {
     PercentBar,
   },
@@ -64,7 +68,7 @@ export default {
 
   computed: {
     percent() {
-      return this.TotalValue=== 0? 0 :parseInt((this.TotalValue / this.ActualValue) * 100);
+      return this.TotalValue=== 0? 0 :parseInt((this.TotalValue / this.ActualValue)*10);
     },
 
   

src/components/coms/table/table-qc.vue

@@ -8,7 +8,9 @@
           :class="{ light: col.is_light }"
           :style="{ width: col.width }"
           @click="onSort(col)"
-        >{{ col.name }}</th>
+        >
+          {{ col.name }}
+        </th>
       </tr>
     </thead>
     <el-scrollbar>
@@ -18,7 +20,11 @@
             v-for="(col, i) of data.column"
             :key="i"
             :style="{ width: col.width }"
-            :class="{ light: hoverRow == row || hoverCol == col, num: col.is_num, 'always-light': col.is_light || row.is_light }"
+            :class="{
+              light: hoverRow == row || hoverCol == col,
+              num: col.is_num,
+              'always-light': col.is_light || row.is_light,
+            }"
             @mouseenter="hover(row, col)"
             @mouseleave="leave()"
           >
@@ -56,6 +62,7 @@
 
 <script>
 import * as echarts from "echarts";
+import api from "@api/wisdomOverhaul/energy/index.js";
 export default {
   // 名称
   name: "ComTable",
@@ -67,30 +74,30 @@ export default {
     // hover 样式
     showHover: {
       type: Boolean,
-      default: true
+      default: true,
     },
     // 列高亮
     showColHover: {
       type: Boolean,
-      default: false
+      default: false,
     },
     canScroll: {
       type: Boolean,
-      default: true
+      default: true,
     },
     pageSize: {
       type: Number,
-      default: 0
+      default: 0,
     },
     height: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   // 自定义事件
   emits: {
     // 分页事件
-    onPagging: null
+    onPagging: null,
   },
   // 数据
   data() {
@@ -104,7 +111,7 @@ export default {
       dialogShow: false,
       dialogTitle: "",
       dialogData: {},
-      myChart : null
+      myChart: null,
     };
   },
   computed: {
@@ -124,7 +131,7 @@ export default {
           if (a[that.sortCol] < b[that.sortCol]) return rev * -1;
           return 0;
         });
-        return data; 
+        return data;
       }
     },
     pageable() {
@@ -141,7 +148,7 @@ export default {
     endRow() {
       if (this.pageable) return this.currentPage * this.pageSize;
       else return this.data.data.length;
-    }
+    },
   },
   // 函数
   methods: {
@@ -159,7 +166,7 @@ export default {
       this.clearChart();
       let subUrl = "";
       let data = {};
-      let method = "POST";
+      let method = "GET";
       if ("sjbz" == col.field) {
         subUrl = "/leaderboard/curveMonthchatAjax";
         data["type"] = "sjbz";
@@ -195,13 +202,15 @@ export default {
         data["month"] = pdate[1];
       }
       data["wtId"] = row.fj;
-      let that = this;
-      that.API.requestData({
-        method: method,
-        subUrl: subUrl,
-        data: data,
-        success(res) {
-          if (res.code === 200) {
+
+      api
+        .requestData({
+          method: method,
+          subUrl: subUrl,
+          data: data,
+        })
+        .then((res) => {
+              if (res.code === 200) {
             const linedata1 = [];
             const linedata2 = [];
             const names = [res.data.name1, res.data.name2];
@@ -210,14 +219,35 @@ export default {
               linedata2.push(item["value3"]);
             });
 
-            that.dialogShow = true;
-            that.dialogTitle = "曲线偏差率排行";
-            that.initChart(linedata1, linedata2, names);
+            this.dialogShow = true;
+            this.dialogTitle = "曲线偏差率排行";
+            this.initChart(linedata1, linedata2, names);
           }
-        }
-      });
+        });
+
+      // let that = this;
+      // that.API.requestData({
+      //   method: method,
+      //   subUrl: subUrl,
+      //   data: data,
+      //   success(res) {
+      //     if (res.code === 200) {
+      //       const linedata1 = [];
+      //       const linedata2 = [];
+      //       const names = [res.data.name1, res.data.name2];
+      //       res.data.datas.forEach((item, index) => {
+      //         linedata1.push(item["value2"]);
+      //         linedata2.push(item["value3"]);
+      //       });
+
+      //       that.dialogShow = true;
+      //       that.dialogTitle = "曲线偏差率排行";
+      //       that.initChart(linedata1, linedata2, names);
+      //     }
+      //   }
+      // });
     },
-    clearChart(){
+    clearChart() {
       // echarts.init(document.getElementById("chartDiv"));
       // TODO 未实现 点开后先清空曲线。mychart 不能定义为全局变量。Echarts bug
     },
@@ -227,7 +257,7 @@ export default {
       let option = {
         color: ["#05bb4c", "#4b55ae"],
         tooltip: {
-          trigger: "axis"
+          trigger: "axis",
         },
         legend: {
           show: true,
@@ -238,14 +268,14 @@ export default {
           inactiveColor: "#606769",
           textStyle: {
             color: "#B3BDC0",
-            fontSize: 12
-          }
+            fontSize: 12,
+          },
         },
         grid: {
           top: 32,
           left: 40,
           right: 40,
-          bottom: 24
+          bottom: 24,
         },
         xAxis: [
           {
@@ -255,11 +285,11 @@ export default {
               formatter: "{value}",
               fontSize: 9.35925925925926,
               textStyle: {
-                color: "#606769"
-              }
+                color: "#606769",
+              },
             },
             axisLine: {
-              show: false
+              show: false,
             },
             data: [
               "0",
@@ -287,9 +317,9 @@ export default {
               "22",
               "23",
               "24",
-              "25"
-            ]
-          }
+              "25",
+            ],
+          },
         ],
         yAxis: [
           {
@@ -297,19 +327,19 @@ export default {
             name: "(W)",
             axisLabel: {
               formatter: "{value}",
-              fontSize: 9.35925925925926
+              fontSize: 9.35925925925926,
             },
             axisLine: {
-              show: false
+              show: false,
             },
             splitLine: {
               show: true,
               lineStyle: {
                 color: "#606769",
-                type: "dashed"
-              }
-            }
-          }
+                type: "dashed",
+              },
+            },
+          },
         ],
         series: [
           {
@@ -321,11 +351,11 @@ export default {
             lineStyle: {
               normal: {
                 color: "#05bb4c",
-                width: 1
+                width: 1,
               },
               emphasis: {
-                color: "#05bb4c"
-              }
+                color: "#05bb4c",
+              },
             },
             areaStyle: {
               normal: {
@@ -333,49 +363,49 @@ export default {
                   colorStops: [
                     {
                       offset: 0,
-                      color: "rgba(5,187,76,0.3)"
+                      color: "rgba(5,187,76,0.3)",
                     },
                     {
                       offset: 1,
-                      color: "rgba(5,187,76,0.1)"
-                    }
+                      color: "rgba(5,187,76,0.1)",
+                    },
                   ],
                   x: 0,
                   y: 0,
                   x2: 0,
                   y2: 1,
                   type: "linear",
-                  global: false
+                  global: false,
                 },
                 shadowColor: "rgba(5,187,76,0.1)",
-                shadowBlur: 10
+                shadowBlur: 10,
               },
               emphasis: {
                 color: {
                   colorStops: [
                     {
                       offset: 0,
-                      color: "rgba(5,187,76,0.3)"
+                      color: "rgba(5,187,76,0.3)",
                     },
                     {
                       offset: 1,
-                      color: "rgba(5,187,76,0.1)"
-                    }
+                      color: "rgba(5,187,76,0.1)",
+                    },
                   ],
                   x: 0,
                   y: 0,
                   x2: 0,
                   y2: 1,
                   type: "linear",
-                  global: false
+                  global: false,
                 },
                 shadowColor: "rgba(5,187,76,0.1)",
-                shadowBlur: 10
-              }
+                shadowBlur: 10,
+              },
             },
 
             yAxisIndex: 0,
-            data: data1
+            data: data1,
           },
           {
             name: names[1],
@@ -386,50 +416,50 @@ export default {
             lineStyle: {
               normal: {
                 color: "#606769",
-                width: 1
+                width: 1,
               },
               emphasis: {
-                color: "#fa8c16"
-              }
+                color: "#fa8c16",
+              },
             },
             areaStyle: {
               normal: {
                 color: "transparent",
                 shadowColor: "rgba(250,140,22,0.1)",
-                shadowBlur: 10
+                shadowBlur: 10,
               },
               emphasis: {
                 color: {
                   colorStops: [
                     {
                       offset: 0,
-                      color: "rgba(250,140,22,0.3)"
+                      color: "rgba(250,140,22,0.3)",
                     },
                     {
                       offset: 1,
-                      color: "rgba(250,140,22,0.1)"
-                    }
+                      color: "rgba(250,140,22,0.1)",
+                    },
                   ],
                   x: 0,
                   y: 0,
                   x2: 0,
                   y2: 1,
                   type: "linear",
-                  global: false
+                  global: false,
                 },
                 shadowColor: "rgba(250,140,22,0.1)",
-                shadowBlur: 10
-              }
+                shadowBlur: 10,
+              },
             },
 
             yAxisIndex: 0,
-            data: data2
-          }
-        ]
+            data: data2,
+          },
+        ],
       };
       myChart.clear();
       myChart.setOption(option);
-      this.resize = function() {
+      this.resize = function () {
         myChart.resize();
       };
       window.addEventListener("resize", this.resize);
@@ -471,9 +501,9 @@ export default {
         pageIndex: this.currentPage,
         pageSize: this.pageSize,
         start: this.startRow,
-        end: this.endRow
+        end: this.endRow,
       });
-    }
+    },
   },
   // 生命周期钩子
   // 创建前
@@ -485,7 +515,7 @@ export default {
   // 渲染后
   mounted() {},
   beforeUpdate() {},
-  updated() {}
+  updated() {},
 };
 </script>
 

src/store/index.js

@@ -6,7 +6,7 @@ const debug = process.env.NODE_ENV !== 'production';
 
 // 默认状态
 const state = {
-  websocketTimeSec: 1000,
+  websocketTimeSec: 5000,
   loading: false, //全局 - 加载中....
   themeName: localStorage.getItem("themeName") || "dark", // 主题
   menuData: [],

src/views/Decision/Decision1.vue

@@ -321,15 +321,6 @@ export default {
       api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;
       });
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "/consumer/benchmarking/wplist",
-      //   success(res) {
-      //     that.ChangZhan = res.data;
-      //   },
-      // });
     },
     ChangZhanChange(val) {
       this.TypeClass = "";
@@ -345,19 +336,6 @@ export default {
       }).then((res) => {
         this.XiangMu = res.data;
       });
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "/consumer/benchmarking/projectList",
-      //   data: {
-      //     wpids: val,
-      //   },
-      //   success(res) {
-      //     that.XiangMu = res.data;
-      //   },
-      // });
     },
     XiangMuChange(val) {
       this.TypeClass = "";
@@ -372,19 +350,6 @@ export default {
       }).then((res) => {
         this.XianLu = res.data;
       });
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "/consumer/benchmarking/lineList",
-      //   data: {
-      //     projects: val,
-      //   },
-      //   success(res) {
-      //     that.XianLu = res.data;
-      //   },
-      // });
     },
     XianLuChange(val) {
       this.TypeClass = "";
@@ -502,85 +467,7 @@ export default {
             this.tableData.data = data2;
           }
         });
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: process.env.VUE_APP_API,
-      //   subUrl: "consumer/benchmarking/fjjxb",
-      //   data: {
-      //     wpids: that.value1,
-      //     projectids: that.value2,
-      //     lineids: that.value3,
-      //     beginDate: that.value4,
-      //     endDate: that.value5,
-      //     type: that.TypeClass,
-      //     target: "",
-      //     sort: "",
-      //   },
-      //   success(res) {
-      //     var name = [],
-      //       data = [],
-      //       llfdl = [],
-      //       legend = [
-      //         "实际电量",
-      //         "计划检修损失",
-      //         "非计划检修损失",
-      //         "限电损失",
-      //         "受累损失",
-      //         "性能损失",
-      //       ],
-      //       data2 = []; //项目列表
-      //     res.data.forEach((item, index) => {
-      //       name.push(item.name);
-      //       data.push([
-      //         item.sjfdl,
-      //         item.jhjx,
-      //         item.fjhjx,
-      //         item.xd,
-      //         item.sl,
-      //         item.xn,
-      //       ]);
-      //       llfdl.push(item.llfdl);
-      //       data2.push({
-      //         index: index + 1,
-      //         name: item.name,
-      //         llfdl: item.llfdl,
-      //         sjfdl: item.sjfdl,
-      //         speed: item.speed,
-      //         fjhjx: item.fjhjx,
-      //         jhjx: item.jhjx,
-      //         sl: item.sl,
-      //         xd: item.xd,
-      //         xn: item.xn,
-      //         fnlly: item.fnlly,
-      //         is_light: false,
-      //       });
-      //     });
-      //     name.pop();
-      //     data.pop();
-      //     llfdl.pop();
-      //     if (data.length > 0) {
-      //       let arr1 = [];
-      //       const length = data[0].length;
-      //       for (var i = 0; i < length; i++) {
-      //         let arr2 = [];
-      //         data.forEach((ele) => {
-      //           arr2.push(ele[i]);
-      //         });
-      //         arr1.push(arr2);
-      //       }
-      //       that.lineData = llfdl;
-      //       that.bardata = {
-      //         area: name,
-      //         legend: legend,
-      //         data: arr1,
-      //       };
-      //     }
-      //     that.tableDataEnd = data2[data2.length - 1];
-      //     data2.pop();
-      //     that.tableData.data = data2;
-      //   },
-      // });
+     
     },
     mxClick() {
       this.$router.push("/decision/decision1Mx");
@@ -603,6 +490,7 @@ export default {
       that.tableData.data.forEach((i, index) => {
         list.push(i);
       });
+      console.log('that.tableDataEnd',that.tableDataEnd);
       list.push(that.tableDataEnd);
       const data = that.formatJson(filterVal, list);
       export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字

src/views/Decision/Decision2.vue

@@ -97,7 +97,7 @@
       <div :class="detailShow == 2 ? 'query-actions1 ' : 'query-actions'">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn">导出</button>
+        <button class="btn" @click="exportExcel()">导出</button>
         <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
       </div>
     </div>
@@ -209,7 +209,7 @@ export default {
   },
   data() {
     let that = this;
-  
+
     return {
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
@@ -720,6 +720,34 @@ export default {
     this.AjaxCommon();
   },
   methods: {
+  
+    exportExcel() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+
+      that.tableData.column.forEach((ele) => {
+        tHeader.push(ele.name);
+        filterVal.push(ele.field);
+      });
+
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+        list.push(i);
+      });
+      // list.push(that.tableDataEnd);
+        console.log(filterVal);
+        console.log(list);
+      const data = that.formatJson(filterVal, list);
+    
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
+    },
+
+      formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+
     ChangZhanVal() {
       api.benchmarkingWplist({}).then((res) => {
         //   that.value2.push(res.data[0].id);
@@ -728,20 +756,6 @@ export default {
         this.XiangMuVal(this.value2);
       });
 
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wplist",
-      //   success(res) {
-      //   //   that.value2.push(res.data[0].id);
-      //     that.ChangZhan = res.data;
-      //     //  that.AjaxCommon();
-      //     that.XiangMuVal(that.value2);
-      //     console.log("resCHANzhan:", res.data);
-      //     console.log("value2:", that.value2);
-      //   },
-      // });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -975,150 +989,7 @@ export default {
           this.analyis = analyis;
         });
 
-      // var that = this;
-      // that.API.requestData({
-      //   //五项损失率
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wxssl",
-      //   data: {
-      //     wpids: that.value1,
-      //     projectids: that.value2,
-      //     lineids: that.value3,
-      //     beginDate: that.value4,
-      //     endDate: that.value5,
-      //     target: "",
-      //     sort: "",
-      //   },
-      //   success(res) {
-      //     that.ajaxData = res.data;
-      //     console.log("resData:", res);
-      //     var dataTab = [], //表格
-      //       fdl = [],
-      //       cz = [],
-      //       ll = [],
-      //       analyis = [],
-      //       gzssdl = [],
-      //       jxssdl = [],
-      //       xnssdl = [],
-      //       xdssdl = [],
-      //       slssdl = [];
-      //     res.data.forEach((item, index) => {
-      //       that.tableIdArr.push(item.id);
-      //       dataTab.push({
-      //         //表格
-      //         index: index + 1,
-      //         name: item.name,
-      //         zhpm: item.zhpm,
-      //         fdlpm: item.fdlpm,
-      //         fdl: item.fdl,
-      //         gzssdlpm: item.gzssdlpm,
-      //         gzssdl: item.gzssdl,
-      //         jxssdlpm: item.jxssdlpm,
-      //         jxssdl: item.jxssdl,
-      //         xnssdlpm: item.xnssdlpm,
-      //         xnssdl: item.xnssdl,
-      //         xdssdlpm: item.xdssdlpm,
-      //         xdssdl: item.xdssdl,
-      //         slssdlpm: item.slssdlpm,
-      //         slssdl: item.slssdl,
-      //         fnlylpm: item.fnlylpm,
-      //         fnlyl: item.fnlyl,
-      //         gzsslpm: item.gzsslpm,
-      //         gzssl: item.gzssl,
-      //         jxsslpm: item.jxsslpm,
-      //         jxssl: item.jxssl,
-      //         qflpm: item.qflpm,
-      //         qfl: item.qfl,
-      //         xnsslpm: item.xnsslpm,
-      //         xnssl: item.xnssl,
-      //         slsslpm: item.slsslpm,
-      //         slssl: item.slssl,
-      //         is_light: false,
-      //       });
-
-      //       fdl.push({
-      //         value: item.fdl,
-      //         name: item.name,
-      //       });
-
-      //       cz.push({
-      //         value: (
-      //           item.gzssdl +
-      //           item.jxssdl +
-      //           item.xnssdl +
-      //           item.xdssdl +
-      //           item.slssdl
-      //         ).toFixed(2),
-      //         name: item.name,
-      //       });
-
-      //       ll.push({
-      //         value: item.llfdl,
-      //         name: item.name,
-      //       });
-
-      //       gzssdl.push({
-      //         text: item.name,
-      //         value: item.gzssdl,
-      //       });
-      //       jxssdl.push({
-      //         text: item.name,
-      //         value: item.jxssdl,
-      //       });
-      //       xnssdl.push({
-      //         text: item.name,
-      //         value: item.xnssdl,
-      //       });
-      //       xdssdl.push({
-      //         text: item.name,
-      //         value: item.xdssdl,
-      //       });
-      //       slssdl.push({
-      //         text: item.name,
-      //         value: item.slssdl,
-      //       });
-      //     });
-      //     analyis.push(
-      //       {
-      //         title: "故障损失电量",
-      //         yAxisIndex: 0,
-      //         value: gzssdl,
-      //       },
-      //       {
-      //         title: "检修损失电量",
-      //         yAxisIndex: 0,
-      //         value: jxssdl,
-      //       },
-      //       {
-      //         title: "性能损失电量",
-      //         yAxisIndex: 0,
-      //         value: xnssdl,
-      //       },
-      //       {
-      //         title: "限电损失电量",
-      //         yAxisIndex: 0,
-      //         value: xdssdl,
-      //       },
-      //       {
-      //         title: "受累损失电量",
-      //         yAxisIndex: 0,
-      //         value: slssdl,
-      //       }
-      //     );
-      //     that.tableData.data = dataTab;
-      //     that.innerFdl = fdl;
-      //     that.outerFdl = fdl;
-
-      //     that.innerCz = cz;
-      //     that.outerCz = cz;
-
-      //     that.innerLl = ll;
-      //     that.outerLl = ll;
-
-      //     that.analyis = analyis;
-      //   },
-      // });
+     
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Cjdb.vue

@@ -57,7 +57,8 @@
       <div class="query-actions">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn">导出</button>
+        <!-- <button class="btn">导出</button> -->
+        <button class="btn" @click="exportExcel()">导出</button>
         <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
       </div>
     </div>
@@ -129,7 +130,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-		:title="[windNum,windNum2]"
+        :title="[windNum, windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -397,14 +398,16 @@ export default {
               that.clearDb();
               that.detailShow = 2;
 
-              api.benchmarkingDetails({
-        id: dataId,
+              api
+                .benchmarkingDetails({
+                  id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-      }).then((res) => {
-                var dataTab = [];
+                })
+                .then((res) => {
+                  var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
                     dataTab.push({
@@ -438,7 +441,7 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-      });
+                });
 
               // that.API.requestData({
               //   method: "GET",
@@ -712,15 +715,37 @@ export default {
     this.AjaxCommon();
   },
   methods: {
-    ChangZhanVal() {
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    exportExcel() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-api.benchmarkingWplist({
-        
-      }).then((res) => {
-        this.ChangZhan = res.data;
+      that.tableData.column.forEach((ele) => {
+        if (ele.name != "") {
+          tHeader.push(ele.name);
+          filterVal.push(ele.field);
+        }
       });
 
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+        if (i.name != "") {
+          list.push(i);
+        }
+      });
+      // list.push(that.tableDataEnd);
 
+      const data = that.formatJson(filterVal, list);
+      export_json_to_excel(tHeader, data, "导出的Excel"); // 最后一个是表名字
+    },
+    ChangZhanVal() {
+      api.benchmarkingWplist({}).then((res) => {
+        this.ChangZhan = res.data;
+      });
 
       // var that = this;
       // that.API.requestData({
@@ -764,8 +789,8 @@ api.benchmarkingWplist({
       }
     },
     AjaxCommon() {
-
-api.benchmarkingCjdb({
+      api
+        .benchmarkingCjdb({
           wpids: this.value1,
           projectids: this.value2,
           lineids: this.value3,
@@ -773,8 +798,9 @@ api.benchmarkingCjdb({
           endDate: this.value5,
           target: "",
           sort: "",
-      }).then((res) => {
-         this.ajaxData = res.data;
+        })
+        .then((res) => {
+          this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -892,9 +918,7 @@ api.benchmarkingCjdb({
           this.outerCz = cz;
 
           this.analyis = analyis;
-      });
-
-
+        });
 
       // var that = this;
       // that.API.requestData({

src/views/Decision/Decision2Cndb.vue

@@ -57,7 +57,8 @@
       <div class="query-actions">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn">导出</button>
+        <!-- <button class="btn">导出</button> -->
+        <button class="btn" @click="exportExcel()">导出</button>
         <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
       </div>
     </div>
@@ -418,55 +419,6 @@ export default {
                   });
                   that.tableDataDetail.data = dataTab;
                 });
-
-              // var that = this;    benchmarkingDetails
-              // that.API.requestData({
-              //   method: "GET",
-              //   baseURL: "http://10.83.66.220:8020/",
-              //   subUrl: "benchmarking/details",
-              //   data: {
-              //     id: dataId,
-              //     beginDate: that.value4,
-              //     endDate: that.value5,
-              //     target: "",
-              //     sort: "",
-              //   },
-              //   success(res) {
-              //     var dataTab = [];
-              //     res.data.forEach((item, index) => {
-              //       that.tableIdArr.push(item.date);
-
-              //       dataTab.push({
-              //         //表格
-              //         index: index + 1,
-              //         fdl: item.fdl,
-              //         name: item.name,
-              //         zhpm: item.zhpm,
-              //         gzssdl: item.gzssdl,
-              //         jxssdlpm: item.jxssdlpm,
-              //         jxssdl: item.jxssdl,
-              //         xnssdlpm: item.xnssdlpm,
-              //         xnssdl: item.xnssdl,
-              //         xdssdlpm: item.xdssdlpm,
-              //         xdssdl: item.xdssdl,
-              //         slssdlpm: item.slssdlpm,
-              //         slssdl: item.slssdl,
-              //         gzsslpm: item.gzsslpm,
-              //         gzssl: item.gzssl,
-              //         jxsslpm: item.jxsslpm,
-              //         jxssl: item.jxssl,
-              //         qflpm: item.qflpm,
-              //         qfl: item.qfl,
-              //         xnsslpm: item.xnsslpm,
-              //         xnssl: item.xnssl,
-              //         slsslpm: item.slsslpm,
-              //         slssl: item.slssl,
-              //         is_light: false,
-              //       });
-              //     });
-              //     that.tableDataDetail.data = dataTab;
-              //   },
-              // });
             },
           },
         ],
@@ -689,25 +641,38 @@ export default {
     this.AjaxCommon();
   },
   methods: {
-    ChangZhanVal() {
-
+    formatJson(filterVal, jsonData) {
+      console.log(jsonData.map((v) => filterVal.map((j) => v[j])));
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    exportExcel() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
 
-api.benchmarkingWplist({
-       
-      }).then((res) => {
-        this.ChangZhan = res.data;
+      that.tableData.column.forEach((ele) => {
+        if (ele.name != "") {
+          tHeader.push(ele.name);
+          filterVal.push(ele.field);
+        }
       });
 
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+          if (i.name != "") {
+        list.push(i);
+          }
+      });
+      // list.push(that.tableDataEnd);
+      const data1 = that.formatJson(filterVal, list);
+      export_json_to_excel(tHeader, data1, "导出的Excel"); // 最后一个是表名字
+    },
 
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/wplist",
-      //   success(res) {
-      //     that.ChangZhan = res.data;
-      //   },
-      // });
+    ChangZhanVal() {
+      api.benchmarkingWplist({}).then((res) => {
+        this.ChangZhan = res.data;
+      });
     },
     ChangZhanChange(val) {
       this.value1 = val;
@@ -741,15 +706,16 @@ api.benchmarkingWplist({
       }
     },
     AjaxCommon() {
-
-api.benchmarkingCndb({
-         wpid: this.value1,
+      api
+        .benchmarkingCndb({
+          wpid: this.value1,
           beginDate: this.value4,
           endDate: this.value5,
           target: "",
           sort: "",
-      }).then((res) => {
-         this.ajaxData = res.data;
+        })
+        .then((res) => {
+          this.ajaxData = res.data;
           var dataTab = [], //表格
             analyis = [],
             gzssdl = [],
@@ -843,118 +809,7 @@ api.benchmarkingCndb({
           this.tableData.data = dataTab;
 
           this.analyis = analyis;
-      });
-
-
-      // var that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.83.66.220:8020/",
-      //   subUrl: "benchmarking/cndb",
-      //   data: {
-      //     wpid: that.value1,
-      //     beginDate: that.value4,
-      //     endDate: that.value5,
-      //     target: "",
-      //     sort: "",
-      //   },
-      //   success(res) {
-      //     that.ajaxData = res.data;
-      //     var dataTab = [], //表格
-      //       analyis = [],
-      //       gzssdl = [],
-      //       jxssdl = [],
-      //       xnssdl = [],
-      //       xdssdl = [],
-      //       slssdl = [];
-      //     res.data.forEach((item, index) => {
-      //       that.tableIdArr.push(item.date);
-      //       dataTab.push({
-      //         //表格
-      //         index: index + 1,
-      //         zhpm: item.zhpm,
-      //         date: item.date.substr(0, 10),
-      //         fdlpm: item.fdlpm,
-      //         fdl: item.fdl,
-      //         gzssdlpm: item.gzssdlpm,
-      //         gzssdl: item.gzssdl,
-      //         jxssdlpm: item.jxssdlpm,
-      //         jxssdl: item.jxssdl,
-      //         xnssdlpm: item.xnssdlpm,
-      //         xnssdl: item.xnssdl,
-      //         xdssdlpm: item.xdssdlpm,
-      //         xdssdl: item.xdssdl,
-      //         slssdlpm: item.slssdlpm,
-      //         slssdl: item.slssdl,
-      //         fnlylpm: item.fnlylpm,
-      //         fnlyl: item.fnlyl,
-      //         gzsslpm: item.gzsslpm,
-      //         gzssl: item.gzssl,
-      //         jxsslpm: item.jxsslpm,
-      //         jxssl: item.jxssl,
-      //         qflpm: item.qflpm,
-      //         qfl: item.qfl,
-      //         xnsslpm: item.xnsslpm,
-      //         xnssl: item.xnssl,
-      //         slsslpm: item.slsslpm,
-      //         slssl: item.slssl,
-      //         is_light: false,
-      //       });
-      //       if (index < 7) {
-      //         gzssdl.push({
-      //           text: item.date.substr(0, 10),
-      //           value: item.gzssdl,
-      //         });
-      //         jxssdl.push({
-      //           text: item.date.substr(0, 10),
-      //           value: item.jxssdl,
-      //         });
-      //         xnssdl.push({
-      //           text: item.date.substr(0, 10),
-      //           value: item.xnssdl,
-      //         });
-      //         xdssdl.push({
-      //           text: item.date.substr(0, 10),
-      //           value: item.xdssdl,
-      //         });
-      //         slssdl.push({
-      //           text: item.date.substr(0, 10),
-      //           value: item.slssdl,
-      //         });
-      //       }
-      //     });
-      //     analyis.push(
-      //       {
-      //         title: "故障损失电量",
-      //         yAxisIndex: 0,
-      //         value: gzssdl,
-      //       },
-      //       {
-      //         title: "检修损失电量",
-      //         yAxisIndex: 0,
-      //         value: jxssdl,
-      //       },
-      //       {
-      //         title: "性能损失电量",
-      //         yAxisIndex: 0,
-      //         value: xnssdl,
-      //       },
-      //       {
-      //         title: "限电损失电量",
-      //         yAxisIndex: 0,
-      //         value: xdssdl,
-      //       },
-      //       {
-      //         title: "受累损失电量",
-      //         yAxisIndex: 0,
-      //         value: slssdl,
-      //       }
-      //     );
-      //     that.tableData.data = dataTab;
-
-      //     that.analyis = analyis;
-      //   },
-      // });
+        });
     },
     AjaxDbfx() {
       var that = this;

src/views/Decision/Decision2Xldb.vue

@@ -97,7 +97,7 @@
       <div :class="detailShow == 2 ? 'query-actions1' : 'query-actions'">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn">导出</button>
+   <button class="btn" @click="exportExcel()">导出</button>
         <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
       </div>
     </div>
@@ -772,6 +772,35 @@ export default {
     // });
   },
   methods: {
+
+       formatJson(filterVal, jsonData) {
+      console.log(jsonData.map((v) => filterVal.map((j) => v[j])));
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    exportExcel() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+
+      that.tableData.column.forEach((ele) => {
+        if (ele.name != "") {
+          tHeader.push(ele.name);
+          filterVal.push(ele.field);
+        }
+      });
+
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+          if (i.name != "") {
+        list.push(i);
+          }
+      });
+      // list.push(that.tableDataEnd);
+      const data1 = that.formatJson(filterVal, list);
+      export_json_to_excel(tHeader, data1, "导出的Excel"); // 最后一个是表名字
+    },
+
     ChangZhanVal() {
       api.benchmarkingWplist({}).then((res) => {
         this.oneData = res.data[0].id;

src/views/Decision/Decision2Xmdb.vue

@@ -77,7 +77,8 @@
       <div class="query-actions">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
-        <button class="btn">导出</button>
+        <!-- <button class="btn">导出</button> -->
+             <button class="btn" @click="exportExcel()">导出</button>
         <button class="btn" v-show="detailShow == 2" @click="back">返回</button>
       </div>
     </div>
@@ -723,6 +724,34 @@ export default {
     // this.AjaxCommon();
   },
   methods: {
+
+      formatJson(filterVal, jsonData) {
+      console.log(jsonData.map((v) => filterVal.map((j) => v[j])));
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    exportExcel() {
+      let that = this;
+      const { export_json_to_excel } = require("@tools/excel/Export2Excel.js"); // 注意这个Export2Excel路径
+      let tHeader = []; // 上面设置Excel的表格第一行的标题
+      let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+
+      that.tableData.column.forEach((ele) => {
+        if (ele.name != "") {
+          tHeader.push(ele.name);
+          filterVal.push(ele.field);
+        }
+      });
+
+      var list = [];
+      that.tableData.data.forEach((i, index) => {
+          if (i.name != "") {
+        list.push(i);
+          }
+      });
+      // list.push(that.tableDataEnd);
+      const data1 = that.formatJson(filterVal, list);
+      export_json_to_excel(tHeader, data1, "导出的Excel"); // 最后一个是表名字
+    },
     ChangZhanVal() {
       api.benchmarkingWplist({}).then((res) => {
         this.ChangZhan = res.data;

src/views/HealthControl/Health.vue

@@ -15,7 +15,7 @@
       >
         已确认缺陷
       </div>
-      <div
+      <!-- <div
         class="item"
         @click="tabSelect(2)"
         :class="{ active: tabIndex == 2 }"
@@ -28,7 +28,7 @@
         :class="{ active: tabIndex == 3 }"
       >
         已完成任务
-      </div>
+      </div> -->
     </div>
     <div v-if="tabIndex == 0">
       <health-tab-1 />
@@ -36,16 +36,18 @@
     <div v-if="tabIndex == 1">
       <health-tab-2 />
     </div>
-    <div v-if="tabIndex == 2">
-      <health-tab-3 />
+    <!-- <div v-if="tabIndex == 2">
+      <health-tab-3 /> -->
+
       <!-- <button class="btn" @click="dialogVisible = true">点击弹窗</button>
       <el-dialog title="日信息对比" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal" :close-on-click-modal="false">
         <dayinfo />
       </el-dialog> -->
-    </div>
-    <div v-if="tabIndex == 3">
+
+    <!-- </div> -->
+    <!-- <div v-if="tabIndex == 3">
       <health-tab-4 />
-    </div>
+    </div> -->
   </div>
 </template>
 

src/views/HealthControl/Health0.vue

@@ -61,13 +61,39 @@
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
             </span>
             <div class="fan-code">
-              <div class="fan-code-text font-md green">{{value2}}</div>
-              <div class="fan-code-label font-md gray-l" style="margin-left:20px">高频：</div>
-              <div class="fan-code-value font-md green">{{stoptypemap && stoptypemap.top1type}}</div>
-              <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 == 'null'?'暂无数据':stoptypemap.top3type)}}</div>
+              <div class="fan-code-text font-md green">{{ value2 }}</div>
+              <div
+                class="fan-code-label font-md gray-l"
+                style="margin-left: 20px"
+              >
+                高频：
+              </div>
+              <div class="fan-code-value font-md green">
+                {{ stoptypemap && stoptypemap.top1type }}
+              </div>
+              <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 == "null"
+                    ? "暂无数据"
+                    : stoptypemap.top3type)
+                }}
+              </div>
             </div>
             <!-- <span class="svg-icon svg-icon-white svg-icon-md mg-l-16">
               <SvgIcon svgid="svg-wind-site"></SvgIcon>
@@ -78,7 +104,7 @@
             <div class="fan-code">
               <div class="fan-code-value nm font-md green">{{stoptypemap && stoptypemap.wtscore}}</div>
             </div> -->
-            <button class="btn mg-l-16" type="button"  @click="onClickReport()">
+            <button class="btn mg-l-16" type="button" @click="onClickReport()">
               <i class="el-icon-s-order mg-r-8"></i><span>健康报告</span>
             </button>
           </el-col>
@@ -100,35 +126,80 @@
           <el-col :span="6"></el-col>
           <el-col :span="6"></el-col>
           <el-col :span="6">
-            <progress-bar title="风机" name="风机健康度" :progress='stoptypemap && stoptypemap.wtscore' :color="stoptypemap &&color('05bb4c')"></progress-bar>
+            <progress-bar
+              title="风机"
+              name="风机健康度"
+              :progress="stoptypemap && stoptypemap.wtscore"
+              :color="stoptypemap && color('05bb4c')"
+            ></progress-bar>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="发电机" name="寿命指数" :progress='partmap && partmap.fdj.smsyl' :color="partmap &&color(partmap.fdj.jkzt)"></progress-bar>
+            <progress-bar
+              title="发电机"
+              name="寿命指数"
+              :progress="partmap && partmap.fdj.smsyl"
+              :color="partmap && color(partmap.fdj.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="齿轮箱" name="寿命指数" :progress='partmap &&partmap.clx.smsyl' :color="partmap &&color(partmap.clx.jkzt)"></progress-bar>
+            <progress-bar
+              title="齿轮箱"
+              name="寿命指数"
+              :progress="partmap && partmap.clx.smsyl"
+              :color="partmap && color(partmap.clx.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="主轴" name="寿命指数" :progress='partmap &&partmap.zz.smsyl' :color="partmap &&color(partmap.zz.jkzt)"></progress-bar>
+            <progress-bar
+              title="主轴"
+              name="寿命指数"
+              :progress="partmap && partmap.zz.smsyl"
+              :color="partmap && color(partmap.zz.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="变桨" name="寿命指数" :progress='partmap &&partmap.bj.smsyl' :color="partmap &&color(partmap.bj.jkzt)"></progress-bar>
+            <progress-bar
+              title="变桨"
+              name="寿命指数"
+              :progress="partmap && partmap.bj.smsyl"
+              :color="partmap && color(partmap.bj.jkzt)"
+            ></progress-bar>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="偏航" name="寿命指数" :progress='partmap &&partmap.ph.smsyl' :color="partmap &&color(partmap.ph.jkzt)"></progress-bar>
+            <progress-bar
+              title="偏航"
+              name="寿命指数"
+              :progress="partmap && partmap.ph.smsyl"
+              :color="partmap && color(partmap.ph.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="机舱" name="寿命指数" :progress='partmap &&partmap.jc.smsyl' :color="partmap &&color(partmap.jc.jkzt)"></progress-bar>
+            <progress-bar
+              title="机舱"
+              name="寿命指数"
+              :progress="partmap && partmap.jc.smsyl"
+              :color="partmap && color(partmap.jc.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="变频器" name="寿命指数" :progress='partmap &&partmap.bpq.smsyl' :color="partmap &&color(partmap.bpq.jkzt)"></progress-bar>
+            <progress-bar
+              title="变频器"
+              name="寿命指数"
+              :progress="partmap && partmap.bpq.smsyl"
+              :color="partmap && color(partmap.bpq.jkzt)"
+            ></progress-bar>
           </el-col>
           <el-col :span="6" class="mg-t-16">
-            <progress-bar title="主控" name="寿命指数" :progress='partmap &&partmap.zk.smsyl' :color="partmap &&color(partmap.zk.jkzt)"></progress-bar>
+            <progress-bar
+              title="主控"
+              name="寿命指数"
+              :progress="partmap && partmap.zk.smsyl"
+              :color="partmap && color(partmap.zk.jkzt)"
+            ></progress-bar>
           </el-col>
         </el-row>
       </el-col>
@@ -199,7 +270,12 @@
         </el-row>
       </el-col>
     </el-row>
-    <health-report :show="reportshow" :params="reportparams" ref="eport" @closed="closed"/>
+    <health-report
+      :show="reportshow"
+      :params="reportparams"
+      ref="eport"
+      @closed="closed"
+    />
   </div>
 </template>
 
@@ -208,7 +284,8 @@ import SvgIcon from "@com/coms/icon/svg-icon.vue";
 import StandAloneImg from "@/views/WindSite/pages/Info/StandAloneImg.vue";
 import ProgressBar from "@com/coms/progress-bar/progress-bar.vue";
 import Table from "../../components/coms/table/table.vue";
-import HealthReport from "../../components/other/healthReport/index.vue"
+import HealthReport from "../../components/other/healthReport/index.vue";
+import api from "@api/wisdomOverhaul/health/index.js";
 export default {
   setup() {},
   components: {
@@ -216,7 +293,7 @@ export default {
     StandAloneImg,
     ProgressBar,
     Table,
-    HealthReport
+    HealthReport,
   },
   data() {
     return {
@@ -224,21 +301,21 @@ export default {
       reportparams: undefined,
       bsxImg: require("@assets/png/bsx.png"),
       options: [],
-      wtid:'',
-      wpid:'',
-      options1:[],
+      wtid: "",
+      wpid: "",
+      options1: [],
       value1: [],
       value2: [],
-      colorval:{
-        '1.0':'green',
-        '2.0':'purple',
-        '3.0':'orange',
-        '4.0':'red',
+      colorval: {
+        "1.0": "green",
+        "2.0": "purple",
+        "3.0": "orange",
+        "4.0": "red",
       },
       activeIndex: -1,
       gztableData: {
         column: [
-            {
+          {
             name: "",
             field: "index",
             width: "30px",
@@ -289,12 +366,11 @@ export default {
             is_light: false,
           },
         ],
-        data: [
-        ],
+        data: [],
       },
       yjtableData: {
         column: [
-            {
+          {
             name: "",
             field: "index",
             width: "30px",
@@ -345,8 +421,7 @@ export default {
             is_light: false,
           },
         ],
-        data: [
-        ],
+        data: [],
       },
       yxtableData: {
         column: [
@@ -687,130 +762,176 @@ export default {
           },
         ],
       },
-      partmap:null,
-      stoptypemap:null,
+      partmap: null,
+      stoptypemap: null,
     };
   },
   created() {
     this.wtid = this.$route.params.wtId;
     this.wpid = this.$route.params.wpId;
-    this.search()
+    this.search();
   },
   methods: {
     // 查看健康报告
-    onClickReport(){
-		// console.log(this.value2,new Date(new Date()).formatDate("yyyy-MM-dd"))
-      
-      this.reportshow = true
+    onClickReport() {
+      // console.log(this.value2,new Date(new Date()).formatDate("yyyy-MM-dd"))
+
+      this.reportshow = true;
       // this.reportparams = {wtId: this.value2, recorddate: new Date(new Date()).formatDate("yyyy-MM-dd")}
-	  this.$refs.eport.getReport(this.value2,new Date(new Date()).formatDate("yyyy-MM-dd"));
+      this.$refs.eport.getReport(
+        this.value2,
+        new Date(new Date()).formatDate("yyyy-MM-dd")
+      );
     },
     // 关闭健康报告
-    closed(){
-      this.reportshow = false
+    closed() {
+      this.reportshow = false;
     },
-      color(val){
-     return this.colorval[val]
+    color(val) {
+      return this.colorval[val];
     },
-    wpselect(){
-      console.warn('wpselect');
-      this.searchWindturbine('select')
+    wpselect() {
+      console.warn("wpselect");
+      this.searchWindturbine("select");
     },
-    wtselect(){
-      console.warn('wtselect');
-      this.searchWtHealthInfo()
+    wtselect() {
+      console.warn("wtselect");
+      this.searchWtHealthInfo();
     },
-    async search() {
-      const { data } = await this.API.requestData({
-        subUrl: "powercompare/windfarmAjax",
+    search() {
+      api.powercompareWindfarmAjax({}).then((res) => {
+        this.options = res.data;
+        this.value1 = this.wpid;
+        this.searchWindturbine();
       });
-      this.options = data.data;
-      this.value1 = this.wpid;
-      this.searchWindturbine()
+
+      // const { data } = await this.API.requestData({
+      //   subUrl: "powercompare/windfarmAjax",
+      // });
+      // this.options = data.data;
+      // this.value1 = this.wpid;
+      // this.searchWindturbine()
     },
-    async searchWindturbine(statu) {
-      const { data } = await this.API.requestData({
-        subUrl: "/powercompare/windturbineAjax",
-        data:{
-             wpId : this.value1
-        }
-      });
-      this.options1 = data.data;
-      this.value2 = statu =='select' ?data.data[0].id : this.wtid;
-      console.warn(data);
-     this.searchWtHealthInfo()
+    searchWindturbine(statu) {
+      api.powercompareWindturbineAjax({
+          wpId: this.value1,
+        })
+        .then((res) => {
+          this.options1 = res.data;
+          this.value2 = statu == "select" ? data.data[0].id : this.wtid;
+          this.searchWtHealthInfo();
+        });
+
+      // const { data } = await this.API.requestData({
+      //   subUrl: "/powercompare/windturbineAjax",
+      //   data: {
+      //     wpId: this.value1,
+      //   },
+      // });
+      // this.options1 = data.data;
+      // this.value2 = statu == "select" ? data.data[0].id : this.wtid;
+      // console.warn(data);
+      // this.searchWtHealthInfo();
     },
     async searchWtHealthInfo() {
-    //   const { data } = await this.API.requestData({
-    //     subUrl: "/healthsub//findWtHealthInfo",
-    //     showLoading: true,
-    //     method:'POST',
-    //     timeout: 30000, // 请求超时时间，默认 3s ，可缺省
-    //     data:{
-    //          wtId : this.value2
-    //     }
-    //   });
-    //  console.warn(data);
-    //  this.gztableData.data = data.data.gzls
-    //  this.yjtableData.data = data.data.yjls
-    //  this.yxtableData.data = data.data.bjyxls
-    //  this.tableData2.data =  data.data.djpgls
-    //  this.tableData11.data = data.data.wdls
-    //  this.tableData3.data = data.data.qxpcls
-    //  this.tableData4.data = data.data.jkls
-    //  this.partmap = data.data.partmap
-    //  this.stoptypemap = data.data.stoptypemap
+      //   const { data } = await this.API.requestData({
+      //     subUrl: "/healthsub//findWtHealthInfo",
+      //     showLoading: true,
+      //     method:'POST',
+      //     timeout: 30000, // 请求超时时间，默认 3s ，可缺省
+      //     data:{
+      //          wtId : this.value2
+      //     }
+      //   });
+      //  console.warn(data);
+      //  this.gztableData.data = data.data.gzls
+      //  this.yjtableData.data = data.data.yjls
+      //  this.yxtableData.data = data.data.bjyxls
+      //  this.tableData2.data =  data.data.djpgls
+      //  this.tableData11.data = data.data.wdls
+      //  this.tableData3.data = data.data.qxpcls
+      //  this.tableData4.data = data.data.jkls
+      //  this.partmap = data.data.partmap
+      //  this.stoptypemap = data.data.stoptypemap
       this.search1();
       this.search2();
       this.search3();
     },
-    search1(){
-      const that = this;
-      this.API.requestData({
-        subUrl: "healthsub/findWtHealthInfo1",
-        method:'POST',
-        timeout: 30000, 
-        data:{
-             wtId : this.value2
-        },
-        success(res) {
-          that.yjtableData.data = res.data.yjls;
-          that.partmap = res.data.partmap;
-          that.stoptypemap = res.data.stoptypemap;
-          that.gztableData.data = res.data.gzls;
-        },
-      });
+    search1() {
+      api.healthsubFindWtHealthInfo1({
+          wtId: this.value2,
+        })
+        .then((res) => {
+          this.yjtableData.data = res.data.yjls;
+          this.partmap = res.data.partmap;
+          this.stoptypemap = res.data.stoptypemap;
+          this.gztableData.data = res.data.gzls;
+        });
+
+      // const that = this;
+      // this.API.requestData({
+
+      //   subUrl: "healthsub/findWtHealthInfo1",
+      //   method: "POST",
+      //   timeout: 30000,
+      //   data: {
+      //     wtId: this.value2,
+      //   },
+      //   success(res) {
+      //     that.yjtableData.data = res.data.yjls;
+      //     that.partmap = res.data.partmap;
+      //     that.stoptypemap = res.data.stoptypemap;
+      //     that.gztableData.data = res.data.gzls;
+      //   },
+      // });
     },
-    search2(){
-      const that = this;
-      this.API.requestData({
-        subUrl: "healthsub/findWtHealthInfo2",
-        method:'POST',
-        timeout: 30000, 
-        data:{
-             wtId : this.value2
-        },
-        success(res) {
-          that.yxtableData.data = res.data.bjyxls;
-          that.tableData2.data =  res.data.djpgls;
-        },
-      });
+    search2() {
+      api.healthsubFindWtHealthInfo2({
+          wtId: this.value2,
+        })
+        .then((res) => {
+          this.yxtableData.data = res.data.bjyxls;
+          this.tableData2.data = res.data.djpgls;
+        });
+
+      // const that = this;
+      // this.API.requestData({
+      //   subUrl: "healthsub/findWtHealthInfo2",
+      //   method: "POST",
+      //   timeout: 30000,
+      //   data: {
+      //     wtId: this.value2,
+      //   },
+      //   success(res) {
+      //     that.yxtableData.data = res.data.bjyxls;
+      //     that.tableData2.data = res.data.djpgls;
+      //   },
+      // });
     },
-    search3(){
-      const that = this;
-      this.API.requestData({
-        subUrl: "healthsub/findWtHealthInfo3",
-        method:'POST',
-        timeout: 30000, 
-        data:{
-             wtId : this.value2
-        },
-        success(res) {
-          that.tableData3.data = res.data.qxpcls;
-          that.tableData11.data = res.data.wdls;
-          that.tableData4.data = res.data.jkls;
-        },
-      });
+    search3() {
+      api.healthsubFindWtHealthInfo3({
+          wtId: this.value2,
+        })
+        .then((res) => {
+          this.tableData3.data = res.data.qxpcls;
+          this.tableData11.data = res.data.wdls;
+          this.tableData4.data = res.data.jkls;
+        });
+
+      // const that = this;
+      // this.API.requestData({
+      //   subUrl: "healthsub/findWtHealthInfo3",
+      //   method: "POST",
+      //   timeout: 30000,
+      //   data: {
+      //     wtId: this.value2,
+      //   },
+      //   success(res) {
+      //     that.tableData3.data = res.data.qxpcls;
+      //     that.tableData11.data = res.data.wdls;
+      //     that.tableData4.data = res.data.jkls;
+      //   },
+      // });
     },
     selectSvg: function (index) {
       this.activeIndex = index;
@@ -829,7 +950,7 @@ export default {
     align-items: center;
 
     .fan-code {
-      width:76%;
+      width: 76%;
       display: flex;
       align-items: center;
       background: #53626833;
@@ -844,26 +965,26 @@ export default {
         }
       }
 
-            .fan-code-text {
-                padding-right: 20px;
-                border-right: 1px solid #536268;
-                // overflow: hidden;
-                // text-overflow:ellipsis;
-                white-space: nowrap;
-            }
+      .fan-code-text {
+        padding-right: 20px;
+        border-right: 1px solid #536268;
+        // overflow: hidden;
+        // text-overflow:ellipsis;
+        white-space: nowrap;
+      }
 
-            .fan-code-label {
-                // margin-left: 20px;
-                // min-width: 50px;
-                min-width:41px;
-            }
+      .fan-code-label {
+        // margin-left: 20px;
+        // min-width: 50px;
+        min-width: 41px;
+      }
 
-            .fan-code-value {
-                // margin-left: 20px;
-                // overflow: hidden;
-                // text-overflow:ellipsis;
-                white-space: nowrap;
-                max-width: 112px;
+      .fan-code-value {
+        // margin-left: 20px;
+        // overflow: hidden;
+        // text-overflow:ellipsis;
+        white-space: nowrap;
+        max-width: 112px;
 
         &.nm {
           margin-left: 0;

src/views/HealthControl/Health5.vue

@@ -85,14 +85,17 @@ export default {
     // 健康矩阵数据
     getHealthMatrix() {
       api.healthmainFindHealthMatrixMap().then((res) => {
-        if (res.code == 200) {
-          this.stationsList.push(res.data.fczbmap.CL_FDC);
-          this.stationsList.push(res.data.fczbmap.DX_FDC);
-          this.stationsList.push(res.data.fczbmap.KB_FDC);
-          this.windturbineList.push(res.data.fjmap[0]); //崇礼
-          this.windturbineList.push(res.data.fjmap[1]); //代县
-          this.windturbineList.push(res.data.fjmap[2]); //康宝
-        }
+        this.stationsList.push(res.data.fczbmap.CL_FDC);
+        this.stationsList.push(res.data.fczbmap.KB_FDC);
+        this.stationsList.push(res.data.fczbmap.DX_FDC);
+
+        this.stationsList.push(res.data.fczbmap.SY_FDC);
+        this.windturbineList.push(res.data.fjmap[0]); //崇礼
+        this.windturbineList.push(res.data.fjmap[1]); //康宝
+        this.windturbineList.push(res.data.fjmap[2]); //代县
+
+        this.windturbineList.push(res.data.fjmap[3]); //寿阳
+        console.log(this.stationsList);
       });
     },
     // 跳转按钮

src/views/HealthControl/HealthTab1.vue

@@ -140,7 +140,7 @@ export default {
     jumpUrl(item) {
       const wpid = item.wpid;
       const wtid = item.wtid;
-      this.$router.push(`/health/health0/${wpid}/${wtid}`)
+      this.$router.push(`/health/health0/${wpid}/${wtid}`);
     },
     // 未确认缺陷按钮下的健康趋势选项
     onClickInfo(item) {
@@ -224,35 +224,39 @@ export default {
     },
     // 健康报告推荐
     requestRecommen(url) {
-      api.requestRecommen({
-        url:url
-      }).then(res =>{
-        if (res.code == 200) this.recommenList = res.data;
-      })
+      api
+        .requestRecommen({
+          url: url,
+        })
+        .then((res) => {
+          if (res.code == 200) this.recommenList = res.data;
+        });
     },
     // 操作推荐内容（提交/取消）
     requestOption(url, rid) {
-      let data ={
-        rid: rid
-      }
-      api.recommen(url,data).then(res =>{
-         if (res.code == 200) this.onClickRecommon(that.recommenIndex);
-      })
+      let data = {
+        rid: rid,
+      };
+      api.recommen(url, data).then((res) => {
+        if (res.code == 200) this.onClickRecommon(this.recommenIndex);
+      });
     },
     // 操作推荐内容全部（提交/取消）
     requestOptionAll(url) {
-      let data = { typeid: this.recommenIndex }
-      api.recommen(url,data).then(res =>{
-         if (res.code == 200) this.onClickRecommon(that.recommenIndex);
-      })
+      let data = { typeid: this.recommenIndex };
+      api.recommenALL(url, data).then((res) => {
+        if (res.code == 200) this.onClickRecommon(this.recommenIndex);
+      });
     },
     // 损失电量分析  type：1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势
     requestCoulometry(type) {
-      api.findAllChartjz({
-        wpId: 0,
-        type: type
-      }).then(res =>{
-        if (res.code == 200) {
+      api
+        .findAllChartjz({
+          wpId: 0,
+          type: type,
+        })
+        .then((res) => {
+          if (res.code == 200) {
             this.bardata.legend = ["优数量", "良数量", "差数量"];
             this.lineData = res.data.lvchart;
             this.bardata.area = res.data.datechart;
@@ -260,7 +264,7 @@ export default {
             this.bardata.data[1] = res.data.lslchart;
             this.bardata.data[0] = res.data.yslchart;
           }
-      })
+        });
     },
   },
 };

src/views/Home/Home.vue

@@ -931,7 +931,6 @@ export default {
   },
 
   methods: {
-
     mGetDate() {
       var date = new Date();
       var year = date.getFullYear();
@@ -1438,7 +1437,6 @@ export default {
   },
 
   created() {
-
     let that = this;
     that.nowTime = new Date().formatDate("hh:mm:ss");
     that.$nextTick(() => {
@@ -1447,6 +1445,7 @@ export default {
       that.timmer = setInterval(() => {
         that.requestData(false);
       }, that.$store.state.websocketTimeSec);
+
       that.timmer2 = setInterval(() => {
         that.nowTime = new Date().formatDate("hh:mm:ss");
       }, 1000);
@@ -1454,6 +1453,9 @@ export default {
         this.getCharts();
       }, 360000);
     });
+
+ 
+
   },
 
   unmounted() {

src/views/Home/components/map/CL_FDC.vue

@@ -165,7 +165,7 @@
           />
           <text x="505" y="165" fill="#919697" font-size="14">1#</text>
           <text x="585" y="165" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL01_XL_fcgl }}万kw
+            {{ sourceMap.CL01_XL_fcgl }}MW
           </text>
         </g>
         <g
@@ -186,7 +186,7 @@
           />
           <text x="290" y="240" fill="#919697" font-size="14">2#</text>
           <text x="369" y="240" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL02_XL_fcgl }}万kw
+            {{ sourceMap.CL02_XL_fcgl }}MW
           </text>
         </g>
         <g
@@ -207,7 +207,7 @@
           />
           <text x="680" y="145" fill="#919697" font-size="14">3#</text>
           <text x="760" y="145" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL03_XL_fcgl }}万kw
+            {{ sourceMap.CL03_XL_fcgl }}MW
           </text>
         </g>
         <!-- 二期 -->
@@ -229,7 +229,7 @@
           />
           <text x="632" y="10" fill="#919697" font-size="14">4#</text>
           <text x="710" y="10" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL04_XL_fcgl }}万kw
+            {{ sourceMap.CL04_XL_fcgl }}MW
           </text>
         </g>
   <g
@@ -250,7 +250,7 @@
           />
           <text x="330" y="90" fill="#919697" font-size="14">5#</text>
           <text x="410" y="90" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL05_XL_fcgl }}万kw
+            {{ sourceMap.CL05_XL_fcgl }}MW
           </text>
         </g>
          <g
@@ -271,7 +271,7 @@
           />
           <text x="180" y="90" fill="#919697" font-size="14">6#</text>
           <text x="260" y="90" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.CL06_XL_fcgl }}万kw
+            {{ sourceMap.CL06_XL_fcgl }}MW
           </text>
         </g>
         <line

src/views/Home/components/map/DX_FDC.vue

@@ -109,7 +109,7 @@
           />
           <text x="130" y="125" fill="#919697" font-size="14">1#</text>
           <text x="210" y="125" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.DX01_XL_fcgl }}万kw
+            {{ sourceMap.DX01_XL_fcgl }}MW
           </text>
         </g>
         <g
@@ -130,7 +130,7 @@
           />
           <text x="480" y="130" fill="#919697" font-size="14">2#</text>
           <text x="560" y="130" fill="#05bb4c" font-size="14" text-anchor="end">
-            {{ sourceMap.DX02_XL_fcgl }}万kw
+            {{ sourceMap.DX02_XL_fcgl }}MW
           </text>
         </g>
     

src/views/Home/components/map/KB_FDC.vue

@@ -224,7 +224,7 @@
         />
         <text x="205" y="177" fill="#919697" font-size="14">1#</text>
         <text x="230" y="177" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB01_XL_fcgl }}万kw
+          {{ sourceMap.KB01_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -245,7 +245,7 @@
         />
         <text x="211" y="81" fill="#919697" font-size="14">2#</text>
         <text x="234" y="81" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB02_XL_fcgl }}万kw
+          {{ sourceMap.KB02_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -266,7 +266,7 @@
         />
         <text x="198" y="42" fill="#919697" font-size="14">3#</text>
         <text x="221" y="42" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB03_XL_fcgl }}万kw
+          {{ sourceMap.KB03_XL_fcgl }}MW
         </text>
       </g>
         <line
@@ -306,7 +306,7 @@
         />
         <text x="100" y="186" fill="#919697" font-size="14">4#</text>
         <text x="125" y="186" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB04_XL_fcgl }}万kw
+          {{ sourceMap.KB04_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -327,7 +327,7 @@
         />
         <text x="92" y="93" fill="#919697" font-size="14">5#</text>
         <text x="111" y="93" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB05_XL_fcgl }}万kw
+          {{ sourceMap.KB05_XL_fcgl }}MW
         </text>
       </g>
        <g
@@ -348,7 +348,7 @@
         />
         <text x="113" y="67" fill="#919697" font-size="14">6#</text>
         <text x="133" y="67" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB06_XL_fcgl }}万kw
+          {{ sourceMap.KB06_XL_fcgl }}MW
         </text>
       </g>
         <line
@@ -388,7 +388,7 @@
         />
         <text x="72" y="246" fill="#919697" font-size="14">7 #</text>
         <text x="91" y="246" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB07_XL_fcgl }}万kw
+          {{ sourceMap.KB07_XL_fcgl }}MW
         </text>
       </g>
       
@@ -410,7 +410,7 @@
         />
         <text x="114" y="286" fill="#919697" font-size="14">8 #</text>
         <text x="137" y="286" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB08_XL_fcgl }}万kw
+          {{ sourceMap.KB08_XL_fcgl }}MW
         </text>
       </g>
 
@@ -432,7 +432,7 @@
         />
         <text x="153" y="265" fill="#919697" font-size="14">9 #</text>
         <text x="178" y="265" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB09_XL_fcgl }}万kw
+          {{ sourceMap.KB09_XL_fcgl }}MW
         </text>
       </g>
       
@@ -473,7 +473,7 @@
         />
         <text x="200" y="240" fill="#919697" font-size="14">10 #</text>
         <text x="230" y="240" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB10_XL_fcgl }}万kw
+          {{ sourceMap.KB10_XL_fcgl }}MW
         </text>
       </g>
  <g
@@ -494,7 +494,7 @@
         />
         <text x="260" y="203" fill="#919697" font-size="14">11 #</text>
         <text x="290" y="203" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB11_XL_fcgl }}万kw
+          {{ sourceMap.KB11_XL_fcgl }}MW
         </text>
       </g>
  <g
@@ -515,7 +515,7 @@
         />
         <text x="357" y="163" fill="#919697" font-size="14">12 #</text>
         <text x="387" y="163" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB12_XL_fcgl }}万kw
+          {{ sourceMap.KB12_XL_fcgl }}MW
         </text>
       </g>
 
@@ -537,7 +537,7 @@
         />
         <text x="390" y="203" fill="#919697" font-size="14">13 #</text>
         <text x="420" y="203" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB13_XL_fcgl }}万kw
+          {{ sourceMap.KB13_XL_fcgl }}MW
         </text>
       </g>
 
@@ -559,7 +559,7 @@
         />
         <text x="485" y="88" fill="#919697" font-size="14">14 #</text>
         <text x="515" y="88" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB14_XL_fcgl }}万kw
+          {{ sourceMap.KB14_XL_fcgl }}MW
         </text>
       </g>
     
@@ -581,7 +581,7 @@
         />
         <text x="375" y="47" fill="#919697" font-size="14">15 #</text>
         <text x="405" y="47" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB15_XL_fcgl }}万kw
+          {{ sourceMap.KB15_XL_fcgl }}MW
         </text>
       </g>
     
@@ -603,7 +603,7 @@
         />
         <text x="445" y="165" fill="#919697" font-size="14">16 #</text>
         <text x="475" y="165" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB16_XL_fcgl }}万kw
+          {{ sourceMap.KB16_XL_fcgl }}MW
         </text>
       </g>
     
@@ -625,7 +625,7 @@
         />
         <text x="515" y="55" fill="#919697" font-size="14">17 #</text>
         <text x="545" y="55" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB17_XL_fcgl }}万kw
+          {{ sourceMap.KB17_XL_fcgl }}MW
         </text>
       </g>
     
@@ -647,7 +647,7 @@
         />
         <text x="465" y="33" fill="#919697" font-size="14">18 #</text>
         <text x="494" y="33" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB18_XL_fcgl }}万kw
+          {{ sourceMap.KB18_XL_fcgl }}MW
         </text>
       </g>
     
@@ -669,7 +669,7 @@
         />
         <text x="348" y="118" fill="#919697" font-size="14">19 #</text>
         <text x="379" y="118" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB19_XL_fcgl }}万kw
+          {{ sourceMap.KB19_XL_fcgl }}MW
         </text>
       </g>
     
@@ -691,7 +691,7 @@
         />
         <text x="285" y="102" fill="#919697" font-size="14">20 #</text>
         <text x="320" y="102" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB20_XL_fcgl }}万kw
+          {{ sourceMap.KB20_XL_fcgl }}MW
         </text>
       </g>
     
@@ -713,7 +713,7 @@
         />
         <text x="405" y="72" fill="#919697" font-size="14">21 #</text>
         <text x="435" y="72" fill="#05bb4c" font-size="14">
-          {{ sourceMap.KB21_XL_fcgl }}万kw
+          {{ sourceMap.KB21_XL_fcgl }}MW
         </text>
       </g>
     

src/views/Home/components/map/SY_FDC.vue

@@ -107,7 +107,7 @@
         />
         <text x="395" y="17" fill="#919697" font-size="14">1#</text>
         <text x="473" y="17" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY01_XL_fcgl }}万kw
+          {{ sourceMap.SY01_XL_fcgl }}MW
         </text>
       </g>
 
@@ -129,7 +129,7 @@
         />
         <text x="330" y="140" fill="#919697" font-size="14">2#</text>
         <text x="410" y="140" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY02_XL_fcgl }}万kw
+          {{ sourceMap.SY02_XL_fcgl }}MW
         </text>
       </g>
 
@@ -151,7 +151,7 @@
         />
         <text x="412" y="110" fill="#919697" font-size="14">3#</text>
         <text x="490" y="110" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY03_XL_fcgl }}万kw
+          {{ sourceMap.SY03_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -172,7 +172,7 @@
         />
         <text x="412" y="110" fill="#919697" font-size="14">4#</text>
         <text x="490" y="110" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY04_XL_fcgl }}万kw
+          {{ sourceMap.SY04_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -193,7 +193,7 @@
         />
         <text x="290" y="165" fill="#919697" font-size="14">4#</text>
         <text x="370" y="165" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY04_XL_fcgl }}万kw
+          {{ sourceMap.SY04_XL_fcgl }}MW
         </text>
       </g>
       <g
@@ -214,7 +214,7 @@
         />
         <text x="480" y="280" fill="#919697" font-size="14">5#</text>
         <text x="560" y="280" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY05_XL_fcgl }}万kw
+          {{ sourceMap.SY05_XL_fcgl }}MW
         </text>
       </g>
 
@@ -236,7 +236,7 @@
         />
         <text x="115" y="280" fill="#919697" font-size="14">6#</text>
         <text x="195" y="280" fill="#05bb4c" font-size="14" text-anchor="end">
-          {{ sourceMap.SY06_XL_fcgl }}万kw
+          {{ sourceMap.SY06_XL_fcgl }}MW
         </text>
       </g>
     </svg>

src/views/Home/components/power-plan.vue

@@ -18,8 +18,8 @@
           :title="''"
           TotalText="月实际"
           ActualText="月计划"
-          :TotalValue="((planData.yfdl)*100).toFixed(1)"
-          :ActualValue="((planData.yfdljh)*10).toFixed(1)"
+          :TotalValue="parseInt((planData.yfdl)*100)"
+          :ActualValue="parseInt(planData.yfdljh)"
           :percent="planData.ywcl"
         />
       </Col>
@@ -30,8 +30,8 @@
           :title="''"
           TotalText="年实际"
           ActualText="年计划"
-          :TotalValue="((planData.nfdl)*100).toFixed(1)"
-          :ActualValue="((planData.nfdljh)*10).toFixed(1)"
+          :TotalValue="parseInt((planData.nfdl)*100)"
+          :ActualValue="parseInt(planData.nfdljh)"
           :percent="planData.nwcl"
         />
       </Col>

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

@@ -88,6 +88,53 @@
         </template>
       </table-3>
     </panel-3>
+    <el-dialog
+      :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="Analysis"
+        :yAxises="AnalysisYAxises"
+        :showLegend="true"
+      />
+    </el-dialog>
+    <el-dialog
+      :title="dialogTitleFX"
+      v-model="dialogVisibleFX"
+      width="70%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+    >
+      <FX :date="startdate" :wpid="wpvalue" />
+    </el-dialog>
   </div>
 </template>
 
@@ -276,21 +323,22 @@ export default {
     //对比
     showChart(column) {
       console.log(55555);
-      let that = this;
-      that.dialogTitle = column.column.name;
-      that.wtId = column.row.name;
-      that.descName = column.column.name;
+      // let that = this;
+      this.dialogTitle = column.column.name;
+      this.wtId = column.row.name;
+      this.descName = column.column.name;
 
-      that.requestDetailData(
-        that.wpvalue,
-        that.startdate,
-        that.enddate,
+      this.requestDetailData(
+        this.wpvalue,
+        this.startdate,
+        this.enddate,
         60,
         column.row.name,
         column.column.name
       );
     },
     requestDetailData(station, startTs, endTs, interval, wtId, name) {
+      this.dialogVisible = true;
       // BASE.showLoading();
       api
         .analysisDetail({
@@ -304,185 +352,185 @@ export default {
           name: name,
         })
         .then((res) => {
-          if(res.data)
-          if (res.data.length == 1) {
-            this.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;
-            this.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,
+          if (res.data)
+            if (res.data.length == 1) {
+              this.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;
+              this.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,
+                  });
                 });
               });
-            });
-            this.Analysis = aList1;
-          } else if (res.data.length == 2) {
-            this.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;
+              this.Analysis = aList1;
+            } else if (res.data.length == 2) {
+              this.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;
+                });
               });
-            });
-            this.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,
+              this.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
+              // 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
 
-            //       });
-            //     });
-            //   });
-            // });
+              //       });
+              //     });
+              //   });
+              // });
 
-            this.Analysis = aList2;
-          } else if (res.data.length == 4) {
-            this.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;
+              this.Analysis = aList2;
+            } else if (res.data.length == 4) {
+              this.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;
+                });
               });
-            });
-            this.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,
+              this.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,
+                  });
                 });
               });
-            });
-            this.Analysis = aList4;
-          } else if (res.data.length == 0) {
-            this.dialogVisible = false;
-            BASE.closeLoading();
-            this.BASE.showMsg({
-              type: "warning",
-              msg: "暂无数据",
-            });
-          }
+              this.Analysis = aList4;
+            } else if (res.data.length == 0) {
+              this.dialogVisible = false;
+              BASE.closeLoading();
+              this.BASE.showMsg({
+                type: "warning",
+                msg: "暂无数据",
+              });
+            }
         });
     },
     //切换数据类型

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

@@ -55,11 +55,11 @@ export default {
   props: {
     date: {
       type: String,
-      default: "2021-06-06",
+      default: "",
     },
     wpid: {
       type: String,
-      default: "MHS_FDC",
+      default: "CL_FDC",
     },
   },
   data() {
@@ -70,15 +70,15 @@ export default {
     };
   },
   created() {
+    console.log(this.wpid);
     this.searchData();
   },
   methods: {
     searchData() {
-
-
       api
         .radarGzfx({
-         stId: this.wpid,
+
+         wpid:this.wpid,
           Date: this.date,
         })
         .then((res) => {

src/views/NewPages/daily.vue

@@ -196,4 +196,5 @@ export default {
     background-color: beige;
   }
 }
+
 </style>

src/views/NewPages/form.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="from">
+  <div
+    class="from"
+    :class="$store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'"
+  >
     <div class="btns">
       <!-- <button class="btn green">保存</button> -->
       <button class="btn green" @click="back">返回</button>
@@ -7,6 +10,7 @@
     </div>
     <div class="tableForm">
       <el-table
+        v-if="$store.state.themeName === 'dark'"
         :data="tableData"
         :header-cell-style="{
           height: '40px',
@@ -56,6 +60,43 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-table
+        v-else
+        :data="tableData"
+        :header-cell-style="{
+          background: 'rgb(193,197,199)',
+        }"
+      >
+        <el-table-column
+          v-for="(i, index) in tableData[0]
+            ? Object.keys(tableData[0]).sort(function (n, m) {
+                return parseInt(n.split('_')[0]) - parseInt(m.split('_')[0]);
+              })
+            : ''"
+          :key="index"
+          :prop="i"
+          :label="i === 'name' ? '名字' : i === 'date' ? '日期' : i.slice(2)"
+          :fixed="i === 'name' || i === 'date' ? 'left' : null"
+          width="160"
+          align="center"
+        >
+          <template #default="scope">
+            <!-- <el-input @input="send(scope.row)"
+              v-if="scope.row.name =='止码' && i != 'name' && i != 'date'" 
+              v-model="scope.row[i]" 
+              :disabled='timeNow.isConfirm == 1'>
+              </el-input> -->
+            <el-input
+              @input="send(scope.row)"
+              v-if="scope.row.name == '止码' && i != 'name' && i != 'date'"
+              v-model="scope.row[i]"
+              :disabled="true"
+              style="width: 75%"
+            ></el-input>
+            <label v-else>{{ scope.row[i] }}</label>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
   </div>
 </template>
@@ -129,28 +170,56 @@ export default {
 
 
 <style lang="less" scoped>
-.btn:hover {
-  color: #fff;
-}
-.btn {
-  margin: 20px;
-}
-.tableForm {
-  margin: 20px 20px 0 20px;
-}
+.light-matrix {
+  .btn:hover {
+    color: #fff;
+  }
+  .btn {
+    margin: 20px;
+  }
+  .tableForm {
+    margin: 20px 20px 0 20px;
+  }
 
-/deep/ .fixed {
-  background-color: black !important;
+  /deep/ .fixed {
+    background-color: black !important;
+  }
+  /deep/.el-table__fixed::before {
+    height: 0;
+  }
+  /deep/.main-body
+    .el-table.el-table--striped
+    .el-table__body
+    tr.el-table__row--striped
+    td {
+    opacity: 1 !important;
+    background-color: yellowgreen;
+  }
 }
-/deep/.el-table__fixed::before {
-  height: 0;
-}
-/deep/.main-body
-  .el-table.el-table--striped
-  .el-table__body
-  tr.el-table__row--striped
-  td {
-  opacity: 1 !important;
-  background-color: yellowgreen;
+.dark-matrix {
+  .btn:hover {
+    color: #fff;
+  }
+  .btn {
+    margin: 20px;
+  }
+  .tableForm {
+    margin: 20px 20px 0 20px;
+  }
+
+  /deep/ .fixed {
+    background-color: black !important;
+  }
+  /deep/.el-table__fixed::before {
+    height: 0;
+  }
+  /deep/.main-body
+    .el-table.el-table--striped
+    .el-table__body
+    tr.el-table__row--striped
+    td {
+    opacity: 1 !important;
+    background-color: yellowgreen;
+  }
 }
 </style>

src/views/NewPages/station.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="station">
+  <div
+    class="station"
+    :class="$store.state.themeName === 'dark' ? 'dark-matrix' : 'light-matrix'"
+  >
     <div class="btns">
       <!-- <button class="btn green">保存</button> -->
       <button class="btn green" @click="back">返回</button>
@@ -181,16 +184,32 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.btn:hover {
-  color: #fff;
+.dark-matrix {
+  .btn:hover {
+    color: #fff;
+  }
+  .btn {
+    margin: 20px;
+  }
+  .table-D {
+    margin: 20px 20px 0 20px;
+  }
+  /deep/.el-table thead.is-group th.el-table__cell {
+    background-color: rgb(37, 36, 36);
+  }
 }
-.btn {
-  margin: 20px;
-}
-.table-D {
-  margin: 20px 20px 0 20px;
-}
-/deep/.el-table thead.is-group th.el-table__cell {
-  background-color: rgb(37, 36, 36);
+.light-matrix {
+  .btn:hover {
+    color: #fff;
+  }
+  .btn {
+    margin: 20px;
+  }
+  .table-D {
+    margin: 20px 20px 0 20px;
+  }
+  /deep/.el-table thead.is-group th.el-table__cell {
+    background-color: rgb(193, 197, 199);
+  }
 }
 </style>

src/views/NewPages/znzhfx.vue

@@ -377,19 +377,8 @@ export default {
         year: this.year,
         month: this.month,
       });
-
-      //  this.API.requestData({
-      //   subUrl: "/singleanalysis/singleanalysisSub",
-      //   method: "POST",
-      //   data: {
-      //     wtId: this.wtId,
-      //     year: this.year,
-      //     month: this.month,
-      //   },
-      // });
-      console.log(data.data);
-      const res = data.data;
-      this.tableVal = data.data;
+      const res = data;
+      this.tableVal =data;
       console.warn(this.tableVal);
       let arr = [];
       let keyarr = Object.keys(res.byzb);
@@ -433,6 +422,8 @@ export default {
       this.tableData2.data = arr;
       console.warn(arr);
     },
+
+
     async searchChart() {
       const { data } = await api
         .singleanalysisSingleanalysisChart({
@@ -441,18 +432,7 @@ export default {
           month: this.month,
         })
        
-
-      // this.API.requestData({
-      //   subUrl: "/singleanalysis/singleanalysisChart",
-      //   method: "POST",
-      //   data: {
-      //     wtId: this.wtId,
-      //     year: this.year,
-      //     month: this.month,
-      //   },
-      // });
-      console.warn(data.data);
-      const res = data.data;
+      const res = data;
       let arrfffdl = [];
       let arrfffs = [];
       res.ff.forEach((e) => {
@@ -497,7 +477,6 @@ export default {
       this.list = [];
       this.list.push(obj);
       this.list.push(obj1);
-      console.warn(this.list);
       /////
       let arrwsarea = [];
       let arrwslegend = [
@@ -534,8 +513,11 @@ export default {
   .anliz-des {
     font-size: 16px;
     color: #b3bdc0;
-    margin-top: 1.4993vh;
+    margin-top:0.4993vh;
     margin-bottom: 44px;
+    padding-left: 20px;
+
+
   }
   .table-panel {
     .table-title {

src/views/SandTable/SandTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sand-table" id="sandTable">
     <img :src="require('@assets/png/3dback.png')" class="i3dback" />
-    <!-- <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" /> -->
+    <img :src="require('@assets/png/3dcloud.png')" class="i3dcloud" />
     <!-- <StBack></StBack> -->
     <!-- <ThreeModel1
       class="three-model-layer"
@@ -9,8 +9,12 @@
       @when="when"
       @clickMapItem="clickMapItem"
     ></ThreeModel1> -->
+    
+    <!-- 地图总览 -->
+    <SvgMap> </SvgMap>
+
     <div class="sand-table-left">
-      <PanelSand
+      <!-- <PanelSand
         class="left-panel"
         title="气象预测"
         :subTitle="timeStr + '实况'"
@@ -21,15 +25,35 @@
           :data="tqmap1"
           @click="openWeatherDialog"
         />
-      </PanelSand>
+      </PanelSand> -->
+
       <PanelSand class="left-panel mg-t-16" title="健康推荐">
         <RankTable :data="rmls" @rowClick="clickHealthRow"></RankTable>
       </PanelSand>
-      <PanelSand class="left-panel mg-t-16" title="停机信息">
+      <PanelSandToolbar class="left-panel mg-t-16" title="部件">
+        <template v-slot:tools>
+          <div class="exchange" @click="changeBjSwitch">
+            <span :class="bjSwitch ? 'gray' : 'green'">库存</span>
+            <i class="green fa fa-exchange mg-l-8 mg-r-8"></i>
+            <span :class="bjSwitch ? 'green' : 'gray'">记录</span>
+          </div>
+        </template>
+        <template v-slot:default>
+          <RadarPieChart
+            height="20.6vh"
+            :list="bjChartData.slice(11)"
+            title="部件情况"
+          />
+        </template>
+      </PanelSandToolbar>
+    </div>
+
+    <div class="sand-table-right">
+      <PanelSand class="right-panel mg-t-16" title="停机信息">
         <RankTable :data="sels" @rowClick="clickStopRow"></RankTable>
         <!-- <ComTable :data="sels"></ComTable> -->
       </PanelSand>
-      <PanelSandToolbar class="left-panel mg-t-16" title="隐患情况">
+      <PanelSandToolbar class="right-panel mg-t-16" title="隐患情况">
         <template v-slot:tools>
           <div class="exchange" @click="changeWarnSwitch">
             <span :class="warnSwitch ? 'gray' : 'green'">预警</span>
@@ -40,7 +64,7 @@
         <template v-slot:default>
           <RadarPieChart
             height="20.6vh"
-            :list="warnChartData"
+            :list="warnChartData" 
             title="隐患情况"
           />
         </template>
@@ -159,6 +183,7 @@
         "
       ></Ppanel>
     </div>
+
     <el-dialog
       title=""
       :custom-class="tableDialogClass"
@@ -435,6 +460,7 @@
 </template>
 
 <script>
+import SvgMap from "../../views/Home/components/map/svg-map-nx copy.vue";
 import ThreeModel1 from "./component/ThreeModel1.vue";
 import PanelSand from "@com/coms/panel/panel-sand.vue";
 import PanelSandToolbar from "@com/coms/panel/panel-sand-toolbar.vue";
@@ -470,6 +496,7 @@ export default {
     Row,
     SvgIcon,
     hlsVideo,
+    SvgMap,
   },
   // 数据
   data() {
@@ -509,76 +536,7 @@ 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: [
-        [
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=SBQ_FDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=NSS_FDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-        ],
-        [
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=QS_FDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=MHS_FDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-        ],
-        [
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=XS_FDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-          {
-            url: "http://192.168.10.10:9984/ws.html",
-            token: "?token=PL_GDC_SC&autoplay=true",
-            class: "",
-            switch: true,
-          },
-        ],
-      ],
+
       showVideoDialog: false,
       dialogVideoUrl: "",
       warnChartData: [],
@@ -596,48 +554,6 @@ export default {
         },
       ],
       workDataIndex: 0,
-      workData: {
-        column: [
-          {
-            name: "人员",
-            field: "laborname",
-            is_num: false,
-            is_light: false,
-            click(e, row) {
-              that.changePeople(row.index);
-            },
-          },
-          {
-            name: "职务",
-            field: "jobcode",
-            is_num: false,
-            is_light: false,
-            click(e, row) {
-              that.changePeople(row.index);
-            },
-          },
-          {
-            name: "开始时间",
-            field: "starttime",
-            width: "150px",
-            is_num: false,
-            is_light: false,
-            click(e, row) {
-              that.changePeople(row.index);
-            },
-          },
-          {
-            name: "原因",
-            field: "problem",
-            is_num: false,
-            is_light: false,
-            click(e, row) {
-              that.changePeople(row.index);
-            },
-          },
-        ],
-        data: [],
-      },
       sels: {
         column: [
           {
@@ -753,90 +669,18 @@ export default {
           this.gxkmap = res.data.gxkmap;
           this.weatherChart = weatherChart;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "sandtable/findWtInfo",
-      //   data: {
-      //     wpId: that.wpId,
-      //   },
-      //   success(res) {
-      //     res.data.tqmap5.ls.forEach((ele) => {
-      //       ele.time = new Date(ele.time).formatDate("yyyy-MM-dd hh:mm");
-      //     });
-
-      //     const keys = ["wd", "sd"];
-      //     let weatherChart = [
-      //       {
-      //         title: "温度",
-      //         smooth: true,
-      //         value: [],
-      //       },
-      //       {
-      //         title: "湿度",
-      //         smooth: true,
-      //         value: [],
-      //       },
-      //     ];
-
-      //     keys.forEach((key, keyIndex) => {
-      //       res.data.tqmap5.ls.forEach((ele) => {
-      //         weatherChart[keyIndex].value.push({
-      //           text: ele.time,
-      //           value: ele[key],
-      //         });
-      //       });
-      //     });
-
-      //     that.tqmap1 = res.data.tqmap1;
-      //     that.tqmap5 = res.data.tqmap5.ls;
-
-      //     res.data.sels.forEach((ele) => {
-      //       ele.stopTime = new Date(ele.stopTime).formatDate(
-      //         "yyyy-MM-dd hh:mm:ss"
-      //       );
-      //       ele.startTime = new Date(ele.stopTime).formatDate(
-      //         "yyyy-MM-dd hh:mm:ss"
-      //       );
-      //     });
-
-      //     res.data.rmls.forEach((ele) => {
-      //       ele.recodedate = new Date(ele.recodedate).formatDate(
-      //         "yyyy-MM-dd hh:mm:ss"
-      //       );
-      //     });
-
-      //     that.sels.data = res.data.sels;
-      //     that.rmls.data = res.data.rmls;
-      //     that.gxkmap = res.data.gxkmap;
-      //     that.weatherChart = weatherChart;
-      //   },
-      // });
     },
 
     // 获取中部地图数据
-    getWpHealthInfo() {
-      api
-        .sandtableJudgeWpHealth({
-          wpId: this.wpId,
-        })
-        .then((res) => {
-          this.mapSource = res.data;
-        });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "POST",
-      //   subUrl: "sandtable/judgeWpHealth",
-      //   data: {
-      //     wpId: that.wpId,
-      //   },
-      //   success(res) {
-      //     that.mapSource = res.data;
-      //   },
-      // });
-    },
+    // getWpHealthInfo() {
+    //   api
+    //     .sandtableJudgeWpHealth({
+    //       wpId: this.wpId,
+    //     })
+    //     .then((res) => {
+    //       this.mapSource = res.data;
+    //     });
+    // },
 
     // 获取报警玫瑰图
     getWarnMGT() {
@@ -855,27 +699,6 @@ export default {
           }
           this.warnChartData = warnChartData;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://192.168.1.18:8075/",
-      //   subUrl: "alarm/count/query/alltotal",
-      //   data: {
-      //     stationid: that.wpId,
-      //   },
-      //   success(res) {
-      //     let warnChartData = [];
-      //     for (let key in res.data) {
-      //       const ele = res.data[key];
-      //       warnChartData.push({
-      //         value: ele.count,
-      //         name: ele.relatePartsText,
-      //       });
-      //     }
-      //     that.warnChartData = warnChartData;
-      //   },
-      // });
     },
 
     // 获取故障玫瑰图
@@ -895,27 +718,6 @@ export default {
           }
           this.warnChartData = warnChartData;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://192.168.1.18:8075/",
-      //   subUrl: "shutdown/count/alltotal",
-      //   data: {
-      //     stId: that.wpId,
-      //   },
-      //   success(res) {
-      //     let warnChartData = [];
-      //     for (let key in res.data) {
-      //       const ele = res.data[key];
-      //       warnChartData.push({
-      //         value: ele.count,
-      //         name: ele.type,
-      //       });
-      //     }
-      //     that.warnChartData = warnChartData;
-      //   },
-      // });
     },
 
     // 获取库存玫瑰图
@@ -935,27 +737,6 @@ export default {
           }
           this.bjChartData = bjChartData;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://192.168.1.18:9988/",
-      //   subUrl: "inventory/groupcount",
-      //   data: {
-      //     stId: that.wpId,
-      //   },
-      //   success(res) {
-      //     let bjChartData = [];
-      //     for (let key in res.data) {
-      //       const ele = res.data[key];
-      //       bjChartData.push({
-      //         value: ele.curbal,
-      //         name: ele.description,
-      //       });
-      //     }
-      //     that.bjChartData = bjChartData;
-      //   },
-      // });
     },
 
     // 获取记录玫瑰图
@@ -975,60 +756,22 @@ export default {
           }
           this.bjChartData = bjChartData;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://192.168.1.18:9988/",
-      //   subUrl: "equoperationrecord/equupdatecount",
-      //   data: {
-      //     stId: that.wpId,
-      //   },
-      //   success(res) {
-      //     let bjChartData = [];
-      //     for (let key in res.data) {
-      //       const ele = res.data[key];
-      //       bjChartData.push({
-      //         value: ele.count,
-      //         name: ele.description,
-      //       });
-      //     }
-      //     that.bjChartData = bjChartData;
-      //   },
-      // });
     },
 
     // 获取中部地图数据
-    getTop4Info() {
-      api
-        .equoperationrecordTop4({
-          stId: this.wpId,
-        })
-        .then((res) => {
-          res.data.forEach((ele, index) => {
-            ele.index = index;
-            ele.jobcode = ele.jobcode || "------";
-          });
-          this.workData.data = res.data;
-        });
-
-      //   let that = this;
-      //   that.API.requestData({
-      //     method: "GET",
-      //     baseURL: "http://192.168.1.18:9988/",
-      //     subUrl: "equoperationrecord/top4",
-      //     data: {
-      //       stId: that.wpId,
-      //     },
-      //     success(res) {
-      //       res.data.forEach((ele, index) => {
-      //         ele.index = index;
-      //         ele.jobcode = ele.jobcode || "------";
-      //       });
-      //       that.workData.data = res.data;
-      //     },
-      //   });
-    },
+    // getTop4Info() {
+    //   api
+    //     .equoperationrecordTop4({
+    //       stId: this.wpId,
+    //     })
+    //     .then((res) => {
+    //       res.data.forEach((ele, index) => {
+    //         ele.index = index;
+    //         ele.jobcode = ele.jobcode || "------";
+    //       });
+    //       this.workData.data = res.data;
+    //     });
+    // },
 
     // 获取主要指标
     getWpMainInfo() {
@@ -1040,20 +783,6 @@ export default {
           this.mainInfo = res.data;
           this.showMainInfoDialog = true;
         });
-
-      // let that = this;
-      // that.API.requestData({
-      //   method: "GET",
-      //   baseURL: "http://10.155.32.4:8034/",
-      //   subUrl: "benchmark/zyzb",
-      //   data: {
-      //     windPowerStation: that.wpId,
-      //   },
-      //   success(res) {
-      //     that.mainInfo = res.data;
-      //     that.showMainInfoDialog = true;
-      //   },
-      // });
     },
 
     clickStopRow(row) {
@@ -1081,63 +810,6 @@ export default {
       return number / 100;
     },
 
-    // 切换人员展示
-    changePeople(index) {
-      if (!this.peopleAnmLock && this.workDataIndex !== index) {
-        this.peopleAnmLock = true;
-        this.peopleClass = "fadeOutRight";
-        setTimeout(() => {
-          this.workDataIndex = index;
-          this.peopleClass = "fadeInRight";
-          this.peopleAnmLock = false;
-        }, 150);
-      }
-    },
-
-    // 点击风场或者光伏
-    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.code = videoArray[pIndex + cIndex];
-              setTimeout(() => {
-                // 设置显示动画
-                cEle.class = "animated a1 flipInX";
-              }, 150);
-            }, 350);
-          }, (pIndex + cIndex + pIndex) * 150);
-        });
-      });
-      this.getWtInfo();
-      this.getWpHealthInfo();
-      this.getTop4Info();
-      this.getWarnMGT();
-      this.getRepertoryMGT();
-      this.getWpMainInfo();
-    },
-
     // 页面跳转
     jumpUrl(url) {
       this.$router.push(url);
@@ -1171,8 +843,8 @@ export default {
   },
   created() {
     this.getWtInfo();
-    this.getWpHealthInfo();
-    this.getTop4Info();
+    // this.getWpHealthInfo();
+    // this.getTop4Info();
     this.getWarnMGT();
     this.getRepertoryMGT();
     this.timeStr = new Date().formatDate("MM-dd hh:mm");
@@ -1226,10 +898,12 @@ export default {
 
   .left-panel {
     width: 360px;
+    margin-bottom: 150px;
   }
 
   .right-panel {
     width: 36.852vh;
+    margin-bottom: 150px;
   }
 
   .three-model-layer {

src/views/SandTable/component/ThreeModel1.vue

@@ -2,7 +2,7 @@
   <div class="three-model">
     <loading ref="pageLoading"></loading>
     <div class="map-3d" :style="'transform: rotate(' + mapDeg + 'deg);'">
-      <img :src="require('@assets/png/3dmap.png')" alt="" />
+      <!-- <img :src="require('@assets/png/3dmap.png')" alt="" /> -->
     </div>
     <div class="three-html-layer">
       <div

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

@@ -562,7 +562,118 @@ export class BoosterStation {
 			"KB35KV3MDW20": { tag: "HB_GD_KBF_DQ_P1_L1_001_DI1902" },
 
 
-		},}
+		},
+		"SY_FDC": {
+			"SY1SVGIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0651" },
+			"SY1SVGP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0642" },
+			"SY1SVGQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0643" },
+			"SY1SVG033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4572" },
+			"SY1SVG033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4574" },
+			"SY1SVG033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4576" },
+			"SY1SVGGLX": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0037" },
+			"SY1SVGGLX0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0038" },
+			"SY1FCIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0675" },
+			"SY1FCP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0666" },
+			"SY1FCQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0667" },
+			"SY1FC033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4846" },
+			"SY1FC033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4848" },
+			"SY1FC033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4850" },
+			"SY1FCGLX": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0037" },
+			"SY1FCGLX0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0038" },
+			"SYJD1XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0579" },
+			"SYJD1XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0570" },
+			"SYJD1XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0571" },
+			"SYJD1X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3870" },
+			"SYJD1X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3872" },
+			"SYJD1X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI387" },
+			"SYJD2XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0591" },
+			"SYJD2XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0582" },
+			"SYJD2XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0583" },
+			"SYJD2X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3987" },
+			"SYJD2X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3989" },
+			"SYJD2X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3991" },
+			"SYJD3XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0603" },
+			"SYJD3XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0594" },
+			"SYJD3XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0595" },
+			"SYJD3X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4104" },
+			"SYJD3X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4106" },
+			"SYJD3X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4108" },
+			"SYJD4XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0615" },
+			"SYJD4XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0606" },
+			"SYJD4XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0607" },
+			"SYJD4X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4221" },
+			"SYJD4X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4223" },
+			"SYJD4X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4225" },
+			"SYJD5XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0627" },
+			"SYJD5XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0618" },
+			"SYJD5XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0619" },
+			"SYJD5X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4338" },
+			"SYJD5X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4340" },
+			"SYJD5X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4342" },
+			"SYJD6XIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0639" },
+			"SYJD6XP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0630" },
+			"SYJD6XQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0631" },
+			"SYJD6X033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4455" },
+			"SYJD6X033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4457" },
+			"SYJD6X033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4459" },
+			"SYZYBIA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0663" },
+			"SYZYBP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0654" },
+			"SYZYBQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0655" },
+			"SYZYB033": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4718" },
+			"SYZYB033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4720" },
+			"SYZYB033-7": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI4722" },
+			"SY1#ZBYW1": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0554" },
+			"SY1#ZBYW2": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0555" },
+			"SY1#ZBRW": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0556" },
+			"SY1#ZBDW1": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0557" },
+			"SY3I9SCG": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI3723" },
+			"SY1#ZBDCKAI": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0551" },
+			"SY1#ZBDCKP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0541" },
+			"SY1#ZBDCKQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0542" },
+			"SY1#ZBDCK33": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2786" },
+			"SY1#ZBDCK033sc": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2787" },
+			"SY220MXCK1A": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0525" },
+			"SY220MXCK1B": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0526" },
+			"SY220MXCK1C": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0527" },
+			"SY220MXCK1AB": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0522" },
+			"SY220MXCK1BC": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0523" },
+			"SY220MXCK1CA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0524" },
+			"SY35IM2A": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0561" },
+			"SY35IM2B": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0562" },
+			"SY35IM2C": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0563" },
+			"SY35IM2AB": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0558" },
+			"SY35IM2BC": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0559" },
+			"SY35IM2CA": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0560" },
+			"SY221GSXAI": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0517" },
+			"SY221GSXP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0508" },
+			"SY221GSXQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0509" },
+			"SY221GSX0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0794" },
+			"SY221GSX10": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0792" },
+			"SY221GSXA0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0790" },
+			"SY221GSX1": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0788" },
+			"SY221GSXA": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0786" },
+			"SY221GSXAX": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0780" },
+			"SY221GSXBX": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0781" },
+			"SY221GSXCX": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0782" },
+			"SY221GSXDLQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI0778" },
+			"SY2010DD": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2837" },
+			"SY1010DD": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2850" },
+			"SYMX2A9": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI1952" },
+			"SYMX2A90": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI1954" },
+			"SYMX2A10": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI1956" },
+			"SY201ZB0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2735" },
+			"SY201ZB10": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2733" },
+			"SY201ZBA0": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2731" },
+			"SY201ZBDLQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2725" },
+			"SY201ZB1": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2729" },
+			"SY201ZBA": { tag: "HB_GD_SYF_DQ_P1_L1_001_DI2727" },
+			"SY201ZBAI": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0538" },
+			"SY201ZBP": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0528" },
+			"SY201ZBQ": { tag: "HB_GD_SYF_DQ_P1_L1_001_AI0529" },	
+		},
+	
+	
+	}
 
 	constructor() {
 		this.getDatas = this.getDatas.bind(this);

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

@@ -16,6 +16,7 @@
               style="enable-background: new 0 0 1777.7 1012.6"
               xml:space="preserve"
             >
+
               <g id="other">
                 <g>
                   <g>
@@ -4666,6 +4667,8 @@
                   </text>
                 </g>
               </g>
+
+
             </svg>
           </template>
         </previewPicture>

src/views/WindSite/pages/BoosterStation.vue

@@ -16,6 +16,8 @@
 
     <!-- 代县 -->
     <DX class="booster-station-body" v-if="wpId === 'DX_FDC'" />
+    <!-- 寿阳 -->
+    <SY class="booster-station-body" v-if="wpId === 'SY_FDC'" />
 
    
   </div>
@@ -26,6 +28,7 @@ import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 import CL from "../components/boosterstation/cl.vue";
 import KB from "../components/boosterstation/kb.vue";
 import DX from "../components/boosterstation/dx.vue";
+import SY from "../components/boosterstation/sy.vue";
 import api from "@api/cockpit/matrix/index.js";
 export default {
   // 名称
@@ -36,6 +39,7 @@ export default {
     CL,
     KB,
     DX,
+    SY
   },
   // 数据
   data() {

src/views/WindSite/pages/Info/StandAloneImg.vue

@@ -209,7 +209,7 @@
 				circle: false,
 				text: false,
 				hover: 0,
-				svgWidth: 1386,
+				svgWidth: 700,
 				svgHeight: 400,
 			};
 		},

src/views/allLifeManage/tab1.vue

@@ -346,7 +346,7 @@ export default {
             pagesize: this.pageSize,
           })
           .then((res) => {
-            if (res.data.records.length) {
+            if (res?.data?.records?.length) {
               res.data.records.forEach((ele, index) => {
                 ele.index = index + 1;
                 ele.timeDate = this.fmtDate(new Date(ele.time));

src/views/layout/Header.vue

@@ -103,6 +103,11 @@ export default {
           path: "/others",
           isActive: false,
         },
+        {
+          id: "报警",
+          text: "报警",
+          isActive: false,
+        },
       ],
       activeIndex: 0,
       // menusDropdown: [
@@ -126,7 +131,7 @@ export default {
   mounted() {
     let that = this;
     $(document).keydown((event) => {
-      if (event.keyCode == 192 ) {
+      if (event.keyCode == 192) {
         // c
         // let firstDate = new Date();
         // if (that.firsttime == 0) {
@@ -145,6 +150,11 @@ export default {
   },
   methods: {
     click(index, data) {
+      if (index === 4) {
+        // window.location.href = "http://10.83.68.205:8078/#/login";
+        window.open("http://10.83.68.205:8078/#/login");
+      }
+
       this.activeIndex = index;
       this.$router.push(data.path);
       const ActiveModule = this.menus.find((ele) => {
@@ -154,8 +164,7 @@ export default {
         this.$store.dispatch("changeModuleName", ActiveModule.text);
       }
     },
-    clickSubMenu(index, code) {
-    },
+    clickSubMenu(index, code) {},
     clickMenu() {
       this.dropdown = !this.dropdown;
     },

src/views/layout/Menu.vue

@@ -60,7 +60,7 @@
             :class="subIndex == index ? 'green' : 'gray'"
           >
             {{ menu.text }}
-            {{ menu.text }}
+       
           </div>
         </router-link>
       </li>
@@ -482,11 +482,11 @@ export default {
                 },
               ],
             },
-            {
-              text: "全生命周期",
-              icon: "svg-全生命周期",
-              path: "/health/allLifeManage",
-            },
+            // {
+            //   text: "全生命周期",
+            //   icon: "svg-全生命周期",
+            //   path: "/health/allLifeManage",
+            // },
             {
               text: "能效分析",
               icon: "svg-能效分析",
@@ -497,11 +497,11 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/nxfx/powerCurve",
                 },
-                {
-                  text: "偏航对风分析",
-                  icon: "svg-wind-site",
-                  path: "/health/nxfx/phdffx",
-                },
+                // {
+                //   text: "偏航对风分析",
+                //   icon: "svg-wind-site",
+                //   path: "/health/nxfx/phdffx",
+                // },
                 // {
                 //   text: "切入切出分析",
                 //   icon: "svg-wind-site",
@@ -1112,6 +1112,8 @@ export default {
         return t.id == this.currRoot;
       })[0].data;
       this.$store.dispatch("changeMenuData", data);
+      // console.log('this.menuData',this.menuData);
+      // console.log('data',data);
       return data;
     },
   },

src/views/malfunctionRecall/index.vue

@@ -300,7 +300,7 @@ export default {
       api.eventGetShutdownevent(data).then((res) => {
         if (res.code == 200) {
           this.tableData.data = [];
-          if (res.data.list.length) {
+          if (res?.data?.list?.length) {
             let data = res.data.list;
             for (var i = 0; i < data.length; i++) {
               let obj = {

src/views/singleAnalysis/znzhfx.vue

@@ -86,6 +86,7 @@ import VertivalBarLineChart from "../../components/chart/combination/vertival-ba
 import MultipleBarLineChart from "../../components/chart/combination/multiple-bar-line-chart.vue";
 import DoubleLineChart from "../../components/chart/line/double-line-chart.vue";
 // import DoubleLineChart from "./double-line-chart.vue";
+import api from "@api/economic/index.js";
 import Get_PDF from "@tools/htmlToPdf";
 export default {
   setup() {},
@@ -376,37 +377,14 @@ export default {
     },
   },
   methods: {
-    //导出pdf
-    exportPDF(name) {
-      this.BASE.showMsg({
-        type: "success",
-        msg: "正在导出...请稍后...",
-      });
-      Get_PDF.downloadPDF(
-        document.querySelector(".pdfDom"),
-        this.wtId +
-          "号风机" +
-          this.year +
-          "年" +
-          this.month +
-          "月运行指标性能分析"
-      );
-    },
     async search() {
-      console.log(this.wtId, "--", this.year, "---", this.month);
-      const { data } = await this.API.requestData({
-        subUrl: "/singleanalysis/singleanalysisSub",
-        method: "POST",
-        data: {
-          wtId: this.wtId,
-          year: this.year,
-          month: this.month,
-        },
+      const { data } = await api.singleanalysisSingleanalysisSub({
+        wtId: this.wtId,
+        year: this.year,
+        month: this.month,
       });
-      console.warn(data.data);
-      const res = data.data;
-      this.tableVal = data.data;
-	  console.log(data.data)
+      const res = data;
+      this.tableVal =data;
       console.warn(this.tableVal);
       let arr = [];
       let keyarr = Object.keys(res.byzb);
@@ -450,19 +428,17 @@ export default {
       this.tableData2.data = arr;
       console.warn(arr);
     },
+
+
     async searchChart() {
-      console.log(this.wtId, "--", this.year, "---", this.month);
-      const { data } = await this.API.requestData({
-        subUrl: "/singleanalysis/singleanalysisChart",
-        method: "POST",
-        data: {
+      const { data } = await api
+        .singleanalysisSingleanalysisChart({
           wtId: this.wtId,
           year: this.year,
           month: this.month,
-        },
-      });
-      console.warn(data.data);
-      const res = data.data;
+        })
+       
+      const res = data;
       let arrfffdl = [];
       let arrfffs = [];
       res.ff.forEach((e) => {
@@ -507,7 +483,6 @@ export default {
       this.list = [];
       this.list.push(obj);
       this.list.push(obj1);
-      console.warn(this.list);
       /////
       let arrwsarea = [];
       let arrwslegend = [

src/views/windAnalysis/fxzstab1.vue

@@ -47,7 +47,7 @@ export default {
     return {
       wpArray: [],
       wtArray: [],
-      wpId: "MHS_FDC",
+      wpId: "CL_FDC",
       recorddate: new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
       chartData: [{
         title: "风速",