shi'sen'yuan 3 سال پیش
والد
کامیت
1a9e8b6776

+ 12 - 2
ui/src/views/front/bottomEnergy.vue

@@ -84,10 +84,20 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: dateDay
+          data: dateDay,
+          axisLabel: {
+            textStyle: {
+              color: '#ffffff'
+            },
+          }
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          axisLabel: {
+            textStyle: {
+              color: '#ffffff'
+            },
+          }
         },
         series: [
           {

+ 11 - 1
ui/src/views/front/bottomLeft.vue

@@ -81,9 +81,19 @@ export default {
         xAxis: {
           type: 'category',
           data: dateDay,
+          axisLabel: {//x轴文字的配置
+            textStyle: {
+              color: '#ffffff',
+            }
+          },
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          axisLabel: {
+            textStyle: {
+              color: '#ffffff'
+            },
+          }
         },
         series: [
           {

+ 9 - 1
ui/src/views/front/energyConsumption.vue

@@ -81,11 +81,19 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: dateDay
+          data: dateDay,
+          axisLabel: {
+            textStyle: {
+              color: '#ffffff'
+            },
+          }
         },
         yAxis: {
           type: 'value',
           axisLabel: {
+            textStyle: {
+              color: '#ffffff'
+            },
             formatter: '{value}%'
           }
         },

+ 3 - 7
ui/src/views/front/ethyleneTank.vue

@@ -103,13 +103,9 @@ export default {
       }
     }
     .ModelFont {
-      // position: relative;
-      // top: 0.3rem;
-      // right: 0.5rem;
-      // font-size: 12px;
-          position: absolute;
-          bottom: -13px;
-          left: 20px;
+      position: absolute;
+      bottom: -13px;
+      left: 7px;
     }
 
     .modelTop{

+ 10 - 10
ui/src/views/front/productTank.vue

@@ -18,33 +18,33 @@
         <img src="@/assets/image/warehouse3.png" style="height: 124px;margin-top: 0.3rem" v-if="40<=(dashboarddata.proTwo) && (dashboarddata.proTwo)<60">
         <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem" v-if="60<=(dashboarddata.proTwo) && (dashboarddata.proTwo)<80">
         <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem" v-if="80<=(dashboarddata.proTwo) && (dashboarddata.proTwo)<100">
-        <div class="ModelFont" style="margin-left: 0.2rem">{{ dashboarddata.proTwo }}%</div>
+        <div class="ModelFont" style="margin-left: 55px;margin-top: 7px">{{ dashboarddata.proTwo }}%</div>
         <span class="modelTop pos1">STT1520</span>
       </div>
-      <div style="float: left; margin-left: 0.2rem;position: relative">
+      <div style="float: left; margin-left: 0.1rem;position: relative">
         <div style="text-align: center">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="0<=(dashboarddata.proOne) && (dashboarddata.proOne)<20">
           <img src="@/assets/image/warehouse2.png" style="height:80px" v-if="20<=(dashboarddata.proOne) && (dashboarddata.proOne)<40">
           <img src="@/assets/image/warehouse3.png" style="height:80px" v-if="40<=(dashboarddata.proOne) && (dashboarddata.proOne)<60">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="60<=(dashboarddata.proOne) && (dashboarddata.proOne)<80">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="80<=(dashboarddata.proOne) && (dashboarddata.proOne)<100">
-          <div class="ModelFont ModelFont2" style="top: 80px;left: 88px;">{{ dashboarddata.proOne }}%</div>
+          <div class="ModelFont ModelFont2" style="top: 80px;left: 80px;">{{ dashboarddata.proOne }}%</div>
           <span class="modelTop pos2">STT1510</span>
         </div>
-        <div style="text-align: center;">
+        <div style="text-align: center;; margin-top: 0.2rem">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="0<=(dashboarddata.proThree) && (dashboarddata.proThree)<20">
           <img src="@/assets/image/warehouse2.png" style="height:80px" v-if="20<=(dashboarddata.proThree) && (dashboarddata.proThree)<40">
           <img src="@/assets/image/warehouse3.png" style="height:80px" v-if="40<=(dashboarddata.proThree) && (dashboarddata.proThree)<60">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="60<=(dashboarddata.proThree) && (dashboarddata.proThree)<80">
           <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="80<=(dashboarddata.proThree) && (dashboarddata.proThree)<100">
-          <div class="ModelFont ModelFont2"  style="top: 170px;left: 40px;">{{ dashboarddata.proThree }}%</div>
+          <div class="ModelFont ModelFont2"  style="top: 185px;left: 25px;">{{ dashboarddata.proThree }}%</div>
           <span class="modelTop pos3">STT1360</span>
           <img src="@/assets/image/warehouse1.png" style="height:80px; margin-left: 0.2rem" v-if="0<=(dashboarddata.proFour) && (dashboarddata.proFour)<20">
           <img src="@/assets/image/warehouse2.png" style="height:80px; margin-left: 0.2rem" v-if="20<=(dashboarddata.proFour) && (dashboarddata.proFour)<40">
           <img src="@/assets/image/warehouse3.png" style="height:80px; margin-left: 0.2rem" v-if="40<=(dashboarddata.proFour) && (dashboarddata.proFour)<60">
           <img src="@/assets/image/warehouse1.png" style="height:80px; margin-left: 0.2rem" v-if="60<=(dashboarddata.proFour) && (dashboarddata.proFour)<80">
           <img src="@/assets/image/warehouse1.png" style="height:80px; margin-left: 0.2rem" v-if="80<=(dashboarddata.proFour) && (dashboarddata.proFour)<100">
-          <div class="ModelFont ModelFont2"  style="top: 170px;left: 140px;">{{ dashboarddata.proFour }}%</div>
+          <div class="ModelFont ModelFont2"  style="top: 185px;left: 140px;">{{ dashboarddata.proFour }}%</div>
           <span class="modelTop pos4">STT1410</span>
         </div>
       </div>
@@ -88,16 +88,16 @@ export default {
         top: 0px;
       }
       &.pos2{
-        left: 80px;
+        left: 75px;
         top: -15px;
       }
       &.pos3{
-        left: 24px;
-        top: 70px;
+        left: 22px;
+        top: 80px;
       }
       &.pos4{
         left: 130px;
-        top: 70px;
+        top: 80px;
       }
     }
   }