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

src/components/other/healthReport/index.vue

@@ -136,10 +136,15 @@
           <el-form-item class="text-indent-2">
             统计周期内，曲线偏差率-5%，其中风速在3-5m/s区间曲线偏差率10%，风速在5-11m/s区间曲线偏差率为-8%，风速在11-25m/s区间曲线偏差率为3%，总体低于该型号机组平均值（3%）。
           </el-form-item>
-          <div class="logHead">功率曲线拟合</div>
-          <double-line-chart :height="'250px'" :list="glqxnh" />
-          <div class="logHead">曲线偏差率</div>
-          <normal-line-chart :list="qxpcls" />
+		  <div v-if="healthreport.glqxnh">
+			  <div class="logHead">功率曲线拟合</div>
+			  <double-line-chart :height="'250px'" :list="glqxnh" />
+		  </div>
+          <div v-if="healthreport.qxpcls">
+				<div class="logHead">曲线偏差率</div>
+				<normal-line-chart :list="qxpcls" />
+          </div>
+          
         </el-form>
       </div>
  
@@ -171,27 +176,34 @@
               healthreport.descriptiondfpcl
             }}；（如果需要查看在每一个功率等高线下偏航对风偏差角度信号在角度数值上的聚集程度，可参考能效分析中对风偏差分析模块）
           </el-form-item>
-          <div class="logHead">对风偏差率（频次）</div>
-          <DoubleLineChart
-            style="margin: 10px 0"
-            width="100%"
-            height="300px"
-            :list="dfpc.nipples"
-          />
-          <div class="logHead">对风偏差率（功率）</div>
-          <DoubleLineChart
-            style="margin: 10px 0"
-            width="100%"
-            height="300px"
-            :list="dfpc.dfpclpowers"
-          />
-          <div class="logHead">对风偏差率（风速）</div>
-          <DoubleLineChart
-            style="margin: 10px 0"
-            width="100%"
-            height="300px"
-            :list="dfpc.dfpclSpeeds"
-          />
+          
+		  <div v-if="healthreport.nipples">
+		  		<div class="logHead">对风偏差率（频次）</div>
+		  		<DoubleLineChart
+		  		  style="margin: 10px 0"
+		  		  width="100%"
+		  		  height="300px"
+		  		  :list="dfpc.nipples"
+		  		/>
+		  </div>
+		  <div v-if="healthreport.dfpclpowers">
+		  		<div class="logHead">对风偏差率（功率）</div>
+		  		<DoubleLineChart
+		  		  style="margin: 10px 0"
+		  		  width="100%"
+		  		  height="300px"
+		  		  :list="dfpc.dfpclpowers"
+		  		/>
+		  </div>
+		  <div v-if="healthreport.dfpclSpeeds">
+		  		<div class="logHead">对风偏差率（风速）</div>
+		  		<DoubleLineChart
+		  		  style="margin: 10px 0"
+		  		  width="100%"
+		  		  height="300px"
+		  		  :list="dfpc.dfpclSpeeds"
+		  		/>
+		  </div>
         </el-form>
       </div>
  
@@ -869,16 +881,16 @@
           <el-form-item class="imp fw"><b>推荐检修方案</b></el-form-item>
           <el-form-item class="imp fw text-indent-2">故障预测</el-form-item>
           <el-form-item class="text-indent-4"
-            >高频：{{ datas.highfrequency }}</el-form-item
+            >高频：{{ datas.highfrequency ? datas.highfrequency : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-4"
-            >中频：{{ datas.mediatefrequency }}</el-form-item
+            >中频：{{ datas.mediatefrequency ? datas.mediatefrequency : '暂无数据' }}</el-form-item
           >
           <el-form-item class="m-b-10 text-indent-4"
-            >低频：{{ datas.fowfrequency == 'null'?'暂无数据':datas.fowfrequency }}</el-form-item
+            >低频：{{ datas.fowfrequency ? datas.fowfrequency : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-2"
-            >推荐检修理由：{{ datas.reason }}</el-form-item
+            >推荐检修理由：{{ datas.reason ? datas.reason : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-2"
             >推荐检修日期：{{
@@ -886,13 +898,13 @@
             }}</el-form-item
           >
           <el-form-item class="text-indent-2"
-            >推荐排查方法：{{ datas.troublemethods }}</el-form-item
+            >推荐排查方法：{{ datas.troublemethods ? datas.troublemethods : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-2"
-            >推荐处理方法：{{ datas.processingmethod }}</el-form-item
+            >推荐处理方法：{{ datas.processingmethod ? datas.processingmethod : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-2"
-            >推荐工具器：{{ datas.tools }}</el-form-item
+            >推荐工具器：{{ datas.tools ? datas.tools : '暂无数据' }}</el-form-item
           >
           <el-form-item class="text-indent-2"
             >平均消缺时长：{{
@@ -1722,6 +1734,7 @@ export default {
         }, // 请求所携带参数，默认为空，可缺省
         success(res) {
           if (res.code == 200) {
+			  console.log(res)
             that.datas = res.data;
             that.healthreport = res.data.healthreport;
             that.randomInitDate();
@@ -1768,7 +1781,6 @@ export default {
                 value: [],
               },
             ];
-			console.log(11111,res.data.healthreport.qxpcls)
 			if(res.data.healthreport.qxpcls){
 				let qxpcl = res.data.healthreport.qxpcls.sort(that.compare("date"));
 				if (qxpcl != null && qxpcl != undefined) {
@@ -1783,7 +1795,6 @@ export default {
 				    });
 				  }
 				  that.qxpcls = qxpcls;
-				  console.log(11111,that.qxpcls)
 				}
 			}
  

src/views/Home/Home.vue

@@ -869,8 +869,8 @@ export default {
   },
   data() {
     return {
-      historyWpId: '',
-      historyPlanBtnName:'',
+      historyWpId: "",
+      historyPlanBtnName: "",
       timmer: null, // 计时器
       timmer2: null,
       timmer3: null,
@@ -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/map.vue

@@ -28,7 +28,7 @@
     <div class="name-box" v-if="currentMode != 'NX'">
       <div class="name-box-title" @click="onBackStation">{{ currentTitle }}</div>
       <div class="name-box-period" v-show="currentPeriod != 'ZERO'">
-        <span class="name-box-period-label">期次：</span>
+        <span class="name-box-period-label">{{textType}}：</span>
         <span class="name-box-period-value"
           >{{ currentName }}{{ currentPeriod }}</span
         >
@@ -221,6 +221,7 @@ export default {
   // 数据
   data() {
     return {
+		textType:'期次',
       fcId: "",
       safeDay: "",
       showType: "all",
@@ -281,10 +282,17 @@ export default {
       this.mapIndex = 1;
       this.$emit("mapClick", wpId, planBtnName);
     },
-    clickFj(wpId, planBtnName) {
+    clickFj(wpId, planBtnName,textType) {
+		console.log(textType)
       this.$emit("mapClick", wpId, planBtnName);
     },
-    changePeriod: function (name, period) {
+    changePeriod: function (name, period,textType) {
+		console.log(textType)
+		if(textType){
+			this.textType = '期次'
+		}else{
+			this.textType = '线路'
+		}
       this.currentName = name;
       this.currentPeriod = period;
       this.currentMode = "SUB";

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

@@ -320,7 +320,7 @@ export default {
     changeshowType(id, planBtnName) {
       this.activeId = id;
       this.$emit("clickFj", id, planBtnName);
-      this.$emit("changePeriod", "麻黄山", planBtnName.substring(planBtnName.length - 2));
+      this.$emit("changePeriod", "麻黄山", planBtnName.substring(planBtnName.length - 2),1);
     },
     clickFj(id, planBtnName) {
       this.$emit("clickFj", id, planBtnName);
@@ -353,7 +353,7 @@ export default {
           elsImage[index].style.display = "block";
           let period = this.getAttribute("data-period");
           let strs = period.split(",");
-          that.$emit("changePeriod", "麻黄山", strs[1].substring(strs[1].length - 2));
+          that.$emit("changePeriod", "麻黄山", strs[1].substring(strs[1].length - 2),1);
           that.changeshowType(strs[0], strs[1]);
           that.$emit("clickFj", strs[0], strs[1]);
           this.style.opacity = 0;

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

@@ -495,7 +495,7 @@ export default {
     changeshowType(id, planBtnName) {
       this.activeId = id;
       this.$emit("clickFj", id, planBtnName);
-      this.$emit("changePeriod", "牛首山", planBtnName.substring(planBtnName.length - 2));
+      this.$emit("changePeriod", "牛首山", planBtnName.substring(planBtnName.length - 2),1);
     },
     clickFj(id, planBtnName) {
       this.$emit("clickFj", id, planBtnName);
@@ -531,7 +531,7 @@ export default {
           elsImage[index].style.display = "block";
           let period = this.getAttribute("data-period");
           let strs = period.split(",");
-          that.$emit("changePeriod", "牛首山", strs[1].substring(strs[1].length - 2));
+          that.$emit("changePeriod", "牛首山", strs[1].substring(strs[1].length - 2),1);
           that.changeshowType(strs[0], strs[1]);
           that.$emit("clickFj", strs[0], strs[1]);
           this.style.opacity = 0.2;

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

@@ -458,7 +458,7 @@ export default {
     changeshowType(id, planBtnName) {
       this.activeId = id;
       this.$emit("clickFj", id, planBtnName);
-      this.$emit("changePeriod", "青山", planBtnName.substring(planBtnName.length - 2));
+      this.$emit("changePeriod", "青山", planBtnName.substring(planBtnName.length - 2),1);
     },
     clickFj(id, planBtnName) {
       this.$emit("clickFj", id, planBtnName);
@@ -494,7 +494,7 @@ export default {
           elsImage[index].style.display = "block";
           let period = this.getAttribute("data-period");
           let strs = period.split(",");
-          that.$emit("changePeriod", "青山", strs[1].substring(strs[1].length - 2));
+          that.$emit("changePeriod", "青山", strs[1].substring(strs[1].length - 2),1);
           that.changeshowType(strs[0], strs[1]);
           that.$emit("clickFj", strs[0], strs[1]);
           this.style.opacity = 0.2;

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

@@ -578,7 +578,7 @@ export default {
     changeshowType(id, planBtnName) {
       this.activeId = id;
       this.$emit("clickFj", id, planBtnName);
-      this.$emit("changePeriod", "石板泉", planBtnName.substring(planBtnName.length - 2));
+      this.$emit("changePeriod", "石板泉", planBtnName.substring(planBtnName.length - 2),1);
     },
     clickFj(id, planBtnName) {
       this.$emit("clickFj", id, planBtnName);
@@ -614,7 +614,7 @@ export default {
           elsImage[index].style.display = "block";
           let period = this.getAttribute("data-period");
           let strs = period.split(",");
-          that.$emit("changePeriod", "石板泉", strs[1].substring(strs[1].length - 2));
+          that.$emit("changePeriod", "石板泉", strs[1].substring(strs[1].length - 2),1);
           that.changeshowType(strs[0], strs[1]);
           that.$emit("clickFj", strs[0], strs[1]);
           this.style.opacity = 0.2;

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

@@ -58,7 +58,7 @@
                     c-2-6.4-3.9-12.7-10.9-15.7c-1.9-0.8-2-3.3-2.3-5.3c-0.3-2.9,1.5-5.1,2.9-7.3c1.8-2.8,2.3-5-0.4-7.9c-2.6-2.7-2.8-6.2-0.6-9.6
                     c1.1-1.7,2.1-3.6,0.2-5.4c-3.3-3.3-6.1-7-10.3-9.3c-6.6-3.6-6.7-3.9-4.6-11.4c0.8-2.8,1.4-5.7-1-7.9c-6.7-6.3-7.6-16-13.4-22.9
                     C3.7,327,2.8,323.8,0,322z" fill="#119933" opacity="0" class="map-float"
-						data-period="XS02_GC,香山二期" />
+						data-period="XS02_GC,香山二期,1" />
 					<path d="M592,14c1.7,0,3.3,0,5,0c2,2.3,4.7,3.7,7.4,5c7,3.4,14.2,6.6,21.2,10.2c11.2,5.7,19.3,13.5,17.5,27.5c-0.3,2.6,0,5.3,0.1,8
                     c0.7,14.2-0.7,28.2-3.7,42.1c-0.8,3.6-1.6,6.3,2.4,8.2c1.8,0.9,2.8,2.8,3.1,4.9c0.9,5.6,2,11.2,0.9,16.9c-0.8,4.2,0.6,5.4,4.4,4.2
                     c5.3-1.6,9,0.2,11.7,4.8c1,1.8,2.8,2.8,4.5,3.9c2,1.3,1.8,2.6,0,3.9c-1.9,1.4-3.8,2.7-5.7,4c-1.5,1-2.5,2.2-1.3,4.1
@@ -75,7 +75,7 @@
                     c3.3-9.3,8.8-17.5,14.3-25.7c0.9-1.3,2.5-1.5,3.8-2.2c5-2.7,9.9-5.5,11.5-11.6c0.4-1.7,1.4-3.1,2.8-4.1c8.6-6.4,13-15.3,15.7-25.4
                     c1-3.7,3.1-5.9,6.6-7.5c6.4-3,13.3-1.6,19.6-1.4c12.9,0.3,24.3-2.5,35.2-9c2.5-1.5,5.2-2.9,8-2.3c5.3,1.2,10.2-0.2,15.2-1.7
                     c2.9-0.8,5.8-1.8,7.9,1.7c1.1,1.8,2.8,1.7,4.4,0.6C581.7,16.7,586.9,15.5,592,14z" fill="#119933"
-						opacity="0" class="map-float" data-period="XS01_GC,香山一期" />
+						opacity="0" class="map-float" data-period="XS01_GC,香山一期,1" />
 				</g>
 			</g>
 			<g>
@@ -171,10 +171,10 @@
 			changeshowType(id, planBtnName) {
 				this.activeId = id;
 				this.$emit("clickFj", id, planBtnName);
-				this.$emit("changePeriod", "香山", planBtnName.substring(planBtnName.length - 2));
+				this.$emit("changePeriod", "香山", planBtnName.substring(planBtnName.length - 2),1);
 			},
 			clickFj(id, planBtnName) {
-				this.$emit("clickFj", id, planBtnName);
+				this.$emit("clickFj", id, planBtnName,2);
 				this.$emit("changePeriod", "香山", planBtnName.substring(planBtnName.length - 2));
 			},
 			click: function(id) {
@@ -207,7 +207,7 @@
 						elsImage[index].style.display = "block";
 						let period = this.getAttribute("data-period");
 						let strs = period.split(",");
-						that.$emit("changePeriod", "香山", strs[1].substring(strs[1].length - 2));
+						that.$emit("changePeriod", "香山", strs[1].substring(strs[1].length - 2),1);
 						that.changeshowType(strs[0], strs[1]);
 						that.$emit("clickFj", strs[0], strs[1]);
 						this.style.opacity = 0.2;

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/Status/Status.vue

@@ -321,7 +321,7 @@ export default {
             is_light: false,
           },
           {
-            // name: "受理损失电量",
+            // name: "受累损失电量",
             field: "slss",
             unit: "万kwh",
             is_num: true,
@@ -467,7 +467,7 @@ export default {
             is_light: false,
           },
           {
-            // name: "受理损失电量",
+            // name: "受累损失电量",
             field: "slss",
             unit: "万kwh",
             is_num: true,

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

@@ -653,7 +653,7 @@ export default {
         case 4:
           return "orange";
         case 5:
-          return "purple";
+          return "pink";
         case 6:
           return "write";
       }
@@ -729,7 +729,7 @@ export default {
                   value: [],
                 },
                 {
-                  title: "最有功率律",
+                  title: "最优功率",
                   smooth: true, // 使用单位
                   value: [],
                 },
@@ -1072,6 +1072,8 @@ export default {
         this.requestData(false);
         this.renderBtnActiveIndex();
         this.requestLoss();
+        this.requestPower();
+        this.requestMonthPower();
       }
     },
   },

src/views/WindSite/pages/Home/stationJson/HZJ_GDC.js

@@ -0,0 +1,111 @@
+export default [
+  {
+    id: "root",
+    name: "海子井光电场",
+    type: "img",
+    image: "stationimg",
+    x: 10,
+    y: 30,
+  },
+  //1号线路
+  {
+    id: "HZJ01_01",
+    type: "circle",
+    x: 120,
+    y: 60,
+    connects: ["root"],
+  },
+  {
+    id: "HZJ01_02",
+    type: "circle",
+    x: 160,
+    y: 60,
+    connects: ["HZJ01_01"],
+  },
+  {
+    id: "HZJ01_03",
+    type: "circle",
+    x: 200,
+    y: 60,
+    connects: ["HZJ01_02"],
+  },
+  {
+    id: "HZJ01_04",
+    type: "circle",
+    x: 240,
+    y: 60,
+    connects: ["HZJ01_03"],
+  },
+  {
+    id: "HZJ01_05",
+    type: "circle",
+    x: 280,
+    y: 60,
+    connects: ["HZJ01_04"],
+  },
+  {
+    id: "HZJ01_06",
+    type: "circle",
+    x: 320,
+    y: 60,
+    connects: ["HZJ01_05"],
+  },
+  {
+    id: "HZJ01_07",
+    type: "circle",
+    x: 360,
+    y: 60,
+    connects: ["HZJ01_06"],
+  },
+ //二号线路
+  {
+    id: "HZJ01_08",
+    type: "circle",
+    x: 120,
+    y: 120,
+    connects: ["root"],
+  },
+  {
+    id: "HZJ01_09",
+    type: "circle",
+    x: 160,
+    y: 120,
+    connects: ["HZJ01_08"],
+  },
+  {
+    id: "HZJ01_10",
+    type: "circle",
+    x: 200,
+    y: 120,
+    connects: ["HZJ01_09"],
+  },
+  {
+    id: "HZJ01_11",
+    type: "circle",
+    x: 240,
+    y: 120,
+    connects: ["HZJ01_10"],
+  },
+  {
+    id: "HZJ01_12",
+    type: "circle",
+    x: 280,
+    y: 120,
+    connects: ["HZJ01_11"],
+  },
+  {
+    id: "HZJ01_13",
+    type: "circle",
+    x: 320,
+    y: 120,
+    connects: ["HZJ01_12"],
+  },
+  {
+    id: "HZJ01_14",
+    type: "circle",
+    x: 360,
+    y: 120,
+    connects: ["HZJ01_13"],
+  },
+
+]

src/views/layout/Menu.vue

@@ -396,7 +396,7 @@ export default {
                   text: "自组合评级",
                   icon: "svg-wind-site",
                   path: "/health/assess/selfEvaluate",
-                }
+                },
               ],
             },
             {
@@ -414,16 +414,16 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/gzzd/malfunctionRecall",
                 },
-				{
-				  text: "故障分类",
-				  icon: "svg-wind-site",
-				  path: "/health/gzzd/gzfl",
-				},
-				{
-				  text: "预警分类",
-				  icon: "svg-wind-site",
-				  path: "/health/gzzd/yjfl",
-				},
+                // {
+                //   text: "故障分类",
+                //   icon: "svg-wind-site",
+                //   path: "/health/gzzd/gzfl",
+                // },
+                // {
+                //   text: "预警分类",
+                //   icon: "svg-wind-site",
+                //   path: "/health/gzzd/yjfl",
+                // },
               ],
             },
             {