liying5537 2 gadi atpakaļ
vecāks
revīzija
8888872368

+ 2 - 2
ui/.env.development

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

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

@@ -12,7 +12,7 @@
           </div>
         </div>
       </div>
-      <div style="text-align: center;padding-bottom: 2px;display: flex;justify-content: space-between;margin-top: 10px;align-items: center;height: 80%;">
+      <div style="text-align: center;padding-bottom: 2px;display: flex;justify-content: space-around;margin-top: 10px;align-items: center;height: 80%;">
         <div style="position: relative;">
           <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
           <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">

+ 4 - 1
ui/src/views/front/bottomRight.vue

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div>
-        <dv-scroll-board :config="config" style="height:200px"/>
+        <dv-scroll-board :config="config" style="height:200px;widows: 70% !important; margin: auto;"/>
       </div>
     </div>
   </div>
@@ -95,4 +95,7 @@ export default {
     }
   }
 }
+.dv-scroll-board{
+  width: 70% !important;
+}
 </style>

+ 1 - 1
ui/src/views/front/energyConsumption.vue

@@ -13,7 +13,7 @@
         </div>
       </div>
       <div>
-        <div id="LossrateChart" style="width:420px; height: 160px;"></div>
+        <div id="LossrateChart" style="width:420px; height: 160px;margin: auto;"></div>
       </div>
     </div>
   </div>

+ 1 - 1
ui/src/views/front/ethyleneTank.vue

@@ -12,7 +12,7 @@
           </div>
         </div>
       </div>
-      <div style="text-align: center; display: flex;justify-content: space-between;margin-top: 10px;align-items: center;height: 80%;">
+      <div style="text-align: center; display: flex;justify-content: space-around;margin-top: 10px;align-items: center;height: 80%;">
         <div style="position: relative;">
             <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<20">
             <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<40">

+ 2 - 2
ui/src/views/front/napTank.vue

@@ -12,7 +12,7 @@
           </div>
         </div>
       </div>
-      <div style="text-align: center; display: flex;justify-content: space-between; width: 96%;margin: auto; height: 100%;align-items: center;">
+      <div style="text-align: center; display: flex;justify-content: center;height: 100%;align-items: center;">
         <div style="position: relative;">
           <span class="span-num1">T1621</span>
           <img src="@/assets/image/warehouse1.png" style="height: 100px;width:120px;margin-top: 0.3rem" v-if="0<=(dashboarddata.napOne) && (dashboarddata.napOne)<20">
@@ -22,7 +22,7 @@
           <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;">
+        <div style="position: relative;margin: 0 10%;">
           <span class="span-num2">T1622</span>
           <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">

+ 1 - 1
ui/src/views/front/productProportion.vue

@@ -14,7 +14,7 @@
       </div>
       <div>
         <div>
-          <div id="productProportion" style="width:420px; height: 160px;"></div>
+          <div id="productProportion" style="width:420px; height: 160px;margin: auto;"></div>
         </div>
       </div>
     </div>

+ 3 - 3
ui/src/views/front/productTank.vue

@@ -12,8 +12,8 @@
           </div>
         </div>
       </div>
-      <div style="display:flex;align-items: center;justify-content: space-around;width: 100%;height: 90%;">
-        <div style="float: left; margin-left: 0.1rem;position: relative">
+      <div style="display:flex; align-items: center;justify-content: center;width: 100%;height: 90%;">
+        <div style="float: left;position: relative">
           <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem" v-if="0<=(dashboarddata.proTwo) && (dashboarddata.proTwo)<20">
           <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">
@@ -22,7 +22,7 @@
           <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: 0.1rem;position: relative">
+        <div style="float: left; margin-left: 10%;position: relative">
           <div style="text-align: center">
             <img src="@/assets/image/warehouse1.png" style="height:80px" v-if="0<=(dashboarddata.proOne) && (dashboarddata.proOne)<20">
             <img src="@/assets/image/warehouse2.png" style="height:80px" v-if="20<=(dashboarddata.proOne) && (dashboarddata.proOne)<40">

+ 4 - 1
ui/src/views/monitor/elecNew/index.vue

@@ -558,7 +558,10 @@ width: 100%;
 
 }
 
-
+.yunxing-left #bottomRight .dv-scroll-board{
+	width: 70%!important;
+  margin:auto ;
+}
 </style>