Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into mw

src/components/chart/bar/multiple-bar-chart.vue

@@ -267,7 +267,9 @@ export default {
     },
   },
   methods: {
-    resize() {},
+    resize() {
+      this.initChart();
+    },
     initChart() {
       let chart = echarts.init(this.$el);
 

src/views/Home/Home.vue

@@ -201,7 +201,7 @@
                 </tr>
                 <tr class="">
                   <td class="text gray">
-                    {{ wpId === "0" ? "减排二氧化碳" : "年等效科利用系数" }}
+                    {{ wpId === "0" ? "减排二氧化碳" : "年等效可利用系数" }}
                   </td>
                   <td class="value green">
                     <!-- {{ wpId === "0" ? jczbmap.jpeyht  : gxkmap.ndxkyss }} -->
@@ -869,8 +869,8 @@ export default {
   },
   data() {
     return {
-      historyWpId: '',
-      historyPlanBtnName:'',
+      historyWpId: "",
+      historyPlanBtnName: "",
       timmer: null, // 计时器
       timmer2: null,
       timmer3: null,
@@ -1023,9 +1023,9 @@ export default {
         success(res) {
           that.powerData = [
             {
-              title: "日照强度",
+              title: that.wpId === '-2' ? "日照强度" : "风速",
               value: res.data.jczbmap.ssfs,
-              dialogTitle: "日照详情",
+              dialogTitle:  that.wpId === '-2' ? "日照强度详情" : "风速详情",
               subUrl: "genreset/findGLDetail",
               targetName: "ssfs",
               dialogType: "powerLineChart",
@@ -1190,7 +1190,7 @@ export default {
               value: [],
             },
             {
-              title: "平均风速",
+              title: that.wpId === '-2' ? "日照强度" : "平均风速",
               smooth: true,
               value: [],
             },
@@ -1227,26 +1227,68 @@ export default {
 
     // 点击地图展示类型
     changeShowType(wpId, planBtnName) {
-      this.wpName = planBtnName?planBtnName:this.wpName;
-      this.planBtnName = planBtnName?planBtnName:this.planBtnName;
+      if (
+        planBtnName === "电站" ||
+        planBtnName.indexOf("马场湖") !== -1 ||
+        planBtnName.indexOf("宣和") !== -1 ||
+        planBtnName.indexOf("大武口") !== -1 ||
+        planBtnName.indexOf("平罗") !== -1 ||
+        planBtnName.indexOf("海子井") !== -1
+      ) {
+        this.PowertrendYAxises = [
+          {
+            name: "功率",
+            min: 0,
+            max: null,
+            unit: "(万kWh)",
+            position: "left",
+          },
+          {
+            name: "日照",
+            min: 0,
+            max: 25,
+            unit: "(W/㎡)",
+            position: "right",
+          },
+        ];
+      } else {
+        this.PowertrendYAxises = [
+          {
+            name: "功率",
+            min: 0,
+            max: null,
+            unit: "(万kWh)",
+            position: "left",
+          },
+          {
+            name: "风速",
+            min: 0,
+            max: 25,
+            unit: "(m/s)",
+            position: "right",
+          },
+        ];
+      }
+      this.wpName = planBtnName ? planBtnName : this.wpName;
+      this.planBtnName = planBtnName ? planBtnName : this.planBtnName;
       this.jczbmap = {};
       clearInterval(this.timmer);
       this.timmer = null;
-      this.wpId = wpId?wpId:this.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);
+    changeShowTypes(wpId, planBtnName) {
+      this.historyWpId = wpId;
+      this.historyPlanBtnName = planBtnName;
+      this.changeShowType(wpId, planBtnName);
     },
-    changeShowBackType(){
-      this.changeShowType(this.historyWpId,this.historyPlanBtnName);
+    changeShowBackType() {
+      this.changeShowType(this.historyWpId, this.historyPlanBtnName);
     },
     // 打开弹窗
     openDialog(dialogTitle, subUrl, targetName, dialogType) {
@@ -1338,9 +1380,10 @@ export default {
       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.doneLineChartData.units[0] = this.doneLineChartData.units[0]
+        ? this.doneLineChartData.units[0]
+        : "(万KWh)";
       this.dialogShow = true;
-      console.log(this.doneLineChartData)
     },
 
     // 地图进入事件

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

@@ -119,6 +119,7 @@ export default {
 
     openDialog(dialogTitle, subUrl, dialogType) {
       let that = this;
+      
       that.API.requestData({
         method: "POST",
         subUrl,

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

@@ -120,6 +120,7 @@ export default {
 
   watch: {
     data(res) {
+      console.log(11111, res);
       this.PowerLoad = res;
     },
     id(res) {

src/views/SandTable/SandTable.vue

@@ -168,6 +168,7 @@
         class="stb-p"
         :data="riseNumber(gxkmap.bg_sbklyl)"
         dataColor="#05BB4C"
+        daysUnit="%"
         :days="gxkmap.ysbklyl"
         :data1Icon="
           gxkmap.hb_sbklyl < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'
@@ -189,7 +190,7 @@
       <Ppanel
         title="MTBF"
         class="stb-p"
-        :data="riseNumber(gxkmap.bg_mtbf)"
+        :data="'0.1' || riseNumber(gxkmap.bg_mtbf)"
         dataColor="#05BB4C"
         :days="gxkmap.mtbf"
         :data1Icon="gxkmap.hb_mtbf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
@@ -208,7 +209,7 @@
       <Ppanel
         title="MTTR"
         class="stb-p"
-        :data="riseNumber(gxkmap.bg_mttr)"
+        :data="'0.1' || riseNumber(gxkmap.bg_mttr)"
         dataColor="#05BB4C"
         :days="gxkmap.mttr"
         :data1Icon="gxkmap.hb_mttr < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
@@ -227,7 +228,7 @@
       <Ppanel
         title="MTTF"
         class="stb-p"
-        :data="riseNumber(gxkmap.bg_mttf)"
+        :data="'0.1' || riseNumber(gxkmap.bg_mttf)"
         dataColor="#05BB4C"
         :days="gxkmap.mttf"
         :data1Icon="gxkmap.hb_mttf < 0 ? 'svg-arrow-dpwn-1' : 'svg-arrow-up-1'"
@@ -468,11 +469,11 @@
       :destroy-on-close="true"
       :before-close="
         (done) => {
-          mainInfoDialogClass = 'modal animated a1 fadeOutUpBig';
+          mainInfoDialogClass = 'modal curModal animated a1 fadeOutUpBig';
           delaylyFn(450, done);
         }
       "
-      @closed="mainInfoDialogClass = 'modal animated a0 fadeInDown'"
+      @closed="mainInfoDialogClass = 'modal curModal animated a0 fadeInDown'"
     >
       <div v-for="(item, index) in mainInfo" :key="index">
         <el-divider content-position="center">{{ item.name }}</el-divider>
@@ -583,7 +584,7 @@ export default {
       ],
       videoDialogClass: "modal animated a1 bounceIn",
       tableDialogClass: "modal animated a1 fadeInLeftBig",
-      mainInfoDialogClass: "modal animated a0 fadeInDownBig",
+      mainInfoDialogClass: "modal curModal animated a0 fadeInDownBig",
       mainInfo: [],
       peopleClass: "",
       timeStr: "",
@@ -985,7 +986,6 @@ export default {
           windPowerStation: that.wpId,
         },
         success(res) {
-          console.log(123123, res);
           that.mainInfo = res.data;
           that.showMainInfoDialog = true;
         },
@@ -1137,8 +1137,7 @@ export default {
 </script>
 
 <style lang="less">
-
- .sand-table {
+.sand-table {
   width: 100%;
   height: 91.667vh;
   position: relative;
@@ -1273,6 +1272,11 @@ export default {
   }
 }
 
+#sandTable.sand-table .curModal .el-dialog__body {
+  max-height: 600px;
+  overflow-y: scroll;
+}
+
 .exchange {
   cursor: pointer;
 }
@@ -1382,11 +1386,6 @@ export default {
     background: #b3bdc0;
   }
 
-  #sandTable .el-dialog__body {
-    max-height: 600px;
-    overflow-y: scroll;
-  }
-
   animation-duration: 0;
   @keyframes dialog-fade-in {
     0% {

src/views/WindSite/pages/Home/Home.vue

@@ -899,7 +899,6 @@ export default {
             });
           });
           that.dayLost = dayLost;
-          console.log(123123, res);
         },
       });
     },
@@ -936,7 +935,7 @@ export default {
               value: [],
             },
             {
-              title: "风速",
+              title: that.resCode.indexOf("FDC") !== -1 ? "风速" : "日照",
               yAxisIndex: 0,
               value: [],
             },