修改bug

src/views/dataBoard/cpts/homeDetails/index.vue

@@ -789,7 +789,7 @@ export default {
     display: flex;
     align-items: flex-end;
     justify-content: center;
-    margin-top: 60px;
+    margin-top: 20px;
 
     .apar_comtent {
       display: flex;
@@ -826,18 +826,18 @@ export default {
 
           .households {
             @include homeCommon;
-            background: #1A95FF;
+            background: rgba(26,149,255,0.64);
             //background: url("@/assets/images/home/hasPeople.png") no-repeat;
           }
           .dangerHome,
           .dangerPeople {
             @include homeCommon;
-            background: #B43404;
+            background: rgba(201,73,24,0.7);
             //background: url("@/assets/images/home/dangerHomeBg.png") no-repeat;
           }
           .freeHome {
             @include homeCommon;
-            background: #8392A5;
+            background: rgba(204,204,204,0.46);
             //background: url("@/assets/images/home/freeHome.png") no-repeat;
           }
         }

src/views/dataBoard/renfang/cpts/rkfx.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: "",
     },
+    orgType: {
+      type: String,
+      default: ""
+    }
   },
   data() {
     return {
@@ -140,6 +144,7 @@ export default {
         path: "/dataBoard/renfang/resi-analyze",
         query: {
           org_id: this.orgId,
+          orgType: this.orgType,
           type,
           type_category: this.currentTab,
           type_name: name,
@@ -158,7 +163,8 @@ export default {
         code,
         msg
       } = await requestPost(url, {
-        org_id: this.orgId
+        org_id: this.orgId,
+        orgType: this.orgType,
       }, {
         // mockId: 60041615,
       });

src/views/dataBoard/renfang/index.vue

@@ -347,7 +347,7 @@
         </div>
         <div class="bgImg">
           <Title text="人口分析"></Title>
-          <rkfx :orgId="orgId" @handelClickRkfxPei="handelClickRkfxPei"/>
+          <rkfx :orgId="orgId" :orgType="orgLevel" @handelClickRkfxPei="handelClickRkfxPei"/>
         </div>
       </div>
 
@@ -682,19 +682,21 @@ export default {
           const category = data.categoryList[key];
           const categoryName = category.categoryName;
           const categoryCount = category.categoryCount;
-          const radio = categoryCount / resiCount * 100;
+          const radio = categoryCount?categoryCount / resiCount * 100:categoryCount;
+          console.log(radio, categoryCount,
+              resiCount, 'radioradioradio')
           if (categoryName == "OLD_PEOPLE_FLAG") {
-            this.perInfo.OLD_PEOPLE_FLAG = radio.toFixed(2);
+            this.perInfo.OLD_PEOPLE_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           } else if (categoryName == "PARTY_FLAG") {
-            this.perInfo.PARTY_FLAG = radio.toFixed(2);
+            this.perInfo.PARTY_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           } else if (categoryName == "UNEMPLOYED_FLAG") {
-            this.perInfo.UNEMPLOYED_FLAG = radio.toFixed(2);
+            this.perInfo.UNEMPLOYED_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           } else if (categoryName == "VOLUNTEER_FLAG") {
-            this.perInfo.VOLUNTEER_FLAG = radio.toFixed(2);
+            this.perInfo.VOLUNTEER_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           } else if (categoryName == "SUBSISTENCE_ALLOWANCE_FLAG") {
-            this.perInfo.SUBSISTENCE_ALLOWANCE_FLAG = radio.toFixed(2);
+            this.perInfo.SUBSISTENCE_ALLOWANCE_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           } else if (categoryName == "SPECIAL_CROWD_FLAG") {
-            this.perInfo.SPECIAL_CROWD_FLAG = radio.toFixed(2);
+            this.perInfo.SPECIAL_CROWD_FLAG = radio || radio === 0 ? radio.toFixed(2) : '--';
           }
         });
 

src/views/dataBoard/renfang/resi/analyze.vue

@@ -135,13 +135,15 @@ export default {
 
       displayedResiId: "",
       popupShow: false,
-      key: 'type'
+      key: 'type',
+      orgType: ''
     };
   },
 
   activated() {
     this.org_id = getQueryPara("org_id");
     this.resiType = getQueryPara("type");
+    this.orgType = getQueryPara("orgType");
     const type_name = getQueryPara("type_name");
     const type_category = getQueryPara("type_category");
     this.breadList[1].meta.title = type_name + "居民列表";
@@ -200,6 +202,7 @@ export default {
         ...this.query,
         [this.key]: this.resiType,
         agencyId: org_id,
+        orgType: this.orgType,
         pageNo,
         pageSize,
       };