页面修改

ui/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # CPMS管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-#VUE_APP_BASE_API = 'http://47.114.101.16:8090'
+VUE_APP_BASE_API = 'http://47.114.101.16:8090'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ui/src/assets/styles/index.scss

@@ -312,7 +312,7 @@ aside {
       .three-bototm-box {
         margin-top: 0.125rem;
         display: grid;
-        grid-template-columns: repeat(4, 25%);
+        grid-template-columns: repeat(7, 14.5%);
       }
 
       //年产量布局

ui/src/views/dashboard/nap.vue

@@ -1,6 +1,6 @@
 <template>
-  <div style="position: relative; width: 1.7rem; height: 1.6rem; float: left;">
-    <img src="@/assets/image/warehouse.png" style="height: 1.3rem">
+  <div style="position: relative; width: 130px; height:140px; float: left;">
+    <img src="@/assets/image/warehouse.png" style="height: 100px;width:120px">
     <div class="ModelFont">55%</div>
     <!-- <dv-percent-pond :config="config" style="width:1rem; height:0.5rem;position: absolute; top: 0.6rem; left: 0.35rem;" /> -->
   </div>

ui/src/views/dashboard/productProportion.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="productProportion" style="width:5.25rem; height: 2.75rem;"></div>
+    <div id="productProportion" style="width:420px; height: 160px;"></div>
   </div>
 </template>
 

ui/src/views/front/ChartRight.vue

@@ -32,6 +32,8 @@ export default {
 
 <style lang="scss">
   #app-container-Right {
+        width: 500px;
+        height: 750px;
     .up {
       width: 100%;
       display: flex;

ui/src/views/front/acrylicTank.vue

@@ -14,23 +14,23 @@
       </div>
       <div style="text-align: center;padding-bottom: 2px">
         <div style="float: left">
-          <img src="@/assets/image/spherical.png" style="height: 1.3rem; margin-top: 0.7rem; margin-left: 0.2rem">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem">
           <div class="ModelFont">55%</div>
         </div>
         <div style="float: left">
-          <img src="@/assets/image/Spherical1.png" style="height: 1.3rem; margin-top: 0.1rem">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem">
           <div class="ModelFont">55%</div>
         </div>
         <div style="float: left">
-          <img src="@/assets/image/Spherical2.png" style="height: 1.3rem; margin-top: 0.7rem">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem">
           <div class="ModelFont">55%</div>
         </div>
         <div style="float: left">
-          <img src="@/assets/image/Spherical3.png" style="height: 1.3rem; margin-top: 0.1rem">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem">
           <div class="ModelFont">55%</div>
         </div>
         <div style="float: left">
-          <img src="@/assets/image/Spherical1.png" style="height: 1.3rem; margin-top: 0.7rem">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: -0.5rem;margin-left: 0.7rem">
           <div class="ModelFont">55%</div>
         </div>
       </div>

ui/src/views/front/annualOutput.vue

@@ -42,7 +42,7 @@ export default {
 <style lang="scss">
   #app-container-annual {
     padding: 0.2rem 0.2rem 0;
-    height: 2.9rem;
+    height: 220px;
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {

ui/src/views/front/energyConsumption.vue

@@ -32,11 +32,11 @@ export default {
 <style lang="scss">
   #app-container-energy {
     padding: 0.2rem 0.2rem 0;
-    height: 2.9rem;
+    height: 240px;
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2.5rem;
+      height: 90%;
       border-radius: 0.125rem;
     }
     .text {

ui/src/views/front/ethyleneTank.vue

@@ -12,16 +12,16 @@
           </div>
         </div>
       </div>
-      <div style="text-align: center">
-        <img src="@/assets/image/cylindrical.png" style="height: 1.8rem;margin-left: 0.4rem">
+      <div style="text-align: center;">
+        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="height: 1.8rem;margin-left: 0.2rem ">
+        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="height: 1.8rem;margin-left: 0.2rem ">
+        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="height: 1.8rem;margin-left: 0.2rem ">
+        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
-        <img src="@/assets/image/cylindrical.png" style="height: 1.8rem;margin-left: 0.2rem ">
+        <img src="@/assets/image/cylindrical.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
         <span class="ModelFont">55%</span>
       </div>
     </div>

ui/src/views/front/materialBalance.vue

@@ -410,7 +410,10 @@
 </script>
 
 <style lang="scss">
-
+#materialBalance{
+  width: 1400px;
+  height: 750px;
+}
   .box_one{
     width: 101px;
     height: 55px;

ui/src/views/front/napTank.vue

@@ -33,8 +33,7 @@ export default {
 <style lang="scss">
   #app-container-nap {
     padding: 0.2rem 0.2rem 0;
-    height: 2.9rem;
-    min-width: 3.75rem;
+    height: 220px;
     border-radius: 0.0625rem;
     .bg-color-black {
       height: 2.5rem;

ui/src/views/front/productProportion.vue

@@ -32,11 +32,11 @@ export default {
 <style lang="scss">
   #app-container-proportion {
     padding: 0.2rem 0.2rem 0;
-    height: 2.9rem;
+    height: 240px;
     min-width: 3.75rem;
     border-radius: 0.0625rem;
     .bg-color-black {
-      height: 2.5rem;
+      height: 90%;
       border-radius: 0.125rem;
     }
     .text {

ui/src/views/front/productTank.vue

@@ -12,17 +12,17 @@
           </div>
         </div>
       </div>
-      <div style="float: left; margin-left: 0.3rem">
-        <img src="@/assets/image/warehouse1.png" style="height: 1.6rem;margin-top: 0.3rem">
-        <div class="ModelFont" style="margin-left: 0.75rem">65%</div>
+      <div style="float: left; margin-left: 0.1rem">
+        <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem">
+        <div class="ModelFont" style="margin-left: 0.2rem">65%</div>
       </div>
-      <div style="float: left; margin-left: 0.3rem">
+      <div style="float: left; margin-left: 0.2rem">
         <div style="text-align: center">
-          <img src="@/assets/image/warehouse1.png" style="height: 1rem">
+          <img src="@/assets/image/warehouse1.png" style="height:80px">
         </div>
         <div style="text-align: center">
-          <img src="@/assets/image/warehouse3.png" style="height: 0.95rem">
-          <img src="@/assets/image/warehouse2.png" style="height: 0.95rem; margin-left: 0.4rem">
+          <img src="@/assets/image/warehouse3.png" style="height: 80px">
+          <img src="@/assets/image/warehouse2.png" style="height:80px; margin-left: 0.2rem">
         </div>
       </div>
     </div>

ui/src/views/monitor/elec/index.vue

@@ -61,27 +61,38 @@
 
       <div class="body-box" v-if="dashboard === 1">
         <div class="three-content-box">
-          <div>
-            <material-balance />
-          </div>
-          <div>
-            <chart-right/>
+          <div style="width:1920px;display: flex;">
+            <div>
+              <material-balance />
+            </div>
+            <div>
+              <chart-right/>
+            </div>
           </div>
         </div>
         <div class="three-bototm-box">
-          <dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
             <nap-tank />
             <!--<bottom-left />-->
           </dv-border-box-12>
-          <dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
             <ethylene-tank />
           </dv-border-box-12>
-          <dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
             <acrylic-tank />
           </dv-border-box-12>
-          <dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
             <product-tank />
           </dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
+            <!-- <product-tank /> -->
+          </dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
+            <!-- <product-tank /> -->
+          </dv-border-box-12>
+          <dv-border-box-12 style="width: 438px;height: 260px;">
+            <!-- <product-tank /> -->
+          </dv-border-box-12>
         </div>
       </div>
     </div>
@@ -108,6 +119,7 @@
         </div>
         <!-- 中间 -->
         <div>
+          555
           <center-left1 />
         </div>
         <div>