From 3977fda40ac6b1d4dcd9cc2635cda9cb9c902f22 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Fri, 17 Mar 2023 17:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BA=86=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{event-details.vue => event-detail.vue}   |   6 +-
 ...er-details.vue => hiddenDanger-detail.vue} |   2 +-
 .../{need-details.vue => need-detail.vue}     |  80 ++++----
 src/views/dataBoard/cpts/resi-details.vue     |   6 +-
 ...details.vue => specialCategory-detail.vue} | 189 +++++++++++-------
 src/views/dataBoard/sida/wt/eventList.vue     |  15 +-
 .../dataBoard/sida/wt/hiddenDangerList.vue    |  27 ++-
 .../dataBoard/sida/wt/specialCategoryList.vue |  31 +--
 src/views/dataBoard/sida/xq/list.vue          |  92 +++++----
 9 files changed, 251 insertions(+), 197 deletions(-)
 rename src/views/dataBoard/cpts/{event-details.vue => event-detail.vue} (98%)
 rename src/views/dataBoard/cpts/{hiddenDanger-details.vue => hiddenDanger-detail.vue} (99%)
 rename src/views/dataBoard/cpts/{need-details.vue => need-detail.vue} (95%)
 rename src/views/dataBoard/cpts/{specialCategory-details.vue => specialCategory-detail.vue} (86%)

diff --git a/src/views/dataBoard/cpts/event-details.vue b/src/views/dataBoard/cpts/event-detail.vue
similarity index 98%
rename from src/views/dataBoard/cpts/event-details.vue
rename to src/views/dataBoard/cpts/event-detail.vue
index eb3b3e84c..7b855e3a6 100644
--- a/src/views/dataBoard/cpts/event-details.vue
+++ b/src/views/dataBoard/cpts/event-detail.vue
@@ -106,9 +106,9 @@ import { GaodeMap, Map } from '@antv/l7-maps';
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
-	name: 'eventDetails',
+	name: 'eventdetail',
 	props: {
-		detailsId: {
+		detailId: {
 			type: String,
 			default: ''
 		},
@@ -150,7 +150,7 @@ export default {
 				url,
 				{
 					queryParam: {
-						event_id: this.detailsId
+						event_id: this.detailId
 					}
 				},
 				{
diff --git a/src/views/dataBoard/cpts/hiddenDanger-details.vue b/src/views/dataBoard/cpts/hiddenDanger-detail.vue
similarity index 99%
rename from src/views/dataBoard/cpts/hiddenDanger-details.vue
rename to src/views/dataBoard/cpts/hiddenDanger-detail.vue
index 78d90ecea..68b5b5d8e 100644
--- a/src/views/dataBoard/cpts/hiddenDanger-details.vue
+++ b/src/views/dataBoard/cpts/hiddenDanger-detail.vue
@@ -793,7 +793,7 @@ import { GaodeMap, Map } from "@antv/l7-maps";
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
-	name: 'eventDetails',
+	name: 'eventdetail',
 	props: {
 		eventId: {
 			type: String,
diff --git a/src/views/dataBoard/cpts/need-details.vue b/src/views/dataBoard/cpts/need-detail.vue
similarity index 95%
rename from src/views/dataBoard/cpts/need-details.vue
rename to src/views/dataBoard/cpts/need-detail.vue
index f05eaf40d..3dafde384 100644
--- a/src/views/dataBoard/cpts/need-details.vue
+++ b/src/views/dataBoard/cpts/need-detail.vue
@@ -1,42 +1,6 @@
 <template>
 	<popup 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.parent_type_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">需求类别：</div>
-						<div class="value">{{ info.parent_type_name }} {{ info.child_type_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">需求标题 ：</div>
-						<div class="value">{{ info.title }}</div>
-					</div>
-					<div class="item" style="width: 100%;">
-						<div class="field">详细说明：</div>
-						<div class="value">{{ info.content }}</div>
-					</div>
-					<div class="item">
-						<div class="field">查找有该需求人员 ：</div>
-						<div class="value">{{ info.resi_search_tag_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">服务方 ：</div>
-						<div class="value">{{ info.service_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">服务范围 ：</div>
-						<div class="value">{{ info.scope_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">服务时间：</div>
-						<div class="value">{{ info.start_service_time }}至{{ info.end_service_time }}</div>
-					</div>
-				</div>
-			</div>
 			<div class="m-info" v-if="detailType == '政府支撑'">
 				<el-row>
 					<el-col :span="12">
@@ -114,7 +78,7 @@
 					</el-col>
 				</el-row>
 			</div>
-			<div class="m-info" v-else>
+			<div class="m-info" v-if="detailType == '服务支撑' || detailType == '商家支撑'">
 				<div class="row">
 					<div class="item">
 						<div class="field">所属网格：</div>
@@ -176,6 +140,38 @@
 					</div>
 				</div>
 			</div>
+			<div class="m-info" v-else>
+				<div class="row">
+					<div class="item">
+						<div class="field">需求类别：</div>
+						<div class="value">{{ info.parent_type_name }} {{ info.child_type_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">需求标题 ：</div>
+						<div class="value">{{ info.title }}</div>
+					</div>
+					<div class="item" style="width: 100%;">
+						<div class="field">详细说明：</div>
+						<div class="value">{{ info.content }}</div>
+					</div>
+					<div class="item">
+						<div class="field">查找有该需求人员 ：</div>
+						<div class="value">{{ info.resi_search_tag_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">服务方 ：</div>
+						<div class="value">{{ info.service_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">服务范围 ：</div>
+						<div class="value">{{ info.scope_name }}</div>
+					</div>
+					<div class="item">
+						<div class="field">服务时间：</div>
+						<div class="value">{{ info.start_service_time }}至{{ info.end_service_time }}</div>
+					</div>
+				</div>
+			</div>
 		</template>
 	</popup>
 </template>
@@ -187,7 +183,7 @@ import { requestPostBi } from '@/js/dai/request-bipass';
 export default {
 	name: 'needDetails',
 	props: {
-		needId: {
+		detailId: {
 			type: String,
 			default: ''
 		},
@@ -236,7 +232,7 @@ export default {
 				url,
 				{
 					queryParam: {
-						need_id: this.needId
+						need_id: this.detailId
 					}
 				},
 				{
@@ -247,10 +243,8 @@ export default {
 				this.info = { ...this.info, ...data[0] };
 				if (this.detailType == '政府支撑') {
 					this.progress = this.info.progress;
-
-					
 				}
-				console.log(this.info);
+				console.log('this.info', this.info);
 			} else {
 				this.$message.error(msg);
 			}
@@ -260,7 +254,7 @@ export default {
 </script>
 <style scoped>
 .m-info .row .item .field {
-	width: 120px !important;
+	width: 140px !important;
 }
 </style>
 <style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue
index eb3ae4965..4092c5527 100644
--- a/src/views/dataBoard/cpts/resi-details.vue
+++ b/src/views/dataBoard/cpts/resi-details.vue
@@ -934,12 +934,12 @@ export default {
 	display: flex;
 	flex-wrap: wrap;
 
-	span {
+	
+}
+.u-categorys span {
 		display: block;
 		width: 90px;
 	}
-}
-
 .m-tabs {
 	margin-top: 30px;
 	display: flex;
diff --git a/src/views/dataBoard/cpts/specialCategory-details.vue b/src/views/dataBoard/cpts/specialCategory-detail.vue
similarity index 86%
rename from src/views/dataBoard/cpts/specialCategory-details.vue
rename to src/views/dataBoard/cpts/specialCategory-detail.vue
index c05205a28..15a6d549a 100644
--- a/src/views/dataBoard/cpts/specialCategory-details.vue
+++ b/src/views/dataBoard/cpts/specialCategory-detail.vue
@@ -9,77 +9,57 @@
 				</div>
 				<div class="row">
 					<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.parent_category }} {{ info.category }}</div>
-					</div>
-					<div class="item">
-						<div class="field">房屋用途：</div>
-						<div class="value">{{ info.report_type }}</div>
-					</div>
-					<div class="item">
-						<div class="field">房屋状态：</div>
-						<div class="value">{{ info.report_user_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">房主姓名：</div>
-						<div class="value">{{ info.report_time }}</div>
+						<div class="field">所属网格：</div>
+						<div class="value">
+							<span v-if="info.community">{{ info.community }}</span>
+							<span v-if="info.grid">- {{ info.grid }}</span>
+						</div>
 					</div>
 					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ info.report_user_mobile }}</div>
+						<div class="field">所属房屋：</div>
+						<div class="value">
+							<span v-if="info.village">{{ info.village }}</span>
+							<span v-if="info.building">- {{ info.building }}</span>
+							<span v-if="info.unit">- {{ info.unit }}</span>
+							<span v-if="info.room">- {{ info.room }}</span>
+						</div>
 					</div>
 					<div class="item">
-						<div class="field">证件号：</div>
-						<div class="value">{{ info.report_user_mobile }}</div>
+						<div class="field">本地户籍：</div>
+						<div class="value">{{ info.census_type }}</div>
 					</div>
 				</div>
-				<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.demand_user_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ info.want_service_time }}</div>
-					</div>
-					<div class="item">
-						<div class="field">证件号：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="field">居民姓名：</div>
+						<div class="value">{{ info.name }}</div>
 					</div>
 					<div class="item">
-						<div class="field">本地户籍：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="field">出生日期：</div>
+						<div class="value">{{ info.birthday }}</div>
 					</div>
 					<div class="item">
 						<div class="field">性别：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ info.gender }}</div>
 					</div>
 					<div class="item">
-						<div class="field">出生日期：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="field">民族：</div>
+						<div class="value">{{ info.ethnic }}</div>
 					</div>
 					<div class="item">
-						<div class="field">民族：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="field">联系电话：</div>
+						<div class="value">{{ info.telephone }}</div>
 					</div>
 					<div class="item">
-						<div class="field">居民类别：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="field">证件号：</div>
+						<div class="value">{{ info.idcard }}</div>
 					</div>
 					<div class="item">
 						<div class="field">备注：</div>
-						<div class="value">{{ info.content }}</div>
+						<div class="value">{{ info.resident_remark }}</div>
 					</div>
 				</div>
+
 				<div class="subtitle">
 					<i class="i-chunk"></i>
 					<span>分类信息</span>
@@ -140,7 +120,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>
@@ -571,9 +551,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>
@@ -592,9 +572,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>
@@ -633,7 +613,7 @@
 							<div class="value">{{ info.address }}</div>
 						</div>
 					</div>
-				</div>
+				</div> -->
 			</div>
 		</template>
 	</popup>
@@ -641,13 +621,13 @@
 
 <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: 'eventDetails',
+	name: 'eventdetail',
 	props: {
-		detailsId: {
+		detailId: {
 			type: String,
 			default: ''
 		},
@@ -661,9 +641,8 @@ export default {
 	created() {},
 	data() {
 		return {
-			progress: [],
 			info: {},
-
+			title: '',
 			currentTabIndex: 0,
 			startTabIndex: 0,
 			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
@@ -674,18 +653,28 @@ export default {
 	mounted() {
 		this.getApiData();
 	},
+	computed: {
+		currentTab() {
+			return this.tabList[this.currentTabIndex];
+		}
+	},
 
 	methods: {
-		iniMap() {
-			const scene = new Scene({
-				id: 'map',
-				map: new GaodeMap({
-					pitch: 35.210526315789465,
-					style: 'dark',
-					center: [104.288144, 31.239692],
-					zoom: 4.4
-				})
-			});
+		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;
+			}
 		},
 		handleClose() {
 			this.$emit('close');
@@ -705,17 +694,31 @@ export default {
 				url,
 				{
 					queryParam: {
-						resident_id: this.detailsId
+						resident_id: this.detailId
 					}
 				},
 				{
 					// mockId: 60235478,
 				}
 			);
+
 			if (code === 0) {
 				this.info = { ...this.info, ...data[0] };
-
 				console.log(this.info);
+				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('特殊人群');
+				tabList.push('出生信息');
+				tabList.push('死亡信息');
+				tabList.push('迁出');
+				this.tabList = tabList;
+				console.log('this.info', this.info);
 			} else {
 				this.$message.error(msg);
 			}
@@ -727,5 +730,51 @@ export default {
 .m-info .row .item .field {
 	width: 120px !important;
 }
+.u-categorys {
+	display: flex;
+	flex-wrap: wrap;
+
+	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>
 <style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/wt/eventList.vue b/src/views/dataBoard/sida/wt/eventList.vue
index 48f72bc4c..ead2bb116 100644
--- a/src/views/dataBoard/sida/wt/eventList.vue
+++ b/src/views/dataBoard/sida/wt/eventList.vue
@@ -35,18 +35,18 @@
 			:list="list"
 			:total="total"
 			@handleSizeChange="handleSizeChange"
-			@handlepage_numChange="handlepage_numChange"
+			@handlePageNoChange="handlePageNoChange"
 			@operate="showInfo"
 		></cpt-tb>
 
-		<details @close="displayedId = ''" :detailsId="displayedId" :detailType="detailType" v-if="displayedId != ''" />
+		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
 	</div>
 </template>
 
 <script>
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
-import details from '@/views/dataBoard/cpts/event-details';
+import detail from '@/views/dataBoard/cpts/event-detail';
 import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
 
@@ -56,13 +56,13 @@ export default {
 	components: {
 		cptTb,
 		cptBread,
-		details
+		detail
 	},
 
 	data() {
 		return {
 			searchDate: [],
-			displayedId: '',
+			detailId: '',
 			searchDate: '',
 
 			detailType: '',
@@ -160,10 +160,11 @@ export default {
 			let item = this.srcTableData[index];
 
 			this.detailType = this.listType;
-			this.displayedId = item.event_id;
+			this.detailId = item.event_id;
 		},
 
-		handlepage_numChange(page_num) {
+		handlePageNoChange(page_num) {
+			console.log("dddddd")
 			this.page_num = page_num;
 			this.getList();
 		},
diff --git a/src/views/dataBoard/sida/wt/hiddenDangerList.vue b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
index 644583092..dbec81257 100644
--- a/src/views/dataBoard/sida/wt/hiddenDangerList.vue
+++ b/src/views/dataBoard/sida/wt/hiddenDangerList.vue
@@ -35,18 +35,18 @@
 			:list="list"
 			:total="total"
 			@handleSizeChange="handleSizeChange"
-			@handlepage_numChange="handlepage_numChange"
+			@handlePageNoChange="handlePageNoChange"
 			@operate="showInfo"
 		></cpt-tb>
 
-		<details @close="displayedId = ''" :detailsId="displayedId" :detailType="detailType" v-if="displayedId != ''" />
+		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
 	</div>
 </template>
 
 <script>
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
-import details from '@/views/dataBoard/cpts/event-details';
+import detail from '@/views/dataBoard/cpts/event-detail';
 import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
 
@@ -56,13 +56,13 @@ export default {
 	components: {
 		cptTb,
 		cptBread,
-		details
+		detail
 	},
 
 	data() {
 		return {
 			searchDate: [],
-			displayedId: '',
+			detailId: '',
 			searchDate: '',
 
 			detailType: '',
@@ -118,7 +118,6 @@ export default {
 					width: '10%'
 				}
 			],
-
 			header: ['序号', '安全隐患', '隐患明细', '创建时间', '操作']
 		};
 	},
@@ -129,9 +128,8 @@ export default {
 		this.type2 = getQueryPara('type2');
 
 		this.page_num = 1;
-		this.getDate();
+		// this.getDate();
 		this.init();
-	
 	},
 
 	methods: {
@@ -159,12 +157,11 @@ export default {
 
 		showInfo(index) {
 			let item = this.srcTableData[index];
-
-			this.detailType = this.listType;
-			this.displayedId = item.danger_name;
+			this.detailType = item.danger_name;
+			this.detailId = item.hidden_danger_id;
 		},
 
-		handlepage_numChange(page_num) {
+		handlePageNoChange(page_num) {
 			this.page_num = page_num;
 			this.getList();
 		},
@@ -211,14 +208,14 @@ export default {
 				this.list = data.map((item, index) => {
 					return [
 						index + 1,
+						item.danger_name ? item.danger_name : '--',
+						item.detailed ? item.detailed : '--',
 
-						item.event_content ? obj : '--',
-						item.status ? obj2 : '--',
 						item.created_time ? item.created_time : '--',
 						{ type: 'operate', list: ['查看'] }
 					];
 				});
-				
+
 				// console.log('this.list', this.list);
 			} else {
 				this.$message.error(msg);
diff --git a/src/views/dataBoard/sida/wt/specialCategoryList.vue b/src/views/dataBoard/sida/wt/specialCategoryList.vue
index 373ef0976..f1796d5b5 100644
--- a/src/views/dataBoard/sida/wt/specialCategoryList.vue
+++ b/src/views/dataBoard/sida/wt/specialCategoryList.vue
@@ -39,18 +39,18 @@
 			:list="list"
 			:total="total"
 			@handleSizeChange="handleSizeChange"
-			@handlepage_numChange="handlepage_numChange"
+			@handlePageNoChange="handlePageNoChange"
 			@operate="showInfo"
 		></cpt-tb>
 
-		<details @close="displayedId = ''" :detailsId="displayedId" :detailType="detailType" v-if="displayedId != ''" />
+		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
 	</div>
 </template>
 
 <script>
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
-import details from '@/views/dataBoard/cpts/specialCategory-details';
+import detail from '@/views/dataBoard/cpts/specialCategory-detail';
 import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
 
@@ -60,13 +60,13 @@ export default {
 	components: {
 		cptTb,
 		cptBread,
-		details
+		detail
 	},
 
 	data() {
 		return {
 			searchDate: [],
-			displayedId: '',
+			detailId: '',
 			searchDate: '',
 
 			detailType: '',
@@ -146,7 +146,6 @@ export default {
 		this.page_num = 1;
 		// this.getDate();
 		this.init();
-	
 	},
 
 	methods: {
@@ -175,14 +174,12 @@ export default {
 		showInfo(index) {
 			let item = this.srcTableData[index];
 			this.detailType = item.special_category;
-			this.displayedId = item.user_id;
-			this.detailType = '信访人员';
-			console.log('this.displayedId ', this.displayedId, this.detailType);
+			this.detailId = item.user_id;
 		},
 
-		handlepage_numChange(page_num) {
+		handlePageNoChange(page_num) {
 			this.page_num = page_num;
-			console.log(this.page_num )
+
 			this.getList();
 		},
 
@@ -190,7 +187,6 @@ export default {
 			localStorage.setItem('dataBoard_page_size', page_size);
 			this.page_size = page_size;
 			this.getList();
-			
 		},
 
 		async getList() {
@@ -217,13 +213,9 @@ export default {
 					// mockId: 60068051,
 				}
 			);
-
 			this.loading = false;
-
 			if (code === 0) {
-				
 				this.srcTableData = data;
-				console.log('this.srcTableData ', this.srcTableData);
 				// this.total = data.total;
 				this.list = data.map((item, index) => {
 					return [
@@ -237,20 +229,17 @@ export default {
 						{ type: 'operate', list: ['查看'] }
 					];
 				});
-
-				// console.log('this.list', this.list);
 			} else {
 				this.$message.error(msg);
 			}
 		},
-
 		async getCount() {
-			console.log("dddd");
+			console.log('dddd');
 			const { org_id, listType, page_num, page_size, searchDate } = this;
 			const start_date = searchDate[0];
 			const end_date = searchDate[1];
 			const url = 'special_category_list_num';
-			let special_category= this.type2;
+			let special_category = this.type2;
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
diff --git a/src/views/dataBoard/sida/xq/list.vue b/src/views/dataBoard/sida/xq/list.vue
index 6581bf10f..14faef084 100644
--- a/src/views/dataBoard/sida/xq/list.vue
+++ b/src/views/dataBoard/sida/xq/list.vue
@@ -31,6 +31,18 @@
 						<el-option value="社区文化">社区文化</el-option>
 					</template>
 				</el-select>
+				<div class="m-search2 left10" style="display: inline-block;">
+					<el-date-picker
+						type="daterange"
+						unlink-panels
+						value-format="yyyy-MM-dd"
+						@change="init"
+						v-model="searchDate"
+						range-separator="至"
+						start-placeholder="开始日期"
+						end-placeholder="结束日期"
+					></el-date-picker>
+				</div>
 			</div>
 		</div>
 		<cpt-tb
@@ -44,14 +56,14 @@
 			@operate="showInfo"
 		></cpt-tb>
 
-		<needDetails @close="displayedId = ''" :needId="displayedId" :detailType="detailType" v-if="displayedId != ''" />
+		<needdetail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
 	</div>
 </template>
 
 <script>
 import cptTb from '@/views/dataBoard/cpts/tb';
 import cptBread from '@/views/dataBoard/renfang/cpts/bread';
-import needDetails from '@/views/dataBoard/cpts/need-details';
+import needdetail from '@/views/dataBoard/cpts/need-detail';
 import { requestPostBi } from '@/js/dai/request-bipass';
 import getQueryPara from 'dai-js/modules/getQueryPara';
 
@@ -61,12 +73,13 @@ export default {
 	components: {
 		cptTb,
 		cptBread,
-		needDetails
+		needdetail
 	},
 
 	data() {
 		return {
-			displayedId: '',
+			searchDate: [],
+			detailId: '',
 
 			detailType: '',
 			breadList: [
@@ -92,9 +105,9 @@ export default {
 			listType: '', // 流动 常驻 全部
 
 			loading: true,
-			pageSize: parseInt(localStorage.getItem('dataBoard_PageSize')) || 20,
+			page_size: parseInt(localStorage.getItem('dataBoard_page_size')) || 20,
 
-			pageNo: 1,
+			page_num: 1,
 			total: 0,
 			srcTableData: [],
 			list: [],
@@ -133,14 +146,25 @@ export default {
 	activated() {
 		this.org_id = getQueryPara('org_id');
 		this.listType = getQueryPara('type');
-		this.type2= getQueryPara('type2');
-		
-		this.pageNo = 1;
-		this.getList();
-		this.getCount();
+		this.type2 = getQueryPara('type2');
+
+		this.page_num = 1;
+		// this.getDate();
+		this.init();
 	},
 
 	methods: {
+		init() {
+			this.getList();
+			this.getCount();
+		},
+		getDate() {
+			var nowDate = new Date();
+			var year = nowDate.getFullYear();
+			var month = nowDate.getMonth() + 1;
+			var day = nowDate.getDay();
+			this.searchDate = [`${year}-${1}-${1}`, `${year}-${month}-${day}`];
+		},
 		changList() {
 			this.type2 = '全部';
 			this.getList();
@@ -150,29 +174,26 @@ export default {
 				this.$router.back();
 			}
 		},
-
-		handleSearch() {},
-
 		showInfo(index) {
 			let item = this.srcTableData[index];
-
 			this.detailType = item.need_type;
-			this.displayedId = item.need_id;
+			this.detailId = item.need_id;
 		},
 
-		handlePageNoChange(pageNo) {
-			this.pageNo = pageNo;
-			this.getList();
+		handlePageNoChange(page_num) {
+			this.page_num = page_num;
+			this.init();
 		},
-
-		handleSizeChange(pageSize) {
-			localStorage.setItem('dataBoard_PageSize', pageSize);
-			this.pageSize = pageSize;
-			this.getList();
+		handleSizeChange(page_size) {
+			localStorage.setItem('dataBoard_page_size', page_size);
+			this.page_size = page_size;
+			this.init();
 		},
 
 		async getList() {
-			const { org_id, listType, pageNo, pageSize } = this;
+			const { org_id, listType, page_num, page_size, searchDate } = this;
+			const start_date = searchDate[0];
+			const end_date = searchDate[1];
 			this.loading = true;
 			const url = 'need_list';
 			const { data, code, msg } = await requestPostBi(
@@ -181,8 +202,10 @@ export default {
 					queryParam: {
 						org_id,
 						type: this.type2,
-						pageNo,
-						pageSize
+						page_num,
+						page_size,
+						start_date,
+						end_date
 					}
 				},
 				{
@@ -195,7 +218,6 @@ export default {
 			if (code === 0) {
 				this.srcTableData = data;
 				console.log('this.srcTableData ', this.srcTableData);
-				// this.total = data.total;
 
 				this.list = data.map((item, index) => {
 					let a = '';
@@ -229,9 +251,9 @@ export default {
 		},
 
 		async getCount() {
-			const { org_id, listType, pageNo, pageSize } = this;
+			const { org_id, listType, page_num, page_size } = this;
 
-			const url = 'need_list_total';
+			const url = 'need_list_num';
 
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -239,17 +261,19 @@ export default {
 					queryParam: {
 						org_id,
 						type: listType,
-						pageNo,
-						pageSize
+						start_date,
+						end_date
 					}
 				},
 				{
 					// mockId: 63070189,
-				}
+				},
+				console.log('ddd')
 			);
 
 			if (code === 0) {
-				this.total = parseInt(data[0].count);
+				this.total = parseInt(data[0].total);
+				console.log(this.total);
 			} else {
 				this.$message.error(msg);
 			}