Merge remote-tracking branch 'origin/master'

src/views/modules_guAn/visualization/modules/3DInfo.vue

@@ -94,7 +94,7 @@ export default {
     // 3D区域
     .area-3D{
       height: calc(100% - 25px);
-      padding: 30px;
+      padding: 10px;
       .img-3D{
         width: 100%;
         height: 100%;

src/views/modules_guAn/visualization/modules/EquipmentInfo.vue

@@ -41,7 +41,7 @@
             <span style="font-size: 11px;">设定80.0℃</span>
           </div>
           <div style="height: 70%; display: flex; justify-content: center; align-items: center;">
-            <span style="font-size: 40px;">-100.2</span>
+            <span style="font-size: 35px;">-100.2</span>
           </div>
           <div style="height: 15%; display: flex; justify-content: end; align-items: center;">
             <span style="font-size: 12px;">℃</span>
@@ -54,7 +54,7 @@
             <span style="font-size: 11px;">设定50.0%R.H</span>
           </div>
           <div style="height: 70%; display: flex; justify-content: center; align-items: center;">
-            <span style="font-size: 40px;">1000.0</span>
+            <span style="font-size: 35px;">1000.0</span>
           </div>
           <div style="height: 15%; display: flex; justify-content: end; align-items: center;">
             <span style="font-size: 12px;">%R.H</span>
@@ -67,7 +67,7 @@
             <span style="font-size: 11px;">设定1120W/㎡</span>
           </div>
           <div style="height: 70%; display: flex; justify-content: center; align-items: center;">
-            <span style="font-size: 40px;">1000.0</span>
+            <span style="font-size: 35px;">1000.0</span>
           </div>
           <div style="height: 15%; display: flex; justify-content: end; align-items: center;">
             <span style="font-size: 12px;">W/㎡</span>
@@ -154,6 +154,7 @@ export default {
     linear-gradient(#207ab7, #207ab7) right bottom;
     background-repeat: no-repeat;
     background-size: 0.05vw 1vw, 1vw 0.05vw;
+    padding: 1px 2px;
   }
   .bo{
     height: 95%;