Merge branch 'dev-z0525'

src/assets/scss/modules/visual/houseStatic.scss

@@ -170,7 +170,7 @@
             margin-top:1px;
             width: 18px;
             height: 8px;
-            background: #ff7800;
+            background: #3dda83;
             border-radius: 4px;
           } 
 
@@ -189,7 +189,7 @@
             margin-top:1px;
             width: 18px;
             height: 8px;
-            background: #00E5ED;
+            background: #e43c26;
             border-radius: 4px;
           }
           >span{
@@ -299,21 +299,21 @@
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #FAC126;
+    color: #3dda83;
   }
 
   .cz{
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #45D97F;
+    color: #e43c26;
   }
 
   .xz{
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #2865FA;
+    color: #fac126;
   }
 
   .colorwhite{

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -46,7 +46,7 @@
             </div>
 
             <div class="icon_roomstate">
-              <div>{{item.rentFlag}}</div>
+              <div :style="{ color: item.rentFlag == '自住' ? '#3dda83' : item.rentFlag == '出租' ? '#e43c26' : '#fac126' }">{{item.rentFlag}}</div>
             </div>
 
             <div class="icon_category">
@@ -163,9 +163,6 @@ export default {
       runNum: 0,
       runAgencyArray: [],
 
-
-
-
     }
   },
   async mounted () {

src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue

@@ -233,21 +233,21 @@ export default {
         xzHouseTotal: 200,//房屋闲置总数		
         xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的）	
       },
-      houseColorArray: ['#FAC126', '#3DDA83', '#2865FA'],
+      houseColorArray: ['#3dda83', '#e43c26', '#fac126'],
       housePieData: [],
 
       legendArray: [
         {
           name: '自住房屋数',
-          url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
         },
         {
           name: '出租房屋数',
-          url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/hong@2x.png')
         },
         {
           name: '闲置房屋数',
-          url: require('../../../../../assets/img/shuju/measure/lan@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
         }
       ],
 
@@ -265,7 +265,7 @@ export default {
         ldUserRatio: '5%',//流动居民总数占比	
 
       },
-      userColorArray: ['#ff7800', '#00E5ED'],
+      userColorArray: ['#3dda83', '#e43c26'],
       userPieData: [],
 
       subList: [],