diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 97f89d650..912638956 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -637,8 +637,16 @@ export default {
 				this.searchModule.result = data.map((item) => {
 					let type = item.type || searchModule.resultTab;
 					let title = "";
+					let detailJson = {};
 					if (searchModule.resultTab == 0) {
 						title = item.name;
+						if (typeof item.detail_json == "string") {
+							try {
+								detailJson = JSON.parse(item.detail_json);
+							} catch (e) {
+								console.log(e);
+							}
+						}
 					} else if (type == "1") {
 						title = item.user_name;
 					} else if (type == "2") {
@@ -652,6 +660,7 @@ export default {
 					return {
 						title,
 						type,
+						...detailJson,
 						...item,
 					};
 				});
diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue
index 3cdf7390f..2a98b3571 100644
--- a/src/views/dataBoard/renfang/warn/building.vue
+++ b/src/views/dataBoard/renfang/warn/building.vue
@@ -30,7 +30,7 @@
 			></cpt-tb>
 		</div>
 
-		<resi-list :building_id="displayedId" v-if="displayedId" />
+		<resi-list :building_id="displayedId" :resident_type="type_id" v-if="displayedId" />
 	</div>
 </template>
 
@@ -205,9 +205,9 @@ export default {
 					return [
 						index + 1,
 						item.grid ? item.grid : "--",
+						item.village ? item.village : "--",
 						item.building ? item.building : "--",
-						item.unit ? item.unit : "--",
-						item.door ? item.door : "--",
+						item.warn_num ? item.warn_num : "--",
 
 						{ type: "operate", list: ["查看人员"] },
 					];
diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue
index 4c1a9ad4d..2bf578135 100644
--- a/src/views/dataBoard/renfang/warn/resi.vue
+++ b/src/views/dataBoard/renfang/warn/resi.vue
@@ -44,6 +44,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		resident_type: {
+			type: String,
+			default: "",
+		},
 	},
 
 	components: {
@@ -57,12 +61,12 @@ export default {
 			tableTitle: "预警人员列表",
 			searchName: "",
 
-			orgLevel: "",
-			org_id: "",
-			type_id: "", // 预警人员列表
+			resident_type: "",
+			building_id: "", // 预警人员列表
 
 			loading: true,
-			pageSize: parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
+			pageSize:
+				parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
 			pageNo: 1,
 			total: 0,
 			srcTableData: [],
@@ -146,17 +150,17 @@ export default {
 		},
 
 		async getList() {
-			const { org_id, type_id, pageNo, pageSize } = this;
+			const { resident_type, building_id, pageNo, pageSize } = this;
 			this.loading = true;
 
-			const url = "resident_class_list";
+			const url = "building_resident_list";
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
-						org_id,
-						type_id,
+						resident_type,
+						building_id,
 						pageNo,
 						pageSize,
 					},
@@ -192,16 +196,16 @@ export default {
 		},
 
 		async getCount() {
-			const { org_id, type_id, pageNo, pageSize } = this;
+			const { resident_type, building_id, pageNo, pageSize } = this;
 
-			const url = "resident_class_list_total";
+			const url = "building_resident_list_total";
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
-						org_id,
-						type_id,
+						resident_type,
+						building_id,
 						pageNo,
 						pageSize,
 					},
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index ae5a035a7..cce171821 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -315,6 +315,7 @@ export default {
       let params = {
         templateId: id || '',
         searchForm: {...this.search},
+        formCode: 'resident_base_info',
         exportConfig: {
           ...this.form,
           formCode: 'resident_base_info',