zhangjingyuan 3 лет назад
Родитель
Сommit
bf14079933

+ 6 - 6
src/views/system/jbdHome/board/component/equipmentBoardTopcard.vue

@@ -4,13 +4,13 @@
       <!-- <div class="title">设备信息情况</div> -->
       <div class="bar">
         <div v-for="(item, index) in topBarData" :key="index" class="item">
-          <div v-for="(v, i) in item.children" :key="i" class="box1" style="">
+          <div v-for="(v, i) in item.children" :key="i" class="box1" >
             <div class="label" style="text-align: center; ">{{ v.label }}</div>
             <div class="count" style="display: flex;justify-content: center;">
-              <div :style="{'color':1}">{{v.value}}{{ v.style.fill }}</div>
+              <div :style="{color:v.data.style.fill}" style="font: size 18px;font-weight:bold;">{{v.value}}</div>
               <div class="unit">{{ v.unit }}</div>
             </div>
-          </div>
+          </div>  
         </div>
       </div>
     </div>
@@ -116,7 +116,7 @@ export default {
     padding: 6px 6px;
     border-left: 5px solid rgb(6, 30, 93);
     &:first-child {
-      width: 34%;
+      width: 30%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -136,7 +136,7 @@ export default {
       }
     }
     &:nth-child(3) {
-      width: 15%;
+      width: 16%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -156,7 +156,7 @@ export default {
       }
     }
     &:last-child {
-      width: 25%;
+      width: 24%;
       display: flex;
       justify-content: space-around;
       align-items: center;

+ 2 - 1
src/views/system/jbdHome/board/component/getPieView.vue

@@ -49,7 +49,8 @@ export default {
         },
         color:this.info.color,
         tooltip: {
-          trigger: 'item'
+          trigger: 'item',
+          formatter: '{d}%'
         },
         legend: {
           show: true,

+ 1 - 1
src/views/system/jbdHome/board/equipmentBoard.vue

@@ -472,7 +472,7 @@ export default {
   .header {
     position: relative;
     width: 100%;
-    height: 7%;
+    height: 8%;
     display: flex;
     justify-content: space-between;
     flex-shrink: 0;