diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
index 5f491b578..c31800aec 100644
--- a/src/views/dataBoard/renfang/cpts/rkfx.vue
+++ b/src/views/dataBoard/renfang/cpts/rkfx.vue
@@ -147,6 +147,9 @@ export default {
     },
     // 获取房屋总数等
     async getInfo() {
+      if(this.orgId==""){
+        return;
+      }
       const url = "/actual/base/peopleRoomOverview/getresidentAnalyze";
       this.$refs.pieChart.showLoading();
       const {
diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue
index 4653a10a6..c16457ca1 100644
--- a/src/views/dataBoard/renfang/resi/analyze.vue
+++ b/src/views/dataBoard/renfang/resi/analyze.vue
@@ -38,7 +38,7 @@
 import cptTb from "@/views/dataBoard/cpts/tb";
 import cptBread from "@/views/dataBoard/renfang/cpts/bread";
 import resiDetails from "@/views/dataBoard/cpts/resi-details";
-import { requestPostBi } from "@/js/dai/request-bipass";
+import {requestPost} from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
 export default {
@@ -80,6 +80,9 @@ export default {
       srcTableData: [],
       list: [],
 
+      query: {
+      },
+
       colList: [
         {
           align: "left",
@@ -144,7 +147,6 @@ export default {
 
     this.pageNo = 1;
     this.getList();
-    this.getCount();
   },
 
   methods: {
@@ -176,18 +178,20 @@ export default {
       const { org_id, resiType, pageNo, pageSize } = this;
       this.loading = true;
 
-      const url = "resident_analyze_list";
+      const url = "/actual/base/residentBaseInfo/page";
 
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id,
-            type: resiType,
+      //通过resiType判断要查询的条件
+      this.getQueryByResiType(resiType);
+
+      this.query = {
+            ...this.query,
+            agencyId:org_id,
             pageNo,
             pageSize,
-          },
-        },
+          };
+
+      const { data, code, msg } = await requestPost(
+        url,this.query,
         {
           // mockId: 60069169,
         }
@@ -196,20 +200,19 @@ export default {
       this.loading = false;
 
       if (code === 0) {
-        this.srcTableData = data;
-        // this.total = data.total;
-
-        this.list = data.map((item, index) => {
+        this.srcTableData = data.list;
+        this.total = data.total;
+       
+        this.list = data.list.map((item, index) => {
           return [
             index + 1,
-            item.user_name ? item.user_name : "--",
-            item.grid ? item.grid : "--",
-            item.house ? item.house : "--",
-            item.telephone ? item.telephone : "--",
-            item.idcard ? item.idcard : "--",
-            item.gender ? item.gender : "--",
+            item.name ? item.name : "--",
+            item.gridName ? item.gridName : "--",
+            item.homeName ? item.homeName : "--",
+            item.mobile ? item.mobile : "--",
+            item.idNum ? item.idNum : "--",
+            item.gender === "1" ? "男" : (item.gender === "2" ? "女" : "--"),
             item.birthday ? item.birthday : "--",
-
             { type: "operate", list: ["查看"] },
           ];
         });
@@ -218,32 +221,67 @@ export default {
       }
     },
 
-    async getCount() {
-      const { org_id, resiType, pageNo, pageSize } = this;
-
-      const url = "resident_analyze_list_total";
-
-      const { data, code, msg } = await requestPostBi(
-        url,
-        {
-          queryParam: {
-            org_id,
-            type: resiType,
-            pageNo,
-            pageSize,
-          },
-        },
-        {
-          // mockId: 63070408,
-        }
-      );
-
-      if (code === 0) {
-        this.total = parseInt(data[0].count);
-      } else {
-        this.$message.error(msg);
-      }
-    },
+    getQueryByResiType(resiType){
+    if(resiType == "male_count"){
+      this.query = {gender:"1" };
+    }else if (resiType == "female_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "local_count") {
+      this.query = {localResidenceFlag:"1" };
+    }else if (resiType == "field_count") {
+      this.query = {localResidenceFlag:"0" };
+    }else if (resiType == "resi_y_house_y_count") {
+      this.query = {householdSituation:"rhyz" };
+    }else if (resiType == "resi_y_house_n_count") {
+      this.query = {householdSituation:"rzhbz" };
+    }else if (resiType == "resi_n_house_y_count") {
+      this.query = {householdSituation:"hzrbz" };
+    }else if (resiType == "age50_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "age5059_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "age6069_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "age7079_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "age80_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "culture_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "committee_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "capable_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "friend_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "agent_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "mediator_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "collector_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "security_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "party_mem_count") {
+      this.query = {gender:"2" };
+    }else if (resiType == "primary_count") {
+      this.query = {cultureLevel:"0",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "junior_high_count") {
+      this.query = {cultureLevel:"1",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "second_speci_count") {
+      this.query = {cultureLevel:"2",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "high_school_count") {
+      this.query = {cultureLevel:"3",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "junior_college_count") {
+      this.query = {cultureLevel:"4",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "undergrad_count") {
+      this.query = {cultureLevel:"5",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "master_count") {
+      this.query = {cultureLevel:"6",categoryKey:"PARTY_FLAG"};
+    }else if (resiType == "doctor_count") {
+      this.query = {cultureLevel:"7",categoryKey:"PARTY_FLAG"};
+    }
+  },
   },
 
   destroyed() {