shi'sen'yuan 3 жил өмнө
parent
commit
27f5facaed

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

@@ -23,11 +23,11 @@
           <div class="ModelFont">{{ dashboarddata.acrOne }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<20">
-          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<40">
-          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<60">
-          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<80">
-          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<100">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="0<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="20<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="40<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="60<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<100">
           <span class="modelTop pos2">STT1012</span>
           <div class="ModelFont">{{ dashboarddata.acrTwo }}%</div>
         </div>
@@ -41,11 +41,11 @@
           <div class="ModelFont">{{ dashboarddata.acrThree }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
-          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
-          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
-          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
-          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
           <span class="modelTop pos4">STT1014</span>
           <div class="ModelFont">{{ dashboarddata.acrFour }}%</div>
         </div>

+ 6 - 6
ui/src/views/front/annualOutput.vue

@@ -16,30 +16,30 @@
         <!--<div class="annual">2233 t</div>
         <dv-decoration-8 :reverse="true" style="width:150px;height:30px;" />-->
         <div>
-          <div style="margin-left: 0.75rem; margin-bottom: -0.2rem; font-weight:bold">C2H4</div>
+          <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">C2H4</div>
           <dv-border-box-10 style="width:110px; height:0.7rem;">
             <div class="annual">2264 t</div>
           </dv-border-box-10>
         </div>
 
         <div>
-          <div style="margin-left: 0.75rem; margin-bottom: -0.2rem; font-weight:bold">C3H6</div>
+          <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">C3H6</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
             <div class="annual">1149 t</div>
           </dv-border-box-10>
         </div>
 
         <div>
-          <div style="margin-left: 0.75rem; margin-bottom: -0.2rem;  font-weight:bold">C3H6</div>
+          <div style="margin-left: 0.35rem; margin-bottom: -0.2rem;  font-weight:bold">瞬时能耗</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
-            <div class="annual">1149 t</div>
+            <div class="annual">1149</div>
           </dv-border-box-10>
         </div>
 
         <div>
-          <div style="margin-left: 0.75rem; margin-bottom: -0.2rem; font-weight:bold">C3H6</div>
+          <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">累计能耗</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
-            <div class="annual">1149 t</div>
+            <div class="annual">1149</div>
           </dv-border-box-10>
         </div>
         <!--<div class="annual">650 t</div>