Merge branch 'lining' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/views/Home/Home.vue

@@ -47,6 +47,8 @@
           :data="fcmap"
           :xtData="xtmap"
           @mapClick="changeShowType"
+          @mapClicks="changeShowTypes"
+          @mapClickBack="changeShowBackType"
           @backStation="onBackStation"
         ></Map>
       </div>
@@ -867,6 +869,8 @@ export default {
   },
   data() {
     return {
+      historyWpId: '',
+      historyPlanBtnName:'',
       timmer: null, // 计时器
       timmer2: null,
       timmer3: null,
@@ -1190,6 +1194,11 @@ export default {
               smooth: true,
               value: [],
             },
+            {
+              title: "72小时预测功率",
+              smooth: true,
+              value: [],
+            },
           ];
 
           rdlKey.forEach((keyEle, keyIndex) => {
@@ -1218,19 +1227,27 @@ export default {
 
     // 点击地图展示类型
     changeShowType(wpId, planBtnName) {
-      this.wpName = planBtnName;
-      this.planBtnName = planBtnName;
+      this.wpName = planBtnName?planBtnName:this.wpName;
+      this.planBtnName = planBtnName?planBtnName:this.planBtnName;
       this.jczbmap = {};
       clearInterval(this.timmer);
       this.timmer = null;
-      this.wpId = wpId;
+      this.wpId = wpId?wpId:this.wpId;
+      
       this.requestData(false);
       this.getCharts();
       this.timmer = setInterval(() => {
         this.requestData(false);
       }, this.$store.state.websocketTimeSec);
     },
-
+    changeShowTypes(wpId,planBtnName){
+      this.historyWpId = wpId
+      this.historyPlanBtnName = planBtnName
+      this.changeShowType(wpId,planBtnName);
+    },
+    changeShowBackType(){
+      this.changeShowType(this.historyWpId,this.historyPlanBtnName);
+    },
     // 打开弹窗
     openDialog(dialogTitle, subUrl, targetName, dialogType) {
       this.dialogTitle = dialogTitle;
@@ -1320,9 +1337,10 @@ export default {
     showDoneChart(res) {
       this.dialogTitle = res.dialogTitle;
       this.dialogType = res.dialogType;
-
       this.doneLineChartData = res.data;
+      this.doneLineChartData.units[0] = this.doneLineChartData.units[0]?this.doneLineChartData.units[0]:'(万KWh)';
       this.dialogShow = true;
+      console.log(this.doneLineChartData)
     },
 
     // 地图进入事件

src/views/Home/components/coulometric-analysis.vue

@@ -26,7 +26,7 @@
         <div class="coulometric-info">
           <svg-icon svgid="svg-arrow-down" class="icon yellow" />
           <span class="title gray">避免故障</span>
-          <span class="value">{{ bmgz_ }}</span>
+          <span class="value">{{ bmgz_ }}次</span>
         </div>
         <percent-card :value="jdl_" color="yellow" title="降低率" />
         <card-1

src/views/Home/components/map.vue

@@ -268,13 +268,13 @@ export default {
       let wpId = showType === "all" ? "0" : showType === "fc" ? "-1" : "-2";
       this.safeDay = "---";
       this.mapName = "nx";
-      this.$emit("mapClick", wpId, this.tabs[index].text);
+      this.$emit("mapClicks", wpId, this.tabs[index].text);
     },
     backMap(wpId, planBtnName) {
       this.currentMode = "NX";
       this.mapName = "nx";
       this.mapIndex = -1;
-      this.$emit("mapClick", wpId, planBtnName);
+      this.$emit("mapClickBack");
     },
     clickLabel(wpId, planBtnName) {
       this.mapName = wpId;
@@ -311,7 +311,6 @@ export default {
       this.safeDay = res;
     },
     data(res) {
-		console.log(res)
       this.sourceMap = res;
     },
     xtData(res) {

src/views/Home/components/weather.vue

@@ -80,8 +80,8 @@ export default {
       visibility: "20KM", //能见度
       humidity: "75.0%", // 湿度
       pressure: "994kPa", // 气压
-      sunrise: "04:06", // 日出
-      sunset: "18:50", // 日落
+      sunrise: "08:10", // 日出
+      sunset: "17:39", // 日落
     };
   },