Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl

# Conflicts:
#	src/router/index.js

public/static/config/modeConfig.js

@@ -1,5 +1,5 @@
 // 本地联调开关
-const localTest = 1;
+const localTest = 0;
 
 // 服务器地址
 let baseURL = null;

src/views/HealthControl/HealthTab1.vue

@@ -27,12 +27,16 @@
       </div>
     </div>
     <div class="health-report">
-      <panel class="health-report-panel" :title="'推荐检修风机'" :showLine="false">
+      <panel
+        class="health-report-panel"
+        :title="'推荐检修风机'"
+        :showLine="false"
+      >
         <div class="actions mg-b-16">
           <div class="item green" @click="onClickRecommon(1)">当日内推荐</div>
           <div class="item purple" @click="onClickRecommon(2)">三日内推荐</div>
           <div class="item gray" @click="onClickRecommon(3)">超三日推荐</div>
-          <div style="margin-left:450px">
+          <div style="margin-left: 450px">
             <button class="btn" @click="onClickCofirmAll()">全部确认</button>
             <button class="btn" @click="onClickIgnoreAll()">全部忽略</button>
           </div>
@@ -45,9 +49,17 @@
             </div>
             <div class="info">
               <p>推荐理由：{{ item.reason }}</p>
-              <p>推荐检修时间：{{new Date(item.recodedate).formatDate("yyyy-MM-dd hh:mm:ss")}}</p>
+              <p>
+                推荐检修时间：{{
+                  new Date(item.recodedate).formatDate("yyyy-MM-dd hh:mm:ss")
+                }}
+              </p>
               <p>推荐时间对应风速：{{ item.speed }} m/s</p>
-              <p>判断时间：{{new Date(item.createdate).formatDate("yyyy-MM-dd hh:mm:ss")}}</p>
+              <p>
+                判断时间：{{
+                  new Date(item.createdate).formatDate("yyyy-MM-dd hh:mm:ss")
+                }}
+              </p>
               <div class="actions mg-t-16">
                 <button class="btn success" @click="onClickCofirm(item)">
                   <i class="fa fa-check"></i>
@@ -63,7 +75,7 @@
         </div>
       </panel>
     </div>
-    <health-report :show="reportshow" :params="reportparams" @closed="closed"/>
+    <health-report :show="reportshow" :params="reportparams" @closed="closed" />
   </div>
 </template>
 
@@ -71,23 +83,28 @@
 import VertivalBarLineChart from "../../components/chart/combination/vertival-bar-line-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
-import HealthReport from "../../components/other/healthReport/index.vue"
+import HealthReport from "../../components/other/healthReport/index.vue";
 
 export default {
-  components: { SvgIcon, Panel, VertivalBarLineChart, HealthReport},
+  components: { SvgIcon, Panel, VertivalBarLineChart, HealthReport },
   data() {
     return {
       infoList: [
         // {title: '24小时健康趋势', svgid: 'svg-24-houre', active: false, type: 'houre'},
         { title: "7日健康趋势", svgid: "svg-h-day", active: true, type: "day" },
-        { title: "30日健康趋势", svgid: "svg-h-month", active: false, type: "month"},
+        {
+          title: "30日健康趋势",
+          svgid: "svg-h-month",
+          active: false,
+          type: "month",
+        },
       ],
       bardata: { area: [], legend: [], data: [] }, // 损失电量分析echart数值
       lineData: [],
       recommenList: [], // 健康报告推荐
       recommenIndex: 1, // 记录当前是那个推荐
       reportshow: false, //是否显示健康报告
-      reportparams: undefined
+      reportparams: undefined,
     };
   },
   created() {
@@ -128,20 +145,26 @@ export default {
       }
     },
     // 查看健康报告
-    onClickReport(item){
-      this.reportshow = true
-      this.reportparams = {wtId: item.wtid, recorddate: new Date(item.recodedate).formatDate("yyyy-MM-dd")}
+    onClickReport(item) {
+      this.reportshow = true;
+      this.reportparams = {
+        wtId: item.wtid,
+        recorddate: new Date(item.createdate).formatDate("yyyy-MM-dd"),
+      };
     },
     // 关闭健康报告
-    closed(){
-      this.reportshow = false
+    closed() {
+      this.reportshow = false;
     },
     // 健康推荐提交
     onClickCofirm(item) {
       let that = this;
-      that.$confirm('确认提交？').then(_=> {
-        that.requestOption("recommen/confirpush", item.rid);
-      }).catch(_=>{})
+      that
+        .$confirm("确认提交？")
+        .then((_) => {
+          that.requestOption("recommen/confirpush", item.rid);
+        })
+        .catch((_) => {});
     },
     // 健康推荐取消
     onClickIgnore(item) {
@@ -150,16 +173,22 @@ export default {
     // 健康推荐提交全部
     onClickCofirmAll() {
       let that = this;
-      that.$confirm('确认全部提交？').then(_=> {
-        that.requestOptionAll("recommen/confirpushAll");
-      }).catch(_=>{})
+      that
+        .$confirm("确认全部提交？")
+        .then((_) => {
+          that.requestOptionAll("recommen/confirpushAll");
+        })
+        .catch((_) => {});
     },
     // 健康推荐取消全部
     onClickIgnoreAll() {
       let that = this;
-      that.$confirm('确认全部取消？').then(_=> {
-        that.requestOptionAll("recommen/ignorepushAll");
-      }).catch(_=>{})
+      that
+        .$confirm("确认全部取消？")
+        .then((_) => {
+          that.requestOptionAll("recommen/ignorepushAll");
+        })
+        .catch((_) => {});
     },
     // 健康报告推荐
     requestRecommen(url) {
@@ -376,7 +405,7 @@ export default {
           flex-direction: row;
           justify-content: space-between;
           span {
-             cursor: pointer; 
+            cursor: pointer;
           }
         }
 
@@ -389,11 +418,11 @@ export default {
           p {
             margin: 0;
             line-height: 2;
-            overflow:hidden; 
-            text-overflow:ellipsis;
-            display:-webkit-box; 
-            -webkit-box-orient:vertical;
-            -webkit-line-clamp:2; 
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
           }
 
           .actions {

src/views/Home/Home.vue

@@ -159,14 +159,14 @@
               <td class="unit gray">%</td>
             </tr>
             <tr class="">
-              <td class="text gray">MTBF(月)</td>
+              <td class="text gray">MTBF(日)</td>
               <td class="value green">{{jczbmap.mtbf}}</td>
-              <td class="unit gray"></td>
+              <td class="unit gray">小时</td>
             </tr>
             <tr class="">
-              <td class="text gray">MTTR(月)</td>
+              <td class="text gray">MTTR(日)</td>
               <td class="value green">{{jczbmap.mttr}}</td>
-              <td class="unit gray"></td>
+              <td class="unit gray">小时</td>
             </tr>
           </table>
         </com-panel>

src/views/LightMatrix1/LightMatrix1.vue

@@ -346,12 +346,12 @@ export default {
     goDetails(item) {
       if (item.wpId.indexOf("FDC") !== -1) {
         this.$router.push({
-          path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`,
+          path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`
         });
       } else {
-        this.$router.push({
-          path: `/monitor/windsite/inverter-info/${item.wpId}/${item.wtId}`,
-        });
+        // this.$router.push({
+        //   path: `/info/inverter-info/${item.wpId}/${item.wtId}`
+        // });
       }
     },
   },

src/views/WindSite/pages/BoosterStation.vue

@@ -16,7 +16,7 @@
 <script>
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 // import bsx6 from "../components/bsx6.vue";
-import BoosterMCH from "../components/boosterstation/mch/mch.vue";
+import BoosterMCH from "../components/boosterstation/mch.vue";
 
 export default {
   // 名称

src/views/realSearch/index.vue

@@ -74,7 +74,6 @@
 </template>
 
 <script>
-import { Message } from 'element-plus';
 import CollapseList from "@com/coms/collapse/collapse-list.vue";
 import ComTable from "@com/coms/table/table.vue";
 import * as echarts from "echarts";
@@ -229,8 +228,8 @@ export default {
     let that = this;
     that.$nextTick(() => {
       that.tableid = that.$route.query.tableid || "JSFW";
-      that.getTableData();
       that.getMenuList();
+      that.getTableData();
     });
   },
 
@@ -278,7 +277,7 @@ export default {
             children: []
           };
           let PL_GDC = {
-            name: "平罗",
+            text: "平罗",
             children: []
           };
           let XH_GDC = {