Merge branch 'yx' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into baiyanting

src/components/other/healthReport/index.vue

@@ -117,6 +117,41 @@
           </el-form>
         </div>
       </div>
+
+      <div class="textBox" v-if="tjjxfa.wtId">
+        <el-form>
+          <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"
+            >高频：{{ tjjxfa.top1 || "" }}</el-form-item
+          >
+          <el-form-item class="text-indent-4"
+            >中频：{{ tjjxfa.top2 || "" }}</el-form-item
+          >
+          <el-form-item class="m-b-10 text-indent-4"
+            >低频：{{ tjjxfa.top3 || "" }}</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >推荐排查方法：{{ tjjxfa.gzpc || "" }}</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >推荐处理方法：{{ tjjxfa.gzcl || "" }}</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >推荐工具器：{{ tjjxfa.gqj || "" }}</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >平均消缺时长：{{ tjjxfa.xqsc || "---" }}小时</el-form-item
+          >
+          <el-form-item class="text-indent-2"
+            >推荐检修日期：{{
+              new Date(tjjxfa.recordDate).formatDate("yyyy-MM-dd")
+            }}</el-form-item
+          >
+          <el-form-item>结论：健康报告达到推荐级别，推荐检修!</el-form-item>
+        </el-form>
+      </div>
+      
       <div class="textBox">
         <el-form>
           <el-form-item class="imp fw text-indent-2"><b>性能</b></el-form-item>
@@ -879,39 +914,6 @@
         </el-form>
       </div>
 
-      <div class="textBox" v-if="tjjxfa.wtId">
-        <el-form>
-          <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"
-            >高频：{{ tjjxfa.top1 || "" }}</el-form-item
-          >
-          <el-form-item class="text-indent-4"
-            >中频：{{ tjjxfa.top2 || "" }}</el-form-item
-          >
-          <el-form-item class="m-b-10 text-indent-4"
-            >低频：{{ tjjxfa.top3 || "" }}</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >推荐排查方法：{{ tjjxfa.gzpc || "" }}</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >推荐处理方法：{{ tjjxfa.gzcl || "" }}</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >推荐工具器：{{ tjjxfa.gqj || "" }}</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >平均消缺时长：{{ tjjxfa.xqsc || "---" }}小时</el-form-item
-          >
-          <el-form-item class="text-indent-2"
-            >推荐检修日期：{{
-              new Date(tjjxfa.recordDate).formatDate("yyyy-MM-dd")
-            }}</el-form-item
-          >
-          <el-form-item>结论：健康报告达到推荐级别，推荐检修!</el-form-item>
-        </el-form>
-      </div>
       <!-- <div class="textBox">
         <el-form>
           <el-form-item class="fw" style="margin: 10px 0; text-align: center"

src/views/HealthControl/HealthTab1.vue

@@ -62,7 +62,9 @@
         <div class="report-items scroll">
           <div class="item" v-for="(item, index) in recommenList" :key="index">
             <div class="title">
-              <div @click="jumpUrl(item)">风机编号：{{ item.nemCode }}</div>
+              <div @click="jumpUrl(item)">
+                {{ item.wtName }}&nbsp;{{ item.nemCode }}
+              </div>
               <span @click="onClickReport(item)">健康报告</span>
             </div>
             <div class="info">
@@ -178,7 +180,7 @@ export default {
     onClickReport(item) {
       this.$refs.eport.getReport(
         item.wtId,
-        new Date(item.createDate).formatDate("yyyy-MM-dd")
+        new Date(item.recordDate).formatDate("yyyy-MM-dd")
       );
       this.reportshow = true;
     },