*

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

ui/src/assets/styles/index.scss

@@ -416,10 +416,10 @@ aside {
 }
 
 .annual {
-  width:100px;
-  height:10px;
+  // width:100px;
+  // height:10px;
   margin-top:18px;
-  margin-left: 0.3rem;
+  // margin-left: 0.3rem;
   padding-top: 0.25rem;
   color: #cfe5ea;
   font:30px/15px 'ds-digitalbold';

ui/src/views/front/annualOutput.vue

@@ -12,18 +12,36 @@
           </div>
         </div>
       </div>
-      <div style="margin:auto; top: 0; bottom: 0; margin-left: 0.5rem; right: 0;">
+      <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 style="margin-left: 0.75rem; margin-bottom: -0.2rem; font-weight:bold">C2H4</div>
-        <dv-border-box-10 style="width:150px; height:0.7rem;">
-          <div class="annual">2264 t</div>
-        </dv-border-box-10>
+        <div>
+          <div style="margin-left: 0.75rem; 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-left: 0.75rem; 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 style="margin-left: 0.75rem; margin-bottom: -0.2rem; margin-top: 0.15rem; font-weight:bold">C3H6</div>
-        <dv-border-box-10 :reverse="true" style="width:150px; height:0.7rem">
-          <div class="annual">1149 t</div>
-        </dv-border-box-10>
+        <div>
+          <div style="margin-left: 0.75rem; 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-left: 0.75rem; 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 class="annual">650 t</div>
         <dv-decoration-8 :reverse="true" style="width:150px;height:30px;" />-->
       </div>
@@ -43,7 +61,8 @@ export default {
   #app-container-annual {
     padding: 0.2rem 0.2rem 0;
     height: 220px;
-    min-width: 3.75rem;
+    // min-width: 3.75rem;
+    width: 100%;
     border-radius: 0.0625rem;
     .bg-color-black {
       height: 2.5rem;