cq

ui/src/views/front/acrylicTank.vue

@@ -64,8 +64,6 @@
 </template>
 
 <script>
-  import { selectLast } from "@/api/aspen/dashboarddata";
-
 export default {
   props: ['dashboarddata'],
   data () {
@@ -77,13 +75,6 @@ export default {
   created() {
   },
   methods: {
-    /** 查询dashboard抓取数据列表 */
-    // getList()
-    // {
-    //   selectLast(this.queryParams).then(response => {
-    //     this.dashboarddata = response.data;
-    //   });
-    // }
   }
 }
 </script>
@@ -95,7 +86,7 @@ export default {
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2rem;
+      height: 2.7rem;
       border-radius: 0.125rem;
     }
     .text {

ui/src/views/front/bottomEnergy.vue

@@ -34,7 +34,7 @@ export default {
     },
     height: {
       type: String,
-      default: '1.7rem'
+      default: '2.2rem'
     }
   },
   data() {
@@ -94,11 +94,11 @@ export default {
               color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
                 {
                   offset: 0,
-                  color: 'rgb(207,243,68)'
+                  color: 'rgb(143,227,89)'
                 },
                 {
                   offset: 1,
-                  color: 'rgb(119,189,74)'
+                  color: 'rgba(207,243,68,0)'
                 }
               ])
             },
@@ -117,7 +117,7 @@ export default {
   min-width: 3.75rem;
   border-radius: 0.0625rem;
   .bg-color-black {
-    height: 2rem;
+    height: 2.7rem;
     border-radius: 0.125rem;
   }
   .text {

ui/src/views/front/bottomLeft.vue

@@ -33,7 +33,7 @@ export default {
     },
     height: {
       type: String,
-      default: '1.7rem'
+      default: '2.2rem'
     }
   },
   data() {
@@ -90,11 +90,11 @@ export default {
               color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
                 {
                   offset: 0,
-                  color: 'rgb(210,233,253)'
+                  color: 'rgb(0,84,253)'
                 },
                 {
                   offset: 1,
-                  color: 'rgb(0,84,253)'
+                  color: 'rgba(152,206,253,0.34)'
                 }
               ])
             },
@@ -113,7 +113,7 @@ export default {
   min-width: 3.75rem;
   border-radius: 0.0625rem;
   .bg-color-black {
-    height: 2rem;
+    height: 2.7rem;
     border-radius: 0.125rem;
   }
   .text {

ui/src/views/front/bottomRight.vue

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div>
-        <dv-scroll-board :config="config" style="height:1.8rem"/>
+        <dv-scroll-board :config="config" style="height:2.2rem"/>
       </div>
     </div>
   </div>
@@ -60,7 +60,7 @@ export default {
   min-width: 3.75rem;
   border-radius: 0.0625rem;
   .bg-color-black {
-    height: 2rem;
+    height: 2.7rem;
     border-radius: 0.125rem;
   }
   .text {

ui/src/views/front/energyConsumption.vue

@@ -110,7 +110,19 @@ export default {
                   }
                 ]
               ]
-            }
+            },
+            areaStyle: {
+              color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: '#37A2FF'
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(55,162,255,0)'
+                }
+              ])
+            },
           }
         ]
       })

ui/src/views/front/ethyleneTank.vue

@@ -84,7 +84,7 @@ export default {
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2rem;
+      height: 2.7rem;
       border-radius: 0.125rem;
     }
     .text {

ui/src/views/front/napTank.vue

@@ -15,29 +15,29 @@
       <div style="text-align: center; display: flex;justify-content: space-between;margin-top: 10px;">
         <div style="position: relative;">
           <span class="span-num1">T1621</span>
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="0<=(dashboarddata.napOne) && (dashboarddata.napOne)<20">
-          <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px" v-if="20<=(dashboarddata.napOne) && (dashboarddata.napOne)<40">
-          <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px" v-if="40<=(dashboarddata.napOne) && (dashboarddata.napOne)<60">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="60<=(dashboarddata.napOne) && (dashboarddata.napOne)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="80<=(dashboarddata.napOne) && (dashboarddata.napOne)<100">
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="0<=(dashboarddata.napOne) && (dashboarddata.napOne)<20">
+          <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>
         </div>
         <div style="position: relative;">
           <span class="span-num2">T1622</span>
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="0<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<20">
-          <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px" v-if="20<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<40">
-          <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px" v-if="40<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<60">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="60<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="80<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<100">
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="0<=(dashboarddata.napTwo) && (dashboarddata.napTwo)<20">
+          <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>
         </div>
         <div style="position: relative;">
           <span class="span-num3">T1623</span>
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="0<=(dashboarddata.napThree) && (dashboarddata.napThree)<20">
-          <img src="@/assets/image/warehouse2.png" style="height: 100px;width:120px" v-if="20<=(dashboarddata.napThree) && (dashboarddata.napThree)<40">
-          <img src="@/assets/image/warehouse3.png" style="height: 100px;width:120px" v-if="40<=(dashboarddata.napThree) && (dashboarddata.napThree)<60">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="60<=(dashboarddata.napThree) && (dashboarddata.napThree)<80">
-          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px" v-if="80<=(dashboarddata.napThree) && (dashboarddata.napThree)<100">
+          <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="0<=(dashboarddata.napThree) && (dashboarddata.napThree)<20">
+          <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>
         </div>
       </div>
@@ -59,7 +59,7 @@ export default {
     border-radius: 0.0625rem;
     .bg-color-black {
       border-radius: 0.125rem;
-      height: 2rem;
+      height: 220px;
     }
     .text {
       color: #c3cbde;
@@ -73,19 +73,19 @@ export default {
     .span-num1{
         position: absolute;
         left: 32%;
-        top: -16px;
+        top: 0px;
     }
 
     .span-num2{
         position: absolute;
         left: 32%;
-        top: -16px;
+        top: 0px;
     }
 
     .span-num3{
         position: absolute;
         left: 32%;
-        top: -16px;
+        top: 0px;
     }
   }
 </style>

ui/src/views/front/productTank.vue

@@ -67,7 +67,7 @@ export default {
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2rem;
+      height: 2.7rem;
       border-radius: 0.125rem;
     }
     .text {