LY dash

ui/src/views/front/acrylicTank.vue

@@ -18,45 +18,45 @@
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
           <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
           <img src="@/assets/image/Spherical4.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
-          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) ">
           <span class="modelTop pos1">STT1011</span>
-          <div class="ModelFont">{{ dashboarddata.acrOne }}%</div>
+          <div class="ModelFont">{{ dashboarddata.acrOne }}</div>
         </div>
         <div style="position: relative;">
           <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="0<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<20">
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="20<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<40">
           <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="40<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<60">
           <img src="@/assets/image/Spherical4.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="60<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<80">
-          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<100">
+          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrTwo) ">
           <span class="modelTop pos2">STT1012</span>
-          <div class="ModelFont">{{ dashboarddata.acrTwo }}%</div>
+          <div class="ModelFont">{{ dashboarddata.acrTwo }}</div>
         </div>
         <div style="position: relative;">
           <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrThree) && (dashboarddata.acrThree)<20">
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrThree) && (dashboarddata.acrThree)<40">
           <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrThree) && (dashboarddata.acrThree)<60">
           <img src="@/assets/image/Spherical4.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrThree) && (dashboarddata.acrThree)<80">
-          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrThree) && (dashboarddata.acrThree)<100">
+          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrThree) ">
           <span class="modelTop pos3">STT1013</span>
-          <div class="ModelFont">{{ dashboarddata.acrThree }}%</div>
+          <div class="ModelFont">{{ dashboarddata.acrThree }}</div>
         </div>
         <div style="position: relative;">
           <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="0<=(dashboarddata.acrFour) && (dashboarddata.acrFour)<20">
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="20<=(dashboarddata.acrFour) && (dashboarddata.acrFour)<40">
           <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="40<=(dashboarddata.acrFour) && (dashboarddata.acrFour)<60">
           <img src="@/assets/image/Spherical4.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="60<=(dashboarddata.acrFour) && (dashboarddata.acrFour)<80">
-          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrFour) && (dashboarddata.acrFour)<100">
+          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.1rem" v-if="80<=(dashboarddata.acrFour) ">
           <span class="modelTop pos4">STT1014</span>
-          <div class="ModelFont">{{ dashboarddata.acrFour }}%</div>
+          <div class="ModelFont">{{ dashboarddata.acrFour }}</div>
         </div>
         <div style="position: relative;">
           <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrZero) && (dashboarddata.acrZero)<20">
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrZero) && (dashboarddata.acrZero)<40">
           <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrZero) && (dashboarddata.acrZero)<60">
           <img src="@/assets/image/Spherical4.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrZero) && (dashboarddata.acrZero)<80">
-          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrZero) && (dashboarddata.acrZero)<100">
+          <img src="@/assets/image/Spherical5.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrZero) ">
           <span class="modelTop pos5">STT1040</span>
-          <div class="ModelFont">{{ dashboarddata.acrZero }}%</div>
+          <div class="ModelFont">{{ dashboarddata.acrZero }}</div>
         </div>
       </div>
     </div>

ui/src/views/front/ethyleneTank.vue

@@ -18,18 +18,18 @@
             <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;" v-if="20<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<40">
             <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;" v-if="40<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<60">
             <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;" v-if="60<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<80">
-            <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<100">
+            <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtOne)">
             <span class="modelTop pos">STT1061</span>
-            <span class="ModelFont">{{ dashboarddata.ehtOne }}%</span>
+            <span class="ModelFont">{{ dashboarddata.ehtOne }}</span>
         </div>
         <div style="position: relative; margin-left: 8% ;">
           <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;" v-if="0<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<20">
           <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;" v-if="20<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<40">
           <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;" v-if="40<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<60">
           <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;" v-if="60<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<80">
-          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<100">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtTwo)">
             <span class="modelTop pos">STT1062</span>
-            <span class="ModelFont">{{ dashboarddata.ehtTwo }}%</span>
+            <span class="ModelFont">{{ dashboarddata.ehtTwo }}</span>
         </div>
 
         <div style="position: relative;margin-left: 8% ;">
@@ -37,27 +37,27 @@
           <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;" v-if="20<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<40">
           <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;" v-if="40<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<60">
           <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;" v-if="60<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<80">
-          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<100">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtThree)">
           <span class="modelTop pos">STT1063</span>
-          <span class="ModelFont">{{ dashboarddata.ehtThree }}%</span>
+          <span class="ModelFont">{{ dashboarddata.ehtThree }}</span>
         </div>
         <div style="position: relative;margin-left: 8% ;">
           <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;" v-if="0<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<20">
           <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;" v-if="20<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<40">
           <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;" v-if="40<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<60">
           <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;" v-if="60<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<80">
-          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<100">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtFour)">
           <span class="modelTop pos">STT1064</span>
-          <span class="ModelFont">{{ dashboarddata.ehtFour }}%</span>
+          <span class="ModelFont">{{ dashboarddata.ehtFour }}</span>
         </div>
         <div style="position: relative;margin-left: 8% ;">
           <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;" v-if="0<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<20">
           <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;" v-if="20<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<40">
           <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;" v-if="40<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<60">
           <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;" v-if="60<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<80">
-          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<100">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;" v-if="80<=(dashboarddata.ehtFive)">
           <span class="modelTop pos">STT1065</span>
-          <span class="ModelFont">{{ dashboarddata.ehtFive }}%</span>
+          <span class="ModelFont">{{ dashboarddata.ehtFive }}</span>
         </div>
       </div>
     </div>

ui/src/views/front/napTank.vue

@@ -19,8 +19,8 @@
           <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="20<=(dashboarddata.napOne) && (dashboarddata.napOne)<40">
           <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="40<=(dashboarddata.napOne) && (dashboarddata.napOne)<60">
           <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="60<=(dashboarddata.napOne) && (dashboarddata.napOne)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napOne) && (dashboarddata.napOne)<100">
-          <div class="ModelFont">{{ dashboarddata.napOne }}%</div>
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napOne)">
+          <div class="ModelFont">{{ dashboarddata.napOne }}</div>
         </div>
         <div style="position: relative;margin: 0 3%;">
           <span class="span-num2">T1622</span>
@@ -28,8 +28,8 @@
           <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="20<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<40">
           <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="40<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<60">
           <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="60<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<100">
-          <div class="ModelFont">{{ dashboarddata.napTwo }}%</div>
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napTwo) ">
+          <div class="ModelFont">{{ dashboarddata.napTwo }}</div>
         </div>
         <div style="position: relative;">
           <span class="span-num3">T1623</span>
@@ -37,8 +37,8 @@
           <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="20<=(dashboarddata.napThree) && (dashboarddata.napThree)<40">
           <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="40<=(dashboarddata.napThree) && (dashboarddata.napThree)<60">
           <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="60<=(dashboarddata.napThree) && (dashboarddata.napThree)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napThree) && (dashboarddata.napThree)<100">
-          <div class="ModelFont">{{ dashboarddata.napThree }}%</div>
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="80<=(dashboarddata.napThree) ">
+          <div class="ModelFont">{{ dashboarddata.napThree }}</div>
         </div>
       </div>
     </div>

ui/src/views/front/productTank.vue

@@ -18,8 +18,8 @@
           <img src="@/assets/image/warehouse2.png" style="height: 124px;margin-top: 0.3rem" v-if="20<=(dashboarddata.proTwo) && (dashboarddata.proTwo)<40">
           <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: 55px;margin-top: 7px">{{ dashboarddata.proTwo }}%</div>
+          <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem" v-if="80<=(dashboarddata.proTwo)">
+          <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: 5%;position: relative">
@@ -28,8 +28,8 @@
             <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: 80px;">{{ dashboarddata.proOne }}%</div>
+            <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="80<=(dashboarddata.proOne) ">
+            <div class="ModelFont ModelFont2" style="top: 80px;left: 80px;">{{ dashboarddata.proOne }}</div>
             <span class="modelTop pos2">STT1510</span>
           </div>
           <div style="text-align: center;; margin-top: 0.2rem">
@@ -37,15 +37,15 @@
             <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: 185px;left: 25px;">{{ dashboarddata.proThree }}%</div>
+            <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="80<=(dashboarddata.proThree) ">
+            <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: 185px;left: 140px;">{{ dashboarddata.proFour }}%</div>
+            <img src="@/assets/image/warehouse1.png" style="height:80px; margin-left: 0.2rem" v-if="80<=(dashboarddata.proFour)">
+            <div class="ModelFont ModelFont2"  style="top: 185px;left: 140px;">{{ dashboarddata.proFour }}</div>
             <span class="modelTop pos4">STT1410</span>
           </div>
         </div>