Merge branch 'zz-test' into master

app/src/views/Home/components/MapCharts.vue

@@ -366,7 +366,7 @@ export default {
           show: false,
           bottom: 20,
           left: 10,
-          color: ["#ff4601", "#fffc00"],
+          color: ["#b5f8ff", "#235d99"],
           // min: 0,
           max: maxMap > 0 ? maxMap : 1,
           calculable: true,
@@ -426,11 +426,11 @@ export default {
                   colorStops: [
                     {
                       offset: 0,
-                      color: "#f8a34c", // 0% 处的颜色
+                      color: "#06969d", // 0% 处的颜色
                     },
                     {
                       offset: 1,
-                      color: "#f6e226",
+                      color: "#1daedc",
                     },
                   ],
                 },

app/src/views/Home/components/WisdomFire.vue

@@ -9,7 +9,7 @@
             <span>已接入物联网建筑数</span>
           </span>
           <span class="num">1542</span>
-          <span>栋</span>
+          <span class="build-line">栋</span>
         </div>
       </div>
       <!-- 设备数 -->
@@ -188,7 +188,7 @@ img {
 .pressure-bg {
   width: 66px;
   height: 77px;
-  background: url("../../assets/images/water.png") no-repeat;
+  background: url("@/assets/images/water.png") no-repeat;
   font-size: 24px;
   text-align: center;
   padding-left: 3px;
@@ -209,4 +209,8 @@ img {
 .unit {
   margin-right: 12px;
 }
+.build-line{
+  display: inline-block;
+  margin-top: 6px;
+}
 </style>