Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/views/Home/Home.vue

@@ -1205,6 +1205,7 @@ export default {
             margin-left: 16px;
             .value {
               font-size: 24px;
+              display: inline-block;
             }
           }
         }
@@ -1241,6 +1242,9 @@ export default {
           .value {
             text-align: left;
             font-size: 12px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
           }
         }
       }

src/views/SandTable/SandTable.vue

@@ -730,7 +730,7 @@ export default {
 
   .sand-table-bottom {
     position: absolute;
-    right: calc(50vw - 545px);
+    left: calc(50vw - 550px);
     bottom: 0;
     z-index: 2;
     display: flex;

src/views/SandTable/component/p-panel.vue

@@ -3,13 +3,13 @@
     <div class="p-panel-title font-sm">{{ title }}</div>
     <div class="p-panel-body">
       <div class="pp-info">
-        <div class="pp-info-days mg-r-16">
+        <div class="pp-info-days">
           <span class="font-num green font-lg pp-info-days-num">{{
             days
           }}</span>
           <span class="gray font-sm">{{ daysUnit }}</span>
         </div>
-        <div class="pp-info-data mg-l-16">
+        <div class="pp-info-data">
           <span class="gray-l font-sm">{{ data1Str }}</span>
           <span class="pp-icon-l svg-icon" :class="data1IconClass">
             <svg-icon :svgid="data1Icon" />
@@ -42,7 +42,7 @@
             'border-color: ' + dataColor + '4d; background: ' + backColor + ';'
           "
         >
-          <div class="pp-data-split" v-for="index of 20" :key="index"></div>
+          <div class="pp-data-split" v-for="index of 19" :key="index"></div>
           <div
             class="pp-data-num"
             :style="
@@ -147,11 +147,16 @@ export default {
 <style lang="less">
 .p-panel {
   background: #1a1f2fcc;
+  width: 206px;
 
   .font-sm {
     font-size: 12px;
   }
 
+  .font-lg {
+    font-size: 16px;
+  }
+
   .p-panel-title {
     height: 2.778vh;
     line-height: 2.778vh;
@@ -173,7 +178,7 @@ export default {
         margin-left: auto;
 
         .pp-icon-l {
-          padding: 1.111vh 2.037vh 0 0.556vh;
+          padding: 1.111vh 1.037vh 0 0.556vh;
         }
 
         .pp-icon-r {
@@ -200,7 +205,7 @@ export default {
 
       .pp-data-box {
         height: 0.741vh;
-        width: 200px;
+        width: 190px;
         border: 1px solid;
         position: relative;
         display: flex;