状态码判断函数修改 部分字段位置调整

src/views/LightMatrix3/LightMatrix3.vue

@@ -7,46 +7,46 @@
       <div class="dot right bottom"></div>
       <Row>
         <Col :span="3">
-          <div class="panel-item-gf">
-            <div class="panel-item-gf-left">
-              <span class="svg-icon svg-icon-write svg-icon-md">
-                <SvgIcon :svgid="panelData.first.icon"></SvgIcon>
+        <div class="panel-item-gf">
+          <div class="panel-item-gf-left">
+            <span class="svg-icon svg-icon-write svg-icon-md">
+              <SvgIcon :svgid="panelData.first.icon"></SvgIcon>
+            </span>
+          </div>
+          <div class="panel-item-gf-right">
+            <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
+            <div class="panel-item-gf-down">{{ sourceMap[panelData.first.key] || "---" }}</div>
+          </div>
+        </div>
+        </Col>
+        <Col :span="3" v-for="(data, index) of panelData.datas" :key="index">
+        <div class="panel-item" :class="data.color">
+          <div class="panel-item-left">
+            <div class="panel-item-li">
+              <span>{{ data.name }}</span>
+              <span class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
+                <SvgIcon :svgid="data.nameIcon"></SvgIcon>
               </span>
             </div>
-            <div class="panel-item-gf-right">
-              <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
-              <div class="panel-item-gf-down">{{ sourceMap[panelData.first.key] || "---" }}</div>
+            <div class="panel-item-li">
+              <span v-if="data.calcStr && sourceMap">{{ calcGfStr(data.calcStr) || "---" }}</span>
+              <span v-else>{{ sourceMap[data.key] || "---" }}</span>
+              <span class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
+                <SvgIcon :svgid="data.numIcon"></SvgIcon>
+              </span>
             </div>
           </div>
-        </Col>
-        <Col :span="3" v-for="(data, index) of panelData.datas" :key="index">
-          <div class="panel-item" :class="data.color">
-            <div class="panel-item-left">
-              <div class="panel-item-li">
-                <span>{{ data.name }}</span>
-                <span class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
-                  <SvgIcon :svgid="data.nameIcon"></SvgIcon>
-                </span>
-              </div>
-              <div class="panel-item-li">
-                <span v-if="data.calcStr && sourceMap">{{ calcGfStr(data.calcStr) || "---" }}</span>
-                <span v-else>{{ sourceMap[data.key] || "---" }}</span>
-                <span class="svg-icon svg-icon-sm" :class="'svg-icon-' + data.color">
-                  <SvgIcon :svgid="data.numIcon"></SvgIcon>
-                </span>
-              </div>
+          <div class="panel-item-right">
+            <div class="panel-item-ri">
+              <span>{{ data.text1 }}</span>
+              <span>{{ sourceMap[data.key1] || "---" }}</span>
             </div>
-            <div class="panel-item-right">
-              <div class="panel-item-ri">
-                <span>{{ data.text1 }}</span>
-                <span>{{ sourceMap[data.key1] || "---" }}</span>
-              </div>
-              <div class="panel-item-ri">
-                <span>{{ data.text2 }}</span>
-                <span>{{ sourceMap[data.key2] || "---" }}</span>
-              </div>
+            <div class="panel-item-ri">
+              <span>{{ data.text2 }}</span>
+              <span>{{ sourceMap[data.key2] || "---" }}</span>
             </div>
           </div>
+        </div>
         </Col>
       </Row>
     </div>
@@ -74,15 +74,15 @@
                   <i class="svg-icon svg-icon-sm" :class="'svg-icon-' + cItem.color">
                     <SvgIcon svgid="svg-W"></SvgIcon>
                   </i>
-                  <div>{{ cItem.fdl }}</div>
+                  <div>{{ cItem.gl }}</div>
                 </div>
               </div>
               <div class="card-right">
                 <div class="num">
                   <i class="svg-icon svg-icon-sm" :class="'svg-icon-' + cItem.color">
-                    <SvgIcon svgid="svg-R"></SvgIcon>
+                    <!-- <SvgIcon svgid="svg-R"></SvgIcon> -->
                   </i>
-                  <div>{{ cItem.gl }}</div>
+                  <div>{{ cItem.fdl || '&nbsp;' }}</div>
                 </div>
                 <div class="num">
                   <i class="svg-icon svg-icon-sm" :class="'svg-icon-' + cItem.color">
@@ -120,7 +120,7 @@ export default {
   },
 
   // 数据
-  data() {
+  data () {
     return {
       timmer: null, // 遮罩开关
       sourceMap: {}, // 核心数据
@@ -316,44 +316,62 @@ export default {
   // 函数
   methods: {
     // 根据风机状态码返回对应 class
-    getColor(fjzt) {
+    getColor (fjzt) {
       switch (fjzt) {
-        case 0:
+        case 0: // 待机
           return "green";
           break;
-        case 1:
+        case 1: // 手动停机
+          return "green";
+          break;
+        case 2: // 正常发电
+          return "blue";
+          break;
+        case 3: // 缺陷降出力
           return "blue";
           break;
-        case 2:
+        case 4: // 限电降出力
+          return "purple";
+          break;
+        case 5: // 限电停机
+          return "purple";
+          break;
+        case 6: // 故障停机
           return "red";
           break;
-        case 3:
-          return "gray";
+        case 7: // 场内受累停机
+          return "red";
           break;
-        case 4:
+        case 8: // 检修停机
           return "orange";
           break;
-        case 5:
-          return "purple";
+        case 9: // 离线
+          return "orange";
+          break;
+        case 10: // 电网受累
+          return "gray";
+          break;
+        case 11: // 环境受累
+          return "gray";
           break;
-        case 6:
+        case 12: // 离线
           return "black";
           break;
       }
     },
 
-    calcGfStr(calcStr) {
+    calcGfStr (calcStr) {
       return parseInt(this.sourceMap[calcStr[0]]) + parseInt(this.sourceMap[calcStr[1]]) + "";
     },
 
     // 请求服务
-    requestData(showLoading) {
+    requestData (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
         method: "POST",
         subUrl: "matrix/matrixDetialPush",
-        success(res) {
+        success (res) {
           if (res.data) {
             let sourceMap = res.data;
             for (let key in sourceMap) {
@@ -377,7 +395,7 @@ export default {
     },
   },
 
-  created() {
+  created () {
     let that = this;
     that.$nextTick(() => {
       that.requestData(false);
@@ -387,9 +405,9 @@ export default {
     });
   },
 
-  mounted() {},
+  mounted () { },
 
-  unmounted() {
+  unmounted () {
     clearInterval(this.timmer);
     this.timmer = null;
   },
@@ -682,7 +700,7 @@ export default {
 
           .sub-count {
             font-size: @fontsize-s;
-            font-family: "Bicubik";
+            font-family: 'Bicubik';
             font-weight: 500;
 
             &.write {