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

src/views/Status/Status.vue

@@ -175,7 +175,7 @@ export default {
             is_light: false,
           },
           {
-            name: "受理损失电量",
+            name: "受累损失电量",
             field: "slss",
             unit: "万kwh",
             is_num: true,
@@ -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",
+                // },
               ],
             },
             {