From c608e1d9f953cf1d1d7a6b79c134a16ddb45b1b2 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Mon, 20 Mar 2023 17:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E4=BA=86=E7=BE=A4=E7=A7=9F=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/dataBoard/listBox.scss        |   1 +
 .../dataBoard/cpts/enterpriseInfo-detail.vue  | 133 ++++
 .../dataBoard/cpts/hiddenDanger-detail.vue    | 611 +++++++++---------
 .../dataBoard/cpts/specialCategory-detail.vue | 272 ++++++--
 src/views/dataBoard/sida/cpts/wtqd.vue        |   1 +
 src/views/dataBoard/sida/wt/eventList.vue     |   4 +-
 .../dataBoard/sida/wt/hiddenDangerList.vue    |   9 +-
 .../dataBoard/sida/wt/specialCategoryList.vue |   2 +-
 8 files changed, 662 insertions(+), 371 deletions(-)
 create mode 100644 src/views/dataBoard/cpts/enterpriseInfo-detail.vue

diff --git a/src/assets/scss/dataBoard/listBox.scss b/src/assets/scss/dataBoard/listBox.scss
index d4142cef3..46f231559 100644
--- a/src/assets/scss/dataBoard/listBox.scss
+++ b/src/assets/scss/dataBoard/listBox.scss
@@ -18,6 +18,7 @@
 		::v-deep .el-range-input {
 			background: transparent;
 			border: none;
+			color:#fff
 		}
 	}
 }
diff --git a/src/views/dataBoard/cpts/enterpriseInfo-detail.vue b/src/views/dataBoard/cpts/enterpriseInfo-detail.vue
new file mode 100644
index 000000000..d66b4be1f
--- /dev/null
+++ b/src/views/dataBoard/cpts/enterpriseInfo-detail.vue
@@ -0,0 +1,133 @@
+<template>
+	<popup :title="title" @close="handleClose">
+		<template v-slot:cnt>
+			<div class="m-info" v-if="detailType == '安全隐患'">
+				<div class="row">
+					<div class="item">
+						<div class="field">场所名称：</div>
+						<div class="value">{{ info.place_org_name }}</div>
+					</div>
+
+					<div class="item">
+						<div class="field">占地面积：</div>
+						<div class="value">{{ info.area_covered }}</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>
+
+					<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.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>
+		</template>
+	</popup>
+</template>
+
+<script>
+import popup from '@/views/dataBoard/cpts/popup';
+import { GaodeMap, Map } from '@antv/l7-maps';
+import { requestPostBi } from '@/js/dai/request-bipass';
+
+export default {
+	name: 'eventdetail',
+	props: {
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailType: {
+			type: String,
+			default: ''
+		}
+	},
+
+	components: { popup },
+	created() {},
+	data() {
+		return {
+			progress: [],
+			info: {},
+			title: '事件'
+		};
+	},
+
+	mounted() {
+		this.getApiData();
+	},
+
+	methods: {
+		handleClose() {
+			this.$emit('close');
+		},
+
+		async getApiData() {
+			this.getInfo();
+		},
+
+		// 根据房屋id获取详情
+		async getInfo() {
+			let url = 'enterprise_info';
+			this.title = '安全生产巡查详情';
+
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						enterprise_id: this.detailId
+					}
+				},
+				{
+					// mockId: 60235478,
+				}
+			);
+			if (code === 0) {
+				this.info = { ...this.info, ...data[0] };
+				console.log("安全生产巡查详情",this.info)
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+<style scoped>
+.m-info .row .item .field {
+	width: 120px !important;
+}
+</style>
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/cpts/hiddenDanger-detail.vue b/src/views/dataBoard/cpts/hiddenDanger-detail.vue
index 68b5b5d8e..9fa0219e7 100644
--- a/src/views/dataBoard/cpts/hiddenDanger-detail.vue
+++ b/src/views/dataBoard/cpts/hiddenDanger-detail.vue
@@ -1,102 +1,7 @@
 <template>
 	<popup :title="title" @close="handleClose">
 		<template v-slot:cnt>
-			<div class="m-info" v-if="detailType == '治理事件'">
-				<el-row>
-					<el-col :span="12">
-						<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>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">上报时间：</div>
-								<div class="value">{{ info.created_time }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">事件内容 ：</div>
-								<div class="value">{{ info.event_content }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item" style="width: 100%;">
-								<div class="field">音频：</div>
-								<div class="value">{{ info.attachment_url }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">反映渠道 ：</div>
-								<div class="value">{{ info.source_type }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">地址 ：</div>
-								<div class="value">{{ info.address }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">上报人 ：</div>
-								<div class="value">{{ info.name }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">联系电话：</div>
-								<div class="value">{{ info.mobile }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">证件号：</div>
-								<div class="value">{{ info.id_card }}</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="item">
-								<div class="field">操作：</div>
-								<div class="value"></div>
-							</div>
-						</div>
-					</el-col>
-					<el-col :span="12">
-						<div class="subtitle">
-							<i class="i-chunk"></i>
-							处理进展
-							<i class="i-line"></i>
-						</div>
-						<el-timeline class="timeline">
-							<el-timeline-item v-for="(item, index) in progress" :key="index" :class="index == progress.length - 1 ? 'sucess' : ''">
-								<div class="status-box">
-									<div class="status2" v-if="index == 0">回复</div>
-									<div class="status1" v-else>回复</div>
-									<div class="timestamp">{{ item.reply_time }}</div>
-								</div>
-								<div class="content">
-									<div class="field">回复人：</div>
-									<div class="value">{{ item.user_show_name }}</div>
-								</div>
-								<div class="content">
-									<div class="field">回复内容：</div>
-									<div class="value">{{ item.reply_content }}</div>
-								</div>
-							</el-timeline-item>
-						</el-timeline>
-					</el-col>
-				</el-row>
-			</div>
-			<div class="m-info" v-if="detailType == '安全隐患'">
+			<div class="m-info" v-if="detailType == '生产隐患'">
 				<div class="row">
 					<div class="item">
 						<div class="field">场所名称：</div>
@@ -149,7 +54,39 @@
 					</div>
 				</div>
 			</div>
-			<div class="m-info" v-if="detailType == '综治人群'">
+			<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>
 					基本信息
@@ -158,7 +95,7 @@
 				<div class="row">
 					<div class="item">
 						<div class="field">房屋名称：</div>
-						<div class="value">{{ info.grid }}</div>
+						<!-- <div class="value">{{ info.grid }}</div> -->
 					</div>
 					<div class="item">
 						<div class="field">房屋类型：</div>
@@ -166,23 +103,23 @@
 					</div>
 					<div class="item">
 						<div class="field">房屋用途：</div>
-						<div class="value">{{ info.report_type }}</div>
+						<div class="value">{{ info.house_type }}</div>
 					</div>
 					<div class="item">
 						<div class="field">房屋状态：</div>
-						<div class="value">{{ info.report_user_name }}</div>
+						<div class="value">{{ info.house_state }}</div>
 					</div>
 					<div class="item">
 						<div class="field">房主姓名：</div>
-						<div class="value">{{ info.report_time }}</div>
+						<div class="value">{{ info.homeowner }}</div>
 					</div>
 					<div class="item">
 						<div class="field">联系电话：</div>
-						<div class="value">{{ info.report_user_mobile }}</div>
+						<div class="value">{{ info.homeowner_telep }}</div>
 					</div>
 					<div class="item">
 						<div class="field">证件号：</div>
-						<div class="value">{{ info.report_user_mobile }}</div>
+						<div class="value">{{ info.homeowner_idcard }}</div>
 					</div>
 				</div>
 				<div class="subtitle">
@@ -193,86 +130,47 @@
 				<div class="row">
 					<div class="item">
 						<div class="field">姓名：</div>
-						<div class="value">{{ info.demand_user_name }}</div>
+						<div class="value">{{ userList.name }}</div>
 					</div>
 					<div class="item">
 						<div class="field">联系电话：</div>
-						<div class="value">{{ info.want_service_time }}</div>
+						<div class="value">{{ userList.telephoneidcard }}</div>
 					</div>
 					<div class="item">
 						<div class="field">证件号：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ userList.idcard }}</div>
 					</div>
 					<div class="item">
 						<div class="field">本地户籍：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ userList.content }}</div>
 					</div>
 					<div class="item">
 						<div class="field">性别：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ userList.gender }}</div>
 					</div>
 					<div class="item">
 						<div class="field">出生日期：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ userList.birthday }}</div>
 					</div>
 					<div class="item">
 						<div class="field">民族：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ userList.ethnic }}</div>
 					</div>
-					<div class="item">
+					<!-- <div class="item">
 						<div class="field">居民类别：</div>
-						<div class="value">{{ info.content }}</div>
-					</div>
+						<div class="value">{{ userList.content }}</div>
+					</div> -->
 					<div class="item">
 						<div class="field">备注：</div>
-						<div class="value">{{ info.content }}</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="info.crowd">党员</span>
-								<span v-if="info.mlsp">低保人员</span>
-								<span v-if="info.srs">保障房人员</span>
-								<span v-if="info.unemployed">失业人员</span>
-								<span v-if="info.woca">育龄妇女</span>
-								<span v-if="info.exs">退役军人</span>
-								<span v-if="info.ufs">统战人员</span>
-								<span v-if="info.petitioner">信访人员</span>
-								<span v-if="info.volunteer">志愿者</span>
-								<span v-if="info.in_person">特扶人员</span>
-								<span v-if="info.tenant">租户</span>
-								<span v-if="info.float_popu">流动人口</span>
-								<span v-if="info.special_popu">特殊人群</span>
-								<span v-if="info.aaaa">独居老人</span>
-								<span v-if="info.empty_nest">空巢老人</span>
-								<span v-if="info.disability">失能老人</span>
-								<span v-if="info.dementia">失智老人</span>
-								<span v-if="info.adisability">残疾</span>
-								<span v-if="info.ser_ill">大病</span>
-								<span v-if="info.ncd">慢病</span>
-							</div>
-						</div>
-					</div>
-				</div>
-
 				<div class="subtitle">
 					<i class="i-chunk"></i>
 					<span>其他信息</span>
 					<i class="i-line"></i>
 				</div>
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					其他信息
-					<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
@@ -292,11 +190,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">文化程度：</div>
-							<div class="value">{{ info.education }}</div>
+							<div class="value">{{ userList.education }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.education_remark }}</div>
+							<div class="value">{{ userList.education_remark }}</div>
 						</div>
 					</div>
 				</div>
@@ -305,11 +203,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">兴趣：</div>
-							<div class="value">{{ info.hobby }}</div>
+							<div class="value">{{ userList.hobby }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.hobby_remark }}</div>
+							<div class="value">{{ userList.hobby_remark }}</div>
 						</div>
 					</div>
 				</div>
@@ -318,11 +216,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">宗教：</div>
-							<div class="value">{{ info.belief }}</div>
+							<div class="value">{{ userList.belief }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.belief_remark }}</div>
+							<div class="value">{{ userList.belief_remark }}</div>
 						</div>
 					</div>
 				</div>
@@ -331,71 +229,71 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">残疾类别：</div>
-							<div class="value">{{ info.disable_type }}</div>
+							<div class="value">{{ userList.disable_type }}</div>
 						</div>
 						<div class="item">
 							<div class="field">残疾等级：</div>
-							<div class="value">{{ info.disable_degree }}</div>
+							<div class="value">{{ userList.disable_degree }}</div>
 						</div>
 						<div class="item">
 							<div class="field">残疾证号：</div>
-							<div class="value">{{ info.disable_idcard }}</div>
+							<div class="value">{{ userList.disable_idcard }}</div>
 						</div>
 						<div class="item">
 							<div class="field">残疾说明：</div>
-							<div class="value">{{ info.disable_remark }}</div>
+							<div class="value">{{ userList.disable_remark }}</div>
 						</div>
 						<div class="item">
 							<div class="field">监护人：</div>
-							<div class="value">{{ info.guardian }}</div>
+							<div class="value">{{ userList.guardian }}</div>
 						</div>
 						<div class="item">
 							<div class="field">劳动能力：</div>
-							<div class="value">{{ info.skill }}</div>
+							<div class="value">{{ userList.skill }}</div>
 						</div>
 						<div class="item">
 							<div class="field">非义务教育阶段助学：</div>
-							<div class="value">{{ info.voluntaryEducationFlag }}</div>
+							<div class="value">{{ userList.voluntaryEducationFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">所患大病：</div>
-							<div class="value">{{ info.voluntaryEducationFlag }}</div>
+							<div class="value">{{ userList.voluntaryEducationFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">大病患病时间：</div>
-							<div class="value">{{ info.illnessCode }}</div>
+							<div class="value">{{ userList.illnessCode }}</div>
 						</div>
 						<div class="item">
 							<div class="field">所患慢性病：</div>
-							<div class="value">{{ info.chronicDiseaseCode }}</div>
+							<div class="value">{{ userList.chronicDiseaseCode }}</div>
 						</div>
 						<div class="item">
 							<div class="field">慢病患病时间：</div>
-							<div class="value">{{ info.chronicDiseaseTime }}</div>
+							<div class="value">{{ userList.chronicDiseaseTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否参保：</div>
-							<div class="value">{{ info.chronicDiseaseTime }}</div>
+							<div class="value">{{ userList.chronicDiseaseTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">自付金额：</div>
-							<div class="value">{{ info.selfPayAmount }}</div>
+							<div class="value">{{ userList.selfPayAmount }}</div>
 						</div>
 						<div class="item">
 							<div class="field">救助金额：</div>
-							<div class="value">{{ info.selfPayAmount }}</div>
+							<div class="value">{{ userList.selfPayAmount }}</div>
 						</div>
 						<div class="item">
 							<div class="field">救助时间：</div>
-							<div class="value">{{ info.deliveranceAmount }}</div>
+							<div class="value">{{ userList.deliveranceAmount }}</div>
 						</div>
 						<div class="item">
 							<div class="field">享受救助明细序号：</div>
-							<div class="value">{{ info.deliveranceTime }}</div>
+							<div class="value">{{ userList.deliveranceTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.deliveranceNum }}</div>
+							<div class="value">{{ userList.deliveranceNum }}</div>
 						</div>
 					</div>
 				</div>
@@ -404,19 +302,19 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">工作单位：</div>
-							<div class="value">{{ info.workunit }}</div>
+							<div class="value">{{ userList.workunit }}</div>
 						</div>
 						<div class="item">
 							<div class="field">职业：</div>
-							<div class="value">{{ info.career }}</div>
+							<div class="value">{{ userList.career }}</div>
 						</div>
 						<div class="item">
 							<div class="field">离退休时间：</div>
-							<div class="value">{{ info.retire_date }}</div>
+							<div class="value">{{ userList.retire_date }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.retire_remark }}</div>
+							<div class="value">{{ userList.retire_remark }}</div>
 						</div>
 					</div>
 				</div>
@@ -425,11 +323,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">退休金额：</div>
-							<div class="value">{{ info.retire_income }}</div>
+							<div class="value">{{ userList.retire_income }}</div>
 						</div>
 						<div class="item">
 							<div class="field">月收入：</div>
-							<div class="value">{{ info.income }}</div>
+							<div class="value">{{ userList.income }}</div>
 						</div>
 					</div>
 				</div>
@@ -438,23 +336,23 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">籍贯：</div>
-							<div class="value">{{ info.native }}</div>
+							<div class="value">{{ userList.native }}</div>
 						</div>
 						<div class="item">
 							<div class="field">户籍所在地：</div>
-							<div class="value">{{ info.native_place }}</div>
+							<div class="value">{{ userList.native_place }}</div>
 						</div>
 						<div class="item">
 							<div class="field">现居住地：</div>
-							<div class="value">{{ info.residence_current }}</div>
+							<div class="value">{{ userList.residence_current }}</div>
 						</div>
 						<div class="item">
 							<div class="field">人户状况：</div>
-							<div class="value">{{ info.household }}</div>
+							<div class="value">{{ userList.household }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.household_remark }}</div>
+							<div class="value">{{ userList.household_remark }}</div>
 						</div>
 					</div>
 				</div>
@@ -463,35 +361,35 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">与户主关系：</div>
-							<div class="value">{{ info.holdingrel }}</div>
+							<div class="value">{{ userList.holdingrel }}</div>
 						</div>
 						<div class="item">
 							<div class="field">居住情况：</div>
-							<div class="value">{{ info.residence }}</div>
+							<div class="value">{{ userList.residence }}</div>
 						</div>
 						<div class="item">
 							<div class="field">婚姻状况：</div>
-							<div class="value">{{ info.marital }}</div>
+							<div class="value">{{ userList.marital }}</div>
 						</div>
 						<div class="item">
 							<div class="field">配偶状况：</div>
-							<div class="value">{{ info.spouse }}</div>
+							<div class="value">{{ userList.spouse }}</div>
 						</div>
 						<div class="item">
 							<div class="field">有无赡养人：</div>
-							<div class="value">{{ info.supporters }}</div>
+							<div class="value">{{ userList.supporters }}</div>
 						</div>
 						<div class="item">
 							<div class="field">与赡养人关系：</div>
-							<div class="value">{{ info.supporters_relation }}</div>
+							<div class="value">{{ userList.supporters_relation }}</div>
 						</div>
 						<div class="item">
 							<div class="field">赡养人联系电话：</div>
-							<div class="value">{{ info.dependantMobile }}</div>
+							<div class="value">{{ userList.dependantMobile }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.familyInfoRemark }}</div>
+							<div class="value">{{ userList.familyInfoRemark }}</div>
 						</div>
 					</div>
 				</div>
@@ -500,47 +398,47 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">入党时间：</div>
-							<div class="value">{{ info.joinTime }}</div>
+							<div class="value">{{ userList.joinTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">转正时间：</div>
-							<div class="value">{{ info.positiveTime }}</div>
+							<div class="value">{{ userList.positiveTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">所属支部：</div>
-							<div class="value">{{ info.branchId }}</div>
+							<div class="value">{{ userList.branchId }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否流动党员：</div>
-							<div class="value">{{ info.flowFlag }}</div>
+							<div class="value">{{ userList.flowFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">流动党员活动证号：</div>
-							<div class="value">{{ info.flowActNum }}</div>
+							<div class="value">{{ userList.flowActNum }}</div>
 						</div>
 						<div class="item">
 							<div class="field">职务：</div>
-							<div class="value">{{ info.partyJob }}</div>
+							<div class="value">{{ userList.partyJob }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否退休：</div>
-							<div class="value">{{ info.retiredFlag }}</div>
+							<div class="value">{{ userList.retiredFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否党员中心户：</div>
-							<div class="value">{{ info.centerFlag }}</div>
+							<div class="value">{{ userList.centerFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">入党时所在党支部：</div>
-							<div class="value">{{ info.joinBranchName }}</div>
+							<div class="value">{{ userList.joinBranchName }}</div>
 						</div>
 						<div class="item">
 							<div class="field">组织关系转入社区时间：</div>
-							<div class="value">{{ info.joinCommunityTime }}</div>
+							<div class="value">{{ userList.joinCommunityTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否请长假：</div>
-							<div class="value">{{ info.longHolidayFlag }}</div>
+							<div class="value">{{ userList.longHolidayFlag }}</div>
 						</div>
 					</div>
 				</div>
@@ -549,23 +447,23 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">住房性质：</div>
-							<div class="value">{{ info.housingNature }}</div>
+							<div class="value">{{ userList.housingNature }}</div>
 						</div>
 						<div class="item">
 							<div class="field">保障类型：</div>
-							<div class="value">{{ info.securityType }}</div>
+							<div class="value">{{ userList.securityType }}</div>
 						</div>
 						<div class="item">
 							<div class="field">发证日期：</div>
-							<div class="value">{{ info.certificateDate }}</div>
+							<div class="value">{{ userList.certificateDate }}</div>
 						</div>
 						<div class="item">
 							<div class="field">补贴编号：</div>
-							<div class="value">{{ info.subsidyNum }}</div>
+							<div class="value">{{ userList.subsidyNum }}</div>
 						</div>
 						<div class="item">
 							<div class="field">补贴金额：</div>
-							<div class="value">{{ info.subsidyAmount }}</div>
+							<div class="value">{{ userList.subsidyAmount }}</div>
 						</div>
 					</div>
 				</div>
@@ -574,35 +472,35 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">原工作单位：</div>
-							<div class="value">{{ info.originWorkUnit }}</div>
+							<div class="value">{{ userList.originWorkUnit }}</div>
 						</div>
 						<div class="item">
 							<div class="field">失业时间：</div>
-							<div class="value">{{ info.unemploymentTime }}</div>
+							<div class="value">{{ userList.unemploymentTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">失业证号：</div>
-							<div class="value">{{ info.unemploymentTime }}</div>
+							<div class="value">{{ userList.unemploymentTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">再就业优惠证号：</div>
-							<div class="value">{{ info.employmentNum }}</div>
+							<div class="value">{{ userList.employmentNum }}</div>
 						</div>
 						<div class="item">
 							<div class="field">技术特长：</div>
-							<div class="value">{{ info.specialSkill }}</div>
+							<div class="value">{{ userList.specialSkill }}</div>
 						</div>
 						<div class="item">
 							<div class="field">失业原因：</div>
-							<div class="value">{{ info.unemploymentReason }}</div>
+							<div class="value">{{ userList.unemploymentReason }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否就业困难对象：</div>
-							<div class="value">{{ info.employmentHardFlag }}</div>
+							<div class="value">{{ userList.employmentHardFlag }}</div>
 						</div>
 						<div class="item">
 							<div class="field">劳动能力就业愿望：</div>
-							<div class="value">{{ info.employmentWish }}</div>
+							<div class="value">{{ userList.employmentWish }}</div>
 						</div>
 					</div>
 				</div>
@@ -611,43 +509,43 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">入伍时间：</div>
-							<div class="value">{{ info.joinArmyTime }}</div>
+							<div class="value">{{ userList.joinArmyTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">退伍时间：</div>
-							<div class="value">{{ info.leaveArmyTime }}</div>
+							<div class="value">{{ userList.leaveArmyTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">服役单位：</div>
-							<div class="value">{{ info.serviceUnit }}</div>
+							<div class="value">{{ userList.serviceUnit }}</div>
 						</div>
 						<div class="item">
 							<div class="field">接收单位：</div>
-							<div class="value">{{ info.receiveUnit }}</div>
+							<div class="value">{{ userList.receiveUnit }}</div>
 						</div>
 						<div class="item">
 							<div class="field">待安置补助金：</div>
-							<div class="value">{{ info.settlementAmount }}</div>
+							<div class="value">{{ userList.settlementAmount }}</div>
 						</div>
 						<div class="item">
 							<div class="field">培训状况：</div>
-							<div class="value">{{ info.trainDesc }}</div>
+							<div class="value">{{ userList.trainDesc }}</div>
 						</div>
 						<div class="item">
 							<div class="field">参战时间开始日期：</div>
-							<div class="value">{{ info.joinWarStartTime }}</div>
+							<div class="value">{{ userList.joinWarStartTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">参战时间截止日期：</div>
-							<div class="value">{{ info.joinWarEndTime }}</div>
+							<div class="value">{{ userList.joinWarEndTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">现就业状况：</div>
-							<div class="value">{{ info.employmentSituation }}</div>
+							<div class="value">{{ userList.employmentSituation }}</div>
 						</div>
 						<div class="item">
 							<div class="field">是否办理公益性岗位：</div>
-							<div class="value">{{ info.pubWelfareJobFlag }}</div>
+							<div class="value">{{ userList.pubWelfareJobFlag }}</div>
 						</div>
 					</div>
 				</div>
@@ -656,11 +554,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">职务：</div>
-							<div class="value">{{ info.duty }}</div>
+							<div class="value">{{ userList.duty }}</div>
 						</div>
 						<div class="item">
 							<div class="field">探亲情况：</div>
-							<div class="value">{{ info.visitation }}</div>
+							<div class="value">{{ userList.visitation }}</div>
 						</div>
 					</div>
 				</div>
@@ -669,11 +567,11 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">志愿者类别：</div>
-							<div class="value">{{ info.volunteerCategory }}</div>
+							<div class="value">{{ userList.volunteerCategory }}</div>
 						</div>
 						<div class="item">
 							<div class="field">备注：</div>
-							<div class="value">{{ info.volunteerRemark }}</div>
+							<div class="value">{{ userList.volunteerRemark }}</div>
 						</div>
 					</div>
 				</div>
@@ -682,7 +580,7 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">高龄补助：</div>
-							<div class="value">{{ info.volunteerRemark }}</div>
+							<div class="value">{{ userList.volunteerRemark }}</div>
 						</div>
 					</div>
 				</div>
@@ -691,7 +589,7 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">特殊人群类别：</div>
-							<div class="value">{{ info.specialCategoryCode }}</div>
+							<div class="value">{{ userList.specialCategoryCode }}</div>
 						</div>
 					</div>
 				</div>
@@ -700,23 +598,23 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">出生地：</div>
-							<div class="value">{{ info.birthplace }}</div>
+							<div class="value">{{ userList.birthplace }}</div>
 						</div>
 						<div class="item">
 							<div class="field">父亲姓名：</div>
-							<div class="value">{{ info.father }}</div>
+							<div class="value">{{ userList.father }}</div>
 						</div>
 						<div class="item">
 							<div class="field">母亲姓名：</div>
-							<div class="value">{{ info.mother }}</div>
+							<div class="value">{{ userList.mother }}</div>
 						</div>
 						<div class="item">
 							<div class="field">胎次：</div>
-							<div class="value">{{ info.count }}</div>
+							<div class="value">{{ userList.count }}</div>
 						</div>
 						<div class="item">
 							<div class="field">申报日期：</div>
-							<div class="value">{{ info.reportDate }}</div>
+							<div class="value">{{ userList.reportDate }}</div>
 						</div>
 					</div>
 				</div>
@@ -725,19 +623,19 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">死亡时间：</div>
-							<div class="value">{{ info.deathDate }}</div>
+							<div class="value">{{ userList.deathDate }}</div>
 						</div>
 						<div class="item">
 							<div class="field">加入原因：</div>
-							<div class="value">{{ info.deathReason }}</div>
+							<div class="value">{{ userList.deathReason }}</div>
 						</div>
 						<div class="item">
 							<div class="field">移除时间：</div>
-							<div class="value">{{ info.removeDate }}</div>
+							<div class="value">{{ userList.removeDate }}</div>
 						</div>
 						<div class="item">
 							<div class="field">移除原因：</div>
-							<div class="value">{{ info.removeReason }}</div>
+							<div class="value">{{ userList.removeReason }}</div>
 						</div>
 					</div>
 				</div>
@@ -746,39 +644,39 @@
 					<div class="row">
 						<div class="item">
 							<div class="field">迁出信息：</div>
-							<div class="value">{{ info.outOfTime }}</div>
+							<div class="value">{{ userList.outOfTime }}</div>
 						</div>
 						<div class="item">
 							<div class="field">迁出类别：</div>
-							<div class="value">{{ info.type }}</div>
+							<div class="value">{{ userList.type }}</div>
 						</div>
 						<div class="item">
 							<div class="field">迁出原因：</div>
-							<div class="value">{{ info.reason }}</div>
+							<div class="value">{{ userList.reason }}</div>
 						</div>
 						<div class="item">
 							<div class="field">迁出至组织：</div>
-							<div class="value">{{ info.deptId }}</div>
+							<div class="value">{{ userList.deptId }}</div>
 						</div>
 						<div class="item">
 							<div class="field">小区：</div>
-							<div class="value">{{ info.villageName }}</div>
+							<div class="value">{{ userList.villageName }}</div>
 						</div>
 						<div class="item">
 							<div class="field">楼号：</div>
-							<div class="value">{{ info.buildName }}</div>
+							<div class="value">{{ userList.buildName }}</div>
 						</div>
 						<div class="item">
 							<div class="field">单元：</div>
-							<div class="value">{{ info.unitName }}</div>
+							<div class="value">{{ userList.unitName }}</div>
 						</div>
 						<div class="item">
 							<div class="field">房屋：</div>
-							<div class="value">{{ info.homeName }}</div>
+							<div class="value">{{ userList.homeName }}</div>
 						</div>
 						<div class="item">
 							<div class="field">外迁地址：</div>
-							<div class="value">{{ info.address }}</div>
+							<div class="value">{{ userList.address }}</div>
 						</div>
 					</div>
 				</div>
@@ -788,8 +686,9 @@
 </template>
 
 <script>
+import { Scene } from '@antv/l7';
 import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from "@antv/l7-maps";
+import { GaodeMap, Map } from '@antv/l7-maps';
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
@@ -815,25 +714,48 @@ export default {
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: []
+			tabList: [],
+			userArray: [],
+			userList: {}
 		};
 	},
 
 	mounted() {
 		this.getApiData();
 	},
-
+	computed: {
+		currentTab() {
+			return this.tabList[this.currentTabIndex];
+		}
+	},
 	methods: {
-		iniMap(){
+		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;
+			}
+		},
+
+		iniMap() {
 			const scene = new Scene({
-			  id: 'map',
-			  map: new GaodeMap({
-			    pitch: 35.210526315789465,
-			    style: 'dark',
-			    center: [ 104.288144, 31.239692 ],
-			    zoom: 4.4
-			  })
-			})
+				id: 'map',
+				map: new GaodeMap({
+					pitch: 35.210526315789465,
+					style: 'dark',
+					center: [this.info.latitude, this.info.longitude],
+					zoom: 4.4
+				})
+			});
 		},
 		handleClose() {
 			this.$emit('close');
@@ -843,27 +765,74 @@ export default {
 			this.getInfo();
 		},
 
+		async getData() {
+			await this.info.group_rental.forEach(item => {
+				this.getUserInfo(item.user_id);
+			});
+		},
+		gettab() {
+			this.getData().then(() => {
+				console.log('this.userList', this.userList);
+				this.userList = { ...this.userArray[0] };
+				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;
+			});
+		},
+		async getUserInfo(id) {
+			const url = 'resident_info';
+
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						resident_id: id
+					}
+				},
+				{
+					// mockId: 61172054,
+				}
+			);
+
+			if (code === 0) {
+				this.userArray.push(data[0]);
+				console.log('this.userArray0------------', this.userArray);
+			}
+		},
+
 		// 根据房屋id获取详情
 		async getInfo() {
 			let url = '';
+			let queryParam = {};
 			console.log('this.detailType', this.detailType);
-			if (this.detailType == '治理事件') {
-				url = 'event_info';
-				this.title = '事件';
-			} else if (this.detailType == '安全隐患') {
-				url = 'service_support';
+			if (this.detailType == '生产隐患') {
+				url = 'enterprise_info';
 				this.title = '安全生产巡查详情';
-			} else if (this.detailType == '综治人群') {
-				url = 'busi_support';
-				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;
 			}
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
-					queryParam: {
-						event_id: this.eventId
-					}
+					queryParam: queryParam
 				},
 				{
 					// mockId: 60235478,
@@ -871,26 +840,29 @@ export default {
 			);
 			if (code === 0) {
 				this.info = { ...this.info, ...data[0] };
-				if (this.detailType == '治理事件') {
-					this.progress = this.info.progress;
-				}
 				this.info = {
-					enterprise_id: 'E5d6F7fB-9fF8-b8E5-1e53-1d648b2D2297',
-					place_org_name: '会整光实响教置',
-					area_covered: '书受么由程者证属真实省采界何七影证水。',
-					scale_total: null,
-					grid: '术',
-					place_category: 'adipisicing dolor ea',
-					place_type: 'labore adipisicing officia',
-					person_in_charge: 'culpa id Ut',
-					mobile: '18656024954',
-					address: '四川省许昌市尖扎县',
-					longitude: 'aliquip ut quis',
-					latitude: 'et non'
+					group_rental: [
+						{
+							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'
 				};
-				this.detailType = '安全隐患';
-				this.iniMap()
-				console.log(this.info);
+
+				this.gettab();
+				console.log('this.info', this.info);
+				if (this.detailType == '生产隐患') {
+					this.iniMap();
+				}
 			} else {
 				this.$message.error(msg);
 			}
@@ -904,3 +876,52 @@ export default {
 }
 </style>
 <style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+<style lang="scss" scoped>
+@import '~@/assets/scss/c/config.scss';
+@import '~@/assets/scss/c/function.scss';
+
+.u-categorys {
+	display: flex;
+	flex-wrap: wrap;
+}
+.u-categorys span {
+	display: block;
+	width: 90px;
+}
+.m-tabs {
+	margin-top: 30px;
+	display: flex;
+	align-items: center;
+	padding-left: 20px;
+
+	.tab-btn {
+		width: 30px;
+		text-align: center;
+		cursor: pointer;
+	}
+
+	.tab {
+		@include toe;
+		margin: 0 5px;
+		min-width: 72px;
+		padding: 0 8px;
+		height: 24px;
+		box-shadow: inset 0px 0px 12px 0px rgba(26, 149, 255, 0.45);
+		border-radius: 2px;
+		border: 1px solid #1a95ff;
+		border-radius: 2px;
+		text-align: center;
+		font-size: 14px;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #ffffff;
+		line-height: 23px;
+		cursor: pointer;
+		transition: all ease 0.5s;
+		&.z-on {
+			background: linear-gradient(90deg, #1a5afd, #009cff);
+			box-shadow: none;
+		}
+	}
+}
+</style>
diff --git a/src/views/dataBoard/cpts/specialCategory-detail.vue b/src/views/dataBoard/cpts/specialCategory-detail.vue
index 15a6d549a..0ef3d851c 100644
--- a/src/views/dataBoard/cpts/specialCategory-detail.vue
+++ b/src/views/dataBoard/cpts/specialCategory-detail.vue
@@ -1,10 +1,10 @@
 <template>
-	<popup :title="title" @close="handleClose">
+	<popup title="综治人群详情" @close="handleClose">
 		<template v-slot:cnt>
 			<div class="m-info">
 				<div class="subtitle">
 					<i class="i-chunk"></i>
-					基本信息
+					<span>基本信息</span>
 					<i class="i-line"></i>
 				</div>
 				<div class="row">
@@ -65,31 +65,32 @@
 					<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="info.crowd">党员</span>
-								<span v-if="info.mlsp">低保人员</span>
-								<span v-if="info.srs">保障房人员</span>
-								<span v-if="info.unemployed">失业人员</span>
-								<span v-if="info.woca">育龄妇女</span>
-								<span v-if="info.exs">退役军人</span>
-								<span v-if="info.ufs">统战人员</span>
-								<span v-if="info.petitioner">信访人员</span>
-								<span v-if="info.volunteer">志愿者</span>
-								<span v-if="info.in_person">特扶人员</span>
-								<span v-if="info.tenant">租户</span>
-								<span v-if="info.float_popu">流动人口</span>
-								<span v-if="info.special_popu">特殊人群</span>
-								<span v-if="info.aaaa">独居老人</span>
-								<span v-if="info.empty_nest">空巢老人</span>
-								<span v-if="info.disability">失能老人</span>
-								<span v-if="info.dementia">失智老人</span>
-								<span v-if="info.adisability">残疾</span>
-								<span v-if="info.ser_ill">大病</span>
-								<span v-if="info.ncd">慢病</span>
+								<span v-if="info.crowd != '0'">党员</span>
+								<span v-if="info.mlsp != '0'">低保人员</span>
+								<span v-if="info.srs != '0'">保障房人员</span>
+								<span v-if="info.unemployed != '0'">失业人员</span>
+								<span v-if="info.woca != '0'">育龄妇女</span>
+								<span v-if="info.exs != '0'">退役军人</span>
+								<span v-if="info.ufs != '0'">统战人员</span>
+								<span v-if="info.petitioner != '0'">信访人员</span>
+								<span v-if="info.volunteer != '0'">志愿者</span>
+								<span v-if="info.in_person != '0'">特扶人员</span>
+								<span v-if="info.tenant != '0'">租户</span>
+								<span v-if="info.float_popu != '0'">流动人口</span>
+								<span v-if="info.special_popu != '0'">特殊人群</span>
+								<span v-if="info.aaaa != '0'">独居老人</span>
+								<span v-if="info.empty_nest != '0'">空巢老人</span>
+								<span v-if="info.disability != '0'">失能老人</span>
+								<span v-if="info.dementia != '0'">失智老人</span>
+								<span v-if="info.adisability != '0'">残疾</span>
+								<span v-if="info.ser_ill != '0'">大病</span>
+								<span v-if="info.ncd != '0'">慢病</span>
 							</div>
 						</div>
 					</div>
@@ -100,11 +101,7 @@
 					<span>其他信息</span>
 					<i class="i-line"></i>
 				</div>
-				<div class="subtitle">
-					<i class="i-chunk"></i>
-					其他信息
-					<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
@@ -120,7 +117,7 @@
 					<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 v-if="currentTab == '教育信息'">
 					<div class="row">
 						<div class="item">
 							<div class="field">文化程度：</div>
@@ -551,9 +548,9 @@
 							<div class="value">{{ info.reportDate }}</div>
 						</div>
 					</div>
-				</div> -->
+				</div>
 
-				<!-- <div v-if="currentTab == '死亡信息'">
+				<div v-if="currentTab == '死亡信息'">
 					<div class="row">
 						<div class="item">
 							<div class="field">死亡时间：</div>
@@ -572,9 +569,9 @@
 							<div class="value">{{ info.removeReason }}</div>
 						</div>
 					</div>
-				</div> -->
+				</div>
 
-				<!-- <div v-if="currentTab == '迁出'">
+				<div v-if="currentTab == '迁出'">
 					<div class="row">
 						<div class="item">
 							<div class="field">迁出信息：</div>
@@ -613,7 +610,7 @@
 							<div class="value">{{ info.address }}</div>
 						</div>
 					</div>
-				</div> -->
+				</div>
 			</div>
 		</template>
 	</popup>
@@ -621,28 +618,164 @@
 
 <script>
 import popup from '@/views/dataBoard/cpts/popup';
-
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
-	name: 'eventdetail',
+	name: 'residentDetails',
 	props: {
 		detailId: {
 			type: String,
 			default: ''
-		},
-		detailType: {
-			type: String,
-			default: ''
 		}
 	},
 
 	components: { popup },
-	created() {},
+
 	data() {
 		return {
-			info: {},
-			title: '',
+			info: {
+				// woca: true,
+				// exs: false,
+				// srs: true,
+				// household: "--",
+				// holdingrel: "--",
+				// ethnic: "--",
+				// community: "--",
+				// user_id: "--",
+				// census_type: "--",
+				// aged: true,
+				// spouse: "--",
+				// mlsp: false,
+				// ncp: true,
+				// disable_idcard: "--",
+				// volunteer: false,
+				// village: "--",
+				// disable_degree: "--",
+				// marital: "--",
+				// native_place: "--",
+				// disable_type: "--",
+				// building: "--",
+				// disable_remark: "--",
+				// skill: "--",
+				// petitioner: true,
+				// unemployed: true,
+				// needs_group: "--",
+				// hobby: "--",
+				// unit: "--",
+				// gender: "--",
+				// retire_income: "--",
+				// workunit: "--",
+				// ufs: false,
+				// birthday: "--",
+				// in_person: false,
+				// adisability: false,
+				// household_remark: "--",
+				// belief: "--",
+				// education_remark: "--",
+				// education: "--",
+				// residence_current: "--",
+				// career: "--",
+				// empty_nest: false,
+				// idcard: "--",
+				// room: "--",
+				// guardian: "--",
+				// tenant: true,
+				// residence: "--",
+				// supporters: "--",
+				// ser_ill: false,
+				// ncd: true,
+				// belief_remark: "--",
+				// dementia: false,
+				// disability: true,
+				// telephone: "--",
+				// income: "--",
+				// native: "--",
+				// crowd: false,
+				// resident_remark: "--",
+				// hobby_remark: "--",
+				// retire_remark: "--",
+				// special_popu: true,
+				// street: "--",
+				// float_popu: true,
+				// supporters_relation: "--",
+				// name: "--",
+				// grid: "--",
+				// retire_date: "--",
+				// joinTime: "--",
+				// positiveTime: "--",
+				// branchId: "--",
+				// flowFlag: "--",
+				// flowActNum: "--",
+				// partyJob: "--",
+				// retiredFlag: "--",
+				// centerFlag: "--",
+				// joinBranchName: "--",
+				// joinCommunityTime: "--",
+				// longHolidayFlag: "--",
+				// ensure_house_id: "--",
+				// housingNature: "--",
+				// securityType: "--",
+				// certificateDate: "--",
+				// subsidyNum: "--",
+				// subsidyAmount: "--",
+				// unemployed_id: "--",
+				// originWorkUnit: "--",
+				// unemploymentTime: "--",
+				// unemploymentNum: "--",
+				// employmentNum: "--",
+				// specialSkill: "--",
+				// unemploymentReason: "--",
+				// employmentHardFlag: "--",
+				// employmentWish: "--",
+				// veteran_id: "--",
+				// joinArmyTime: "--",
+				// leaveArmyTime: "--",
+				// serviceUnit: "--",
+				// receiveUnit: "--",
+				// settlementAmount: "--",
+				// trainDesc: "--",
+				// joinWarStartTime: "--",
+				// joinWarEndTime: "--",
+				// employmentSituation: "--",
+				// pubWelfareJobFlag: "--",
+				// united_front_id: "--",
+				// duty: "--",
+				// visitation: "--",
+				// volunteer_id: "--",
+				// volunteerCategory: "--",
+				// volunteerRemark: "--",
+				// old_people_id: "--",
+				// oldSubsidy: "--",
+				// special_id: "--",
+				// specialCategoryCode: "--",
+				// birth_record_id: "--",
+				// birthplace: "--",
+				// father: "--",
+				// mother: "--",
+				// count: "--",
+				// reportDate: "--",
+				// death_record_id: "--",
+				// deathDate: "--",
+				// deathReason: "--",
+				// removeDate: "--",
+				// removeReason: "--",
+				// move_out_record_id: "--",
+				// outOfTime: "--",
+				// type: "--",
+				// reason: "--",
+				// deptId: "--",
+				// villageId: "--",
+				// villageName: "--",
+				// buildId: "--",
+				// buildName: "--",
+				// unitId: "--",
+				// unitName: "--",
+				// homeId: "--",
+				// homeName: "--",
+				// address: "--",
+				// residence_current: "--",
+			},
+
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
@@ -650,15 +783,16 @@ export default {
 		};
 	},
 
-	mounted() {
-		this.getApiData();
-	},
 	computed: {
 		currentTab() {
 			return this.tabList[this.currentTabIndex];
 		}
 	},
 
+	mounted() {
+		this.getApiData();
+	},
+
 	methods: {
 		addStartTabIndex() {
 			const { startTabIndex, tabList } = this;
@@ -676,6 +810,7 @@ export default {
 				this.startTabIndex = 0;
 			}
 		},
+
 		handleClose() {
 			this.$emit('close');
 		},
@@ -686,9 +821,7 @@ export default {
 
 		// 根据房屋id获取详情
 		async getInfo() {
-			let url = 'resident_special_info';
-
-			this.title = '综治人群详情';
+			const url = 'resident_special_info';
 
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -698,27 +831,27 @@ export default {
 					}
 				},
 				{
-					// mockId: 60235478,
+					// mockId: 61172054,
 				}
 			);
 
 			if (code === 0) {
 				this.info = { ...this.info, ...data[0] };
-				console.log(this.info);
+				console.log('this.info', this.info);
+				const { info } = this;
 				let tabList = this.BaseTabList;
-				info.crowd && tabList.push('党员');
-				info.srs && tabList.push('保障房');
-				info.unemployed && tabList.push('失业');
-				info.exs && tabList.push('退役军人');
-				info.ufs && tabList.push('统战人员');
-				info.volunteer && tabList.push('志愿者');
-				info.aged && tabList.push('老年人');
-				info.special_popu && tabList.push('特殊人群');
+				info.crowd!='0' && tabList.push('党员');
+				info.srs!='0' && tabList.push('保障房');
+				info.unemployed!='0' && tabList.push('失业');
+				info.exs!='0' && tabList.push('退役军人');
+				info.ufs!='0' && tabList.push('统战人员');
+				info.volunteer!='0' && tabList.push('志愿者');
+				info.aged!='0' && tabList.push('老年人');
+				info.special_popu!='0' && tabList.push('特殊人群');
 				tabList.push('出生信息');
 				tabList.push('死亡信息');
 				tabList.push('迁出');
 				this.tabList = tabList;
-				console.log('this.info', this.info);
 			} else {
 				this.$message.error(msg);
 			}
@@ -726,20 +859,20 @@ export default {
 	}
 };
 </script>
-<style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
+
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+<style lang="scss" scoped>
+@import '~@/assets/scss/c/config.scss';
+@import '~@/assets/scss/c/function.scss';
+
 .u-categorys {
 	display: flex;
 	flex-wrap: wrap;
-
-	span {
-		display: block;
-		width: 90px;
-	}
 }
-
+.u-categorys span {
+	display: block;
+	width: 90px;
+}
 .m-tabs {
 	margin-top: 30px;
 	display: flex;
@@ -777,4 +910,3 @@ export default {
 	}
 }
 </style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/cpts/wtqd.vue b/src/views/dataBoard/sida/cpts/wtqd.vue
index 58af26c3e..7a7106d2a 100644
--- a/src/views/dataBoard/sida/cpts/wtqd.vue
+++ b/src/views/dataBoard/sida/cpts/wtqd.vue
@@ -113,6 +113,7 @@ export default {
 			);
 			this.$refs.pieChart.hideLoading();
 			if (code === 0) {
+				console.log("data",data)
 				if (data && Array.isArray(data) && data.length > 0) {
 					let info = data[0];
 					this.info = {
diff --git a/src/views/dataBoard/sida/wt/eventList.vue b/src/views/dataBoard/sida/wt/eventList.vue
index ead2bb116..ad02b5f94 100644
--- a/src/views/dataBoard/sida/wt/eventList.vue
+++ b/src/views/dataBoard/sida/wt/eventList.vue
@@ -141,8 +141,10 @@ export default {
 			var nowDate = new Date();
 			var year = nowDate.getFullYear();
 			var month = nowDate.getMonth() + 1;
-			var day = nowDate.getDay();
+			var day = nowDate.getDate();
+			console.log("nowDate",day)
 			this.searchDate = [`${year}-${1}-${1}`, `${year}-${month}-${day}`];
+			
 		},
 		changList() {
 			this.type2 = '全部';
diff --git a/src/views/dataBoard/sida/wt/hiddenDangerList.vue b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
index dbec81257..57ce493e3 100644
--- a/src/views/dataBoard/sida/wt/hiddenDangerList.vue
+++ b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
@@ -46,7 +46,7 @@
 <script>
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
-import detail from '@/views/dataBoard/cpts/event-detail';
+import detail from '@/views/dataBoard/cpts/hiddenDanger-detail';
 import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
 
@@ -140,7 +140,7 @@ export default {
 			var nowDate = new Date();
 			var year = nowDate.getFullYear();
 			var month = nowDate.getMonth() + 1;
-			var day = nowDate.getDay();
+			var day = nowDate.getDate();
 			this.searchDate = [`${year}-${1}-${1}`, `${year}-${month}-${day}`];
 		},
 		changList() {
@@ -191,6 +191,7 @@ export default {
 						end_date,
 						org_id,
 						danger_name
+						
 					}
 				},
 				{
@@ -216,7 +217,7 @@ export default {
 					];
 				});
 
-				// console.log('this.list', this.list);
+				console.log('this.list', this.list);
 			} else {
 				this.$message.error(msg);
 			}
@@ -227,7 +228,7 @@ export default {
 			const start_date = searchDate[0];
 			const end_date = searchDate[1];
 			const url = 'hidden_danger_list_num';
-			let event_type = this.type2;
+			let danger_name = this.type2;
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
diff --git a/src/views/dataBoard/sida/wt/specialCategoryList.vue b/src/views/dataBoard/sida/wt/specialCategoryList.vue
index f1796d5b5..a54141636 100644
--- a/src/views/dataBoard/sida/wt/specialCategoryList.vue
+++ b/src/views/dataBoard/sida/wt/specialCategoryList.vue
@@ -156,7 +156,7 @@ export default {
 			var nowDate = new Date();
 			var year = nowDate.getFullYear();
 			var month = nowDate.getMonth() + 1;
-			var day = nowDate.getDay();
+			var day = nowDate.getDate();
 			this.searchDate = [`${year}-${1}-${1}`, `${year}-${month}-${day}`];
 		},
 		changList() {