资源部分剩下的mock

src/views/dataBoard/sida/zy/gexingDetail.vue

@@ -99,7 +99,7 @@ export default {
 		return {
 			progress: [],
 			info: {},
-			title: '事件',
+			title: '个性服务详情',
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			currentTabIndex2: 0,
@@ -135,7 +135,7 @@ export default {
 					user_demand_id: this.detailId
 				},
 				{
-					// mockId: 60235478,
+					mockId: 69964568,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/gexingList.vue

@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
 export default {
 	name: 'event-list',
 	props: {
-		detailId: {
+		id: {
 			type: String,
 			default: ''
 		},
@@ -35,7 +35,7 @@ export default {
 	},
 	components: {
 		cptTb,
-		cptBread,
+
 		detail
 	},
 
@@ -43,10 +43,8 @@ export default {
 		return {
 			detailId: '',
 			searchDate: '',
-
 			org_id: '',
 			listType: '', // 流动 常驻 全部
-
 			loading: true,
 			page_size: parseInt(localStorage.getItem('dataBoard_page_size')) || 20,
 
@@ -57,27 +55,23 @@ export default {
 
 			colList: [
 				{
-					align: 'left',
-					width: '5%'
+					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 				{
 					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
+
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 
 				{
@@ -88,14 +82,7 @@ export default {
 			header: ['序号', '服务时间', '需求类型', '需求内容', '满意度', '状态', '操作']
 		};
 	},
-
-	activated() {
-		this.org_id = getQueryPara('org_id');
-		this.listType = getQueryPara('type');
-		this.type2 = getQueryPara('type2');
-		this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
-		this.page_num = 1;
-		// this.getDate();
+	created() {
 		this.init();
 	},
 
@@ -105,9 +92,9 @@ export default {
 		},
 
 		showInfo(index) {
-			// let item = this.srcTableData[index];
-			// this.detailType = item.peop_child_type;
-			// this.detailId = item.user_demand_id;
+			let item = this.srcTableData[index];
+			this.detailType = item.peop_child_type;
+			this.detailId = item.user_demand_id;
 			// ceshi
 			// this.detailType = '志愿者';
 			// this.detailId = '1501821704551272449';
@@ -125,9 +112,8 @@ export default {
 		},
 
 		async getList() {
+			console.log('this.srcTableData 444444444444564743534');
 			const { org_id, listType, page_num, page_size, searchDate } = this;
-			const start_date = searchDate[0];
-			const end_date = searchDate[1];
 
 			let peop_type = this.type2;
 
@@ -142,7 +128,7 @@ export default {
 					}
 				},
 				{
-					// mockId: 60068051,
+					mockId: 69844538
 				}
 			);
 
@@ -150,9 +136,8 @@ export default {
 
 			if (code === 0) {
 				this.srcTableData = data;
-				console.log('this.srcTableData ', this.srcTableData);
-				// this.total = data.total;
-				// service_num   avg_satisfaction
+				console.log('this.srcTableData 4444444444444', this.srcTableData);
+
 				this.list = data.map((item, index) => {
 					return [
 						index + 1,
@@ -162,7 +147,7 @@ export default {
 						item.content ? item.content : '--',
 						item.score ? item.score : '--',
 						item.demand_status ? item.demand_status : '--',
-// 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished；
+						// 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished；
 						{ type: 'operate', list: ['查看'] }
 					];
 				});
@@ -171,18 +156,6 @@ export default {
 			} else {
 				this.$message.error(msg);
 			}
-			this.list = [
-				{
-					index: 1,
-					peop_name: '置南于可',
-					peop_child_type: 'in nostrud commodo dolore',
-					service_num: 57,
-					service_ratio: 94,
-					avg_satisfaction: 65,
-					sum_point: 63,
-					'': { type: 'operate', list: ['查看'] }
-				}
-			];
 		},
 
 		async getCount() {
@@ -195,10 +168,8 @@ export default {
 				url,
 				{
 					queryParam: {
-						org_id,
-						start_date,
-						end_date,
-						peop_type
+						user_demand_id: this.id,
+						service_type: this.detailType
 					}
 				},
 				{

src/views/dataBoard/sida/zy/gonggongDetail.vue

@@ -76,7 +76,7 @@ export default {
 		return {
 			progress: [],
 			info: {},
-			title: '事件',
+			title: '公共服务详情',
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			currentTabIndex2: 0,
@@ -112,7 +112,7 @@ export default {
 					service_record_id: this.detailId
 				},
 				{
-					// mockId: 60235478,
+					mockId: 69980718,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/gonggongList.vue

@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
 export default {
 	name: 'event-list',
 	props: {
-		detailId: {
+		id: {
 			type: String,
 			default: ''
 		},
@@ -35,7 +35,7 @@ export default {
 	},
 	components: {
 		cptTb,
-		cptBread,
+
 		detail
 	},
 
@@ -54,30 +54,25 @@ export default {
 			total: 0,
 			srcTableData: [],
 			list: [],
-			sourceName: '0',//0公共服务，1共性需求，2政策找人 3服务找人
+			sourceName: '0', //0公共服务，1共性需求，2政策找人 3服务找人
 			colList: [
 				{
-					align: 'left',
-					width: '5%'
+					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 				{
 					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 				{
-					align: 'left',
-					width: '10%'
+					align: 'left'
 				},
 
 				{
@@ -88,15 +83,8 @@ export default {
 			header: ['序号', '服务时间', '服务名称', '服务范围', '满意度', '状态', '操作']
 		};
 	},
-
-	activated() {
-		this.org_id = getQueryPara('org_id');
-		this.listType = getQueryPara('type');
-		this.type2 = getQueryPara('type2');
-		this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
-		this.page_num = 1;
-		// this.getDate();
-		this.init();
+	created() {
+		this.init() 
 	},
 
 	methods: {
@@ -105,10 +93,10 @@ export default {
 		},
 
 		showInfo(index) {
-			// let item = this.srcTableData[index];
-			// this.detailType = item.peop_child_type;
-			// this.detailId = item.service_record_id;
-			// ceshi
+			let item = this.srcTableData[index];
+			this.detailType = item.peop_child_type;
+			this.detailId = item.service_record_id;
+
 			// this.detailType = '志愿者';
 			// this.detailId = '1501821704551272449';
 		},
@@ -137,13 +125,13 @@ export default {
 				url,
 				{
 					queryParam: {
-						service_org_id: this.detailId,
+						service_org_id: this.id,
 						service_org_type: this.detailType,
-						source_name: this.sourceName
+						source_name: '0'
 					}
 				},
 				{
-					// mockId: 60068051,
+					mockId: 69852161
 				}
 			);
 
@@ -152,39 +140,25 @@ export default {
 			if (code === 0) {
 				this.srcTableData = data;
 				console.log('this.srcTableData ', this.srcTableData);
-				// this.total = data.total;
-				// service_num   avg_satisfaction
+
 				this.list = data.map((item, index) => {
 					return [
 						index + 1,
-						// item.service_record_id ? item.service_record_id : '--',
-						// item.user_demand_id ? item.user_demand_id : '--',
+						// service_record_id
 						item.service_time ? item.service_time : '--',
 						item.service_name ? item.service_name : '--',
 						item.scope_name ? item.scope_name : '--',
+						item.score ? item.score : '--',
 						item.demand_status ? item.demand_status : '--',
-						
 						// 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished；
 						{ type: 'operate', list: ['查看'] }
 					];
 				});
 
-				console.log('this.list', this.list);
+				console.log('公共', this.list);
 			} else {
 				this.$message.error(msg);
 			}
-			this.list = [
-				{
-					index: 1,
-					peop_name: '置南于可',
-					peop_child_type: 'in nostrud commodo dolore',
-					service_num: 57,
-					service_ratio: 94,
-					avg_satisfaction: 65,
-					sum_point: 63,
-					'': { type: 'operate', list: ['查看'] }
-				}
-			];
 		},
 
 		async getCount() {
@@ -204,7 +178,7 @@ export default {
 					}
 				},
 				{
-					// mockId: 63070189,
+					mockId: 63070189
 				}
 			);
 

src/views/dataBoard/sida/zy/lianjianDetail.vue

@@ -59,10 +59,12 @@
 					</div>
 					<div class="item">
 						<div class="field">活动地图：</div>
-						<div class="value"><div style="position: relative;width: 100%;height: 300px;" id="map"></div></div>
+						<div class="value"></div>
 					</div>
 				</div>
+				<div style="position: relative;width: 100%;height: 300px;" id="map"></div>
 			</div>
+			
 		</template>
 	</popup>
 </template>
@@ -92,7 +94,7 @@ export default {
 		return {
 			progress: [],
 			info: {},
-			title: '事件',
+			title: '联建活动详情',
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			currentTabIndex2: 0,
@@ -123,7 +125,8 @@ export default {
 				map: new GaodeMap({
 					pitch: 35.210526315789465,
 					style: 'dark',
-					center: [this.info.latitude, this.info.longitude],
+					// center: [this.info.latitude, this.info.longitude],
+					center: [120.11,36.555],
 					zoom: 4.4
 				})
 			});
@@ -138,7 +141,7 @@ export default {
 					service_record_id: this.detailId
 				},
 				{
-					// mockId: 60235478,
+					mockId: 69994184,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/lianjianList.vue

@@ -24,7 +24,7 @@ import getQueryPara from 'dai-js/modules/getQueryPara';
 export default {
 	name: 'event-list',
 	props: {
-		detailId: {
+		id: {
 			type: String,
 			default: ''
 		},
@@ -35,7 +35,7 @@ export default {
 	},
 	components: {
 		cptTb,
-		cptBread,
+		
 		detail
 	},
 
@@ -88,16 +88,10 @@ export default {
 			header: ['序号', '服务时间', '网格', '活动地址', '活动标题', '人数', '操作']
 		};
 	},
-
-	activated() {
-		this.org_id = getQueryPara('org_id');
-		this.listType = getQueryPara('type');
-		this.type2 = getQueryPara('type2');
-		this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')];
-		this.page_num = 1;
-		// this.getDate();
-		this.init();
-	},
+created() {
+	this.init() 
+},
+	
 
 	methods: {
 		init() {
@@ -105,9 +99,9 @@ export default {
 		},
 
 		showInfo(index) {
-			// let item = this.srcTableData[index];
+			let item = this.srcTableData[index];
 			// this.detailType = item.peop_child_type;
-			// this.detailId = item.service_record_id;
+			this.detailId = item.service_record_id;
 			// ceshi
 			// this.detailType = '志愿者';
 			// this.detailId = '1501821704551272449';
@@ -139,11 +133,11 @@ export default {
 					queryParam: {
 						service_org_id: this.detailId,
 						service_org_type: this.detailType,
-						source_name: this.sourceName
+						source_name:'0'
 					}
 				},
 				{
-					// mockId: 60068051,
+					mockId: 69950764,
 				}
 			);
 

src/views/dataBoard/sida/zy/peopleRes-detail.vue

@@ -48,6 +48,86 @@
 					</div>
 				</div>
 			</div>
+			<div class="m-info" v-if="detailType == '社区自组织'">
+				<div class="subtitle">
+					<i class="i-chunk"></i>
+					基本信息
+					<i class="i-line"></i>
+				</div>
+				<div class="row">
+					<div class="item">
+						<div class="field">组织名称：</div>
+						<div class="value">{{ info.organization_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">组织人数：</div>
+						<div class="value">{{ info.organization_person_count }}</div>
+					</div>
+					<div class="item">
+						<div class="field">服务事项：</div>
+						<div class="value">{{ info.service_item }}</div>
+					</div>
+					<div class="item">
+						<div class="field">联系人：</div>
+						<div class="value">{{ info.principal_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">联系电话：</div>
+						<div class="value">{{ info.principal_phone }}</div>
+					</div>
+				</div>
+			</div>
+			<div class="m-info" v-if="detailType == '联建单位'">
+				<div class="subtitle">
+					<i class="i-chunk"></i>
+					基本信息
+					<i class="i-line"></i>
+				</div>
+				<div class="row">
+					<div class="item">
+						<div class="field">单位名称：</div>
+						<div class="value">{{ info.unit_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">组织：</div>
+						<div class="value">{{ info.agency }}</div>
+					</div>
+					<div class="item">
+						<div class="field">服务事项 ：</div>
+						<div class="value">{{ info.service_matter }}</div>
+					</div>
+					<div class="item">
+						<div class="field">地址：</div>
+						<div class="value">{{ info.address }}</div>
+					</div>
+					<div class="item">
+						<div class="field">联系人：</div>
+						<div class="value">{{ info.contact }}</div>
+					</div>
+					<div class="item">
+						<div class="field">联系电话：</div>
+						<div class="value">{{ info.contact_mobile }}</div>
+					</div>
+				</div>
+			</div>
+			<div class="m-info">
+				<div class="subtitle">
+					<i class="i-chunk"></i>
+					更多信息
+					<i class="i-line"></i>
+				</div>
+				<div class="m-tabs">
+					<div class="tab"  v-if="index!=2|| detailType == '联建单位'" :class="currentTabIndex == index ? 'z-on' : ''" :key="'tab' + index" @click="currentTab = item" v-for="(item, index) in tabList">
+						{{ item }}
+					</div>
+				</div>
+				<div v-if="currentTab == '个性服务'"><gexingList :id="detailId" :detailType="detailType"></gexingList></div>
+				<div v-if="currentTab == '公共服务'"><gonggongList :id="detailId" :detailType="detailType" v-if="detailId != '' || detailType == '联建单位'"></gonggongList></div>
+				<div v-if="currentTab == '联建活动' && detailType == '联建单位'">
+					<lianjianList :id="detailId" :detailType="detailType"></lianjianList>
+					
+				</div>
+			</div>
 		</template>
 	</popup>
 </template>
@@ -57,7 +137,9 @@ import { Scene } from '@antv/l7';
 import popup from '@/views/dataBoard/cpts/popup';
 import { GaodeMap, Map } from '@antv/l7-maps';
 import { requestPostBi } from '@/js/dai/request-bipass';
-
+import lianjianList from './lianjianList.vue';
+import gexingList from './gexingList.vue';
+import gonggongList from './gonggongList.vue';
 export default {
 	name: 'eventdetail',
 	props: {
@@ -71,30 +153,31 @@ export default {
 		}
 	},
 
-	components: { popup },
+	components: { popup, lianjianList, gexingList, gonggongList },
 	created() {},
 	data() {
 		return {
 			progress: [],
 			info: {},
 			title: '人资源详情',
+			currentTab:"个性服务",
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			currentTabIndex2: 0,
 			startTabIndex2: 0,
 
-			tabList: [],
+			tabList: ['个性服务', '公共服务', '联建活动'],
 			tabList2: [],
 			userArray: [],
 			userList: {},
 			loading: true,
 			page_size: parseInt(localStorage.getItem('dataBoard_page_size')) || 20,
-			
+
 			page_num: 1,
 			total: 0,
 			srcTableData: [],
 			list: [],
-			
+
 			colList: [
 				{
 					align: 'left',
@@ -119,7 +202,7 @@ export default {
 					align: 'left',
 					width: '10%'
 				},
-				
+
 				{
 					align: 'left',
 					width: '10%'
@@ -164,23 +247,21 @@ export default {
 		async getInfo() {
 			let url = '';
 			let queryParam = {};
-			let mockId=0;
+			let mockId = 0;
 			console.log('this.detailId', this.detailId);
+			this.title = this.detailType + '详情';
 			if (this.detailType == '志愿者') {
 				url = 'resident_info';
-				this.title = '志愿者详情';
 				queryParam.resident_id = this.detailId;
-				mockId=0;
+				mockId = 0;
 			} else if (this.detailType == '社区自组织') {
 				url = 'self_org';
-				this.title = '社区自组织详情';
 				queryParam.self_org_id = this.detailId;
-				mockId=69828071;
+				mockId = 69828071;
 			} else if (this.detailType == '联建单位') {
 				url = 'party_unit';
-				this.title = '联建单位详情';
 				queryParam.party_unit_id = this.detailId;
-				mockId=69802377;
+				mockId = 69802377;
 			}
 
 			const { data, code, msg } = await requestPostBi(
@@ -189,7 +270,7 @@ export default {
 					queryParam: queryParam
 				},
 				{
-					mockId: mockId,
+					mockId: mockId
 				}
 			);
 			if (code === 0) {
@@ -198,9 +279,7 @@ export default {
 			} else {
 				this.$message.error(msg);
 			}
-		},
-		
-		
+		}
 	}
 };
 </script>

src/views/dataBoard/sida/zy/peopleResList.vue

@@ -175,9 +175,9 @@ export default {
 		showInfo(index) {
 			let item = this.srcTableData[index];
 			// this.detailType = item.peop_child_type;
-			this.detailType = this.type2
+			this.detailType = this.type2;
 			this.detailId = item.peop_id;
-			console.log("item",item)
+			console.log('item', item);
 			// this.detailType = '志愿者';
 			// this.detailId = '1501821704551272449';
 		},

src/views/dataBoard/sida/zy/placeRes-detail.vue

@@ -1,736 +1,54 @@
 <template>
 	<popup :title="title" @close="handleClose">
 		<template v-slot:cnt>
-			<div class="m-info" v-if="detailType == '生产隐患'">
+			<div class="m-info">
 				<div class="row">
 					<div class="item">
 						<div class="field">场所名称：</div>
-						<div class="value">{{ info.place_org_name }}</div>
+						<div class="value">{{ info.place_name }}</div>
 					</div>
 
 					<div class="item">
-						<div class="field">占地面积：</div>
-						<div class="value">{{ info.area_covered }}</div>
+						<div class="field">场所规模 ：</div>
+						<div class="value">{{ info.place_code }}</div>
 					</div>
-
-					<div class="item">
-						<div class="field">场所规模：</div>
-						<div class="value">{{ info.scale_total }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">所属组织：</div>
-						<div class="value">{{ info.grid }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">场所类别：</div>
-						<div class="value">{{ info.place_category }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">场所类型：</div>
-						<div class="value">{{ info.place_type }}</div>
-					</div>
-
 					<div class="item">
 						<div class="field">负责人：</div>
-						<div class="value">{{ info.person_in_charge }}</div>
+						<div class="value">{{ info.user_name }}</div>
 					</div>
 
 					<div class="item">
 						<div class="field">联系电话：</div>
-						<div class="value">{{ info.mobile }}</div>
+						<div class="value">{{ info.telephone }}</div>
 					</div>
 
 					<div class="item">
-						<div class="field">场所地址：</div>
-						<div class="value">{{ info.mobile }}</div>
-					</div>
-					<div style="position: relative;width: 100%;height: 300px;" id="map"></div>
-					<div class="item">
-						<div class="field"></div>
-						<div class="value">{{ info.longitude }}{{ info.latitude }}</div>
-					</div>
-				</div>
-			</div>
-			<div class="m-info" v-if="detailType == '发现问题'">
-				<div class="row">
-					<div class="item">
-						<div class="field">隐患场所：</div>
-						<div class="value">{{ info.danger_place_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">隐患内容：</div>
-						<div class="value">{{ info.danger_content }}</div>
-					</div>
-					<div class="item">
-						<div class="field">所属组织：</div>
-						<div class="value">{{ info.grid }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">上报人：</div>
-						<div class="value">{{ info.report_person }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ info.mobile }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">上报时间：</div>
-						<div class="value">{{ info.report_time }}</div>
-					</div>
-				</div>
-			</div>
-			<div class="m-info" v-if="detailType == '群租房'">
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					基本信息
-					<i class="i-line"></i>
-				</div>
-				<div class="row">
-					<div class="item">
-						<div class="field">房屋名称：</div>
-						<!-- <div class="value">{{ info.grid }}</div> -->
+						<div class="field">所处位置：</div>
+						<div class="value">{{ info.location }}</div>
 					</div>
 					<div class="item">
-						<div class="field">房屋类型：</div>
-						<div class="value">{{ info.parent_category }} {{ info.category }}</div>
+						<div class="field">所属组织 ：</div>
+						<div class="value">{{ info.agency_name }}</div>
 					</div>
 					<div class="item">
-						<div class="field">房屋用途：</div>
-						<div class="value">{{ info.house_type }}</div>
-					</div>
-					<div class="item">
-						<div class="field">房屋状态：</div>
-						<div class="value">{{ info.house_state }}</div>
-					</div>
-					<div class="item">
-						<div class="field">房主姓名：</div>
-						<div class="value">{{ info.homeowner }}</div>
-					</div>
-					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ info.homeowner_telep }}</div>
-					</div>
-					<div class="item">
-						<div class="field">证件号：</div>
-						<div class="value">{{ info.homeowner_idcard }}</div>
-					</div>
-				</div>
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					人员信息
-					<i class="i-line"></i>
-				</div>
-				<div class="m-tabs">
-					<div class="tab-btn" @click="subStartTabIndex2" v-if="userArray.length > 7"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
-					<div
-						v-for="(item, index) in userArray"
-						class="tab"
-						:class="currentTabIndex2 % userArray.length == index ? 'z-on' : ''"
-						:key="'tab' + index"
-						v-show="index >= startTabIndex2 && index < startTabIndex2 + 7"
-						@click="(currentTabIndex2 = index), gettab2(item)"
-					>
-						{{ item.name }}
-					</div>
-					<div class="tab-btn" @click="addStartTabIndex2" v-if="userArray.length > 7"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
-				</div>
-				<div class="row">
-					<div class="item">
-						<div class="field">姓名：</div>
-						<div class="value">{{ userList.name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ userList.telephoneidcard }}</div>
-					</div>
-					<div class="item">
-						<div class="field">证件号：</div>
-						<div class="value">{{ userList.idcard }}</div>
-					</div>
-					<div class="item">
-						<div class="field">本地户籍：</div>
-						<div class="value">{{ userList.content }}</div>
-					</div>
-					<div class="item">
-						<div class="field">性别：</div>
-						<div class="value">{{ userList.gender }}</div>
+						<div class="field">场所类型 ：</div>
+						<div class="value">{{ info.place_category }}</div>
 					</div>
 					<div class="item">
-						<div class="field">出生日期：</div>
-						<div class="value">{{ userList.birthday }}</div>
+						<div class="field">场所类别：</div>
+						<div class="value">{{ info.child_place_type }}</div>
 					</div>
 					<div class="item">
-						<div class="field">民族：</div>
-						<div class="value">{{ userList.ethnic }}</div>
+						<div class="field">占地面积 ：</div>
+						<div class="value">{{ info.place_area }}</div>
 					</div>
-					<!-- <div class="item">
-						<div class="field">居民类别：</div>
-						<div class="value">{{ userList.content }}</div>
-					</div> -->
 					<div class="item">
 						<div class="field">备注：</div>
-						<div class="value">{{ userList.resident_remark }}</div>
-					</div>
-				</div>
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					<span>分类信息</span>
-					<i class="i-line"></i>
-				</div>
-
-				<div class="row">
-					<div class="item">
-						<div class="field">居民分类：</div>
-						<div class="value">
-							<div class="u-categorys">
-								<span v-if="userList.crowd != '0'">党员</span>
-								<span v-if="userList.mlsp != '0'">低保人员</span>
-								<span v-if="userList.srs != '0'">保障房人员</span>
-								<span v-if="userList.unemployed != '0'">失业人员</span>
-								<span v-if="userList.woca != '0'">育龄妇女</span>
-								<span v-if="userList.exs != '0'">退役军人</span>
-								<span v-if="userList.ufs != '0'">统战人员</span>
-								<span v-if="userList.petitioner != '0'">信访人员</span>
-								<span v-if="userList.volunteer != '0'">志愿者</span>
-								<span v-if="userList.in_person != '0'">特扶人员</span>
-								<span v-if="userList.tenant != '0'">租户</span>
-								<span v-if="userList.float_popu != '0'">流动人口</span>
-								<span v-if="userList.special_popu != '0'">特殊人群</span>
-								<span v-if="userList.aaaa != '0'">独居老人</span>
-								<span v-if="userList.empty_nest != '0'">空巢老人</span>
-								<span v-if="userList.disability != '0'">失能老人</span>
-								<span v-if="userList.dementia != '0'">失智老人</span>
-								<span v-if="userList.adisability != '0'">残疾</span>
-								<span v-if="userList.ser_ill != '0'">大病</span>
-								<span v-if="userList.ncd != '0'">慢病</span>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					<span>其他信息</span>
-					<i class="i-line"></i>
-				</div>
-
-				<div class="m-tabs">
-					<div class="tab-btn" @click="subStartTabIndex" v-if="tabList.length > 7"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
-					<div
-						v-show="index >= startTabIndex && index < startTabIndex + 7"
-						class="tab"
-						:class="currentTabIndex % tabList.length == index ? 'z-on' : ''"
-						:key="'tab' + index"
-						@click="currentTabIndex = index"
-						v-for="(item, index) in tabList"
-					>
-						{{ item }}
-					</div>
-					<div class="tab-btn" @click="addStartTabIndex" v-if="tabList.length > 7"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
-				</div>
-
-				<div v-if="currentTab == '教育信息'">
-					<div class="row">
-						<div class="item">
-							<div class="field">文化程度：</div>
-							<div class="value">{{ userList.education }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.education_remark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '兴趣爱好'">
-					<div class="row">
-						<div class="item">
-							<div class="field">兴趣：</div>
-							<div class="value">{{ userList.hobby }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.hobby_remark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '宗教'">
-					<div class="row">
-						<div class="item">
-							<div class="field">宗教：</div>
-							<div class="value">{{ userList.belief }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.belief_remark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '健康'">
-					<div class="row">
-						<div class="item">
-							<div class="field">残疾类别：</div>
-							<div class="value">{{ userList.disable_type }}</div>
-						</div>
-						<div class="item">
-							<div class="field">残疾等级：</div>
-							<div class="value">{{ userList.disable_degree }}</div>
-						</div>
-						<div class="item">
-							<div class="field">残疾证号：</div>
-							<div class="value">{{ userList.disable_idcard }}</div>
-						</div>
-						<div class="item">
-							<div class="field">残疾说明：</div>
-							<div class="value">{{ userList.disable_remark }}</div>
-						</div>
-						<div class="item">
-							<div class="field">监护人：</div>
-							<div class="value">{{ userList.guardian }}</div>
-						</div>
-						<div class="item">
-							<div class="field">劳动能力：</div>
-							<div class="value">{{ userList.skill }}</div>
-						</div>
-						<div class="item">
-							<div class="field">非义务教育阶段助学：</div>
-							<div class="value">{{ userList.voluntaryEducationFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">所患大病：</div>
-							<div class="value">{{ userList.voluntaryEducationFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">大病患病时间：</div>
-							<div class="value">{{ userList.illnessCode }}</div>
-						</div>
-						<div class="item">
-							<div class="field">所患慢性病：</div>
-							<div class="value">{{ userList.chronicDiseaseCode }}</div>
-						</div>
-						<div class="item">
-							<div class="field">慢病患病时间：</div>
-							<div class="value">{{ userList.chronicDiseaseTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否参保：</div>
-							<div class="value">{{ userList.chronicDiseaseTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">自付金额：</div>
-							<div class="value">{{ userList.selfPayAmount }}</div>
-						</div>
-						<div class="item">
-							<div class="field">救助金额：</div>
-							<div class="value">{{ userList.selfPayAmount }}</div>
-						</div>
-						<div class="item">
-							<div class="field">救助时间：</div>
-							<div class="value">{{ userList.deliveranceAmount }}</div>
-						</div>
-						<div class="item">
-							<div class="field">享受救助明细序号：</div>
-							<div class="value">{{ userList.deliveranceTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.deliveranceNum }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '工作'">
-					<div class="row">
-						<div class="item">
-							<div class="field">工作单位：</div>
-							<div class="value">{{ userList.workunit }}</div>
-						</div>
-						<div class="item">
-							<div class="field">职业：</div>
-							<div class="value">{{ userList.career }}</div>
-						</div>
-						<div class="item">
-							<div class="field">离退休时间：</div>
-							<div class="value">{{ userList.retire_date }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.retire_remark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '经济状况'">
-					<div class="row">
-						<div class="item">
-							<div class="field">退休金额：</div>
-							<div class="value">{{ userList.retire_income }}</div>
-						</div>
-						<div class="item">
-							<div class="field">月收入：</div>
-							<div class="value">{{ userList.income }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '居住'">
-					<div class="row">
-						<div class="item">
-							<div class="field">籍贯：</div>
-							<div class="value">{{ userList.native }}</div>
-						</div>
-						<div class="item">
-							<div class="field">户籍所在地：</div>
-							<div class="value">{{ userList.native_place }}</div>
-						</div>
-						<div class="item">
-							<div class="field">现居住地：</div>
-							<div class="value">{{ userList.residence_current }}</div>
-						</div>
-						<div class="item">
-							<div class="field">人户状况：</div>
-							<div class="value">{{ userList.household }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.household_remark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '家庭'">
-					<div class="row">
-						<div class="item">
-							<div class="field">与户主关系：</div>
-							<div class="value">{{ userList.holdingrel }}</div>
-						</div>
-						<div class="item">
-							<div class="field">居住情况：</div>
-							<div class="value">{{ userList.residence }}</div>
-						</div>
-						<div class="item">
-							<div class="field">婚姻状况：</div>
-							<div class="value">{{ userList.marital }}</div>
-						</div>
-						<div class="item">
-							<div class="field">配偶状况：</div>
-							<div class="value">{{ userList.spouse }}</div>
-						</div>
-						<div class="item">
-							<div class="field">有无赡养人：</div>
-							<div class="value">{{ userList.supporters }}</div>
-						</div>
-						<div class="item">
-							<div class="field">与赡养人关系：</div>
-							<div class="value">{{ userList.supporters_relation }}</div>
-						</div>
-						<div class="item">
-							<div class="field">赡养人联系电话：</div>
-							<div class="value">{{ userList.dependantMobile }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.familyInfoRemark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '党员'">
-					<div class="row">
-						<div class="item">
-							<div class="field">入党时间：</div>
-							<div class="value">{{ userList.joinTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">转正时间：</div>
-							<div class="value">{{ userList.positiveTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">所属支部：</div>
-							<div class="value">{{ userList.branchId }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否流动党员：</div>
-							<div class="value">{{ userList.flowFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">流动党员活动证号：</div>
-							<div class="value">{{ userList.flowActNum }}</div>
-						</div>
-						<div class="item">
-							<div class="field">职务：</div>
-							<div class="value">{{ userList.partyJob }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否退休：</div>
-							<div class="value">{{ userList.retiredFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否党员中心户：</div>
-							<div class="value">{{ userList.centerFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">入党时所在党支部：</div>
-							<div class="value">{{ userList.joinBranchName }}</div>
-						</div>
-						<div class="item">
-							<div class="field">组织关系转入社区时间：</div>
-							<div class="value">{{ userList.joinCommunityTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否请长假：</div>
-							<div class="value">{{ userList.longHolidayFlag }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '保障房'">
-					<div class="row">
-						<div class="item">
-							<div class="field">住房性质：</div>
-							<div class="value">{{ userList.housingNature }}</div>
-						</div>
-						<div class="item">
-							<div class="field">保障类型：</div>
-							<div class="value">{{ userList.securityType }}</div>
-						</div>
-						<div class="item">
-							<div class="field">发证日期：</div>
-							<div class="value">{{ userList.certificateDate }}</div>
-						</div>
-						<div class="item">
-							<div class="field">补贴编号：</div>
-							<div class="value">{{ userList.subsidyNum }}</div>
-						</div>
-						<div class="item">
-							<div class="field">补贴金额：</div>
-							<div class="value">{{ userList.subsidyAmount }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '失业'">
-					<div class="row">
-						<div class="item">
-							<div class="field">原工作单位：</div>
-							<div class="value">{{ userList.originWorkUnit }}</div>
-						</div>
-						<div class="item">
-							<div class="field">失业时间：</div>
-							<div class="value">{{ userList.unemploymentTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">失业证号：</div>
-							<div class="value">{{ userList.unemploymentTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">再就业优惠证号：</div>
-							<div class="value">{{ userList.employmentNum }}</div>
-						</div>
-						<div class="item">
-							<div class="field">技术特长：</div>
-							<div class="value">{{ userList.specialSkill }}</div>
-						</div>
-						<div class="item">
-							<div class="field">失业原因：</div>
-							<div class="value">{{ userList.unemploymentReason }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否就业困难对象：</div>
-							<div class="value">{{ userList.employmentHardFlag }}</div>
-						</div>
-						<div class="item">
-							<div class="field">劳动能力就业愿望：</div>
-							<div class="value">{{ userList.employmentWish }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '退役军人'">
-					<div class="row">
-						<div class="item">
-							<div class="field">入伍时间：</div>
-							<div class="value">{{ userList.joinArmyTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">退伍时间：</div>
-							<div class="value">{{ userList.leaveArmyTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">服役单位：</div>
-							<div class="value">{{ userList.serviceUnit }}</div>
-						</div>
-						<div class="item">
-							<div class="field">接收单位：</div>
-							<div class="value">{{ userList.receiveUnit }}</div>
-						</div>
-						<div class="item">
-							<div class="field">待安置补助金：</div>
-							<div class="value">{{ userList.settlementAmount }}</div>
-						</div>
-						<div class="item">
-							<div class="field">培训状况：</div>
-							<div class="value">{{ userList.trainDesc }}</div>
-						</div>
-						<div class="item">
-							<div class="field">参战时间开始日期：</div>
-							<div class="value">{{ userList.joinWarStartTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">参战时间截止日期：</div>
-							<div class="value">{{ userList.joinWarEndTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">现就业状况：</div>
-							<div class="value">{{ userList.employmentSituation }}</div>
-						</div>
-						<div class="item">
-							<div class="field">是否办理公益性岗位：</div>
-							<div class="value">{{ userList.pubWelfareJobFlag }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '统战人员'">
-					<div class="row">
-						<div class="item">
-							<div class="field">职务：</div>
-							<div class="value">{{ userList.duty }}</div>
-						</div>
-						<div class="item">
-							<div class="field">探亲情况：</div>
-							<div class="value">{{ userList.visitation }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '志愿者'">
-					<div class="row">
-						<div class="item">
-							<div class="field">志愿者类别：</div>
-							<div class="value">{{ userList.volunteerCategory }}</div>
-						</div>
-						<div class="item">
-							<div class="field">备注：</div>
-							<div class="value">{{ userList.volunteerRemark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '老年人'">
-					<div class="row">
-						<div class="item">
-							<div class="field">高龄补助：</div>
-							<div class="value">{{ userList.volunteerRemark }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '特殊人群'">
-					<div class="row">
-						<div class="item">
-							<div class="field">特殊人群类别：</div>
-							<div class="value">{{ userList.specialCategoryCode }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '出生信息'">
-					<div class="row">
-						<div class="item">
-							<div class="field">出生地：</div>
-							<div class="value">{{ userList.birthplace }}</div>
-						</div>
-						<div class="item">
-							<div class="field">父亲姓名：</div>
-							<div class="value">{{ userList.father }}</div>
-						</div>
-						<div class="item">
-							<div class="field">母亲姓名：</div>
-							<div class="value">{{ userList.mother }}</div>
-						</div>
-						<div class="item">
-							<div class="field">胎次：</div>
-							<div class="value">{{ userList.count }}</div>
-						</div>
-						<div class="item">
-							<div class="field">申报日期：</div>
-							<div class="value">{{ userList.reportDate }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '死亡信息'">
-					<div class="row">
-						<div class="item">
-							<div class="field">死亡时间：</div>
-							<div class="value">{{ userList.deathDate }}</div>
-						</div>
-						<div class="item">
-							<div class="field">加入原因：</div>
-							<div class="value">{{ userList.deathReason }}</div>
-						</div>
-						<div class="item">
-							<div class="field">移除时间：</div>
-							<div class="value">{{ userList.removeDate }}</div>
-						</div>
-						<div class="item">
-							<div class="field">移除原因：</div>
-							<div class="value">{{ userList.removeReason }}</div>
-						</div>
-					</div>
-				</div>
-
-				<div v-if="currentTab == '迁出'">
-					<div class="row">
-						<div class="item">
-							<div class="field">迁出信息：</div>
-							<div class="value">{{ userList.outOfTime }}</div>
-						</div>
-						<div class="item">
-							<div class="field">迁出类别：</div>
-							<div class="value">{{ userList.type }}</div>
-						</div>
-						<div class="item">
-							<div class="field">迁出原因：</div>
-							<div class="value">{{ userList.reason }}</div>
-						</div>
-						<div class="item">
-							<div class="field">迁出至组织：</div>
-							<div class="value">{{ userList.deptId }}</div>
-						</div>
-						<div class="item">
-							<div class="field">小区：</div>
-							<div class="value">{{ userList.villageName }}</div>
-						</div>
-						<div class="item">
-							<div class="field">楼号：</div>
-							<div class="value">{{ userList.buildName }}</div>
-						</div>
-						<div class="item">
-							<div class="field">单元：</div>
-							<div class="value">{{ userList.unitName }}</div>
-						</div>
-						<div class="item">
-							<div class="field">房屋：</div>
-							<div class="value">{{ userList.homeName }}</div>
-						</div>
-						<div class="item">
-							<div class="field">外迁地址：</div>
-							<div class="value">{{ userList.address }}</div>
-						</div>
+						<div class="value">{{ info.remark }}</div>
 					</div>
 				</div>
 			</div>
+			<div style="position: relative;height: 300px;margin: 20px;" id="map"></div>
 		</template>
 	</popup>
 </template>
@@ -764,17 +82,12 @@ export default {
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			currentTabIndex2: 0,
-			startTabIndex2: 0,
-			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: [],
-			tabList2: [],
-			userArray: [],
-			userList: {}
+			startTabIndex2: 0
 		};
 	},
 
 	mounted() {
-		this.getApiData();
+		this.getInfo();
 	},
 	computed: {
 		currentTab() {
@@ -785,45 +98,14 @@ export default {
 		}
 	},
 	methods: {
-		addStartTabIndex() {
-			const { startTabIndex, tabList } = this;
-			if (startTabIndex < tabList.length - 7) {
-				this.startTabIndex = startTabIndex + 1;
-			} else {
-				this.startTabIndex = tabList.length - 7;
-			}
-		},
-		subStartTabIndex() {
-			const { startTabIndex, tabList } = this;
-			if (startTabIndex > 0) {
-				this.startTabIndex = startTabIndex - 1;
-			} else {
-				this.startTabIndex = 0;
-			}
-		},
-		addStartTabIndex2() {
-			const { startTabIndex2, tabList2 } = this;
-			if (startTabIndex2 < tabList2.length - 7) {
-				this.startTabIndex2 = startTabIndex2 + 1;
-			} else {
-				this.startTabIndex2 = tabList2.length - 7;
-			}
-		},
-		subStartTabIndex2() {
-			const { startTabIndex2, tabList2 } = this;
-			if (startTabIndex2 > 0) {
-				this.startTabIndex2 = startTabIndex2 - 1;
-			} else {
-				this.startTabIndex2 = 0;
-			}
-		},
 		iniMap() {
 			const scene = new Scene({
 				id: 'map',
 				map: new GaodeMap({
 					pitch: 35.210526315789465,
 					style: 'dark',
-					center: [this.info.latitude, this.info.longitude],
+					// center: [this.info.latitude, this.info.longitude],
+					center: [120.00, 36.00],
 					zoom: 4.4
 				})
 			});
@@ -832,129 +114,26 @@ export default {
 			this.$emit('close');
 		},
 
-		async getApiData() {
-			this.getInfo();
-		},
-
-		gettab() {
-			this.info.group_rental.forEach(item => {
-				this.getUserInfo(item.user_id);
-			});
-		},
-
-		getUserInfo(id) {
-			const url = 'resident_info';
-
-			requestPostBi(
-				url,
-				{
-					queryParam: {
-						resident_id: id
-					}
-				},
-				{
-					// mockId: 61172054,
-				}
-			).then(res => {
-				console.log(res);
-				if (res.code === 0) {
-					this.userArray.push(res.data[0]);
-					if (this.userArray.length == 1) {
-						this.gettab2(this.userArray[0]);
-					}
-				}
-			});
-		},
-
-		gettab2(item) {
-			this.userList = { ...item };
-			console.log("当前人员信息",this.userList)
-			let tabList = this.BaseTabList;
-			this.userList.crowd && tabList.push('党员');
-			this.userList.srs && tabList.push('保障房');
-			this.userList.unemployed && tabList.push('失业');
-			this.userList.exs && tabList.push('退役军人');
-			this.userList.ufs && tabList.push('统战人员');
-			this.userList.volunteer && tabList.push('志愿者');
-			this.userList.aged && tabList.push('老年人');
-			this.userList.special_popu && tabList.push('特殊人群');
-			tabList.push('出生信息');
-			tabList.push('死亡信息');
-			tabList.push('迁出');
-			this.tabList = tabList;
-		},
 		// 根据房屋id获取详情
 		async getInfo() {
 			let url = '';
 			let queryParam = {};
-
-			if (this.detailType == '生产隐患') {
-				url = 'enterprise_info';
-				this.title = '安全生产巡查详情';
-				queryParam.enterprise_id = this.detailId;
-			} else if (this.detailType == '群租房') {
-				url = 'group_tenant_info';
-				this.title = '群租房详情';
-				queryParam.room_id = this.detailId;
-			} else if (this.detailType == '发现问题') {
-				url = 'group_tenant_info';
-				this.title = '发现问题详情';
-				queryParam.hidden_danger_id = this.detailId;
-			}
-
+			this.title = this.detailType + '详情';
+			queryParam.place_id = this.detailId;
+			queryParam.parent_place_type = this.detailType;
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: queryParam
 				},
 				{
-					// mockId: 60235478,
+					mockId: 70051004,
 				}
 			);
 			if (code === 0) {
 				this.info = { ...this.info, ...data[0] };
 				console.log('this.info', this.info);
-				// this.info = {
-				// 	group_rental: [
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		}
-				// 	],
-				// 	house_state: null,
-				// 	homeowner_idcard: '53',
-				// 	homeowner: 'elit',
-				// 	room_id: '52',
-				// 	house_usage: 'ullamco culpa dolor',
-				// 	homeowner_telep: 'sed',
-				// 	house_type: 'mollit est eu commodo in'
-				// };
-
-				if (this.detailType == '生产隐患') {
-					this.iniMap();
-				} else if (this.detailType == '群租房') {
-					this.gettab();
-				}
+				this.iniMap();
 			} else {
 				this.$message.error(msg);
 			}

src/views/dataBoard/sida/zy/placeResList.vue

@@ -10,7 +10,7 @@
 				<el-select v-model="type2" @change="init" :clearable="true">
 					<el-option value="安全生产场所">安全生产场所</el-option>
 					<el-option value="城市管理场所">城市管理场所</el-option>
-					<el-option value="应急场所">应急场所</el-option>
+					<el-option value="应急处置场所">应急处置场所</el-option>
 				</el-select>
 
 				<div class="m-search2 left10" style="display: inline-block;">