liying5537 před 3 roky
rodič
revize
a2870081b5

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

@@ -15,28 +15,28 @@
       <div style="margin:auto; top: 0; bottom: 0;margin-left: -0.5rem; right: 0;width: 100%; display: flex;flex-wrap: wrap;justify-content: space-between;align-items: flex-start;">
         <!--<div class="annual">2233 t</div>
         <dv-decoration-8 :reverse="true" style="width:150px;height:30px;" />-->
-        <div>
+        <div style="margin-bottom:20px">
           <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-bottom:20px">
           <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-bottom:20px">
           <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</div>
           </dv-border-box-10>
         </div>
 
-        <div>
+        <div style="margin-bottom:20px">
           <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</div>

+ 6 - 1
ui/src/views/front/productTank.vue

@@ -20,12 +20,15 @@
       <div style="float: left; margin-left: 0.2rem;position: relative">
         <div style="text-align: center">
           <img src="@/assets/image/warehouse1.png" style="height:80px">
+          <div class="ModelFont ModelFont2" style="top: 80px;left: 88px;">65%</div>
           <span class="modelTop pos2">STT1510</span>
         </div>
         <div style="text-align: center;">
           <img src="@/assets/image/warehouse3.png" style="height: 80px">
+          <div class="ModelFont ModelFont2"  style="top: 170px;left: 40px;">65%</div>
           <span class="modelTop pos3">STT1360</span>
           <img src="@/assets/image/warehouse2.png" style="height:80px; margin-left: 0.2rem">
+          <div class="ModelFont ModelFont2"  style="top: 170px;left: 140px;">65%</div>
           <span class="modelTop pos4">STT1410</span>
         </div>
       </div>
@@ -58,7 +61,9 @@ export default {
       position: absolute;
       right: 0.125rem;
     }
-
+    .ModelFont2{
+      position: absolute;
+    }
     .modelTop{
       position: absolute;
       &.pos1{