Ver código fonte

风机卡片顺序调整

xushili 3 anos atrás
pai
commit
a044050396

+ 5 - 0
src/assets/script/UniformCodes.js

@@ -914,6 +914,7 @@ export default class UniformCodes {
                         {
                           "name": "液压油温度",
                           "num": "7",
+                          "code":"DI1555",
                           "unit": "℃"
                         },
                         {
@@ -931,6 +932,7 @@ export default class UniformCodes {
                         {
                           "name": "电机温度",
                           "num": "10",
+                          "code":"AI042",
                           "unit": "℃"
                         }
                       ]
@@ -942,16 +944,19 @@ export default class UniformCodes {
                         {
                           "name": "叶片1偏角",
                           "num": "1",
+                          "code":"AI002",
                           "unit": "度"
                         },
                         {
                           "name": "叶片2偏角",
                           "num": "2",
+                          "code":"AI003",
                           "unit": "度"
                         },
                         {
                           "name": "叶片3偏角",
                           "num": "3",
+                          "code":"AI004",
                           "unit": "度"
                         }
                       ]

+ 0 - 1
src/components/area/windturbine/WindturbineDetailPages.vue

@@ -1,7 +1,6 @@
 <template>
   <el-dialog
     width="65%"
-    top="11vh"
     @opened="opened()"
     @closed="closed()"
     :show-close="false"

+ 10 - 6
src/components/area/windturbine/control/ControlMatrixCard.vue

@@ -33,9 +33,10 @@
               : 'card-right-unselect-' + item.status
           "
         >
-          <div>{{ item.power.toFixed(2) }} kw</div>
-          <div>{{ item.windSpeed.toFixed(2) }} m/s</div>
-          <div>{{ item.rollSpeed.toFixed(2) }} rpm</div>
+        
+          <div class="rightrow">{{ item.windSpeed.toFixed(2) }} m/s</div>
+          <div class="rightrow">{{ item.power.toFixed(2) }} kw</div>
+          <div class="rightrow">{{ item.rollSpeed.toFixed(2) }} rpm</div>
         </div>
       </div>
     </div>
@@ -180,6 +181,9 @@ export default {
 </script>
 
 <style scoped>
+.rightrow{
+  margin-right:3px;
+}
 .content {
   display: flex;
   flex-direction: row;
@@ -196,11 +200,11 @@ export default {
 }
 /*  最外层卡片 */
 .card {
-  width: 110px;
+  width: 112px;
   height: 49px;
   font-size: 12px;
-  margin-top: 5px;
-  margin-left: 4px;
+  margin-top: 4px;
+  margin-left: 3px;
   display: flex;
   flex-direction: row;
   cursor: pointer;

+ 7 - 4
src/components/area/windturbine/problem/ProblemMatrixCard.vue

@@ -33,9 +33,9 @@
               : 'card-right-unselect-' + item.status
           "
         >
-          <div>{{ item.power.toFixed(2) }} kw</div>
-          <div>{{ item.windSpeed.toFixed(2) }} m/s</div>
-          <div>{{ item.rollSpeed.toFixed(2) }} rpm</div>
+          <div class="rightrow">{{ item.windSpeed.toFixed(2) }} m/s</div>
+          <div class="rightrow">{{ item.power.toFixed(2) }} kw</div>
+          <div class="rightrow">{{ item.rollSpeed.toFixed(2) }} rpm</div>
         </div>
       </div>
     </div>
@@ -172,6 +172,9 @@ export default {
 </script>
 
 <style scoped>
+.rightrow{
+  margin-right:3px;
+}
 .content {
   display: flex;
   flex-direction: row;
@@ -189,7 +192,7 @@ export default {
 /*  最外层卡片 */
 .card {
   width: 112px;
-  height: 50px;
+  height: 49px;
   font-size: 12px;
   margin-left: 3px;
   margin-top: 4px;