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

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)
 				}
 			}