Merge remote-tracking branch 'origin/master'

src/views/disasterRiskMonitor/forestFireWarn.vue

@@ -25,9 +25,8 @@
           </van-radio>
         </van-radio-group>
       </div>
-    </div>
-    <div class="info-content">
       <div class="content-header">
+        <i class="icon-chart" />
         <div class="text-box">
           <div class="text1">经统计：</div>
           <div class="text1">{{ queryParams.date[0] }}</div>
@@ -38,6 +37,8 @@
           <div class="text1">条数据</div>
         </div>
       </div>
+    </div>
+    <div class="info-content">
       <van-swipe
         v-if="forestFireData.dataList && forestFireData.dataList.length > 0"
       >
@@ -293,33 +294,48 @@ onMounted(() => {
     width: 100%;
     height: 50%;
   }
-  .select-box {
+  .info-box {
     background-color: #ffffff;
-    height: 50px;
-    display: flex;
-    align-items: center;
-    padding: 0 10px;
-    .picker-container {
-      width: 210px;
+    box-shadow: 0 2px 4px 0 rgba(44, 129, 255, 0.09);
+    margin-bottom: 16px;
+    .select-box {
+      height: 50px;
+      display: flex;
+      align-items: center;
+      padding: 0 10px;
+      .picker-container {
+        width: 210px;
+      }
     }
-  }
-}
-.info-content {
-  .content-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 40px;
-    .text-box {
+    .content-header {
       display: flex;
-      font-size: 14px;
-      .text1 {
-        color: #a7a7a7;
+      align-items: center;
+      height: 40px;
+      padding: 0 10px;
+      .icon-chart {
+        display: inline-block;
+        width: 16px;
+        height: 17px;
+        background: url("@/assets/images/disasterRiskMonitor/galeDisaster/chart.png") no-repeat;
+        background-size: 100% 100%;
+        margin-right: 7px;
+        flex-shrink: 0;
       }
-      .text2 {
-        color: #4894e2;
-        font-weight: bold;
-        margin: 0 5px;
+      .text-box {
+        display: flex;
+        align-items: center;
+        font-size: 14px;
+        .text1 {
+          color: #a7a7a7;
+        }
+        .text2 {
+          font-size: 18px;
+          color: #2C81FF;
+          font-weight: bold;
+          text-align: center;
+          min-width: 30px;
+          margin: 0 5px;
+        }
       }
     }
   }

src/views/disasterRiskMonitor/galeDisaster.vue

@@ -234,8 +234,7 @@ onMounted(() => {
       display: inline-block;
       width: 16px;
       height: 17px;
-      background: url("@/assets/images/disasterRiskMonitor/galeDisaster/chart.png")
-        no-repeat;
+      background: url("@/assets/images/disasterRiskMonitor/galeDisaster/chart.png") no-repeat;
       background-size: 100% 100%;
       margin-right: 7px;
       flex-shrink: 0;