Merge remote-tracking branch 'remotes/origin/mw2' into yx

src/views/HealthControl/assess/assessindex.vue

@@ -111,7 +111,7 @@ export default {
       hisDialogVisible: false,
       hisDialogTitle:"",
       ChangZhan: [],
-      value1: "XS_FDC",
+      value1: "MHS_FDC",
       date: "",
       shows: "d",
       showTitle: "风机日信息量化评级管理",
@@ -474,6 +474,7 @@ export default {
           data: data,
           success(res) {
             that.dialogData1 = [res.data.gaid1, res.data.gaid2];
+			console.log(that.dialogData1)
           }
         });
         that.API.requestData({

src/views/HealthControl/dayinfo.vue

@@ -33,7 +33,7 @@
             <td class="white">{{item.name}}</td>
             <td class="white" v-for="row of gridDatas" :key="row">{{row[item.field]}}</td>
             <td class="white" v-for="row of gridDatas" :key="row">{{row[item.rank]}}</td>
-            <td class="white" v-for="row of gridDatas" :key="row">{{row[item.score]}}</td>
+            <td class="white" v-for="row of gridDatas" :key="row">{{row[item.score]?row[item.score]:0}}</td>
           </tr>
         </table>
       </div>

src/views/LightMatrix1/LightMatrix1.vue

@@ -1,4 +1,5 @@
-<template>
+<template >
+	<el-scrollbar>
   <div class="light-matrix">
     <Row class="panel-2" type="">
       <Col :span="12" class="left-50-16">
@@ -190,6 +191,7 @@
       </div>
     </div>
   </div>
+  </el-scrollbar>
 </template>
 
 <script>
@@ -508,7 +510,6 @@ export default {
 <style lang="less" scoped>
 @panelHeight: 6.481vh;
 @titleHeight: 2.7778vh;
-
 .light-matrix {
   // width: calc(100% - 1.111vh);
   height: calc(100vh - 7.222vh);
@@ -802,4 +803,4 @@ export default {
     text-align: center;
   }
 }
-</style>
+</style>

src/views/sisView/index.vue

@@ -5,35 +5,35 @@
       <div class="viewTitle">综<br /><br />合<br /><br />参<br /><br />数</div>
       <div class="contentBox" style="height: 280px;">
         <div class="contentItem">
-          <div class="itemName">装机容量</div>
+          <div class="itemName size5">装机容量</div>
           <div class="itemNum">{{items.zjrl}}</div>
           <div class="itemUnit">MW</div>
-          <div class="itemName">安全天数</div>
+          <div class="itemName size6">安全天数</div>
           <div class="itemNum">{{items.aqts}}</div>
           <div class="itemUnit">天</div>
-          <div class="itemName">总功率</div>
+          <div class="itemName size5">总功率</div>
           <div class="itemNum">{{items.zgl}}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
-          <div class="itemName">日发电量</div>
+          <div class="itemName size5">日发电量</div>
           <div class="itemNum">{{items.rfdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">年利用小时</div>
+          <div class="itemName size6">年利用小时</div>
           <div class="itemNum">{{items.nlyxs}}</div>
           <div class="itemUnit">小时</div>
-          <div class="itemName">年发电量</div>
+          <div class="itemName size5">年发电量</div>
           <div class="itemNum">{{items.nfdl}}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
-          <div class="itemName">上网电量</div>
+          <div class="itemName size5">上网电量</div>
           <div class="itemNum">{{items.swdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">月利用小时</div>
+          <div class="itemName size6">月利用小时</div>
           <div class="itemNum">{{items.ylyxs}}</div>
           <div class="itemUnit">小时</div>
-          <div class="itemName">月发电量</div>
+          <div class="itemName size5">月发电量</div>
           <div class="itemNum">{{items.yfdl}}</div>
           <div class="itemUnit">万kWh</div>
         </div>
@@ -41,10 +41,10 @@
           <div class="itemName">复位及时率</div>
           <div class="itemNum">{{items.fwjsl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">年计划电量</div>
+          <div class="itemName size6">年计划电量</div>
           <div class="itemNum">{{items.njhdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">年完成率</div>
+          <div class="itemName size5">年完成率</div>
           <div class="itemNum">{{items.nwcl}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -52,10 +52,10 @@
           <div class="itemName">转换及时率</div>
           <div class="itemNum">{{items.zhjsl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月计划电量</div>
+          <div class="itemName size6">月计划电量</div>
           <div class="itemNum">{{items.yjhdl}}</div>
           <div class="itemUnit">万kWh</div>
-          <div class="itemName">月完成率</div>
+          <div class="itemName size5">月完成率</div>
           <div class="itemNum">{{items.ywcl}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -66,7 +66,7 @@
           <div class="itemName">综合厂用电率</div>
           <div class="itemNum">{{items.zhcydl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月M&nbsp;T&nbsp;B&nbsp;F</div>
+          <div class="itemName size5">月M&nbsp;T&nbsp;B&nbsp;F</div>
           <div class="itemNum">{{items.ymtbf}}</div>
           <div class="itemUnit">小时</div>
         </div>
@@ -77,7 +77,7 @@
           <div class="itemName">设备可利用率</div>
           <div class="itemNum">{{items.sbklyl}}</div>
           <div class="itemUnit">%</div>
-          <div class="itemName">月可靠性</div>
+          <div class="itemName size5">月可靠性</div>
           <div class="itemNum">{{items.ykkx}}</div>
           <div class="itemUnit">%</div>
         </div>
@@ -398,9 +398,17 @@ export default {
         justify-content: start;
         align-items: center;
         padding: 2px 0;
-
+		
+		.size5{
+			width: 165px;
+		}
+		
+		.size6{
+			width: 195px;
+		}
+		
         .itemName {
-          width: 195px;
+          min-width: 136px;
           padding: 0 10px;
           text-align: justify;
           text-align-last: justify;
@@ -408,8 +416,9 @@ export default {
 
         .itemNum {
           font-family: Arial, Helvetica, sans-serif;
-          color: #f25656;
-          width: 145px;
+          color: red;
+          width: 187px;
+		  margin-left: 15px;
         }
 
         .itemUnit {