驾驶舱模块BUG修复

src/views/HealthControl/Health2.vue

@@ -2,13 +2,7 @@
   <div class="health-2">
     <div class="power-info mg-b-16">
       <div class="info-tab">
-        <div class="tab active">
-          <i class="svg-icon svg-icon svg-icon-sm">
-            <svg-icon :svgid="'svg-24-houre'" />
-          </i>
-          <span> 24小时健康趋势 </span>
-        </div>
-        <div class="tab">
+        <div class="tab active" @click="changeDate">
           <i class="svg-icon svg-icon svg-icon-sm">
             <svg-icon :svgid="'svg-h-day'" />
           </i>
@@ -21,9 +15,9 @@
           <span>30日健康趋势</span>
         </div>
         <div class="empty"></div>
-        <div class="tab">
+        <!-- <div class="tab">
           <span>全部风场健康趋势</span>
-        </div>
+        </div> -->
       </div>
       <div class="info-chart">
         <panel class="info-chart-panel" :title="'损失电量分析'">
@@ -429,6 +423,19 @@ export default {
       this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
       this.tableData.data[i].index = i + 1;
     }
+
+    let that = this;
+    that.API.requestData({
+      method: "POST",
+      subUrl: "recommen/findAllChartjz",
+      data: {
+        wpId: "0",
+        type: that.type
+      },
+      success (res) {
+        console.log(123123,res);
+      }
+    });
   },
 };
 </script>

src/views/Home/Home.vue

@@ -609,7 +609,7 @@ export default {
           glKey.forEach((keyEle, keyIndex) => {
             res.data.glvos.forEach(cEle => {
               Powertrend.value[keyIndex].value.push({
-                text: new Date(cEle.time).formatDate("yyyy-MM-dd"),
+                text: new Date(cEle.time).formatDate("hh:mm:ss"),
                 value: cEle[keyEle]
               });
             });
@@ -696,6 +696,7 @@ export default {
 
     // 打开弹窗
     openDialog(dialogTitle, subUrl, targetName, dialogType){
+      console.log(123123,dialogType)
       this.dialogTitle = dialogTitle;
       let that = this;
       that.API.requestData({
@@ -707,6 +708,7 @@ export default {
         },
         success (res) {
           that.dialogShow = true;
+          that.dialogData = res.data;
           that.dialogType = dialogType;
         }
       });

src/views/layout/Menu.vue

@@ -106,36 +106,36 @@ export default {
               icon: "svg-wind-site",
               path: "/health/health1",
             },
-            // {
-            //   text: "健康管理2",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health2",
-            // },
-            // {
-            //   text: "健康管理3",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health3",
-            // },
-            // {
-            //   text: "健康管理4",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health4",
-            // },
-            // {
-            //   text: "健康管理5",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health5",
-            // },
-            // {
-            //   text: "健康管理6",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health6",
-            // },
-            // {
-            //   text: "健康管理7",
-            //   icon: "svg-wind-site",
-            //   path: "/health/health7",
-            // },
+            {
+              text: "健康管理2",
+              icon: "svg-wind-site",
+              path: "/health/health2",
+            },
+            {
+              text: "健康管理3",
+              icon: "svg-wind-site",
+              path: "/health/health3",
+            },
+            {
+              text: "健康管理4",
+              icon: "svg-wind-site",
+              path: "/health/health4",
+            },
+            {
+              text: "健康管理5",
+              icon: "svg-wind-site",
+              path: "/health/health5",
+            },
+            {
+              text: "健康管理6",
+              icon: "svg-wind-site",
+              path: "/health/health6",
+            },
+            {
+              text: "健康管理7",
+              icon: "svg-wind-site",
+              path: "/health/health7",
+            },
           ],
         },
         {