描述文本修改

src/views/Decision/Decision1.vue

@@ -189,8 +189,8 @@
 				value3: [],
 				value4: "",
 				value5: "",
-				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("red"), partten
-					.getColor("pink"), partten.getColor("grayl"), partten.getColor("orange")
+				barColor: [partten.getColor("purple"), partten.getColor("orange"), partten.getColor("red"), partten
+					.getColor("pink"), partten.getColor("grayl"), partten.getColor("green")
 				],
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],

src/views/LightMatrix3/LightMatrix3.vue

@@ -79,12 +79,6 @@
                   </div>
                 </div>
                 <div class="card-right">
-                   <div class="num">
-                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <SvgIcon svgid="svg-P"></SvgIcon>
-                    </i>
-                    <span>{{ cItem.fs }}</span>
-                  </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
                       <SvgIcon svgid="svg-W"></SvgIcon>
@@ -97,7 +91,12 @@
                     </i>
                     <span>{{ cItem.fdjzs.toFixed(2) }}</span>
                   </div>
-          
+                  <div class="num">
+                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
                 </div>
               </div>
             </div>
@@ -191,7 +190,7 @@ export default {
           },
           {
             color: "orange",
-            name: "检休",
+            name: "检修",
             nameIcon: "svg-jx-downtime",
             calcStr: ["fcjxtjnum", "fccnsljxnum"],
             numIcon: "svg-field-involved",
@@ -385,18 +384,6 @@ export default {
         },
       });
     },
-	// 查看风机详情
-	goDetails(item) {
-	  if (item.wpId.indexOf("FDC") !== -1) {
-	    this.$router.push({
-	      path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`
-	    });
-	  } else {
-	    // this.$router.push({
-	    //   path: `/info/inverter-info/${item.wpId}/${item.wtId}`
-	    // });
-	  }
-	},
   },
 
   created() {
@@ -420,10 +407,10 @@ export default {
 
 <style lang="less" scoped>
 @panelHeight: 60px;
-@titleHeight: 26px;
+@titleHeight: 3.704vh;
 
 .light-matrix {
-  // width: calc(100% - 1.111vh);
+  width: calc(100% - 1.111vh);
   height: calc(100vh - 7.222vh);
   display: flex;
   flex-direction: column;
@@ -707,16 +694,16 @@ export default {
 
     .panel-title {
       width: 100%;
+      height: @titleHeight;
       line-height: @titleHeight;
       background-color: fade(@darkgray, 40%);
 
       .panel-title-name {
-        font-size: 12px;
+        font-size: @fontsize-s;
         color: @green;
         display: flex;
-        flex-wrap: wrap;
         align-items: center;
-        padding-left: 16px;
+        padding: 0 16px;
 
         i {
           margin-right: 0.7407vh;
@@ -724,7 +711,7 @@ export default {
 
         .sub-title-item {
           display: flex;
-          flex: 0 0 110px;
+          flex: 1;
 
           .sub-title {
             flex: 0 0 auto;
@@ -785,13 +772,13 @@ export default {
 
       .blank {
         margin-right: 4px;
-        flex: 1 0 120px;
+        flex: 1 0 105px;
       }
 
       .card {
         margin-right: 4px;
         margin-top: 4px;
-        flex: 1 0 120px;
+        flex: 1 0 105px;
       }
 
       .card {
@@ -800,7 +787,6 @@ export default {
         .card-panel {
           display: flex;
           flex-grow: row;
-		  cursor: pointer;
 
           .card-left {
             width: 40px;