Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

src/assets/script/UniformCodes.js

@@ -2837,13 +2837,13 @@ export default class UniformCodes {
                 "name": "发电机转速",
                 "num": "3",
                 "code": "AI128",
-                "unit": "rp"
+                "unit": "rpm"
               },
               {
                 "name": "转子转速",
                 "num": "4",
                 "code": "AI017",
-                "unit": "rp"
+                "unit": "rpm"
               },
               {
                 "name": "偏航位置",
@@ -3762,13 +3762,13 @@ export default class UniformCodes {
                 "name": "发电机转速",
                 "num": "3",
                 "code": "AI128",
-                "unit": "rp"
+                "unit": "rpm"
               },
               {
                 "name": "转子转速",
                 "num": "4",
                 "code": "AI300",
-                "unit": "rp"
+                "unit": "rpm"
               },
               {
                 "name": "偏航位置",

src/assets/style/main.css

@@ -86,4 +86,10 @@ body,
   .el-table--border td,.el-table--border th {
     border-right:1px solid rgb(36,36,36);
   
+  }
+  .el-table__body-wrapper{
+    background-color: black;
+  }
+  .el-table__empty-text{
+    color: black;
   }

src/components/StatusBar.vue

@@ -277,7 +277,7 @@ export default {
       this.defectData = bd.Defects;
       this.malfunctionData = bd.Failure;
       this.accidentData = bd.Accidents;
-      if (this.accidentData.length <= 0) {
+/*       if (this.accidentData.length <= 0) {
         this.accidentData = [
           { lastUpdateTime: "-", stationName: "-", alertText: "-" },
         ];
@@ -296,7 +296,7 @@ export default {
         this.malfunctionData = [
           { lastUpdateTime: "-", stationName: "-", alertText: "-" },
         ];
-      }
+      } */
 
     },
   },

src/components/area/AlarmArea.vue

@@ -78,8 +78,9 @@ export default {
   props: {},
   data() {
     return {
-      values: ["-", "-", "-", "-", "-", "-"],
-      dialogVisible: false,
+
+      values: new Array(),
+      dialogVisible:false,
       currentWindturbine: {},
     };
   },