update 公用工程

src/views/3DOverview/components/DianChart.vue

@@ -57,7 +57,7 @@ export default {
           textStyle: {
             color: '#fff9',
             fontSize: 8
-          },
+          }
           // data: ['ABC三相电压/v', 'ABC三相电流/a', '电缆温度']
         },
         grid: {
@@ -83,7 +83,7 @@ export default {
         yAxis: [
           {
             name: '电流/A',
-            nameTextStyle: { align: 'right', fontSize: 8 },
+            nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
             type: 'value',
             splitNumber: 4,
             onZero: true,
@@ -93,10 +93,14 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                color: '#fff9',
+                color: '#5982B2',
                 width: 1
               }
             },
+            axisLabel: {
+              color: '#fff9',
+              fontSize: 10
+            },
             splitLine: {
               show: false
               // lineStyle: {
@@ -106,7 +110,7 @@ export default {
           },
           {
             name: '电压/V',
-            nameTextStyle: { align: 'right', fontSize: 8 },
+            nameTextStyle: { align: 'right', fontSize: 9, color: '#fff9' },
             type: 'value',
             splitNumber: 4,
             axisTick: { show: false },
@@ -116,10 +120,14 @@ export default {
             axisLine: {
               show: true,
               lineStyle: {
-                color: '#fff9',
+                color: '#5982B2',
                 width: 1
               }
             },
+            axisLabel: {
+              color: '#fff9',
+              fontSize: 10
+            },
             splitLine: {
               show: false
               // lineStyle: {
@@ -129,7 +137,7 @@ export default {
           },
           {
             name: '温度',
-            nameTextStyle: { align: 'left', color: '#fff9', fontSize: 8 },
+            nameTextStyle: { align: 'left', color: '#fff9', fontSize: 9 },
             axisTick: { show: false },
             axisLine: {
               show: false,
@@ -144,6 +152,10 @@ export default {
               lineStyle: {
                 color: '#fff3'
               }
+            },
+            axisLabel: {
+              color: '#fff9',
+              fontSize: 10
             }
           }
         ],

src/views/3DOverview/components/LeftContentPublicConsume.vue

@@ -27,8 +27,8 @@
 
     <div>
       <TechyBox class="water-consume">
-        <div class="header-part has-border">
-          <img src="./assets/consume/s.png" width="32" height="32" alt="water">
+        <div class="header-part  ">
+          <img src="./assets/consume/s.png" width="32" height="32" alt="water" />
           <span>水</span>
         </div>
         <div class="content-part">
@@ -62,8 +62,8 @@
 
     <div>
       <TechyBox class="gas-consume">
-        <div class="header-part has-border">
-          <img src="./assets/consume/gas.png" width="32" height="32" alt="qi">
+        <div class="header-part  ">
+          <img src="./assets/consume/gas.png" width="32" height="32" alt="qi" />
           <span>气</span>
         </div>
         <div class="content-part">
@@ -95,7 +95,7 @@
     <div style="flex: 1;">
       <TechyBox class="dian-consume">
         <div class="header-part">
-          <img src="./assets/consume/d.png" width="32" height="32" alt="dian">
+          <img src="./assets/consume/d.png" width="32" height="32" alt="dian" />
           <span>电</span>
         </div>
         <div class="content-part">
@@ -107,7 +107,7 @@
     <div style="flex: 1;">
       <TechyBox class="elec-consume">
         <div class="header-part">
-          <img src="./assets/consume/fad.png" width="32" height="32" alt="fadian">
+          <img src="./assets/consume/fad.png" width="32" height="32" alt="fadian" />
           <span>发电</span>
         </div>
         <div class="content-part">
@@ -211,6 +211,7 @@ export default {
   display: flex;
   align-items: center;
   width: 100%;
+  height: calc(100vmin / 1920 * 28);
 }
 
 .row > .name,
@@ -226,7 +227,10 @@ export default {
 .diy-process-bar {
   margin: 0 8px;
   border-radius: 7px;
-  height: 8px;
+  height: calc(100vmin / 1920 * 14);
+  /* margin: 0 8px;
+  border-radius: 7px; */
+  /* height: 8px; */
   flex: 1 1;
   background-color: #fff3;
   overflow: hidden;