From 70139efd3e593f18bef2bcb9b1de5942e5fe13ea Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Mon, 10 Apr 2023 16:16:32 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue |  12 +-
 src/views/modules/census/census-nineList.vue  | 622 ++++++++++++++-
 .../modules/census/census-residentList.vue    | 743 +++++++++++++++++-
 3 files changed, 1358 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index aa1c0d227..2fb5edebe 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -107,14 +107,19 @@
 							</el-col>
 						</el-row>
 					</el-col>
+
 					<el-col :span="24">
+						<div class="census_searchcensus2">
+							<div class="census_searchcensus_box"></div>
+							<el-button size="small" class="diy-button--output" @click="handleExport(1)">导出</el-button>
+						</div>
 						<el-table
 							:data="tableData"
 							border
 							v-loading="tableLoading"
 							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
 							class="table"
-							style="width: 100%;margin-top: 50px;"
+							style="width: 100%;"
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
@@ -685,8 +690,8 @@ export default {
 
 	justify-content: space-between;
 	align-items: flex-end;
-	margin-bottom: 20px;
-	margin-top: 20px;
+	margin-bottom:0px;
+	margin-top: 0px;
 	.census_searchcensus_box {
 		align-items: flex-end;
 		display: flex;
@@ -725,6 +730,7 @@ export default {
 .diy-button--output {
 	width: 100px;
 	height: 38px;
+
 	background: #feb349;
 	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
 	border-radius: 6px;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 3763ac739..9969c056f 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -1,12 +1,618 @@
 <template>
-	<!-- 	census-orgStatusList
-	census-accountList
-	census-accountActiveList
-	census-houseList
-	census-residentList
-	census-nineList -->
+	<div class="div_main">
+		<div>
+			<div class="div_search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
+					<div>
+						<el-form-item label="所属组织" prop="gridId">
+							<el-cascader
+								class="customer_cascader"
+								ref="myCascader"
+								filterable
+								clearable
+								v-model="formData.orgId"
+								:options="orgOptions"
+								:props="orgOptionProps"
+								:show-all-levels="false"
+								@change="handleChangeAgency"
+							></el-cascader>
+						</el-form-item>
+						<!-- <el-form-item label="上报时间" prop="startTime">
+							<el-date-picker
+								v-model="formData.startDate"
+								:picker-options="startPickerOptions"
+								class="item_width_2"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="开始时间"
+							></el-date-picker>
+							<span class="data-tag">至</span>
+							<el-date-picker
+								v-model="formData.endDate"
+								:picker-options="endPickerOptions"
+								class="item_width_2 data-tag"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="结束时间"
+							></el-date-picker>
+						</el-form-item> -->
+						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+					</div>
+				</el-form>
+			</div>
+			<div class="div_table">
+				<el-row :gutter="20">
+					<el-col :span="24">
+						<div class="div_table_title">九小场所分析</div>
+						<el-row>
+							<el-col :span="12">
+								<div style="height:220px;margin-top:20px">
+									<screen-echarts-frame
+										@handelClickMyPei="handelClickMyPei"
+										:style="{ width: '100%', height: '100%' }"
+										@myChartMethod="pieInitOk"
+										ref="pieChart"
+									></screen-echarts-frame>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div style="height:220px;margin-top:20px;display:flex;align-items: center;">
+									<div class="legend">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
+											<div class="content">
+												<div class="name">{{ item.name }}</div>
+												<div class="num">{{ item.value }}</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+											</div>
+										</div>
+									</div>
+								</div>
+							</el-col>
+						</el-row>
+					</el-col>
+
+					<el-col :span="24">
+						<div class="census_searchcensus2">
+							<div class="census_searchcensus_box"></div>
+							<el-button size="small" class="diy-button--output" @click="handleExport(1)">导出</el-button>
+						</div>
+						<el-table
+							:data="tableData"
+							border
+							v-loading="tableLoading"
+							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+							class="table"
+							style="width: 100%;"
+							:height="maxTableHeight"
+						>
+							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+
+							<el-table-column prop="placeOrgName" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="scaleName" align="center" label="规模" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="personInCharge" align="center" label="负责人" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="mobile" align="center" label="联系方式" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
+								<el-button size="small" type="text" @click="">查看</el-button>
+							</el-table-column>
+						</el-table>
+
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page.sync="pageNo"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize)"
+							layout="sizes, prev, pager, next, total"
+							:total="total"
+						></el-pagination>
+					</el-col>
+				</el-row>
+			</div>
+		</div>
+	</div>
 </template>
 
-<script></script>
+<script>
+import screenEchartsFrame from './chart';
+import screenEchartsFrame2 from './chart';
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+
+import axios from 'axios';
+
+export default {
+	components: { screenEchartsFrame, screenEchartsFrame2 },
+	data() {
+		let endDisabledDate = time => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			if (this.formData.startTime) {
+				let startTime = new Date(this.formData.startTime);
+				return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime;
+			} else {
+				return time.getTime() > nowData;
+			}
+		};
+		let startDisabledDate = time => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			return time.getTime() > nowData;
+		};
+		return {
+			tableLoading: false,
+			user: {},
+			gridList: [], //所属网格list--场所区域
+			tableData: [],
+			formData: {},
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			endPickerOptions: {
+				//时间
+				disabledDate: endDisabledDate
+			},
+			startPickerOptions: {
+				//时间
+				disabledDate: startDisabledDate
+			},
+			agencyId: '', //组织
+			agencyIdArray: [], //组织
+			orgOptions: [], //组织
+			orgOptionProps: {
+				//组织
+				multiple: false,
+				value: 'agencyId',
+				label: 'agencyName',
+				children: 'subAgencyList',
+				checkStrictly: true
+			},
+			TableHeight: '',
+			pieInitState: false,
+			pieInitState2: false,
+			pieOption: [],
+			pieOption2: [],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			chartData: {},
+			placeType: '',
+			pieData: []
+		};
+	},
+	computed: {
+		maxTableHeight() {
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 630 + this.iframeHeigh : this.clientHeight - 630;
+			return this.TableHeight;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {
+		'formData.endTime': function(val) {
+			if (val && val != '') {
+				let arrayTemp = val.split(' ');
+				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+			}
+		}
+	},
+	mounted() {
+		console.log(this.$store.state);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.getOrgTreeList();
+		this.getTableData();
+		this.getsubData();
+		this.getPie();
+	},
+	methods: {
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.placeType="";
+			this.getTableData();
+			this.getsubData();
+			this.getPie();
+		},
+		async getTableData() {
+			this.tableLoading = true;
+			const url = '/gov/org/enterprise/list';
+			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				orgId: this.formData.orgId,
+				orgType: this.orgType,
+				placeType: this.placeType
+			});
+
+			this.tableLoading = false;
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		async getsubData() {
+			this.$refs.pieChart.showLoading();
+			let url = '/gov/org/enterprise/count-type';
+			let param = {
+				orgId: this.formData.orgId,
+				orgType: this.orgType
+
+				// startDate: this.formData.startDate,
+				// endDate: this.formData.endDate
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart.hideLoading();
+
+			if (code === 0) {
+				this.pieData = data;
+				console.log('this.pieData ', this.pieData);
+				this.getPie();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		pieInitOk() {
+			this.pieInitState = true;
+		},
+
+		getPie() {
+			if (this.pieInitState) {
+				this.setPieData();
+			} else {
+				setTimeout(() => {
+					this.getPie();
+				}, 500);
+			}
+		},
+
+		setPieData() {
+			let data = [...this.pieData.list];
+			this.chartData.name = data.map(item => item.placeTypeName);
+			this.chartData.data = data.map(item => {
+				return { value: item.total, id: item.agencyId, placeType: item.placeType, name: item.placeTypeName };
+			});
+
+			console.log('chartData', this.chartData);
+			this.iniPieChart(this.chartData);
+		},
+
+		// 获取饼状图
+		async iniPieChart(chartData) {
+			this.$refs.pieChart.clear();
+			// 获取pieChart配置
+			this.pieOption = {
+				color: this.color,
+				title: {
+					text: this.pieData.total,
+					subtext: '总数',
+					x: 'center',
+					y: 'center',
+					textStyle: {
+						fontSize: 26,
+						color: '#333333',
+						fontWeight: 'bold'
+					},
+					subtextStyle: {
+						fontSize: 14,
+						color: '#333333'
+					}
+				},
+
+				series: [
+					{
+						type: 'pie',
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '65%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+					{
+						type: 'pie',
+						radius: ['80%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					}
+				]
+			};
+			this.$refs.pieChart.setOption(this.pieOption);
+		},
+
+		handelClickMyPei(param) {
+			this.placeType = param.data.placeType;
+			this.getTableData();
+		},
+
+		async handleExport() {
+			const url = '/gov/org/enterprise/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post('/gov/org/customeragency/agencygridtree', {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						// console.log('获取组织树成功', res.data);
+						// let { agencyList, subAgencyList } = res.data;
+						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+						// this.orgOptions = this.deepTree(_arr);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
+					}
+				})
+				.catch(() => {
+					return this.$message.error('网络错误');
+				});
+		},
+		handleChangeAgency(val) {
+			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			console.log(obj);
+			this.formData.orgId = obj.agencyId;
+			if (obj.level == 'grid') {
+				this.orgType = 'grid';
+			} else {
+				this.orgType = obj.agency;
+			}
+		},
+		deepTree(arr) {
+			if (Array.isArray(arr)) {
+				return arr.map(item => {
+					return {
+						...item,
+						subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+@import '@/assets/scss/modules/shequzhili/event-info.scss';
+.legend {
+	display: flex;
+	flex-flow: row wrap;
+	.legend-row {
+		min-width: 100px;
+		display: flex;
+		margin-bottom: 30px;
+		margin-right: 25px;
+		.kuai {
+			width: 12px;
+			height: 12px;
+			margin-right: 10px;
+			border-radius: 4px;
+		}
+		.content {
+			.name {
+				font-size: 14px;
+				color: #999;
+				margin-bottom: 10px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
+}
+.legend2 {
+	// display: flex;
+	// flex-flow: row wrap;
+
+	.legend-row {
+		width: 100%;
+		display: flex;
+		margin-bottom: 16px;
+		.kuai {
+			margin-right: 10px;
+			border-radius: 4px;
+			img {
+				width: 40px;
+				height: 40px;
+			}
+		}
+		.content {
+			display: flex;
+			align-items: center;
+			.name {
+				font-size: 14px;
+				color: #999;
+				width: 60px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
+}
+.btnSearch {
+	width: 100px;
+	height: 36px;
+	background: #2195fe;
+	box-shadow: 0px 2px 6px 0px rgba(28, 107, 253, 0.31);
+	border-radius: 6px;
+	color: #fff;
+}
+.div_search {
+	.item_width_2 {
+		width: 200px;
+	}
+}
+// /这里是不一样的,居左，从下对齐
+.census_searchcensus2 {
+	text-align: center;
+	margin: 0 auto;
+	display: flex;
+
+	justify-content: space-between;
+	align-items: flex-end;
+	margin-bottom: 0px;
+	margin-top: 0px;
+	.census_searchcensus_box {
+		align-items: flex-end;
+		display: flex;
+		img {
+			width: 64px;
+			height: 64px;
+			margin-right: 20px;
+		}
+		h2 {
+			font-size: 28px;
+			color: #333333;
+
+			text-align: left;
+			line-height: 40px;
+			margin: 0px;
+		}
+		h3 {
+			font-size: 14px;
+			color: #333333;
+
+			text-align: left;
+
+			margin: 0px;
+			font-weight: normal;
+		}
+	}
+}
+.div_table_title {
+	margin-top: 20px;
+	line-height: 30px;
+	font-size: 20px;
+
+	font-weight: bold;
+	color: #333333;
+}
+.diy-button--output {
+	width: 100px;
+	height: 38px;
 
-<style></style>
+	background: #feb349;
+	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
+	border-radius: 6px;
+	color: #fff;
+}
+</style>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 3763ac739..2fb5edebe 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -1,12 +1,739 @@
 <template>
-	<!-- 	census-orgStatusList
-	census-accountList
-	census-accountActiveList
-	census-houseList
-	census-residentList
-	census-nineList -->
+	<div class="div_main">
+		<div>
+			<div class="div_search">
+				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
+					<div>
+						<el-form-item label="所属组织" prop="gridId">
+							<el-cascader
+								class="customer_cascader"
+								ref="myCascader"
+								filterable
+								clearable
+								v-model="formData.orgId"
+								:options="orgOptions"
+								:props="orgOptionProps"
+								:show-all-levels="false"
+								@change="handleChangeAgency"
+							></el-cascader>
+						</el-form-item>
+						<el-form-item label="上报时间" prop="startTime">
+							<el-date-picker
+								v-model="formData.startDate"
+								:picker-options="startPickerOptions"
+								class="item_width_2"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="开始时间"
+							></el-date-picker>
+							<span class="data-tag">至</span>
+							<el-date-picker
+								v-model="formData.endDate"
+								:picker-options="endPickerOptions"
+								class="item_width_2 data-tag"
+								size="small"
+								type="date"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								value="yyyy-MM-dd"
+								placeholder="结束时间"
+							></el-date-picker>
+						</el-form-item>
+						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+					</div>
+				</el-form>
+			</div>
+			<div class="div_table">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<div class="div_table_title">房屋用途统计</div>
+						<el-row>
+							<el-col :span="12">
+								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+									<screen-echarts-frame
+										@handelClickMyPei="handelClickMyPei"
+										:style="{ width: '100%', height: '100%' }"
+										@myChartMethod="pieInitOk"
+										ref="pieChart"
+									></screen-echarts-frame>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
+									<div class="legend">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
+											<div class="content">
+												<div class="name">{{ item.name }}</div>
+												<div class="num">{{ item.value }}</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+											</div>
+										</div>
+									</div>
+								</div>
+							</el-col>
+						</el-row>
+					</el-col>
+					<el-col :span="12">
+						<div class="div_table_title">房屋状态统计</div>
+						<el-row>
+							<el-col :span="12">
+								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+									<screen-echarts-frame2
+										@handelClickMyPei="handelClickMyPei2"
+										:style="{ width: '100%', height: '100%' }"
+										@myChartMethod="pieInitOk2"
+										ref="pieChart2"
+									></screen-echarts-frame2>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
+									<div class="legend2">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
+											<div class="kuai" v-if="item.name == '自住'"><img src="../../../assets/img/census/自住.png" /></div>
+											<div class="kuai" v-if="item.name == '出租'"><img src="../../../assets/img/census/出租.png" /></div>
+											<div class="kuai" v-if="item.name == '闲置'"><img src="../../../assets/img/census/闲置.png" /></div>
+											<div class="kuai" v-if="item.name == '未售出'"><img src="../../../assets/img/census/未售出.png" /></div>
+											<div class="content">
+												<div class="name">{{ item.name }}</div>
+												<div class="num">{{ item.value }}</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+											</div>
+										</div>
+									</div>
+								</div>
+							</el-col>
+						</el-row>
+					</el-col>
+
+					<el-col :span="24">
+						<div class="census_searchcensus2">
+							<div class="census_searchcensus_box"></div>
+							<el-button size="small" class="diy-button--output" @click="handleExport(1)">导出</el-button>
+						</div>
+						<el-table
+							:data="tableData"
+							border
+							v-loading="tableLoading"
+							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+							class="table"
+							style="width: 100%;"
+							:height="maxTableHeight"
+						>
+							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
+						</el-table>
+
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page.sync="pageNo"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize)"
+							layout="sizes, prev, pager, next, total"
+							:total="total"
+						></el-pagination>
+					</el-col>
+				</el-row>
+			</div>
+		</div>
+	</div>
 </template>
 
-<script></script>
+<script>
+import screenEchartsFrame from './chart';
+import screenEchartsFrame2 from './chart';
+import { requestPost } from '@/js/dai/request';
+import nextTick from 'dai-js/tools/nextTick';
+import { mapGetters } from 'vuex';
+
+import axios from 'axios';
+
+export default {
+	components: { screenEchartsFrame, screenEchartsFrame2 },
+	data() {
+		let endDisabledDate = time => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			if (this.formData.startTime) {
+				let startTime = new Date(this.formData.startTime);
+				return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime;
+			} else {
+				return time.getTime() > nowData;
+			}
+		};
+		let startDisabledDate = time => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			return time.getTime() > nowData;
+		};
+		return {
+			tableLoading: false,
+			user: {},
+			gridList: [], //所属网格list--场所区域
+			tableData: [],
+			formData: {},
+			pageNo: 1,
+			pageSize: window.localStorage.getItem('pageSize') || 20,
+			total: 1,
+			endPickerOptions: {
+				//时间
+				disabledDate: endDisabledDate
+			},
+			startPickerOptions: {
+				//时间
+				disabledDate: startDisabledDate
+			},
+			agencyId: '', //组织
+			agencyIdArray: [], //组织
+			orgOptions: [], //组织
+			orgOptionProps: {
+				//组织
+				multiple: false,
+				value: 'agencyId',
+				label: 'agencyName',
+				children: 'subAgencyList',
+				checkStrictly: true
+			},
+			TableHeight: '',
+			pieInitState: false,
+			pieInitState2: false,
+			pieOption: [],
+			pieOption2: [],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			chartData: [],
+			chartData2: [],
+			pieData: []
+		};
+	},
+	computed: {
+		maxTableHeight() {
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 700 + this.iframeHeigh : this.clientHeight - 700;
+			return this.TableHeight;
+		},
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	watch: {
+		'formData.endTime': function(val) {
+			if (val && val != '') {
+				let arrayTemp = val.split(' ');
+				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+			}
+		}
+	},
+	mounted() {
+		console.log(this.$store.state);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.getOrgTreeList();
+		this.getTableData();
+		this.getPie();
+		this.getPie2();
+	},
+	methods: {
+		handleSearch(val) {
+			console.log(this.formData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		async getTableData() {
+			this.tableLoading = true;
+			// const url = '/gov/org/staffLoginLog/community-count';
+			const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+
+			const { pageSize, pageNo, formData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...formData
+			});
+
+			this.tableLoading = false;
+			if (code === 0) {
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		async getsubData() {
+			this.$refs.pieChart.showLoading();
+			let url = '/gov/org/staffLoginLog/sub-count';
+			let param = {
+				orgId: this.formData.orgId,
+				level: this.formData.level,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart.hideLoading();
+
+			if (code === 0) {
+				this.pieData = data.list;
+				console.log('this.pieData ', this.pieData);
+				this.getPie();
+				this.getPie2();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		pieInitOk() {
+			this.pieInitState = true;
+		},
+		pieInitOk2() {
+			console.log('2333erwewrwe33333', this.pieInitState2);
+			this.pieInitState2 = true;
+			console.log('2333erwewrwe333335476754765', this.pieInitState2);
+		},
+		getPie() {
+			if (this.pieInitState) {
+				this.setPieData();
+			} else {
+				setTimeout(() => {
+					this.getPie();
+				}, 500);
+			}
+		},
+		getPie2() {
+			if (this.pieInitState2) {
+				console.log('233333333');
+				this.setPieData2();
+			} else {
+				setTimeout(() => {
+					this.getPie2();
+				}, 500);
+			}
+		},
+		setPieData() {
+			// let data = [...this.pieData];
+			// console.log('data', data);
+			let chartData = {
+				name: ['反骨', '反骨2', '反骨3', '反骨4'],
+				data: [{ value: 62, name: '反骨' }, { value: 44, name: '反骨2' }, { value: 123, name: '反骨3' }, { value: 232, name: '反骨4' }]
+			};
+			this.chartData = chartData;
+			// chartData.name = data.map(item => item.agencyName);
+			// chartData.data = data.map(item => {
+			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
+			// });
+			console.log('chartData', chartData);
+			this.iniPieChart(chartData);
+		},
+		setPieData2() {
+			console.log('dddddddddddd');
+			// let data = [...this.pieData];
+			// console.log('data', data);
+			let chartData = {
+				name: ['自住', '出租', '闲置', '未售出'],
+				data: [{ value: 62, name: '自住' }, { value: 243, name: '出租' }, { value: 243, name: '闲置' }, { value: 243, name: '未售出' }]
+			};
+			this.chartData2 = chartData;
+			// chartData.name = data.map(item => item.agencyName);
+			// chartData.data = data.map(item => {
+			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
+			// });
+			console.log('chartData', chartData);
+			this.iniPieChart2(chartData);
+		},
+		// 获取饼状图
+		async iniPieChart(chartData) {
+			this.$refs.pieChart.clear();
+			// 获取pieChart配置
+			this.pieOption = {
+				color: this.color,
+				title: {
+					text: '12345',
+					subtext: '房屋总数(分)',
+					x: 'center',
+					y: 'center',
+					textStyle: {
+						fontSize: 26,
+						color: '#333333',
+						fontWeight: 'bold'
+					},
+					subtextStyle: {
+						fontSize: 14,
+						color: '#333333'
+					}
+				},
+
+				series: [
+					{
+						type: 'pie',
+						radius: ['60%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+
+					{
+						type: 'pie',
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+						data: chartData.data
+					}
+				]
+			};
+			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		async iniPieChart2(chartData) {
+			this.$refs.pieChart2.clear();
+			// 获取pieChart配置
+
+			this.pieOption2 = {
+				color: this.color,
+				title: {
+					text: '12345',
+					subtext: '房屋总数(分)',
+					x: 'center',
+					y: 'center',
+					textStyle: {
+						fontSize: 26,
+						color: '#333333',
+						fontWeight: 'bold'
+					},
+					subtextStyle: {
+						fontSize: 14,
+						color: '#333333'
+					}
+				},
+
+				series: [
+					{
+						type: 'pie',
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+						z: 9999,
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					}
+				]
+			};
+			this.$refs.pieChart2.setOption(this.pieOption2);
+		},
+		handelClickMyPei(param) {
+			if (param.data.level != 'community') {
+				if (param.data.level == 'district') {
+					this.orgType = 'street';
+				}
+				if (param.data.level == 'street') {
+					this.orgType = 'community';
+				}
+
+				this.orgId = param.data.id;
+				this.orgName = param.data.name;
+				this.pageNo = 1;
+				this.showNext();
+				this.dialogVisible = true;
+			}
+		},
+		handelClickMyPei2(param) {
+			if (param.data.level != 'community') {
+				if (param.data.level == 'district') {
+					this.orgType = 'street';
+				}
+				if (param.data.level == 'street') {
+					this.orgType = 'community';
+				}
+
+				this.orgId = param.data.id;
+				this.orgName = param.data.name;
+				this.pageNo = 1;
+				this.showNext();
+				this.dialogVisible = true;
+			}
+		},
+		async handleExport() {
+			const url = '/gov/project/icEvent/export';
+			const { pageSize, pageNo, formData } = this;
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					pageSize,
+					pageNo,
+					...formData
+				},
+				responseType: 'blob'
+			})
+				.then(res => {
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出情失败', err);
+					return this.$message.error('网络错误');
+				});
+		},
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post('gov/org/customeragency/staffinagencylist', {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log('获取组织树成功', res.data);
+						let { agencyList, subAgencyList } = res.data;
+						const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+						this.orgOptions = this.deepTree(_arr);
+					}
+				})
+				.catch(() => {
+					return this.$message.error('网络错误');
+				});
+		},
+		handleChangeAgency(val) {
+			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			console.log(obj);
+			this.formData.orgId = obj.agencyId;
+			this.formData.level = obj.level;
+		},
+		deepTree(arr) {
+			if (Array.isArray(arr)) {
+				return arr.map(item => {
+					return {
+						...item,
+						subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
+					};
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+@import '@/assets/scss/modules/shequzhili/event-info.scss';
+.legend {
+	display: flex;
+	flex-flow: row wrap;
+	.legend-row {
+		min-width: 100px;
+		display: flex;
+		margin-bottom: 30px;
+		margin-right: 25px;
+		.kuai {
+			width: 12px;
+			height: 12px;
+			margin-right: 10px;
+			border-radius: 4px;
+		}
+		.content {
+			.name {
+				font-size: 14px;
+				color: #999;
+				margin-bottom: 10px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
+}
+.legend2 {
+	// display: flex;
+	// flex-flow: row wrap;
+
+	.legend-row {
+		width: 100%;
+		display: flex;
+		margin-bottom: 16px;
+		.kuai {
+			margin-right: 10px;
+			border-radius: 4px;
+			img {
+				width: 40px;
+				height: 40px;
+			}
+		}
+		.content {
+			display: flex;
+			align-items: center;
+			.name {
+				font-size: 14px;
+				color: #999;
+				width: 60px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
+}
+.btnSearch {
+	width: 100px;
+	height: 36px;
+	background: #2195fe;
+	box-shadow: 0px 2px 6px 0px rgba(28, 107, 253, 0.31);
+	border-radius: 6px;
+	color: #fff;
+}
+.div_search {
+	.item_width_2 {
+		width: 200px;
+	}
+}
+// /这里是不一样的,居左，从下对齐
+.census_searchcensus2 {
+	text-align: center;
+	margin: 0 auto;
+	display: flex;
+
+	justify-content: space-between;
+	align-items: flex-end;
+	margin-bottom:0px;
+	margin-top: 0px;
+	.census_searchcensus_box {
+		align-items: flex-end;
+		display: flex;
+		img {
+			width: 64px;
+			height: 64px;
+			margin-right: 20px;
+		}
+		h2 {
+			font-size: 28px;
+			color: #333333;
+
+			text-align: left;
+			line-height: 40px;
+			margin: 0px;
+		}
+		h3 {
+			font-size: 14px;
+			color: #333333;
+
+			text-align: left;
+
+			margin: 0px;
+			font-weight: normal;
+		}
+	}
+}
+.div_table_title {
+	margin-top: 20px;
+	line-height: 30px;
+	font-size: 20px;
+
+	font-weight: bold;
+	color: #333333;
+}
+.diy-button--output {
+	width: 100px;
+	height: 38px;
 
-<style></style>
+	background: #feb349;
+	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
+	border-radius: 6px;
+	color: #fff;
+}
+</style>

From fad93205eba84ecdce7989e67df2b31f4d79bedb Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Mon, 10 Apr 2023 16:35:40 +0800
Subject: [PATCH 02/19] bug

---
 .../census/census-accountActiveList.vue       |   2 +-
 .../modules/census/census-accountList.vue     |  30 +++--
 .../modules/census/census-orgStatusList.vue   | 106 +++++++++++-------
 3 files changed, 86 insertions(+), 52 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 89bd2d260..a85ee01d9 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -89,7 +89,7 @@
 							<el-button size="small" class="diy-button--output" @click="handleExport(0)">导出</el-button>
 						</div>
 						<el-table
-							:data="tableData"
+							:data="tableData2"
 							border
 							v-loading="tableLoading"
 							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index db90cfd78..a0b56ab00 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -451,14 +451,14 @@ export default {
 			this.showNext();
 		},
 		deepTree(arr) {
-		  if (Array.isArray(arr)) {
-		    return arr.map(item => {
-		      return {
-		        ...item,
-		        subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
-		      }
-		    })
-		  }
+			if (Array.isArray(arr)) {
+				return arr.map(item => {
+					return {
+						...item,
+						subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
+					};
+				});
+			}
 		},
 		pieInitOk() {
 			this.pieInitState = true;
@@ -493,7 +493,19 @@ export default {
 				},
 				xAxis: {
 					type: 'category',
-					data: chartData.name
+					data: chartData.name,
+					axisLabel: {
+						interval: 0,
+						interval: 0, //设置横坐标为斜
+						rotate: 30, //文字倾斜角度
+						formatter: function(value) {
+							if (value.length > 10) {
+								value = value.substring(0, 9) + '..';
+							}
+							return value;
+						}
+					},
+					triggerEvent: true
 				},
 				yAxis: {
 					type: 'value',
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 3d54778be..1733974a9 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -17,35 +17,12 @@
 								@change="handleChangeAgency"
 							></el-cascader>
 						</el-form-item>
-						<el-form-item label="上报时间" prop="startDate">
-							<el-date-picker
-								v-model="formData.startDate"
-								:picker-options="startPickerOptions"
-								class="item_width_2"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="开始时间"
-							></el-date-picker>
-							<span class="data-tag">至</span>
-							<el-date-picker
-								v-model="formData.endDate"
-								:picker-options="endPickerOptions"
-								class="item_width_2 data-tag"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="结束时间"
-							></el-date-picker>
-						</el-form-item>
+
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
 					</div>
 				</el-form>
 				<div class="flex">
-					
-					<div class="census_searchcensus" v-if="level=='city'">
+					<div class="census_searchcensus" v-if="level == 'city'">
 						<div class="census_searchcensus_box">
 							<img src="../../../assets/img/census/区级.png" />
 							<div>
@@ -54,7 +31,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="census_searchcensus" v-if="level=='city'||level=='district'">
+					<div class="census_searchcensus" v-if="level == 'city' || level == 'district'">
 						<div class="census_searchcensus_box">
 							<img src="../../../assets/img/census/镇街.png" />
 							<div>
@@ -64,7 +41,7 @@
 						</div>
 					</div>
 
-					<div class="census_searchcensus" v-if="level=='city'||level=='district'||level=='street'">
+					<div class="census_searchcensus" v-if="level == 'city' || level == 'district' || level == 'street'">
 						<div class="census_searchcensus_box">
 							<img src="../../../assets/img/census/社区.png" />
 							<div>
@@ -74,7 +51,7 @@
 						</div>
 					</div>
 
-					<div class="census_searchcensus" >
+					<div class="census_searchcensus">
 						<div class="census_searchcensus_box">
 							<img src="../../../assets/img/census/网格数.png" />
 							<div>
@@ -97,7 +74,39 @@
 			<el-row :gutter="20">
 				<el-col :span="24">
 					<div class="div_table">
-						<div class="div_table_title">下级社区数量统计</div>
+						<div class="div_table_title">下级社区数量统计
+							<el-form :inline="true" :model="formData2" ref="ref_searchform2" :label-width="'80px'" style="display: inline-block;margin-left: 20px;">
+								<div>
+									<el-form-item label="" prop="startDate" >
+										<el-date-picker
+											v-model="formData2.startDate"
+											:picker-options="startPickerOptions"
+											class="item_width_2"
+											size="small"
+											type="date"
+											value-format="yyyy-MM-dd HH:mm:ss"
+											value="yyyy-MM-dd"
+											placeholder="开始时间"
+											@change="handleSearch"
+										></el-date-picker>
+										<span class="data-tag">至</span>
+										<el-date-picker
+											v-model="formData2.endDate"
+											:picker-options="endPickerOptions"
+											class="item_width_2 data-tag"
+											size="small"
+											type="date"
+											value-format="yyyy-MM-dd HH:mm:ss"
+											value="yyyy-MM-dd"
+											placeholder="结束时间"
+											@change="handleSearch"
+										></el-date-picker>
+									</el-form-item>
+								</div>
+							</el-form>
+
+							
+						</div>
 						<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :h="maxTableHeight">
 							<screen-echarts-frame
 								@handelClickMyPei="handelClickMyPei"
@@ -148,8 +157,8 @@ export default {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
 			let nowData = Date.now();
-			if (this.formData.startDate) {
-				let startDate = new Date(this.formData.startDate);
+			if (this.formData2.startDate) {
+				let startDate = new Date(this.formData2.startDate);
 				return time.getTime() > nowData || time.getTime() < startDate || time.getTime() === startDate;
 			} else {
 				return time.getTime() > nowData;
@@ -187,7 +196,9 @@ export default {
 			censusData: { district: '', street: '', community: '', grid: '', staff: '' },
 			formData: {
 				orgId: '',
-				level: '',
+				level: ''
+			},
+			formData2: {
 				startDate: '',
 				endDate: ''
 			},
@@ -219,7 +230,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeigh : this.clientHeight - 420;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
 			console.log('this.TableHeight', this.TableHeight);
 			return this.TableHeight;
 		},
@@ -227,10 +238,10 @@ export default {
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData.endDate': function(val) {
+		'formData2.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
+				this.formData2.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},
@@ -238,7 +249,7 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
-		console.log(this.user)
+		console.log(this.user);
 		this.getOrgTreeList();
 
 		this.getTableData();
@@ -271,8 +282,8 @@ export default {
 			url = '/gov/org/customeragency/getCommunityList';
 			param = {
 				agencyId: this.orgId,
-				timeStart: this.formData.startDate,
-				timeEnd: this.formData.endDate,
+				timeStart: this.formData2.startDate,
+				timeEnd: this.formData2.endDate,
 				pageNum: this.pageNo,
 				pageSize: this.pageSize
 			};
@@ -342,10 +353,10 @@ export default {
 			let agencyId = '';
 			if (this.formData.orgId == '') {
 				agencyId = this.agencyId;
-				this.level=this.user.level
+				this.level = this.user.level;
 			} else {
 				agencyId = this.formData.orgId;
-				this.level=this.formData.level
+				this.level = this.formData.level;
 			}
 			const url = '/gov/org/customeragency/getAgencyCountList';
 			let params = { agencyId: agencyId };
@@ -394,7 +405,7 @@ export default {
 			} else {
 				agencyId = this.formData.orgId;
 			}
-			const { data, code, msg } = await requestPost(url, { agencyId: agencyId });
+			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData2.startDate, timeEnd: this.formData2.endDate });
 
 			this.$refs.pieChart.hideLoading();
 
@@ -458,7 +469,18 @@ export default {
 				},
 				xAxis: {
 					type: 'category',
-					data: chartData.name
+					data: chartData.name,
+					axisLabel: {
+						interval: 0,
+						interval: 0, //设置横坐标为斜
+						rotate: 30, //文字倾斜角度
+						formatter: function(value) {
+							if (value.length > 10) {
+								value = value.substring(0, 9) + '..';
+							}
+							return value;
+						}
+					}
 				},
 				yAxis: {
 					type: 'value',

From 2d2b5301508e4dda9a4ad06784c072ff1778c43f Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Mon, 10 Apr 2023 17:13:46 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8C=E5=A4=87=E4=B8=AA=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-nineList.vue |  29 +-
 src/views/modules/census/record.vue          | 503 +++++++++++++++++++
 2 files changed, 529 insertions(+), 3 deletions(-)
 create mode 100644 src/views/modules/census/record.vue

diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 9969c056f..7a4bc1f8a 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -97,7 +97,9 @@
 							<el-table-column prop="personInCharge" align="center" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="mobile" align="center" label="联系方式" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
-								<el-button size="small" type="text" @click="">查看</el-button>
+								<template slot-scope="scope">
+									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
+								</template>
 							</el-table-column>
 						</el-table>
 
@@ -114,6 +116,13 @@
 				</el-row>
 			</div>
 		</div>
+		<el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+			<record v-if="dialogVisible" :formType="formType" :enterpriseId="enterpriseId" :enterpriseInfo="enterpriseInfo"></record>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 
@@ -123,11 +132,12 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
+import record from './record';
 
 import axios from 'axios';
 
 export default {
-	components: { screenEchartsFrame, screenEchartsFrame2 },
+	components: { screenEchartsFrame, screenEchartsFrame2, record },
 	data() {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -145,6 +155,10 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			dialogVisible: false,
+			enterpriseId: '',
+			enterpriseInfo: {},
+			formType: '',
 			tableLoading: false,
 			user: {},
 			gridList: [], //所属网格list--场所区域
@@ -208,10 +222,19 @@ export default {
 		this.getPie();
 	},
 	methods: {
+		show(row) {
+			this.dialogVisible = true;
+			this.formType = 'view';
+			this.enterpriseId = row.enterpriseId;
+			this.enterpriseInfo = row;
+		},
+		handleClose() {
+			this.dialogVisible = false;
+		},
 		handleSearch(val) {
 			console.log(this.formData);
 			this.pageNo = 1;
-			this.placeType="";
+			this.placeType = '';
 			this.getTableData();
 			this.getsubData();
 			this.getPie();
diff --git a/src/views/modules/census/record.vue b/src/views/modules/census/record.vue
new file mode 100644
index 000000000..b57b75796
--- /dev/null
+++ b/src/views/modules/census/record.vue
@@ -0,0 +1,503 @@
+<template>
+  <div class="m-record"
+       style="padding: 0 20px">
+    <h3>巡查记录</h3>
+    <div class="mt10"
+         v-if="formType == 'edit'">
+      <el-button size="small"
+                 :class="[source==='manage'?'diy-button--add':'diy-button--export']"
+                 :disabled="btnDisabled || disabled"
+                 @click="handleAdd">新增</el-button>
+    </div>
+    <el-table :data="tableData"
+              row-key="id"
+              border
+              style="width: 100%"
+              :header-cell-style="getRowClass">
+      <el-table-column label="序号"
+                       type="index"
+                       align="center"
+                       width="50">
+      </el-table-column>
+
+      <el-table-column prop="patrolTime"
+                       label="巡查时间"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-date-picker v-if="scope.row.isEdit"
+                          v-model="scope.row.patrolTime"
+                          type="date"
+                          class="input-width"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+          <div v-else
+               class="div-content">{{ scope.row.patrolTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="staffId"
+                       label="巡查人员"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-select v-if="scope.row.isEdit"
+                     filterable
+                     v-model="scope.row.staffId"
+                     placeholder="请选择"
+                     class="input-width"
+                     @change="handleChangeStaff(scope.row)"
+                     clearable>
+            <el-option v-for="subItem in optionStaff"
+                       :key="subItem.value"
+                       :label="subItem.label"
+                       :value="subItem.value">
+            </el-option>
+          </el-select>
+          <div v-else
+               class="div-content">{{ scope.row.staffName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="mobile"
+                       label="联系电话"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit"
+                    type="number"
+                    v-model="scope.row.mobile"
+                    placeholder="请输入"
+                    class="input-width"
+                    clearable
+                    disabled></el-input>
+          <div v-else
+               class="div-content">{{ scope.row.mobile }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="result"
+                       label="巡查结果"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-select v-if="scope.row.isEdit"
+                     v-model="scope.row.result"
+                     placeholder="请选择"
+                     class="input-width"
+                     size="small"
+                     clearable>
+            <el-option v-for="subItem in optionResult"
+                       :key="subItem.value"
+                       :label="subItem.label"
+                       :value="subItem.value">
+            </el-option>
+          </el-select>
+          <div v-else
+               class="div-content">{{ scope.row.resultName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="detailed"
+                       label="隐患明细"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit"
+                    type="text"
+                    v-model="scope.row.detailed"
+                    placeholder="请输入"
+                    class="input-width"
+                    maxlength="500"
+                    clearable></el-input>
+          <div v-else
+               class="div-content">{{ scope.row.detailed }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="imgList"
+                       label="图片列表"
+                       align="center"
+                       width="150px">
+        <template slot-scope="scope">
+          <div v-if="scope.row.isEdit">
+            <el-upload :headers="$getElUploadHeaders()"
+                       class="avatar-uploader"
+                       :action="uploadUrl"
+                       :data="{ customerId: customerId }"
+                       :show-file-list="true"
+                       :limit="3"
+                       :file-list="scope.row.imgShowList"
+                       :on-success="(res) => handleImgSuccess(res, scope.row)"
+                       :on-remove="(res) => handleImgRemove(res, scope.row)"
+                       list-type="picture"
+                       :before-upload="beforeImgUpload">
+              <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
+            </el-upload>
+          </div>
+
+          <div v-else
+               class="div-content">
+            <el-image v-if="scope.row.imgList.length > 0"
+                      style="width: 100px; height: 50px"
+                      :src="scope.row.imgList[0]"
+                      fit="cover"
+                      :preview-src-list="scope.row.imgList"></el-image>
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="reviewTime"
+                       label="拟复查时间"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-date-picker v-if="scope.row.isEdit"
+                          v-model="scope.row.reviewTime"
+                          type="date"
+                          class="input-width"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+          <div v-else
+               class="div-content">{{ scope.row.reviewTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="!disabled"
+                       fixed="right"
+                       label="操作"
+                       align="center"
+                       width="120">
+        <template slot-scope="scope">
+          <template v-if="scope.row.isEdit">
+            <el-button @click="handleEdit(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-edit">保存</el-button>
+            <el-button @click="handleChange(scope.row, 'cancle')"
+                       type="text"
+                       size="small"
+                       class="btn-color-edit">取消</el-button>
+          </template>
+          <template v-else>
+            <el-button v-if="formType == 'edit'"
+                       @click="handleChange(scope.row, 'edit')"
+                       type="text"
+                       size="small"
+                       :disabled="disabled"
+                       class="btn-color-edit">修改</el-button>
+            <el-popconfirm v-if="formType == 'edit'"
+                           title="删除之后无法恢复，确认删除？"
+                           @onConfirm="del(scope.row)"
+                           @confirm="del(scope.row)">
+              <el-button slot="reference"
+                         type="text"
+                         size="small"
+                         class="btn-color-del"
+                         style="margin-left: 10px">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    enterpriseId: {
+      type: String,
+      default: "",
+    },
+    enterpriseInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    formType: {
+      type: String,
+      default: "",
+    },
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+  data () {
+    return {
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+
+      btnDisabled: false,
+      btnType: "cancle",
+      isEdit: false,
+      tableData: [],
+      tempRow: {},
+
+      optionResult: [
+        {
+          label: "合格",
+          value: "0",
+        },
+        {
+          label: "不合格",
+          value: "1",
+        },
+      ],
+      optionStaff: [
+        // {
+        //   label: "人名",
+        //   value: "staffId",
+        // },
+      ],
+    };
+  },
+
+  computed: {
+    allowOperate () {
+      const {
+        enterpriseInfo: { agencyId },
+      } = this;
+      return agencyId && agencyId == this.$store.state.user.agencyId;
+    },
+  },
+  watch: {
+    enterpriseId: {
+      handler (val) {
+        console.log("val------points", val);
+        if (val.length > 0) {
+          this.btnDisabled = false;
+          this.getList();
+        } else this.btnDisabled = true;
+      },
+      immediate: true,
+    },
+  },
+
+  created () {
+    this.getOptionStaff();
+  },
+
+  methods: {
+    beforeImgUpload (file) {
+      console.log(file);
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      const srcType = file.type;
+      const format = file.name.split(".").pop();
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+        return false;
+      }
+      if (srcType.indexOf("image") == -1) {
+        this.$message.error("仅限图片格式");
+        return false;
+      }
+      return true;
+    },
+
+    handleImgSuccess (res, row) {
+      console.log("handleImgSuccess", res);
+      if (res.code === 0 && res.msg === "success") {
+        row.imgList.push(res.data.url);
+        this.computeImgShowList(row);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    computeImgShowList (row) {
+      row.imgShowList = row.imgList.map((url) => {
+        return { name: "", url };
+      });
+    },
+
+    handleImgRemove (file, row) {
+      console.log("handleImgRemove", file);
+      let url = file.url || file.response.data.url;
+      if (url) {
+        row.imgList = row.imgList.filter((item) => item !== url);
+        this.computeImgShowList(row);
+      }
+    },
+
+    getRowClass ({ rowIndex, columnIndex }) {
+      if (rowIndex === 0) {
+        return "background: #2195fe; color: #fff;";
+      }
+    },
+
+    handleChange (row, type) {
+      console.log("type----", type);
+      if (type == "cancle") {
+        row = { ...this.tempRow };
+        row.isEdit = false;
+        if (this.btnType == "add") this.tableData.pop();
+        this.getList();
+        console.log("row----", row);
+      } else {
+        this.tempRow = { ...row };
+        row.isEdit = true;
+      }
+      this.btnType = type;
+      this.isEdit = !this.isEdit;
+    },
+
+    handleChangeStaff (row) {
+      const { staffId } = row;
+      const { optionStaff } = this;
+      let item = optionStaff.find((item) => item.value == staffId);
+      if (item) {
+        row.staffName = item.name;
+        row.mobile = item.mobile;
+      }
+    },
+
+    async getOptionStaff () {
+      let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        this.optionStaff = data || [];
+      } else {
+        this.$message.error("请求工作人员数据失败！");
+      }
+    },
+
+    async handleEdit (row) {
+      if (this.btnType == "add") this.save(row);
+      else this.edit(row);
+    },
+
+    handleAdd () {
+      this.btnType = "add";
+      this.isEdit = true;
+
+      const item = {
+        isEdit: true,
+        enterpriseId: this.enterpriseId,
+        patrolTime: "",
+        staffId: "",
+        staffName: "",
+        mobile: "",
+        result: "",
+        imgList: [],
+        reviewTime: "",
+      };
+      this.computeImgShowList(item);
+      this.tableData.push(item);
+    },
+
+    async save (row) {
+      const params = {
+        partyMemberId: this.enterpriseId,
+        ...row,
+      };
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.btnType = "cancle";
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async edit (row) {
+      const params = {
+        ...row,
+      };
+
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async del (row) {
+      await this.$http
+        .post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async getList () {
+      const { enterpriseId } = this;
+
+      const params = {};
+
+      await this.$http
+        .post(`/gov/org/enterprise/patrollist/${enterpriseId}`, {
+          params,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.tableData = res.data.list.map((item) => {
+              this.computeImgShowList(item);
+              return {
+                ...item,
+                isEdit: false,
+              };
+            });
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-record {
+  .mt10 {
+    margin-bottom: 10px;
+  }
+  .input-width {
+    width: 170px;
+  }
+}
+</style>

From 5bbf14ff630f15526b02c4253c46ee3525256ebb Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 09:14:50 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/management/form.scss |  63 ++
 src/views/modules/census/addForm.vue         | 462 ++++++++++
 src/views/modules/census/census-nineList.vue |  38 +-
 src/views/modules/census/record.vue          | 897 +++++++++----------
 src/views/modules/census/record1.vue         | 503 +++++++++++
 5 files changed, 1456 insertions(+), 507 deletions(-)
 create mode 100644 src/assets/scss/modules/management/form.scss
 create mode 100644 src/views/modules/census/addForm.vue
 create mode 100644 src/views/modules/census/record1.vue

diff --git a/src/assets/scss/modules/management/form.scss b/src/assets/scss/modules/management/form.scss
new file mode 100644
index 000000000..18d1ed075
--- /dev/null
+++ b/src/assets/scss/modules/management/form.scss
@@ -0,0 +1,63 @@
+/deep/ .el-input.is-disabled .el-input__inner,
+/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
+	// border:none;background-color: transparent;
+}
+.div_btn {
+	text-align: right;
+}
+.div_map {
+	width: 100%;
+	height: 320px;
+	margin-left: 0px;
+}
+/deep/.el-dialog__body {
+	padding: 30px 80px;
+}
+/deep/.el-dialog__footer {
+	padding: 10px 80px 20px;
+}
+.form-item::v-deep .el-form-item__label {
+	color: #fff;
+}
+.form-item {
+	.el-radio {
+		color: #fff;
+	}
+
+	.el-checkbox {
+		color: #fff;
+	}
+}
+.verifyRed::before {
+	content: '*';
+	color: #f56c6c;
+	margin-right: 4px;
+}
+.form_label_box {
+	width: 150px;
+	display: inline-block;
+	text-align: right;
+	padding-right: 12px;
+}
+
+/deep/.m-record {
+	h3 {
+		&::before {
+			display: inline-block;
+			width: 4px;
+			height: 12px;
+			background: #0056D6;
+			content: '';
+			/**
+		    这个指为正的话 小方块就往上， 为负的话，小方块就往下
+		    */
+			vertical-align: 1px;
+			margin-right: 5px;
+		}
+	}
+}
+/deep/.recordBox .m-table-item{
+	margin-top:0px;
+	max-height:200px;
+	overflow: auto;
+}
\ No newline at end of file
diff --git a/src/views/modules/census/addForm.vue b/src/views/modules/census/addForm.vue
new file mode 100644
index 000000000..293eb3649
--- /dev/null
+++ b/src/views/modules/census/addForm.vue
@@ -0,0 +1,462 @@
+<template>
+	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="场所名称" prop="placeOrgName">
+								<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类型" prop="placeType">
+								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="占地面积" prop="areaCovered">
+								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所规模" prop="scaleTotal">
+								<el-input
+									type="number"
+									v-model="formData.scaleTotal"
+									:disabled="disabled"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入可容纳人数"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="所属组织" prop="gridId">
+								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类别" prop="placeCategory">
+								<el-select v-model="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+									<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="personInCharge">
+								<el-input v-model="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="mobile">
+								<el-input v-model="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="address" style="display: block">
+								<el-select
+									v-model="formData.address"
+									:disabled="disabled"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="场所类别" prop="placeCategory">{{ formData.placeCategoryName }}</el-form-item>
+						</el-col>
+
+						<el-col :span="12">
+							<el-form-item label="场所类型" prop="placeType">{{ formData.placeTypeName }}</el-form-item>
+						</el-col>
+						<!-- <el-col :span="12">
+							<el-form-item label="占地面积" prop="areaCovered">{{ formData.areaCovered }}</el-form-item>
+						</el-col>
+						 -->
+						<el-col :span="12">
+							<el-form-item label="场所区域" prop="gridId">{{ formData.gridName }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="场所名称" prop="placeOrgName">{{ formData.placeOrgName }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="场所规模" prop="scaleTotal">{{ formData.scaleTotal }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="负责人" prop="personInCharge">{{ formData.personInCharge }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
+						</el-col>
+						<el-col :span="24">
+							<el-form-item label="场所地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+			</div>
+			<div class="div_btn" v-if="pageType != 'view'">
+				<el-button size="small" @click="handleCancle">取 消</el-button>
+				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+			</div>
+			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
+		</div>
+
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import { isMobile } from '@/utils/validate';
+import { mapGetters } from 'vuex';
+import { Loading } from 'element-ui'; // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
+import nextTick from 'dai-js/tools/nextTick';
+import record from './record';
+let loading; // 加载动画
+let map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+export default {
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		defaultData: {
+			type: Object,
+			default: null
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailData: {
+			type: Object,
+			default: null
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		let checkNum = (rule, value, callback) => {
+			if (!value) {
+				return callback(new Error('场所规模不能为空'));
+			}
+			setTimeout(() => {
+				if (!Number.isInteger(value)) {
+					callback(new Error('请输入数字值'));
+				}
+			}, 1000);
+		};
+		let checkMObile = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入联系电话'));
+			} else {
+				if (!isMobile(value)) {
+					callback(new Error('联系电话格式不正确'));
+				}
+				callback();
+			}
+		};
+		return {
+			btnDisable: false,
+			user: '',
+			agencyId: '',
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			placeCategoryArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				placeOrgName: '',
+				scaleTotal: '',
+				gridId: '',
+				latestResult: '',
+				placeCategory: '',
+				placeType: '',
+				personInCharge: '',
+				address: '',
+				mobile: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
+				placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				address: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: { record },
+	created() {},
+	async mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		this.loadGrid();
+		this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		async loadGrid() {
+			const url = '/gov/org/customergrid/gridoption';
+			let params = {
+				agencyId: this.agencyId,
+				purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//场所类型
+		async loadplaceType() {
+			const url = '/sys/dict/data/dictlist';
+
+			let params = {
+				dictType: 'ic_enterprise_place_type'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetail() {
+			const url = `/gov/org/enterprise/detail/${this.detailId}`;
+			const { data, code, msg } = await requestPost(url);
+			if (code === 0) {
+				this.formData = { ...data };
+				this.initMap();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleComfirm() {
+			this.save();
+		},
+		async handleAdd() {
+			// this.btnDisable = true;
+			// setTimeout(() => {
+			// 	this.btnDisable = false;
+			// }, 10000);
+			// nextTick(1000);
+			// const form = new Promise((resolve, reject) => {
+			// 	this.$refs['form'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// const form1 = new Promise((resolve, reject) => {
+			// 	this.$refs['form1'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// Promise.all([form1, form])
+			// 	.then(() => {
+			// 		this.addFuwu();
+			// 	})
+			// 	.catch(() => {
+			// 		app.util.validateRule(messageObj);
+			// 		this.btnDisable = false;
+			// 	});
+		},
+
+		async save() {
+			this.formData.agencyId = this.agencyId;
+			var url = '';
+			var params = {};
+			url = '/gov/org/enterprise/addOrUpdate';
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+
+				this.handleCancle();
+				// // this.resetData();
+				// this.$emit('handleComfirm');
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
+		handleCancle() {
+			// this.resetData();
+			this.$emit('handleClose');
+		},
+		resetData() {
+			this.$refs.form.resetFields();
+		},
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: '正在加载……', // 加载中需要显示的文字
+				background: 'rgba(0,0,0,.7)' // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap() {
+			let { latitude, longitude } = this.$store.state.user;
+
+			if (this.formData.latitude && this.formData.longitude) {
+				latitude = this.formData.latitude;
+				longitude = this.formData.longitude;
+			}
+			if (!latitude || latitude == '' || latitude == '0') {
+				latitude = 39.9088810666821;
+				longitude = 116.39743841556731;
+			}
+
+			this.$nextTick(() => {
+				map = new daiMap(
+					document.getElementById('app_event'),
+					{ latitude, longitude },
+					{
+						zoom: 16.2, // 设置地图缩放级别
+						pitch: 43.5, // 设置俯仰角
+						rotation: 45 // 设置地图旋转角度
+					}
+				);
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					this.handleMoveCenter(e);
+				});
+
+				map.setCenter(latitude, longitude);
+				if (this.formData.latitude) {
+					map.setMarker(latitude, longitude);
+				}
+			});
+		},
+		async handleMoveCenter() {
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			this.formData.latitude = lat;
+			this.formData.longitude = lng;
+			map.setMarker(lat, lng);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == 'success') {
+				this.formData.address = data.address;
+				this.searchValue = data.address;
+				this.searchOptions = [];
+			}
+		},
+		async remoteMethod(query) {
+			if (query !== '') {
+				this.loading = true;
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				this.resultList = [];
+
+				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+					if (data.resultList && data.resultList.length > 0) {
+						this.resultList = data.resultList;
+						this.searchOptions = this.resultList.map(item => {
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
+						});
+					}
+				} else {
+					this.searchOptions = [
+						{
+							value: '0',
+							label: '未检索到结果'
+						}
+					];
+				}
+			} else {
+				this.searchOptions = [];
+			}
+		},
+		handleClickKey(index) {
+			let selPosition = this.resultList[index];
+			let lonlat = selPosition.lonlat.split(' ');
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+			this.formData.latitude = lonlat[1];
+			this.formData.longitude = lonlat[0];
+			this.formData.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+// @import '@/assets/scss/modules/visual/a_customize.scss';
+</style>
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 7a4bc1f8a..d88520994 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -116,13 +116,18 @@
 				</el-row>
 			</div>
 		</div>
-		<el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
-			<record v-if="dialogVisible" :formType="formType" :enterpriseId="enterpriseId" :enterpriseInfo="enterpriseInfo"></record>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-			</span>
-		</el-dialog>
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+				
+			/>
+		</div>
 	</div>
 </template>
 
@@ -132,12 +137,12 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-import record from './record';
+import addForm from './addForm';
 
 import axios from 'axios';
 
 export default {
-	components: { screenEchartsFrame, screenEchartsFrame2, record },
+	components: { screenEchartsFrame, screenEchartsFrame2, addForm },
 	data() {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -156,9 +161,9 @@ export default {
 		};
 		return {
 			dialogVisible: false,
-			enterpriseId: '',
-			enterpriseInfo: {},
-			formType: '',
+			detailId: '',
+			detailData: {},
+			pageType: '',
 			tableLoading: false,
 			user: {},
 			gridList: [], //所属网格list--场所区域
@@ -224,12 +229,15 @@ export default {
 	methods: {
 		show(row) {
 			this.dialogVisible = true;
-			this.formType = 'view';
-			this.enterpriseId = row.enterpriseId;
-			this.enterpriseInfo = row;
+			this.pageType = 'view';
+			this.detailId = row.enterpriseId;
+			this.detailData = row;
 		},
 		handleClose() {
 			this.dialogVisible = false;
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
 		},
 		handleSearch(val) {
 			console.log(this.formData);
diff --git a/src/views/modules/census/record.vue b/src/views/modules/census/record.vue
index b57b75796..07cde7c06 100644
--- a/src/views/modules/census/record.vue
+++ b/src/views/modules/census/record.vue
@@ -1,503 +1,416 @@
 <template>
-  <div class="m-record"
-       style="padding: 0 20px">
-    <h3>巡查记录</h3>
-    <div class="mt10"
-         v-if="formType == 'edit'">
-      <el-button size="small"
-                 :class="[source==='manage'?'diy-button--add':'diy-button--export']"
-                 :disabled="btnDisabled || disabled"
-                 @click="handleAdd">新增</el-button>
-    </div>
-    <el-table :data="tableData"
-              row-key="id"
-              border
-              style="width: 100%"
-              :header-cell-style="getRowClass">
-      <el-table-column label="序号"
-                       type="index"
-                       align="center"
-                       width="50">
-      </el-table-column>
-
-      <el-table-column prop="patrolTime"
-                       label="巡查时间"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.patrolTime"
-                          type="date"
-                          class="input-width"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择日期">
-          </el-date-picker>
-          <div v-else
-               class="div-content">{{ scope.row.patrolTime }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="staffId"
-                       label="巡查人员"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-select v-if="scope.row.isEdit"
-                     filterable
-                     v-model="scope.row.staffId"
-                     placeholder="请选择"
-                     class="input-width"
-                     @change="handleChangeStaff(scope.row)"
-                     clearable>
-            <el-option v-for="subItem in optionStaff"
-                       :key="subItem.value"
-                       :label="subItem.label"
-                       :value="subItem.value">
-            </el-option>
-          </el-select>
-          <div v-else
-               class="div-content">{{ scope.row.staffName }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="mobile"
-                       label="联系电话"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.isEdit"
-                    type="number"
-                    v-model="scope.row.mobile"
-                    placeholder="请输入"
-                    class="input-width"
-                    clearable
-                    disabled></el-input>
-          <div v-else
-               class="div-content">{{ scope.row.mobile }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="result"
-                       label="巡查结果"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-select v-if="scope.row.isEdit"
-                     v-model="scope.row.result"
-                     placeholder="请选择"
-                     class="input-width"
-                     size="small"
-                     clearable>
-            <el-option v-for="subItem in optionResult"
-                       :key="subItem.value"
-                       :label="subItem.label"
-                       :value="subItem.value">
-            </el-option>
-          </el-select>
-          <div v-else
-               class="div-content">{{ scope.row.resultName }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="detailed"
-                       label="隐患明细"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.isEdit"
-                    type="text"
-                    v-model="scope.row.detailed"
-                    placeholder="请输入"
-                    class="input-width"
-                    maxlength="500"
-                    clearable></el-input>
-          <div v-else
-               class="div-content">{{ scope.row.detailed }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="imgList"
-                       label="图片列表"
-                       align="center"
-                       width="150px">
-        <template slot-scope="scope">
-          <div v-if="scope.row.isEdit">
-            <el-upload :headers="$getElUploadHeaders()"
-                       class="avatar-uploader"
-                       :action="uploadUrl"
-                       :data="{ customerId: customerId }"
-                       :show-file-list="true"
-                       :limit="3"
-                       :file-list="scope.row.imgShowList"
-                       :on-success="(res) => handleImgSuccess(res, scope.row)"
-                       :on-remove="(res) => handleImgRemove(res, scope.row)"
-                       list-type="picture"
-                       :before-upload="beforeImgUpload">
-              <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
-            </el-upload>
-          </div>
-
-          <div v-else
-               class="div-content">
-            <el-image v-if="scope.row.imgList.length > 0"
-                      style="width: 100px; height: 50px"
-                      :src="scope.row.imgList[0]"
-                      fit="cover"
-                      :preview-src-list="scope.row.imgList"></el-image>
-          </div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="reviewTime"
-                       label="拟复查时间"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.reviewTime"
-                          type="date"
-                          class="input-width"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择日期">
-          </el-date-picker>
-          <div v-else
-               class="div-content">{{ scope.row.reviewTime }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column v-if="!disabled"
-                       fixed="right"
-                       label="操作"
-                       align="center"
-                       width="120">
-        <template slot-scope="scope">
-          <template v-if="scope.row.isEdit">
-            <el-button @click="handleEdit(scope.row)"
-                       type="text"
-                       size="small"
-                       class="btn-color-edit">保存</el-button>
-            <el-button @click="handleChange(scope.row, 'cancle')"
-                       type="text"
-                       size="small"
-                       class="btn-color-edit">取消</el-button>
-          </template>
-          <template v-else>
-            <el-button v-if="formType == 'edit'"
-                       @click="handleChange(scope.row, 'edit')"
-                       type="text"
-                       size="small"
-                       :disabled="disabled"
-                       class="btn-color-edit">修改</el-button>
-            <el-popconfirm v-if="formType == 'edit'"
-                           title="删除之后无法恢复，确认删除？"
-                           @onConfirm="del(scope.row)"
-                           @confirm="del(scope.row)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="btn-color-del"
-                         style="margin-left: 10px">删除</el-button>
-            </el-popconfirm>
-          </template>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
+	<div class="m-record">
+		<h3>检查记录</h3>
+		<div>
+			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
+				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
+			</div>
+			<div class="m-table-item">
+				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
+					<el-table-column prop="patrolTime" label="检查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.patrolTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="staffId" label="检查人员" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select
+								v-if="scope.row.isEdit"
+								v-model="scope.row.staffId"
+								placeholder="请选择"
+								class="input-width"
+								@change="handleChangeStaff(scope.row)"
+								clearable
+							>
+								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.staffName }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="mobile" label="联系电话" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-input v-if="scope.row.isEdit" type="number" v-model="scope.row.mobile" placeholder="请输入" class="input-width" clearable disabled></el-input>
+							<div v-else class="div-content">{{ scope.row.mobile }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="result" label="检查结果" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-select v-if="scope.row.isEdit" v-model="scope.row.result" placeholder="请选择" class="input-width" size="small" clearable>
+								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
+							</el-select>
+							<div v-else class="div-content">{{ scope.row.result == 1 ? '正常' : '异常' }}</div>
+						</template>
+					</el-table-column>
+
+					<!-- <el-table-column
+						prop="detailed"
+						label="隐患明细"
+						align="center"
+						width="200px"
+					>
+						<template slot-scope="scope">
+							<el-input
+								v-if="scope.row.isEdit"
+								type="text"
+								v-model="scope.row.detailed"
+								placeholder="请输入"
+								class="input-width"
+								maxlength="500"
+								clearable
+							></el-input>
+							<div v-else class="div-content">
+								{{ scope.row.detailed }}
+							</div>
+						</template>
+					</el-table-column> -->
+
+					<el-table-column prop="imgList" label="图片列表" align="center">
+						<template slot-scope="scope">
+							<div v-if="scope.row.isEdit">
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									class="avatar-uploader"
+									:action="uploadUrl"
+									:data="{ customerId: customerId }"
+									:show-file-list="true"
+									:limit="3"
+									:file-list="scope.row.imgList"
+									:on-success="res => handleImgSuccess(res, scope.row)"
+									:on-remove="res => handleImgRemove(res, scope.row)"
+									list-type="picture"
+									:before-upload="beforeImgUpload"
+								>
+									<i class="el-icon-plus avatar-uploader-icon"></i>
+									最多三张图片
+								</el-upload>
+							</div>
+
+							<div v-else class="div-content">
+								<el-image
+									v-if="scope.row.imgList.length > 0"
+									style="width: 100px; height: 50px"
+									:src="scope.row.imgList[0]"
+									fit="cover"
+									:preview-src-list="scope.row.imgList"
+								></el-image>
+							</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="reviewTime" label="拟复查时间" align="center" width="200px">
+						<template slot-scope="scope">
+							<el-date-picker
+								v-if="scope.row.isEdit"
+								v-model="scope.row.reviewTime"
+								type="date"
+								class="input-width"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期"
+							></el-date-picker>
+							<div v-else class="div-content">{{ scope.row.reviewTime }}</div>
+						</template>
+					</el-table-column>
+
+					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
+						<template slot-scope="scope">
+							<template v-if="scope.row.isEdit">
+								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
+								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
+							</template>
+							<template v-else>
+								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
+									修改
+								</el-button>
+								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
+									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
+								</el-popconfirm>
+							</template>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
-
+import { requestPost, requestGet } from '@/js/dai/request';
 export default {
-  props: {
-    enterpriseId: {
-      type: String,
-      default: "",
-    },
-    enterpriseInfo: {
-      type: Object,
-      default: () => ({}),
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    formType: {
-      type: String,
-      default: "",
-    },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-  },
-  data () {
-    return {
-      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-      customerId: localStorage.getItem("customerId"),
-
-      btnDisabled: false,
-      btnType: "cancle",
-      isEdit: false,
-      tableData: [],
-      tempRow: {},
-
-      optionResult: [
-        {
-          label: "合格",
-          value: "0",
-        },
-        {
-          label: "不合格",
-          value: "1",
-        },
-      ],
-      optionStaff: [
-        // {
-        //   label: "人名",
-        //   value: "staffId",
-        // },
-      ],
-    };
-  },
-
-  computed: {
-    allowOperate () {
-      const {
-        enterpriseInfo: { agencyId },
-      } = this;
-      return agencyId && agencyId == this.$store.state.user.agencyId;
-    },
-  },
-  watch: {
-    enterpriseId: {
-      handler (val) {
-        console.log("val------points", val);
-        if (val.length > 0) {
-          this.btnDisabled = false;
-          this.getList();
-        } else this.btnDisabled = true;
-      },
-      immediate: true,
-    },
-  },
-
-  created () {
-    this.getOptionStaff();
-  },
-
-  methods: {
-    beforeImgUpload (file) {
-      console.log(file);
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      const srcType = file.type;
-      const format = file.name.split(".").pop();
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-        return false;
-      }
-      if (srcType.indexOf("image") == -1) {
-        this.$message.error("仅限图片格式");
-        return false;
-      }
-      return true;
-    },
-
-    handleImgSuccess (res, row) {
-      console.log("handleImgSuccess", res);
-      if (res.code === 0 && res.msg === "success") {
-        row.imgList.push(res.data.url);
-        this.computeImgShowList(row);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-
-    computeImgShowList (row) {
-      row.imgShowList = row.imgList.map((url) => {
-        return { name: "", url };
-      });
-    },
-
-    handleImgRemove (file, row) {
-      console.log("handleImgRemove", file);
-      let url = file.url || file.response.data.url;
-      if (url) {
-        row.imgList = row.imgList.filter((item) => item !== url);
-        this.computeImgShowList(row);
-      }
-    },
-
-    getRowClass ({ rowIndex, columnIndex }) {
-      if (rowIndex === 0) {
-        return "background: #2195fe; color: #fff;";
-      }
-    },
-
-    handleChange (row, type) {
-      console.log("type----", type);
-      if (type == "cancle") {
-        row = { ...this.tempRow };
-        row.isEdit = false;
-        if (this.btnType == "add") this.tableData.pop();
-        this.getList();
-        console.log("row----", row);
-      } else {
-        this.tempRow = { ...row };
-        row.isEdit = true;
-      }
-      this.btnType = type;
-      this.isEdit = !this.isEdit;
-    },
-
-    handleChangeStaff (row) {
-      const { staffId } = row;
-      const { optionStaff } = this;
-      let item = optionStaff.find((item) => item.value == staffId);
-      if (item) {
-        row.staffName = item.name;
-        row.mobile = item.mobile;
-      }
-    },
-
-    async getOptionStaff () {
-      let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-      const { data, code, msg } = await requestPost(url, {});
-
-      if (code === 0) {
-        this.optionStaff = data || [];
-      } else {
-        this.$message.error("请求工作人员数据失败！");
-      }
-    },
-
-    async handleEdit (row) {
-      if (this.btnType == "add") this.save(row);
-      else this.edit(row);
-    },
-
-    handleAdd () {
-      this.btnType = "add";
-      this.isEdit = true;
-
-      const item = {
-        isEdit: true,
-        enterpriseId: this.enterpriseId,
-        patrolTime: "",
-        staffId: "",
-        staffName: "",
-        mobile: "",
-        result: "",
-        imgList: [],
-        reviewTime: "",
-      };
-      this.computeImgShowList(item);
-      this.tableData.push(item);
-    },
-
-    async save (row) {
-      const params = {
-        partyMemberId: this.enterpriseId,
-        ...row,
-      };
-      await this.$http
-        .post("/gov/org/enterprise/addorupdate-patrol", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("保存成功");
-            row.isEdit = false;
-            this.isEdit = false;
-            this.btnType = "cancle";
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async edit (row) {
-      const params = {
-        ...row,
-      };
-
-      await this.$http
-        .post("/gov/org/enterprise/addorupdate-patrol", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("保存成功");
-            row.isEdit = false;
-            this.isEdit = false;
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async del (row) {
-      await this.$http
-        .post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("删除成功");
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async getList () {
-      const { enterpriseId } = this;
-
-      const params = {};
-
-      await this.$http
-        .post(`/gov/org/enterprise/patrollist/${enterpriseId}`, {
-          params,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.tableData = res.data.list.map((item) => {
-              this.computeImgShowList(item);
-              return {
-                ...item,
-                isEdit: false,
-              };
-            });
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-  },
+	props: {
+		id: {
+			type: String,
+			default: ''
+		},
+		info: {
+			type: Object,
+			default: () => ({})
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		source: {
+			//展示来源：manage  管理平台    visiual  可视化平台
+			type: String,
+			default: 'manage'
+		}
+	},
+	data() {
+		return {
+			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+			customerId: localStorage.getItem('customerId'),
+
+			btnDisabled: false,
+			btnType: 'cancle',
+			isEdit: false,
+			tableData: [],
+			tempRow: {},
+
+			optionResult: [
+				{
+					label: '异常',
+					value: '0'
+				},
+				{
+					label: '正常',
+					value: '1'
+				}
+			],
+			optionStaff: [
+				// {
+				//   label: "人名",
+				//   value: "inspectStaffId",
+				// },
+			]
+		};
+	},
+
+	computed: {
+		allowOperate() {
+			const {
+				info: { agencyId }
+			} = this;
+			return agencyId && agencyId == this.$store.state.user.agencyId;
+		}
+	},
+
+	watch: {
+		id: {
+			handler(val) {
+				if (val.length > 0) {
+					this.btnDisabled = false;
+					this.getList();
+				} else this.btnDisabled = true;
+			},
+			immediate: true
+		}
+	},
+
+	created() {
+		this.getOptionStaff();
+	},
+
+	methods: {
+		beforeImgUpload(file) {
+			console.log(file);
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			const srcType = file.type;
+			const format = file.name.split('.').pop();
+
+			if (!isLt1M) {
+				this.$message.error('上传文件大小不能超过 10MB!');
+				return false;
+			}
+			if (srcType.indexOf('image') == -1) {
+				this.$message.error('仅限图片格式');
+				return false;
+			}
+			return true;
+		},
+
+		handleImgSuccess(res, row) {
+			if (res.code === 0 && res.msg === 'success') {
+				row.imgList.push(res.data.url);
+				this.computeImgShowList(row);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		computeImgShowList(row) {
+			row.imgShowList = row.imgList.map(url => {
+				return { name: '', url };
+			});
+		},
+
+		handleImgRemove(file, row) {
+			let url = file.url || file.response.data.url;
+			if (url) {
+				row.imgList = row.imgList.filter(item => item !== url);
+				this.computeImgShowList(row);
+			}
+		},
+
+		getRowClass({ rowIndex, columnIndex }) {
+			if (rowIndex === 0) {
+				return 'background: #2195fe; color: #fff;';
+			}
+		},
+
+		handleChange(row, type) {
+			if (type == 'cancle') {
+				row = { ...this.tempRow };
+				row.isEdit = false;
+				if (this.btnType == 'add') this.tableData.pop();
+				this.getList();
+			} else {
+				this.tempRow = { ...row };
+				row.isEdit = true;
+			}
+			this.btnType = type;
+			this.isEdit = !this.isEdit;
+		},
+
+		handleChangeStaff(row) {
+			const { staffId } = row;
+			const { optionStaff } = this;
+			let item = optionStaff.find(item => item.value == staffId);
+			if (item) {
+				row.staffName = item.name;
+				row.mobile = item.mobile;
+			}
+		},
+
+		async getOptionStaff() {
+			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				this.optionStaff = data || [];
+			} else {
+				this.$message.error('请求工作人员数据失败！');
+			}
+		},
+
+		async handleEdit(row) {
+			if (row.result == '0' && row.reviewTime == '') {
+				this.$message.error('拟复查时间不能为空');
+			} else {
+				if (this.btnType == 'add') this.save(row);
+				else this.edit(row);
+			}
+		},
+
+		handleAdd() {
+			this.btnType = 'add';
+			this.isEdit = true;
+
+			const item = {
+				isEdit: true,
+				enterpriseId: this.id,
+				patrolTime: '',
+				staffId: '',
+				staffName: '',
+				mobile: '',
+				result: '',
+				reviewTime: '',
+				imgList: []
+			};
+			this.computeImgShowList(item);
+			this.tableData.push(item);
+		},
+
+		async save(row) {
+			const params = {
+				enterpriseId: this.id,
+				...row
+			};
+			const url = `/gov/org/enterprise/addorupdate-patrol`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.btnType = 'cancle';
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async edit(row) {
+			const params = {
+				...row
+			};
+			const url = `/gov/org/enterprise/addorupdate-patrol`;
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('保存成功');
+				row.isEdit = false;
+				this.isEdit = false;
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async del(row) {
+			const url = `/gov/org/enterprise/del-patrol/${row.patrolId}`;
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				this.$message.success('删除成功');
+				this.getList();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getList() {
+			const url = `/gov/org/enterprise/patrollist/${this.id}`;
+			console.log('getList---------------------------------------------------------------------------', url);
+			const { data, code, msg } = await requestPost(url);
+			if (code === 0) {
+				console.log('data', data);
+				this.tableData = data.list.map(item => {
+					this.computeImgShowList(item);
+					return {
+						...item,
+						isEdit: false
+					};
+				});
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
 };
 </script>
 
 <style lang="scss" scoped>
-.m-record {
-  .mt10 {
-    margin-bottom: 10px;
-  }
-  .input-width {
-    width: 170px;
-  }
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+
+.mt10 {
+	margin-bottom: 10px;
+}
+.input-width {
+	width: 170px;
 }
 </style>
diff --git a/src/views/modules/census/record1.vue b/src/views/modules/census/record1.vue
new file mode 100644
index 000000000..b57b75796
--- /dev/null
+++ b/src/views/modules/census/record1.vue
@@ -0,0 +1,503 @@
+<template>
+  <div class="m-record"
+       style="padding: 0 20px">
+    <h3>巡查记录</h3>
+    <div class="mt10"
+         v-if="formType == 'edit'">
+      <el-button size="small"
+                 :class="[source==='manage'?'diy-button--add':'diy-button--export']"
+                 :disabled="btnDisabled || disabled"
+                 @click="handleAdd">新增</el-button>
+    </div>
+    <el-table :data="tableData"
+              row-key="id"
+              border
+              style="width: 100%"
+              :header-cell-style="getRowClass">
+      <el-table-column label="序号"
+                       type="index"
+                       align="center"
+                       width="50">
+      </el-table-column>
+
+      <el-table-column prop="patrolTime"
+                       label="巡查时间"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-date-picker v-if="scope.row.isEdit"
+                          v-model="scope.row.patrolTime"
+                          type="date"
+                          class="input-width"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+          <div v-else
+               class="div-content">{{ scope.row.patrolTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="staffId"
+                       label="巡查人员"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-select v-if="scope.row.isEdit"
+                     filterable
+                     v-model="scope.row.staffId"
+                     placeholder="请选择"
+                     class="input-width"
+                     @change="handleChangeStaff(scope.row)"
+                     clearable>
+            <el-option v-for="subItem in optionStaff"
+                       :key="subItem.value"
+                       :label="subItem.label"
+                       :value="subItem.value">
+            </el-option>
+          </el-select>
+          <div v-else
+               class="div-content">{{ scope.row.staffName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="mobile"
+                       label="联系电话"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit"
+                    type="number"
+                    v-model="scope.row.mobile"
+                    placeholder="请输入"
+                    class="input-width"
+                    clearable
+                    disabled></el-input>
+          <div v-else
+               class="div-content">{{ scope.row.mobile }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="result"
+                       label="巡查结果"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-select v-if="scope.row.isEdit"
+                     v-model="scope.row.result"
+                     placeholder="请选择"
+                     class="input-width"
+                     size="small"
+                     clearable>
+            <el-option v-for="subItem in optionResult"
+                       :key="subItem.value"
+                       :label="subItem.label"
+                       :value="subItem.value">
+            </el-option>
+          </el-select>
+          <div v-else
+               class="div-content">{{ scope.row.resultName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="detailed"
+                       label="隐患明细"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit"
+                    type="text"
+                    v-model="scope.row.detailed"
+                    placeholder="请输入"
+                    class="input-width"
+                    maxlength="500"
+                    clearable></el-input>
+          <div v-else
+               class="div-content">{{ scope.row.detailed }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="imgList"
+                       label="图片列表"
+                       align="center"
+                       width="150px">
+        <template slot-scope="scope">
+          <div v-if="scope.row.isEdit">
+            <el-upload :headers="$getElUploadHeaders()"
+                       class="avatar-uploader"
+                       :action="uploadUrl"
+                       :data="{ customerId: customerId }"
+                       :show-file-list="true"
+                       :limit="3"
+                       :file-list="scope.row.imgShowList"
+                       :on-success="(res) => handleImgSuccess(res, scope.row)"
+                       :on-remove="(res) => handleImgRemove(res, scope.row)"
+                       list-type="picture"
+                       :before-upload="beforeImgUpload">
+              <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
+            </el-upload>
+          </div>
+
+          <div v-else
+               class="div-content">
+            <el-image v-if="scope.row.imgList.length > 0"
+                      style="width: 100px; height: 50px"
+                      :src="scope.row.imgList[0]"
+                      fit="cover"
+                      :preview-src-list="scope.row.imgList"></el-image>
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="reviewTime"
+                       label="拟复查时间"
+                       align="center"
+                       width="200px">
+        <template slot-scope="scope">
+          <el-date-picker v-if="scope.row.isEdit"
+                          v-model="scope.row.reviewTime"
+                          type="date"
+                          class="input-width"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+          <div v-else
+               class="div-content">{{ scope.row.reviewTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="!disabled"
+                       fixed="right"
+                       label="操作"
+                       align="center"
+                       width="120">
+        <template slot-scope="scope">
+          <template v-if="scope.row.isEdit">
+            <el-button @click="handleEdit(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-edit">保存</el-button>
+            <el-button @click="handleChange(scope.row, 'cancle')"
+                       type="text"
+                       size="small"
+                       class="btn-color-edit">取消</el-button>
+          </template>
+          <template v-else>
+            <el-button v-if="formType == 'edit'"
+                       @click="handleChange(scope.row, 'edit')"
+                       type="text"
+                       size="small"
+                       :disabled="disabled"
+                       class="btn-color-edit">修改</el-button>
+            <el-popconfirm v-if="formType == 'edit'"
+                           title="删除之后无法恢复，确认删除？"
+                           @onConfirm="del(scope.row)"
+                           @confirm="del(scope.row)">
+              <el-button slot="reference"
+                         type="text"
+                         size="small"
+                         class="btn-color-del"
+                         style="margin-left: 10px">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    enterpriseId: {
+      type: String,
+      default: "",
+    },
+    enterpriseInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    formType: {
+      type: String,
+      default: "",
+    },
+    source: {//展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: 'manage'
+    }
+  },
+  data () {
+    return {
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+
+      btnDisabled: false,
+      btnType: "cancle",
+      isEdit: false,
+      tableData: [],
+      tempRow: {},
+
+      optionResult: [
+        {
+          label: "合格",
+          value: "0",
+        },
+        {
+          label: "不合格",
+          value: "1",
+        },
+      ],
+      optionStaff: [
+        // {
+        //   label: "人名",
+        //   value: "staffId",
+        // },
+      ],
+    };
+  },
+
+  computed: {
+    allowOperate () {
+      const {
+        enterpriseInfo: { agencyId },
+      } = this;
+      return agencyId && agencyId == this.$store.state.user.agencyId;
+    },
+  },
+  watch: {
+    enterpriseId: {
+      handler (val) {
+        console.log("val------points", val);
+        if (val.length > 0) {
+          this.btnDisabled = false;
+          this.getList();
+        } else this.btnDisabled = true;
+      },
+      immediate: true,
+    },
+  },
+
+  created () {
+    this.getOptionStaff();
+  },
+
+  methods: {
+    beforeImgUpload (file) {
+      console.log(file);
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      const srcType = file.type;
+      const format = file.name.split(".").pop();
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+        return false;
+      }
+      if (srcType.indexOf("image") == -1) {
+        this.$message.error("仅限图片格式");
+        return false;
+      }
+      return true;
+    },
+
+    handleImgSuccess (res, row) {
+      console.log("handleImgSuccess", res);
+      if (res.code === 0 && res.msg === "success") {
+        row.imgList.push(res.data.url);
+        this.computeImgShowList(row);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    computeImgShowList (row) {
+      row.imgShowList = row.imgList.map((url) => {
+        return { name: "", url };
+      });
+    },
+
+    handleImgRemove (file, row) {
+      console.log("handleImgRemove", file);
+      let url = file.url || file.response.data.url;
+      if (url) {
+        row.imgList = row.imgList.filter((item) => item !== url);
+        this.computeImgShowList(row);
+      }
+    },
+
+    getRowClass ({ rowIndex, columnIndex }) {
+      if (rowIndex === 0) {
+        return "background: #2195fe; color: #fff;";
+      }
+    },
+
+    handleChange (row, type) {
+      console.log("type----", type);
+      if (type == "cancle") {
+        row = { ...this.tempRow };
+        row.isEdit = false;
+        if (this.btnType == "add") this.tableData.pop();
+        this.getList();
+        console.log("row----", row);
+      } else {
+        this.tempRow = { ...row };
+        row.isEdit = true;
+      }
+      this.btnType = type;
+      this.isEdit = !this.isEdit;
+    },
+
+    handleChangeStaff (row) {
+      const { staffId } = row;
+      const { optionStaff } = this;
+      let item = optionStaff.find((item) => item.value == staffId);
+      if (item) {
+        row.staffName = item.name;
+        row.mobile = item.mobile;
+      }
+    },
+
+    async getOptionStaff () {
+      let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        this.optionStaff = data || [];
+      } else {
+        this.$message.error("请求工作人员数据失败！");
+      }
+    },
+
+    async handleEdit (row) {
+      if (this.btnType == "add") this.save(row);
+      else this.edit(row);
+    },
+
+    handleAdd () {
+      this.btnType = "add";
+      this.isEdit = true;
+
+      const item = {
+        isEdit: true,
+        enterpriseId: this.enterpriseId,
+        patrolTime: "",
+        staffId: "",
+        staffName: "",
+        mobile: "",
+        result: "",
+        imgList: [],
+        reviewTime: "",
+      };
+      this.computeImgShowList(item);
+      this.tableData.push(item);
+    },
+
+    async save (row) {
+      const params = {
+        partyMemberId: this.enterpriseId,
+        ...row,
+      };
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.btnType = "cancle";
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async edit (row) {
+      const params = {
+        ...row,
+      };
+
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async del (row) {
+      await this.$http
+        .post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async getList () {
+      const { enterpriseId } = this;
+
+      const params = {};
+
+      await this.$http
+        .post(`/gov/org/enterprise/patrollist/${enterpriseId}`, {
+          params,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.tableData = res.data.list.map((item) => {
+              this.computeImgShowList(item);
+              return {
+                ...item,
+                isEdit: false,
+              };
+            });
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-record {
+  .mt10 {
+    margin-bottom: 10px;
+  }
+  .input-width {
+    width: 170px;
+  }
+}
+</style>

From 4bbf60852c74671c2de2dd63bd2cdcb65508f74f Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 10:35:23 +0800
Subject: [PATCH 05/19] bug

---
 src/views/modules/census/census-nineList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index d88520994..007e85fb8 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -160,6 +160,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			orgType:"agency",
 			dialogVisible: false,
 			detailId: '',
 			detailData: {},
@@ -283,6 +284,7 @@ export default {
 			this.getTableData();
 		},
 		async getsubData() {
+			console.log("this.orgType",this.orgType)
 			this.$refs.pieChart.showLoading();
 			let url = '/gov/org/enterprise/count-type';
 			let param = {
@@ -488,7 +490,7 @@ export default {
 			if (obj.level == 'grid') {
 				this.orgType = 'grid';
 			} else {
-				this.orgType = obj.agency;
+				this.orgType = "agency";
 			}
 		},
 		deepTree(arr) {

From 86eb9cf0dda792d31bbb06d1399427f7532b4a6a Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 10:41:37 +0800
Subject: [PATCH 06/19] bug

---
 src/views/modules/census/census-nineList.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 007e85fb8..7a0c2280e 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -241,6 +241,10 @@ export default {
 			this.getTableData();
 		},
 		handleSearch(val) {
+			console.log("val",val);
+			if(this.formData.orgId.length==0){
+				this.formData.orgId="";
+			}
 			console.log(this.formData);
 			this.pageNo = 1;
 			this.placeType = '';

From 7efdfe151b0c5ca5518f8c15bc024a13b530e3c6 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 13:38:18 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E7=BA=A7=E8=81=94bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../census/census-accountActiveList.vue       | 18 ++++---
 .../modules/census/census-accountList.vue     | 12 ++---
 src/views/modules/census/census-nineList.vue  | 47 +++++++++++--------
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index a85ee01d9..53800b18b 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -6,16 +6,15 @@
 					<div>
 						<el-form-item label="所属组织" prop="gridId">
 							<el-cascader
-								class="customer_cascader"
 								ref="myCascader"
 								filterable
-								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
+								clearable
 								:show-all-levels="false"
 								@change="handleChangeAgency"
-							></el-cascader>
+							/>
 						</el-form-item>
 						<el-form-item label="上报时间" prop="startTime">
 							<el-date-picker
@@ -143,11 +142,17 @@ export default {
 			agencyIdArray: [],
 			orgOptions: [],
 			orgOptionProps: {
+				// multiple: false,
+				// value: 'agencyId',
+				// label: 'agencyName',
+				// children: 'subAgencyList',
+				// checkStrictly: true
 				multiple: false,
-				value: 'agencyId',
-				label: 'agencyName',
+				checkStrictly: true,
+				emitPath: false,
 				children: 'subAgencyList',
-				checkStrictly: true
+				label: 'agencyName',
+				value: 'agencyId'
 			},
 			tableData: [],
 
@@ -198,7 +203,6 @@ export default {
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log(obj);
-			this.formData.orgId = obj.agencyId;
 			this.formData.level = obj.level;
 		},
 
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index a0b56ab00..309faf8cb 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -4,18 +4,17 @@
 			<div class="div_search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
 					<div>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属组织" prop="orgId">
 							<el-cascader
-								class="customer_cascader"
 								ref="myCascader"
 								filterable
-								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
-								:show-all-levels="false"
+								clearable
 								@change="handleChangeAgency"
-							></el-cascader>
+								:show-all-levels="false"
+							/>
 						</el-form-item>
 						<el-form-item label="上报时间" prop="startDate">
 							<el-date-picker
@@ -185,6 +184,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			optionsA: [],
 			pieChart: '',
 			pieOption: {},
 			pieInitState: false,
@@ -202,6 +202,7 @@ export default {
 			orgOptionProps: {
 				multiple: false,
 				value: 'agencyId',
+				emitPath: false,
 				label: 'agencyName',
 				children: 'subAgencyList',
 				checkStrictly: true
@@ -341,7 +342,6 @@ export default {
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log(obj);
-			this.formData.orgId = obj.agencyId;
 			this.formData.level = obj.level;
 		},
 		getOrgTreeList() {
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 7a0c2280e..aea5cb4f9 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -4,11 +4,10 @@
 			<div class="div_search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
 					<div>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属组织" prop="orgId">
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								filterable
 								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
@@ -67,7 +66,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -125,7 +124,6 @@
 				:detailId="detailId"
 				:detailData="detailData"
 				@handleClose="handleClose"
-				
 			/>
 		</div>
 	</div>
@@ -160,7 +158,8 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
-			orgType:"agency",
+			orgId: '',
+			orgType: 'agency',
 			dialogVisible: false,
 			detailId: '',
 			detailData: {},
@@ -169,7 +168,9 @@ export default {
 			user: {},
 			gridList: [], //所属网格list--场所区域
 			tableData: [],
-			formData: {},
+			formData: {
+				orgId: ''
+			},
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
 			total: 1,
@@ -190,6 +191,7 @@ export default {
 				value: 'agencyId',
 				label: 'agencyName',
 				children: 'subAgencyList',
+				emitPath: false,
 				checkStrictly: true
 			},
 			TableHeight: '',
@@ -241,11 +243,11 @@ export default {
 			this.getTableData();
 		},
 		handleSearch(val) {
-			console.log("val",val);
-			if(this.formData.orgId.length==0){
-				this.formData.orgId="";
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+				this.formData.orgId = '';
 			}
-			console.log(this.formData);
+
 			this.pageNo = 1;
 			this.placeType = '';
 			this.getTableData();
@@ -288,7 +290,7 @@ export default {
 			this.getTableData();
 		},
 		async getsubData() {
-			console.log("this.orgType",this.orgType)
+			console.log('this.orgType', this.orgType);
 			this.$refs.pieChart.showLoading();
 			let url = '/gov/org/enterprise/count-type';
 			let param = {
@@ -327,7 +329,14 @@ export default {
 			let data = [...this.pieData.list];
 			this.chartData.name = data.map(item => item.placeTypeName);
 			this.chartData.data = data.map(item => {
-				return { value: item.total, id: item.agencyId, placeType: item.placeType, name: item.placeTypeName };
+				return {
+					value: item.total,
+					id: item.agencyId,
+					placeType: item.placeType,
+					name: item.placeTypeName,
+					radio: item.total == 0 ? '0' : ((item.total / this.pieData.total) * 100).toFixed(2)
+				};
+				console.log(item, this.pieData.total);
 			});
 
 			console.log('chartData', this.chartData);
@@ -444,7 +453,9 @@ export default {
 				data: {
 					pageSize,
 					pageNo,
-					...formData
+					orgId: this.formData.orgId,
+					orgType: this.orgType,
+					placeType: this.placeType
 				},
 				responseType: 'blob'
 			})
@@ -475,7 +486,7 @@ export default {
 					if (res.code !== 0) {
 						return this.$message.error(res.msg);
 					} else {
-						// console.log('获取组织树成功', res.data);
+						console.log('获取组织树成功', res.data);
 						// let { agencyList, subAgencyList } = res.data;
 						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
 						// this.orgOptions = this.deepTree(_arr);
@@ -489,12 +500,10 @@ export default {
 		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
-			console.log(obj);
-			this.formData.orgId = obj.agencyId;
-			if (obj.level == 'grid') {
-				this.orgType = 'grid';
+			if (obj) {
+				this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
 			} else {
-				this.orgType = "agency";
+				this.orgType = '';
 			}
 		},
 		deepTree(arr) {

From dbf76938221ed002f13a0ac5bbd8d1f51b98678c Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 14:34:20 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../census/census-accountActiveList.vue       |  5 ++
 .../modules/census/census-accountList.vue     |  6 ++
 src/views/modules/census/census-nineList.vue  | 12 +++-
 .../modules/census/census-orgStatusList.vue   | 62 +++++++------------
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 53800b18b..e3c8373b4 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -207,6 +207,11 @@ export default {
 		},
 
 		handleSearch(val) {
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+				this.formData.orgId = '';
+				this.formData.level = '';
+			}
 			console.log(this.formData);
 			this.pageNo = 1;
 			this.getTableData();
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 309faf8cb..262bbc96f 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -271,6 +271,12 @@ export default {
 	},
 	methods: {
 		handleSearch(val) {
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+				this.formData.orgId = '';
+				this.formData.level = '';
+			}
+
 			this.getCountLevel();
 			this.getTableData();
 			this.getsubData();
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index aea5cb4f9..aa924ccaf 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -90,8 +90,8 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-
 							<el-table-column prop="placeOrgName" align="center" label="场所名称" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="placeTypeName" align="center" label="场所类型" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="scaleName" align="center" label="规模" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="personInCharge" align="center" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="mobile" align="center" label="联系方式" :show-overflow-tooltip="true"></el-table-column>
@@ -246,6 +246,7 @@ export default {
 			let tmp = this.formData.orgId;
 			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
 				this.formData.orgId = '';
+				this.orgType = '';
 			}
 
 			this.pageNo = 1;
@@ -348,6 +349,15 @@ export default {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				color: this.color,
 				title: {
 					text: this.pieData.total,
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 1733974a9..45561ded8 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -4,7 +4,7 @@
 			<div class="div_search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
 					<div>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属组织" prop="orgId">
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
@@ -74,10 +74,11 @@
 			<el-row :gutter="20">
 				<el-col :span="24">
 					<div class="div_table">
-						<div class="div_table_title">下级社区数量统计
+						<div class="div_table_title">
+							下级社区数量统计
 							<el-form :inline="true" :model="formData2" ref="ref_searchform2" :label-width="'80px'" style="display: inline-block;margin-left: 20px;">
 								<div>
-									<el-form-item label="" prop="startDate" >
+									<el-form-item label="" prop="startDate">
 										<el-date-picker
 											v-model="formData2.startDate"
 											:picker-options="startPickerOptions"
@@ -104,8 +105,6 @@
 									</el-form-item>
 								</div>
 							</el-form>
-
-							
 						</div>
 						<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :h="maxTableHeight">
 							<screen-echarts-frame
@@ -186,10 +185,11 @@ export default {
 			orgOptions: [],
 			orgOptionProps: {
 				multiple: false,
-				value: 'agencyId',
-				label: 'agencyName',
+				checkStrictly: true,
+				emitPath: false,
 				children: 'subAgencyList',
-				checkStrictly: true
+				label: 'agencyName',
+				value: 'agencyId'
 			},
 			tableData: [],
 			tableDataView: [],
@@ -222,7 +222,8 @@ export default {
 
 			multipleSelection: [],
 			TableHeight: '',
-			pieData: {}
+			pieData: {},
+			agencyId: ''
 		};
 	},
 	components: {
@@ -351,13 +352,15 @@ export default {
 			console.log('this.formData.orgId', this.formData.orgId);
 
 			let agencyId = '';
-			if (this.formData.orgId == '') {
-				agencyId = this.agencyId;
-				this.level = this.user.level;
-			} else {
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				agencyId = this.formData.orgId;
 				this.level = this.formData.level;
+			} else {
+				agencyId = this.agencyId;
+				this.level = this.user.level;
 			}
+
 			const url = '/gov/org/customeragency/getAgencyCountList';
 			let params = { agencyId: agencyId };
 			const { data, code, msg } = await requestGet(url, params);
@@ -371,39 +374,16 @@ export default {
 				this.$message.error(msg);
 			}
 		},
-		async getTableData() {
-			// this.tableLoading = true;
-			// const url = '/gov/org/customeragency/getCommunityCountList';
-			// let agencyId = '';
-			// if (this.formData.orgId == '') {
-			// 	agencyId = this.agencyId;
-			// } else {
-			// 	agencyId = this.formData.orgId;
-			// }
-			// const { data, code, msg } = await requestPost(url, {
-			// 	{agencyId:agencyId}
-			// });
-			// this.tableLoading = false;
-			// if (code === 0) {
-			// 	this.total = data.total || 0;
-			// 	this.tableData = data.list
-			// 		? data.list.map(item => {
-			// 				return item;
-			// 		  })
-			// 		: [];
-			// 	// console.log('this.tableData ', this.tableData);
-			// } else {
-			// 	this.$message.error(msg);
-			// }
-		},
+		async getTableData() {},
 		async getsubData() {
 			this.$refs.pieChart.showLoading();
 			let url = '/gov/org/customeragency/getCommunityCountList';
 			let agencyId = '';
-			if (this.formData.orgId == '') {
-				agencyId = this.agencyId;
-			} else {
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				agencyId = this.formData.orgId;
+			} else {
+				agencyId = this.agencyId;
 			}
 			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData2.startDate, timeEnd: this.formData2.endDate });
 

From ae87e6ad6d5ffd33b28043d47c373a35b41636a7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 14:40:33 +0800
Subject: [PATCH 09/19] 1

---
 src/views/modules/census/census-nineList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index aa924ccaf..616765192 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -351,7 +351,7 @@ export default {
 			this.pieOption = {
 				tooltip: {
 					trigger: 'item',
-					formatter: '总数  :  {c}<br/> 占比  :  {d}%',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
 					backgroundColor: 'rgb(134,134,134)',
 					borderColor: 'rgb(134,134,134)',
 					textStyle: {

From bb73a699efae828f0a70748fd2c2010090fe2026 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 15:57:39 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue | 215 +++++++++++++-----
 src/views/modules/census/census-nineList.vue  |  10 +-
 2 files changed, 161 insertions(+), 64 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 2fb5edebe..c9cde91df 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -4,11 +4,10 @@
 			<div class="div_search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
 					<div>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属组织" prop="orgId">
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								filterable
 								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
@@ -181,7 +180,9 @@ export default {
 			user: {},
 			gridList: [], //所属网格list--场所区域
 			tableData: [],
-			formData: {},
+			formData: {
+				orgId: ''
+			},
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
 			total: 1,
@@ -202,6 +203,7 @@ export default {
 				value: 'agencyId',
 				label: 'agencyName',
 				children: 'subAgencyList',
+				emitPath: false,
 				checkStrictly: true
 			},
 			TableHeight: '',
@@ -212,7 +214,9 @@ export default {
 			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
-			pieData: []
+			pieData: [],
+			pieData2: [],
+			orgId: ''
 		};
 	},
 	computed: {
@@ -234,16 +238,18 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
+		this.orgId=this.agencyId;
 		this.getOrgTreeList();
-		this.getTableData();
-		this.getPie();
-		this.getPie2();
+		// this.getTableData();
+		this.getsubData();
+		this.getsubData2();
 	},
 	methods: {
 		handleSearch(val) {
-			console.log(this.formData);
 			this.pageNo = 1;
 			this.getTableData();
+			this.getsubData();
+			this.getsubData2();
 		},
 		async getTableData() {
 			this.tableLoading = true;
@@ -280,20 +286,33 @@ export default {
 		},
 		async getsubData() {
 			this.$refs.pieChart.showLoading();
-			let url = '/gov/org/staffLoginLog/sub-count';
+			let url = '/gov/org/ichouse/getHousePurposeCount';
 			let param = {
-				orgId: this.formData.orgId,
-				level: this.formData.level,
-				startDate: this.formData.startDate,
-				endDate: this.formData.endDate
+				orgIdPath: this.orgId,
+				timeStart: this.formData.startDate,
+				timeEnd: this.formData.endDate
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart.hideLoading();
-
 			if (code === 0) {
 				this.pieData = data.list;
-				console.log('this.pieData ', this.pieData);
 				this.getPie();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getsubData2() {
+			this.$refs.pieChart2.showLoading();
+			let url = '/gov/org/ichouse/getHouseStatusCount';
+			let param = {
+				orgIdPath: this.orgId,
+				timeStart: this.formData.startDate,
+				timeEnd: this.formData.endDate
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart2.hideLoading();
+			if (code === 0) {
+				this.pieData2 = data.list;
 				this.getPie2();
 			} else {
 				this.$message.error(msg);
@@ -303,9 +322,7 @@ export default {
 			this.pieInitState = true;
 		},
 		pieInitOk2() {
-			console.log('2333erwewrwe33333', this.pieInitState2);
 			this.pieInitState2 = true;
-			console.log('2333erwewrwe333335476754765', this.pieInitState2);
 		},
 		getPie() {
 			if (this.pieInitState) {
@@ -318,7 +335,6 @@ export default {
 		},
 		getPie2() {
 			if (this.pieInitState2) {
-				console.log('233333333');
 				this.setPieData2();
 			} else {
 				setTimeout(() => {
@@ -327,45 +343,51 @@ export default {
 			}
 		},
 		setPieData() {
-			// let data = [...this.pieData];
-			// console.log('data', data);
-			let chartData = {
-				name: ['反骨', '反骨2', '反骨3', '反骨4'],
-				data: [{ value: 62, name: '反骨' }, { value: 44, name: '反骨2' }, { value: 123, name: '反骨3' }, { value: 232, name: '反骨4' }]
-			};
-			this.chartData = chartData;
-			// chartData.name = data.map(item => item.agencyName);
-			// chartData.data = data.map(item => {
-			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
-			// });
-			console.log('chartData', chartData);
-			this.iniPieChart(chartData);
+			let data = [...this.pieData.list];
+			this.chartData.name = data.map(item => item.type);
+			this.chartData.data = data.map(item => {
+				return {
+					value: item.count,
+					name: item.type,
+					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
+				};
+			});
+
+			console.log('chartData', this.chartData);
+			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			console.log('dddddddddddd');
-			// let data = [...this.pieData];
-			// console.log('data', data);
-			let chartData = {
-				name: ['自住', '出租', '闲置', '未售出'],
-				data: [{ value: 62, name: '自住' }, { value: 243, name: '出租' }, { value: 243, name: '闲置' }, { value: 243, name: '未售出' }]
-			};
-			this.chartData2 = chartData;
-			// chartData.name = data.map(item => item.agencyName);
-			// chartData.data = data.map(item => {
-			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
-			// });
-			console.log('chartData', chartData);
-			this.iniPieChart2(chartData);
+			let data = [...this.pieData2.list];
+			this.chartData2.name = data.map(item => item.type);
+			this.chartData2.data = data.map(item => {
+				return {
+					value: item.count,
+					name: item.type,
+					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
+				};
+			});
+
+			console.log('chartData', this.chartData2);
+			this.iniPieChart(this.chartData2);
 		},
 		// 获取饼状图
 		async iniPieChart(chartData) {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				color: this.color,
 				title: {
-					text: '12345',
-					subtext: '房屋总数(分)',
+					text: this.pieData.total,
+					subtext: '总数',
 					x: 'center',
 					y: 'center',
 					textStyle: {
@@ -382,7 +404,21 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['60%', '85%'],
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '65%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -407,19 +443,32 @@ export default {
 							}
 						}
 					},
-
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
-						avoidLabelOverlap: false,
+						radius: ['80%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
 						label: {
-							show: false,
-							position: 'center'
+							show: false
+						},
+						labelLine: {
+							show: false
 						},
 						tooltip: {
-							show: true
+							show: false
 						},
-						data: chartData.data
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
 					}
 				]
 			};
@@ -430,10 +479,19 @@ export default {
 			// 获取pieChart配置
 
 			this.pieOption2 = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				color: this.color,
 				title: {
-					text: '12345',
-					subtext: '房屋总数(分)',
+					text: this.pieData.total,
+					subtext: '总数',
 					x: 'center',
 					y: 'center',
 					textStyle: {
@@ -459,12 +517,39 @@ export default {
 						tooltip: {
 							show: true
 						},
-						z: 9999,
+
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '85%'],
+						radius: ['60%', '65%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+					{
+						type: 'pie',
+						radius: ['80%', '85%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -577,9 +662,13 @@ export default {
 		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
-			console.log(obj);
-			this.formData.orgId = obj.agencyId;
-			this.formData.level = obj.level;
+
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+				this.orgId = this.formData.orgId;
+			} else {
+				this.orgId = this.agencyId;
+			}
 		},
 		deepTree(arr) {
 			if (Array.isArray(arr)) {
@@ -690,7 +779,7 @@ export default {
 
 	justify-content: space-between;
 	align-items: flex-end;
-	margin-bottom:0px;
+	margin-bottom: 0px;
 	margin-top: 0px;
 	.census_searchcensus_box {
 		align-items: flex-end;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 616765192..69c81768b 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -456,7 +456,15 @@ export default {
 
 		async handleExport() {
 			const url = '/gov/org/enterprise/export';
-			const { pageSize, pageNo, formData } = this;
+
+			const { pageSize, pageNo } = this;
+
+			let tmp = this.formData.orgId;
+			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+				this.formData.orgId = '';
+				this.orgType = '';
+			}
+
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
 				method: 'post',

From 77f6d42de1e6cf0b80636c1f9d19f41e3b9839ef Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 16:46:02 +0800
Subject: [PATCH 11/19] bug

---
 src/views/modules/census/Option.js            |  16 -
 .../census/census-accountActiveList.vue       |   2 +-
 .../modules/census/census-accountList.vue     |   3 +-
 src/views/modules/census/census-houseList.vue |  66 ++-
 src/views/modules/census/census-nineList.vue  |   4 +-
 .../modules/census/census-orgStatusList.vue   |   2 +-
 src/views/modules/census/record1.vue          | 503 ------------------
 7 files changed, 50 insertions(+), 546 deletions(-)
 delete mode 100644 src/views/modules/census/Option.js
 delete mode 100644 src/views/modules/census/record1.vue

diff --git a/src/views/modules/census/Option.js b/src/views/modules/census/Option.js
deleted file mode 100644
index d8c87dd75..000000000
--- a/src/views/modules/census/Option.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as echarts from "echarts";
-export function pieOption() {
-	return {
-		xAxis: {
-			type: 'category',
-			data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-		},
-		yAxis: {
-			type: 'value'
-		},
-		series: [{
-			data: [120, 200, 150, 80, 70, 110, 130],
-			type: 'bar'
-		}]
-	};
-}
diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index e3c8373b4..62d74b247 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -208,7 +208,7 @@ export default {
 
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.formData.level = '';
 			}
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 262bbc96f..56ea1cbfe 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -157,7 +157,6 @@
 
 <script>
 import screenEchartsFrame from './chart';
-import { pieOption } from './Option.js';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
@@ -272,7 +271,7 @@ export default {
 	methods: {
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.formData.level = '';
 			}
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index c9cde91df..2fcd12cf7 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -238,19 +238,13 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
-		this.orgId=this.agencyId;
+		this.orgId = this.agencyId;
 		this.getOrgTreeList();
 		// this.getTableData();
 		this.getsubData();
 		this.getsubData2();
 	},
 	methods: {
-		handleSearch(val) {
-			this.pageNo = 1;
-			this.getTableData();
-			this.getsubData();
-			this.getsubData2();
-		},
 		async getTableData() {
 			this.tableLoading = true;
 			// const url = '/gov/org/staffLoginLog/community-count';
@@ -295,7 +289,7 @@ export default {
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart.hideLoading();
 			if (code === 0) {
-				this.pieData = data.list;
+				this.pieData = data;
 				this.getPie();
 			} else {
 				this.$message.error(msg);
@@ -312,7 +306,8 @@ export default {
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart2.hideLoading();
 			if (code === 0) {
-				this.pieData2 = data.list;
+				this.pieData2 = data;
+				console.log('this.pieData2', this.pieData2);
 				this.getPie2();
 			} else {
 				this.$message.error(msg);
@@ -344,11 +339,20 @@ export default {
 		},
 		setPieData() {
 			let data = [...this.pieData.list];
-			this.chartData.name = data.map(item => item.type);
+			let type = {
+				1: '住宅',
+				2: '商业',
+				3: '办公',
+				4: '工业',
+				5: '存储',
+				6: '商住混用',
+				7: '其它'
+			};
+			this.chartData.name = data.map(item => type[item.type]);
 			this.chartData.data = data.map(item => {
 				return {
 					value: item.count,
-					name: item.type,
+					name: type[item.type],
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
 				};
 			});
@@ -358,17 +362,23 @@ export default {
 		},
 		setPieData2() {
 			let data = [...this.pieData2.list];
-			this.chartData2.name = data.map(item => item.type);
+			let type = {
+				1: '出租',
+				0: '自住',
+				2: '闲置',
+				3: '未售出'
+			};
+			this.chartData2.name = data.map(item => type[item.type]);
 			this.chartData2.data = data.map(item => {
 				return {
 					value: item.count,
-					name: item.type,
+					name: type[item.type],
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
 
 			console.log('chartData', this.chartData2);
-			this.iniPieChart(this.chartData2);
+			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
 		async iniPieChart(chartData) {
@@ -645,30 +655,44 @@ export default {
 		getOrgTreeList() {
 			const { user } = this.$store.state;
 			this.$http
-				.post('gov/org/customeragency/staffinagencylist', {})
+				.post('/gov/org/customeragency/agencygridtree', {})
 				.then(({ data: res }) => {
 					if (res.code !== 0) {
 						return this.$message.error(res.msg);
 					} else {
 						console.log('获取组织树成功', res.data);
-						let { agencyList, subAgencyList } = res.data;
-						const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
-						this.orgOptions = this.deepTree(_arr);
+						// let { agencyList, subAgencyList } = res.data;
+						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+						// this.orgOptions = this.deepTree(_arr);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
 					}
 				})
 				.catch(() => {
 					return this.$message.error('网络错误');
 				});
 		},
+		handleSearch(val) {
+			this.pageNo = 1;
+			this.getTableData();
+			this.getsubData();
+			this.getsubData2();
+		},
 		handleChangeAgency(val) {
-			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
-
+			// let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+			console.log('!tmp', !tmp);
+			console.log("typeof tmp != 'undefined'", typeof tmp != 'undefined');
+			console.log('tmp != 0', tmp != 0);
+			console.log('tmp != null', tmp != null);
+
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
 			} else {
+				console.log('ww');
 				this.orgId = this.agencyId;
 			}
+			console.log('this.orgId', this.orgId);
 		},
 		deepTree(arr) {
 			if (Array.isArray(arr)) {
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 69c81768b..7bf008c15 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -244,7 +244,7 @@ export default {
 		},
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.orgType = '';
 			}
@@ -460,7 +460,7 @@ export default {
 			const { pageSize, pageNo } = this;
 
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.orgType = '';
 			}
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 45561ded8..047b591ae 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -142,7 +142,7 @@
 
 <script>
 import screenEchartsFrame from './chart';
-import { pieOption } from './Option.js';
+
 import { requestPost, requestGet } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
diff --git a/src/views/modules/census/record1.vue b/src/views/modules/census/record1.vue
deleted file mode 100644
index b57b75796..000000000
--- a/src/views/modules/census/record1.vue
+++ /dev/null
@@ -1,503 +0,0 @@
-<template>
-  <div class="m-record"
-       style="padding: 0 20px">
-    <h3>巡查记录</h3>
-    <div class="mt10"
-         v-if="formType == 'edit'">
-      <el-button size="small"
-                 :class="[source==='manage'?'diy-button--add':'diy-button--export']"
-                 :disabled="btnDisabled || disabled"
-                 @click="handleAdd">新增</el-button>
-    </div>
-    <el-table :data="tableData"
-              row-key="id"
-              border
-              style="width: 100%"
-              :header-cell-style="getRowClass">
-      <el-table-column label="序号"
-                       type="index"
-                       align="center"
-                       width="50">
-      </el-table-column>
-
-      <el-table-column prop="patrolTime"
-                       label="巡查时间"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.patrolTime"
-                          type="date"
-                          class="input-width"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择日期">
-          </el-date-picker>
-          <div v-else
-               class="div-content">{{ scope.row.patrolTime }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="staffId"
-                       label="巡查人员"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-select v-if="scope.row.isEdit"
-                     filterable
-                     v-model="scope.row.staffId"
-                     placeholder="请选择"
-                     class="input-width"
-                     @change="handleChangeStaff(scope.row)"
-                     clearable>
-            <el-option v-for="subItem in optionStaff"
-                       :key="subItem.value"
-                       :label="subItem.label"
-                       :value="subItem.value">
-            </el-option>
-          </el-select>
-          <div v-else
-               class="div-content">{{ scope.row.staffName }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="mobile"
-                       label="联系电话"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.isEdit"
-                    type="number"
-                    v-model="scope.row.mobile"
-                    placeholder="请输入"
-                    class="input-width"
-                    clearable
-                    disabled></el-input>
-          <div v-else
-               class="div-content">{{ scope.row.mobile }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="result"
-                       label="巡查结果"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-select v-if="scope.row.isEdit"
-                     v-model="scope.row.result"
-                     placeholder="请选择"
-                     class="input-width"
-                     size="small"
-                     clearable>
-            <el-option v-for="subItem in optionResult"
-                       :key="subItem.value"
-                       :label="subItem.label"
-                       :value="subItem.value">
-            </el-option>
-          </el-select>
-          <div v-else
-               class="div-content">{{ scope.row.resultName }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="detailed"
-                       label="隐患明细"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.isEdit"
-                    type="text"
-                    v-model="scope.row.detailed"
-                    placeholder="请输入"
-                    class="input-width"
-                    maxlength="500"
-                    clearable></el-input>
-          <div v-else
-               class="div-content">{{ scope.row.detailed }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="imgList"
-                       label="图片列表"
-                       align="center"
-                       width="150px">
-        <template slot-scope="scope">
-          <div v-if="scope.row.isEdit">
-            <el-upload :headers="$getElUploadHeaders()"
-                       class="avatar-uploader"
-                       :action="uploadUrl"
-                       :data="{ customerId: customerId }"
-                       :show-file-list="true"
-                       :limit="3"
-                       :file-list="scope.row.imgShowList"
-                       :on-success="(res) => handleImgSuccess(res, scope.row)"
-                       :on-remove="(res) => handleImgRemove(res, scope.row)"
-                       list-type="picture"
-                       :before-upload="beforeImgUpload">
-              <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
-            </el-upload>
-          </div>
-
-          <div v-else
-               class="div-content">
-            <el-image v-if="scope.row.imgList.length > 0"
-                      style="width: 100px; height: 50px"
-                      :src="scope.row.imgList[0]"
-                      fit="cover"
-                      :preview-src-list="scope.row.imgList"></el-image>
-          </div>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="reviewTime"
-                       label="拟复查时间"
-                       align="center"
-                       width="200px">
-        <template slot-scope="scope">
-          <el-date-picker v-if="scope.row.isEdit"
-                          v-model="scope.row.reviewTime"
-                          type="date"
-                          class="input-width"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择日期">
-          </el-date-picker>
-          <div v-else
-               class="div-content">{{ scope.row.reviewTime }}</div>
-        </template>
-      </el-table-column>
-
-      <el-table-column v-if="!disabled"
-                       fixed="right"
-                       label="操作"
-                       align="center"
-                       width="120">
-        <template slot-scope="scope">
-          <template v-if="scope.row.isEdit">
-            <el-button @click="handleEdit(scope.row)"
-                       type="text"
-                       size="small"
-                       class="btn-color-edit">保存</el-button>
-            <el-button @click="handleChange(scope.row, 'cancle')"
-                       type="text"
-                       size="small"
-                       class="btn-color-edit">取消</el-button>
-          </template>
-          <template v-else>
-            <el-button v-if="formType == 'edit'"
-                       @click="handleChange(scope.row, 'edit')"
-                       type="text"
-                       size="small"
-                       :disabled="disabled"
-                       class="btn-color-edit">修改</el-button>
-            <el-popconfirm v-if="formType == 'edit'"
-                           title="删除之后无法恢复，确认删除？"
-                           @onConfirm="del(scope.row)"
-                           @confirm="del(scope.row)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="btn-color-del"
-                         style="margin-left: 10px">删除</el-button>
-            </el-popconfirm>
-          </template>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { requestPost } from "@/js/dai/request";
-
-export default {
-  props: {
-    enterpriseId: {
-      type: String,
-      default: "",
-    },
-    enterpriseInfo: {
-      type: Object,
-      default: () => ({}),
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    formType: {
-      type: String,
-      default: "",
-    },
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
-      type: String,
-      default: 'manage'
-    }
-  },
-  data () {
-    return {
-      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-      customerId: localStorage.getItem("customerId"),
-
-      btnDisabled: false,
-      btnType: "cancle",
-      isEdit: false,
-      tableData: [],
-      tempRow: {},
-
-      optionResult: [
-        {
-          label: "合格",
-          value: "0",
-        },
-        {
-          label: "不合格",
-          value: "1",
-        },
-      ],
-      optionStaff: [
-        // {
-        //   label: "人名",
-        //   value: "staffId",
-        // },
-      ],
-    };
-  },
-
-  computed: {
-    allowOperate () {
-      const {
-        enterpriseInfo: { agencyId },
-      } = this;
-      return agencyId && agencyId == this.$store.state.user.agencyId;
-    },
-  },
-  watch: {
-    enterpriseId: {
-      handler (val) {
-        console.log("val------points", val);
-        if (val.length > 0) {
-          this.btnDisabled = false;
-          this.getList();
-        } else this.btnDisabled = true;
-      },
-      immediate: true,
-    },
-  },
-
-  created () {
-    this.getOptionStaff();
-  },
-
-  methods: {
-    beforeImgUpload (file) {
-      console.log(file);
-      const isLt1M = file.size / 1024 / 1024 < 10;
-      const srcType = file.type;
-      const format = file.name.split(".").pop();
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 10MB!");
-        return false;
-      }
-      if (srcType.indexOf("image") == -1) {
-        this.$message.error("仅限图片格式");
-        return false;
-      }
-      return true;
-    },
-
-    handleImgSuccess (res, row) {
-      console.log("handleImgSuccess", res);
-      if (res.code === 0 && res.msg === "success") {
-        row.imgList.push(res.data.url);
-        this.computeImgShowList(row);
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-
-    computeImgShowList (row) {
-      row.imgShowList = row.imgList.map((url) => {
-        return { name: "", url };
-      });
-    },
-
-    handleImgRemove (file, row) {
-      console.log("handleImgRemove", file);
-      let url = file.url || file.response.data.url;
-      if (url) {
-        row.imgList = row.imgList.filter((item) => item !== url);
-        this.computeImgShowList(row);
-      }
-    },
-
-    getRowClass ({ rowIndex, columnIndex }) {
-      if (rowIndex === 0) {
-        return "background: #2195fe; color: #fff;";
-      }
-    },
-
-    handleChange (row, type) {
-      console.log("type----", type);
-      if (type == "cancle") {
-        row = { ...this.tempRow };
-        row.isEdit = false;
-        if (this.btnType == "add") this.tableData.pop();
-        this.getList();
-        console.log("row----", row);
-      } else {
-        this.tempRow = { ...row };
-        row.isEdit = true;
-      }
-      this.btnType = type;
-      this.isEdit = !this.isEdit;
-    },
-
-    handleChangeStaff (row) {
-      const { staffId } = row;
-      const { optionStaff } = this;
-      let item = optionStaff.find((item) => item.value == staffId);
-      if (item) {
-        row.staffName = item.name;
-        row.mobile = item.mobile;
-      }
-    },
-
-    async getOptionStaff () {
-      let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-      const { data, code, msg } = await requestPost(url, {});
-
-      if (code === 0) {
-        this.optionStaff = data || [];
-      } else {
-        this.$message.error("请求工作人员数据失败！");
-      }
-    },
-
-    async handleEdit (row) {
-      if (this.btnType == "add") this.save(row);
-      else this.edit(row);
-    },
-
-    handleAdd () {
-      this.btnType = "add";
-      this.isEdit = true;
-
-      const item = {
-        isEdit: true,
-        enterpriseId: this.enterpriseId,
-        patrolTime: "",
-        staffId: "",
-        staffName: "",
-        mobile: "",
-        result: "",
-        imgList: [],
-        reviewTime: "",
-      };
-      this.computeImgShowList(item);
-      this.tableData.push(item);
-    },
-
-    async save (row) {
-      const params = {
-        partyMemberId: this.enterpriseId,
-        ...row,
-      };
-      await this.$http
-        .post("/gov/org/enterprise/addorupdate-patrol", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("保存成功");
-            row.isEdit = false;
-            this.isEdit = false;
-            this.btnType = "cancle";
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async edit (row) {
-      const params = {
-        ...row,
-      };
-
-      await this.$http
-        .post("/gov/org/enterprise/addorupdate-patrol", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("保存成功");
-            row.isEdit = false;
-            this.isEdit = false;
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async del (row) {
-      await this.$http
-        .post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("删除成功");
-            this.getList();
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-
-    async getList () {
-      const { enterpriseId } = this;
-
-      const params = {};
-
-      await this.$http
-        .post(`/gov/org/enterprise/patrollist/${enterpriseId}`, {
-          params,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.tableData = res.data.list.map((item) => {
-              this.computeImgShowList(item);
-              return {
-                ...item,
-                isEdit: false,
-              };
-            });
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-          return this.$message.error("网络错误");
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.m-record {
-  .mt10 {
-    margin-bottom: 10px;
-  }
-  .input-width {
-    width: 170px;
-  }
-}
-</style>

From 003612e7930afbebbd4ee7ae1102ed14f3112de9 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 11 Apr 2023 17:16:10 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue |   5 +-
 .../modules/census/census-residentList.vue    | 370 +++++++++++-------
 2 files changed, 238 insertions(+), 137 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 2fcd12cf7..14524ec3b 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -681,10 +681,7 @@ export default {
 		handleChangeAgency(val) {
 			// let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			let tmp = this.formData.orgId;
-			console.log('!tmp', !tmp);
-			console.log("typeof tmp != 'undefined'", typeof tmp != 'undefined');
-			console.log('tmp != 0', tmp != 0);
-			console.log('tmp != null', tmp != null);
+			
 
 			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 2fb5edebe..0ce8e1d84 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -4,11 +4,10 @@
 			<div class="div_search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
 					<div>
-						<el-form-item label="所属组织" prop="gridId">
+						<el-form-item label="所属组织" prop="orgId">
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								filterable
 								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
@@ -17,29 +16,7 @@
 								@change="handleChangeAgency"
 							></el-cascader>
 						</el-form-item>
-						<el-form-item label="上报时间" prop="startTime">
-							<el-date-picker
-								v-model="formData.startDate"
-								:picker-options="startPickerOptions"
-								class="item_width_2"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="开始时间"
-							></el-date-picker>
-							<span class="data-tag">至</span>
-							<el-date-picker
-								v-model="formData.endDate"
-								:picker-options="endPickerOptions"
-								class="item_width_2 data-tag"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="结束时间"
-							></el-date-picker>
-						</el-form-item>
+
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
 					</div>
 				</el-form>
@@ -47,10 +24,10 @@
 			<div class="div_table">
 				<el-row :gutter="20">
 					<el-col :span="12">
-						<div class="div_table_title">房屋用途统计</div>
+						<div class="div_table_title">居民年龄统计</div>
 						<el-row>
 							<el-col :span="12">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+								<div :style="'height:220px;margin-top:20px'">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
@@ -60,7 +37,7 @@
 								</div>
 							</el-col>
 							<el-col :span="12">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
+								<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
 									<div class="legend">
 										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
@@ -76,10 +53,10 @@
 						</el-row>
 					</el-col>
 					<el-col :span="12">
-						<div class="div_table_title">房屋状态统计</div>
+						<div class="div_table_title">居民学历统计</div>
 						<el-row>
 							<el-col :span="12">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+								<div :style="'height:220px;margin-top:20px'">
 									<screen-echarts-frame2
 										@handelClickMyPei="handelClickMyPei2"
 										:style="{ width: '100%', height: '100%' }"
@@ -89,13 +66,10 @@
 								</div>
 							</el-col>
 							<el-col :span="12">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
-									<div class="legend2">
+								<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+									<div class="legend">
 										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
-											<div class="kuai" v-if="item.name == '自住'"><img src="../../../assets/img/census/自住.png" /></div>
-											<div class="kuai" v-if="item.name == '出租'"><img src="../../../assets/img/census/出租.png" /></div>
-											<div class="kuai" v-if="item.name == '闲置'"><img src="../../../assets/img/census/闲置.png" /></div>
-											<div class="kuai" v-if="item.name == '未售出'"><img src="../../../assets/img/census/未售出.png" /></div>
+											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
@@ -123,13 +97,12 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-							<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
-							<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="streetName" label="姓名" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="districtName" label="手机号" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="年龄" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="agencyName" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 
@@ -181,7 +154,9 @@ export default {
 			user: {},
 			gridList: [], //所属网格list--场所区域
 			tableData: [],
-			formData: {},
+			formData: {
+				orgId: ''
+			},
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
 			total: 1,
@@ -202,6 +177,7 @@ export default {
 				value: 'agencyId',
 				label: 'agencyName',
 				children: 'subAgencyList',
+				emitPath: false,
 				checkStrictly: true
 			},
 			TableHeight: '',
@@ -212,7 +188,11 @@ export default {
 			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
-			pieData: []
+			pieData: [],
+			pieData2: [],
+			orgId: '',
+			orgType: '',
+			code: ''
 		};
 	},
 	computed: {
@@ -234,27 +214,25 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
+		this.orgId = this.agencyId;
 		this.getOrgTreeList();
-		this.getTableData();
-		this.getPie();
-		this.getPie2();
+		// this.getTableData();
+		this.getsubData();
+		this.getsubData2();
 	},
 	methods: {
-		handleSearch(val) {
-			console.log(this.formData);
-			this.pageNo = 1;
-			this.getTableData();
-		},
 		async getTableData() {
 			this.tableLoading = true;
 			// const url = '/gov/org/staffLoginLog/community-count';
-			const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+			const url = '/epmetuser/icresiuser/portrayal-list';
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
-				...formData
+				orgId: this.orgId,
+				orgType: this.orgType,
+				code: this.code
 			});
 
 			this.tableLoading = false;
@@ -280,20 +258,32 @@ export default {
 		},
 		async getsubData() {
 			this.$refs.pieChart.showLoading();
-			let url = '/gov/org/staffLoginLog/sub-count';
+			let url = '/epmetuser/icresiuser/age-distribute';
 			let param = {
-				orgId: this.formData.orgId,
-				level: this.formData.level,
-				startDate: this.formData.startDate,
-				endDate: this.formData.endDate
+				orgId: this.orgId,
+				orgType: this.orgType
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart.hideLoading();
-
 			if (code === 0) {
-				this.pieData = data.list;
-				console.log('this.pieData ', this.pieData);
+				this.pieData = data;
 				this.getPie();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getsubData2() {
+			this.$refs.pieChart2.showLoading();
+			let url = '/epmetuser/icresiuser/education-distribute';
+			let param = {
+				orgId: this.orgId,
+				orgType: this.orgType
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart2.hideLoading();
+			if (code === 0) {
+				this.pieData2 = data;
+				console.log('this.pieData2', this.pieData2);
 				this.getPie2();
 			} else {
 				this.$message.error(msg);
@@ -303,9 +293,7 @@ export default {
 			this.pieInitState = true;
 		},
 		pieInitOk2() {
-			console.log('2333erwewrwe33333', this.pieInitState2);
 			this.pieInitState2 = true;
-			console.log('2333erwewrwe333335476754765', this.pieInitState2);
 		},
 		getPie() {
 			if (this.pieInitState) {
@@ -318,7 +306,6 @@ export default {
 		},
 		getPie2() {
 			if (this.pieInitState2) {
-				console.log('233333333');
 				this.setPieData2();
 			} else {
 				setTimeout(() => {
@@ -327,45 +314,66 @@ export default {
 			}
 		},
 		setPieData() {
-			// let data = [...this.pieData];
-			// console.log('data', data);
-			let chartData = {
-				name: ['反骨', '反骨2', '反骨3', '反骨4'],
-				data: [{ value: 62, name: '反骨' }, { value: 44, name: '反骨2' }, { value: 123, name: '反骨3' }, { value: 232, name: '反骨4' }]
+			let data = [...this.pieData];
+			let type = {
+				0: '50岁以下',
+				1: '50-59岁',
+				2: '60-69岁',
+				3: '70-79岁',
+				4: '80岁以上'
 			};
-			this.chartData = chartData;
-			// chartData.name = data.map(item => item.agencyName);
-			// chartData.data = data.map(item => {
-			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
-			// });
-			console.log('chartData', chartData);
-			this.iniPieChart(chartData);
+			this.chartData.name = data.map(item => type[item.code]);
+			this.chartData.data = data.map(item => {
+				return {
+					value: item.totalResi,
+					name: type[item.code],
+					code: item.code,
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / 100) * 100).toFixed(2)
+				};
+			});
+
+			console.log('chartData', this.chartData);
+			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			console.log('dddddddddddd');
-			// let data = [...this.pieData];
-			// console.log('data', data);
-			let chartData = {
-				name: ['自住', '出租', '闲置', '未售出'],
-				data: [{ value: 62, name: '自住' }, { value: 243, name: '出租' }, { value: 243, name: '闲置' }, { value: 243, name: '未售出' }]
+			let data = [...this.pieData2.list];
+			let type = {
+				1: '本科',
+				0: '硕士',
+				2: '博士',
+				3: '博士后'
 			};
-			this.chartData2 = chartData;
-			// chartData.name = data.map(item => item.agencyName);
-			// chartData.data = data.map(item => {
-			// 	return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName };
-			// });
-			console.log('chartData', chartData);
-			this.iniPieChart2(chartData);
+			this.chartData2.name = data.map(item => type[item.code]);
+			this.chartData2.data = data.map(item => {
+				return {
+					value: item.totalResi,
+					name: type[item.code],
+					code: item.code,
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData2.total) * 100).toFixed(2)
+				};
+			});
+
+			console.log('chartData', this.chartData2);
+			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
 		async iniPieChart(chartData) {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				color: this.color,
 				title: {
-					text: '12345',
-					subtext: '房屋总数(分)',
+					text: this.pieData.total,
+					subtext: '总数',
 					x: 'center',
 					y: 'center',
 					textStyle: {
@@ -382,7 +390,21 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['60%', '85%'],
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '65%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -407,19 +429,32 @@ export default {
 							}
 						}
 					},
-
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
-						avoidLabelOverlap: false,
+						radius: ['80%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
 						label: {
-							show: false,
-							position: 'center'
+							show: false
+						},
+						labelLine: {
+							show: false
 						},
 						tooltip: {
-							show: true
+							show: false
 						},
-						data: chartData.data
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
 					}
 				]
 			};
@@ -430,10 +465,19 @@ export default {
 			// 获取pieChart配置
 
 			this.pieOption2 = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
 				color: this.color,
 				title: {
-					text: '12345',
-					subtext: '房屋总数(分)',
+					text: this.pieData.total,
+					subtext: '总数',
 					x: 'center',
 					y: 'center',
 					textStyle: {
@@ -459,12 +503,39 @@ export default {
 						tooltip: {
 							show: true
 						},
-						z: 9999,
+
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '85%'],
+						radius: ['60%', '65%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+					{
+						type: 'pie',
+						radius: ['80%', '85%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -502,39 +573,51 @@ export default {
 					this.orgType = 'community';
 				}
 
-				this.orgId = param.data.id;
-				this.orgName = param.data.name;
-				this.pageNo = 1;
-				this.showNext();
-				this.dialogVisible = true;
+				this.code = param.data.code;
+				this.getTableData();
+				// this.orgName = param.data.name;
+				// this.pageNo = 1;
+				// this.showNext();
+				// this.dialogVisible = true;
 			}
 		},
 		handelClickMyPei2(param) {
-			if (param.data.level != 'community') {
-				if (param.data.level == 'district') {
-					this.orgType = 'street';
-				}
-				if (param.data.level == 'street') {
-					this.orgType = 'community';
-				}
+			// if (param.data.level != 'community') {
+			// 	if (param.data.level == 'district') {
+			// 		this.orgType = 'street';
+			// 	}
+			// 	if (param.data.level == 'street') {
+			// 		this.orgType = 'community';
+			// 	}
 
-				this.orgId = param.data.id;
-				this.orgName = param.data.name;
-				this.pageNo = 1;
-				this.showNext();
-				this.dialogVisible = true;
-			}
+			// 	this.orgId = param.data.id;
+			// 	this.orgName = param.data.name;
+			// 	this.pageNo = 1;
+			// 	this.showNext();
+			// 	this.dialogVisible = true;
+			// }
+			this.code = param.data.code;
+			this.getTableData();
 		},
 		async handleExport() {
-			const url = '/gov/project/icEvent/export';
+			const url = '/epmetuser/icresiuser/portrayal-listexport';
 			const { pageSize, pageNo, formData } = this;
+			let tmp = this.formData.orgId;
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
+				this.formData.orgId = '';
+				this.orgType = '';
+				this.code="";
+			}
+
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
 				method: 'post',
 				data: {
 					pageSize,
 					pageNo,
-					...formData
+					orgId: this.orgId,
+					orgType: this.orgType,
+					code:this.code
 				},
 				responseType: 'blob'
 			})
@@ -560,26 +643,47 @@ export default {
 		getOrgTreeList() {
 			const { user } = this.$store.state;
 			this.$http
-				.post('gov/org/customeragency/staffinagencylist', {})
+				.post('/gov/org/customeragency/agencygridtree', {})
 				.then(({ data: res }) => {
 					if (res.code !== 0) {
 						return this.$message.error(res.msg);
 					} else {
 						console.log('获取组织树成功', res.data);
-						let { agencyList, subAgencyList } = res.data;
-						const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
-						this.orgOptions = this.deepTree(_arr);
+						// let { agencyList, subAgencyList } = res.data;
+						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+						// this.orgOptions = this.deepTree(_arr);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
 					}
 				})
 				.catch(() => {
 					return this.$message.error('网络错误');
 				});
 		},
+		handleSearch(val) {
+			this.pageNo = 1;
+			this.code = '';
+
+			this.getTableData();
+			this.getsubData();
+			this.getsubData2();
+		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
-			console.log(obj);
-			this.formData.orgId = obj.agencyId;
-			this.formData.level = obj.level;
+			if (obj) {
+				this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
+			} else {
+				this.orgType = '';
+			}
+
+			let tmp = this.formData.orgId;
+
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+				this.orgId = this.formData.orgId;
+			} else {
+				this.orgId = '';
+			}
+			console.log('this.orgId', this.orgId);
 		},
 		deepTree(arr) {
 			if (Array.isArray(arr)) {
@@ -690,7 +794,7 @@ export default {
 
 	justify-content: space-between;
 	align-items: flex-end;
-	margin-bottom:0px;
+	margin-bottom: 0px;
 	margin-top: 0px;
 	.census_searchcensus_box {
 		align-items: flex-end;

From 42d3e27ace9236c4bd658b2dd05af123a25854e9 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 12 Apr 2023 11:18:51 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/addFormHouse.vue     | 491 ++++++++++++++++++
 src/views/modules/census/census-houseList.vue | 140 +++--
 .../modules/census/census-residentList.vue    |  28 +-
 3 files changed, 594 insertions(+), 65 deletions(-)
 create mode 100644 src/views/modules/census/addFormHouse.vue

diff --git a/src/views/modules/census/addFormHouse.vue b/src/views/modules/census/addFormHouse.vue
new file mode 100644
index 000000000..b5cdde320
--- /dev/null
+++ b/src/views/modules/census/addFormHouse.vue
@@ -0,0 +1,491 @@
+<template>
+	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="场所名称" prop="placeOrgName">
+								<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类型" prop="placeType">
+								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="占地面积" prop="areaCovered">
+								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所规模" prop="scaleTotal">
+								<el-input
+									type="number"
+									v-model="formData.scaleTotal"
+									:disabled="disabled"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入可容纳人数"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="所属组织" prop="gridId">
+								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类别" prop="placeCategory">
+								<el-select v-model="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+									<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="personInCharge">
+								<el-input v-model="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="mobile">
+								<el-input v-model="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="address" style="display: block">
+								<el-select
+									v-model="formData.address"
+									:disabled="disabled"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="房屋名称" prop="fullName">{{ formData.fullName }}</el-form-item>
+						</el-col>
+						<!-- <el-col :span="12">
+							<el-form-item label="" prop="placeCategory"></el-form-item>
+							<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
+						</el-col> -->
+						<el-col :span="12">
+							<el-form-item label="单元号" prop="unitName">{{ formData.unitName ? formData.unitName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="门牌号" prop="doorName">{{ formData.doorName }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋编码" prop="coding">{{ formData.coding ? formData.coding : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋类型" prop="houseTypeName">{{ formData.houseTypeName ? formData.houseTypeName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋用途" prop="purposeName">{{ formData.purposeName ? formData.purposeName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋状态" prop="rentName">{{ formData.rentName ? formData.rentName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房主姓名" prop="ownerName">{{ formData.ownerName ? formData.ownerName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="联系方式" prop="showOwnerPhone">{{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房主身份证" prop="showOwnerIdCard">{{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="备注" prop="remark">{{ formData.remark ? formData.remark : '--' }}</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- <div id="app_event" class="div_map"></div> -->
+				</el-form>
+			</div>
+			<div class="div_btn" v-if="pageType != 'view'">
+				<el-button size="small" @click="handleCancle">取 消</el-button>
+				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+			</div>
+			<!-- <div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div> -->
+		</div>
+
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import { isMobile } from '@/utils/validate';
+import { mapGetters } from 'vuex';
+import { Loading } from 'element-ui'; // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
+import nextTick from 'dai-js/tools/nextTick';
+import record from './record';
+let loading; // 加载动画
+let map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+export default {
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		defaultData: {
+			type: Object,
+			default: null
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailData: {
+			type: Object,
+			default: null
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		let checkNum = (rule, value, callback) => {
+			if (!value) {
+				return callback(new Error('场所规模不能为空'));
+			}
+			setTimeout(() => {
+				if (!Number.isInteger(value)) {
+					callback(new Error('请输入数字值'));
+				}
+			}, 1000);
+		};
+		let checkMObile = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入联系电话'));
+			} else {
+				if (!isMobile(value)) {
+					callback(new Error('联系电话格式不正确'));
+				}
+				callback();
+			}
+		};
+		return {
+			agencyObj: {},
+			view_real_data: false,
+			btnDisable: false,
+			user: '',
+			agencyId: '',
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			placeCategoryArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				placeOrgName: '',
+				scaleTotal: '',
+				gridId: '',
+				latestResult: '',
+				placeCategory: '',
+				placeType: '',
+				personInCharge: '',
+				address: '',
+				mobile: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
+				placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				address: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: { record },
+	created() {},
+	async mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		this.loadGrid();
+		this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			// this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		async handleTuomin() {
+			const url = '/data/aggregator/epmetuser/detailByType';
+
+			const { data, code, msg } = await requestPost(url, {
+				id: this.detailId,
+				type: 'checkHouse'
+			});
+
+			if (code === 0) {
+				this.$set(this.formData, 'showOwnerPhone', data.mobile);
+				this.$set(this.formData, 'showOwnerIdCard', data.idCard);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async loadGrid() {
+			const url = '/gov/org/customergrid/gridoption';
+			let params = {
+				agencyId: this.agencyId,
+				purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//场所类型
+		async loadplaceType() {
+			const url = '/sys/dict/data/dictlist';
+
+			let params = {
+				dictType: 'ic_enterprise_place_type'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetail() {
+			const url = `/gov/org/ichouse/${this.detailId}`;
+			const { data, code, msg } = await requestGet(url);
+			if (code === 0) {
+				this.formData = { ...data };
+				this.houseType = this.formData.houseType;
+				this.purpose = this.formData.purpose;
+				this.rentFlag = parseInt(this.formData.rentFlag);
+
+				// this.initMap();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleComfirm() {
+			this.save();
+		},
+		async handleAdd() {
+			// this.btnDisable = true;
+			// setTimeout(() => {
+			// 	this.btnDisable = false;
+			// }, 10000);
+			// nextTick(1000);
+			// const form = new Promise((resolve, reject) => {
+			// 	this.$refs['form'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// const form1 = new Promise((resolve, reject) => {
+			// 	this.$refs['form1'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// Promise.all([form1, form])
+			// 	.then(() => {
+			// 		this.addFuwu();
+			// 	})
+			// 	.catch(() => {
+			// 		app.util.validateRule(messageObj);
+			// 		this.btnDisable = false;
+			// 	});
+		},
+
+		async save() {
+			this.formData.agencyId = this.agencyId;
+			var url = '';
+			var params = {};
+			url = '/gov/org/enterprise/addOrUpdate';
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+
+				this.handleCancle();
+				// // this.resetData();
+				// this.$emit('handleComfirm');
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
+		handleCancle() {
+			// this.resetData();
+			this.$emit('handleClose');
+		},
+		resetData() {
+			this.$refs.form.resetFields();
+		},
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: '正在加载……', // 加载中需要显示的文字
+				background: 'rgba(0,0,0,.7)' // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap() {
+			let { latitude, longitude } = this.$store.state.user;
+
+			if (this.formData.latitude && this.formData.longitude) {
+				latitude = this.formData.latitude;
+				longitude = this.formData.longitude;
+			}
+			if (!latitude || latitude == '' || latitude == '0') {
+				latitude = 39.9088810666821;
+				longitude = 116.39743841556731;
+			}
+
+			this.$nextTick(() => {
+				map = new daiMap(
+					document.getElementById('app_event'),
+					{ latitude, longitude },
+					{
+						zoom: 16.2, // 设置地图缩放级别
+						pitch: 43.5, // 设置俯仰角
+						rotation: 45 // 设置地图旋转角度
+					}
+				);
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					this.handleMoveCenter(e);
+				});
+
+				map.setCenter(latitude, longitude);
+				if (this.formData.latitude) {
+					map.setMarker(latitude, longitude);
+				}
+			});
+		},
+		async handleMoveCenter() {
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			this.formData.latitude = lat;
+			this.formData.longitude = lng;
+			map.setMarker(lat, lng);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == 'success') {
+				this.formData.address = data.address;
+				this.searchValue = data.address;
+				this.searchOptions = [];
+			}
+		},
+		async remoteMethod(query) {
+			if (query !== '') {
+				this.loading = true;
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				this.resultList = [];
+
+				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+					if (data.resultList && data.resultList.length > 0) {
+						this.resultList = data.resultList;
+						this.searchOptions = this.resultList.map(item => {
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
+						});
+					}
+				} else {
+					this.searchOptions = [
+						{
+							value: '0',
+							label: '未检索到结果'
+						}
+					];
+				}
+			} else {
+				this.searchOptions = [];
+			}
+		},
+		handleClickKey(index) {
+			let selPosition = this.resultList[index];
+			let lonlat = selPosition.lonlat.split(' ');
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+			this.formData.latitude = lonlat[1];
+			this.formData.longitude = lonlat[0];
+			this.formData.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+// @import '@/assets/scss/modules/visual/a_customize.scss';
+</style>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 14524ec3b..5319789fc 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -124,12 +124,16 @@
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 							<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="communityName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="gridName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="houseName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="purposeName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="rentFlagName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
+								<template slot-scope="scope">
+									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
+								</template>
+							</el-table-column>
 						</el-table>
 
 						<el-pagination
@@ -145,20 +149,31 @@
 				</el-row>
 			</div>
 		</div>
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+			/>
+		</div>
 	</div>
 </template>
 
 <script>
 import screenEchartsFrame from './chart';
 import screenEchartsFrame2 from './chart';
-import { requestPost } from '@/js/dai/request';
+import { requestPost,requestGet  } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-
+import addForm from './addFormHouse';
 import axios from 'axios';
 
 export default {
-	components: { screenEchartsFrame, screenEchartsFrame2 },
+	components: { screenEchartsFrame, screenEchartsFrame2,addForm },
 	data() {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -176,6 +191,11 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			dialogVisible: false,
+			detailId: '',
+			detailData: {},
+			pageType: '',
+			disabled:false,
 			tableLoading: false,
 			user: {},
 			gridList: [], //所属网格list--场所区域
@@ -216,12 +236,14 @@ export default {
 			chartData2: [],
 			pieData: [],
 			pieData2: [],
-			orgId: ''
+			orgId: '',
+			purpose: '',
+			rentFlag: ''
 		};
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 700 + this.iframeHeigh : this.clientHeight - 700;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -240,21 +262,39 @@ export default {
 		this.agencyId = this.user.agencyId;
 		this.orgId = this.agencyId;
 		this.getOrgTreeList();
-		// this.getTableData();
+		this.getTableData();
 		this.getsubData();
 		this.getsubData2();
 	},
 	methods: {
+		show(row) {
+			this.dialogVisible = true;
+			this.pageType = 'view';
+			this.detailId = row.houseId;
+			console.log("detailId",row)
+			console.log("detailId",this.detailId)
+			this.detailData = row;
+		},
+		handleClose() {
+			this.dialogVisible = false;
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
 		async getTableData() {
 			this.tableLoading = true;
 			// const url = '/gov/org/staffLoginLog/community-count';
-			const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count';
+			const url = '/gov/org/ichouse/getHousePictureList';
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
-				...formData
+				orgIdPath: this.orgId,
+				timeStart: this.formData.startDate,
+				timeEnd: this.formData.endDate,
+				purpose:  this.purpose,
+				rentFlag: this.rentFlag
 			});
 
 			this.tableLoading = false;
@@ -353,6 +393,7 @@ export default {
 				return {
 					value: item.count,
 					name: type[item.type],
+					code: item.type,
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
 				};
 			});
@@ -373,6 +414,7 @@ export default {
 				return {
 					value: item.count,
 					name: type[item.type],
+					code: item.type,
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
@@ -589,39 +631,44 @@ export default {
 			this.$refs.pieChart2.setOption(this.pieOption2);
 		},
 		handelClickMyPei(param) {
-			if (param.data.level != 'community') {
-				if (param.data.level == 'district') {
-					this.orgType = 'street';
-				}
-				if (param.data.level == 'street') {
-					this.orgType = 'community';
-				}
+			this.purpose = param.data.code;
+			this.rentFlag = '';
+			this.getTableData();
+			// if (param.data.level != 'community') {
+			// 	if (param.data.level == 'district') {
+			// 		this.orgType = 'street';
+			// 	}
+			// 	if (param.data.level == 'street') {
+			// 		this.orgType = 'community';
+			// 	}
 
-				this.orgId = param.data.id;
-				this.orgName = param.data.name;
-				this.pageNo = 1;
-				this.showNext();
-				this.dialogVisible = true;
-			}
+			// 	this.orgId = param.data.id;
+			// 	this.orgName = param.data.name;
+			// 	this.pageNo = 1;
+			// 	this.showNext();
+			// 	this.dialogVisible = true;
+			// }
 		},
 		handelClickMyPei2(param) {
-			if (param.data.level != 'community') {
-				if (param.data.level == 'district') {
-					this.orgType = 'street';
-				}
-				if (param.data.level == 'street') {
-					this.orgType = 'community';
-				}
-
-				this.orgId = param.data.id;
-				this.orgName = param.data.name;
-				this.pageNo = 1;
-				this.showNext();
-				this.dialogVisible = true;
-			}
+			this.purpose = '';
+			this.rentFlag = param.data.code;
+			this.getTableData();
+			// if (param.data.level != 'community') {
+			// 	if (param.data.level == 'district') {
+			// 		this.orgType = 'street';
+			// 	}
+			// 	if (param.data.level == 'street') {
+			// 		this.orgType = 'community';
+			// 	}
+			// 	this.orgId = param.data.id;
+			// 	this.orgName = param.data.name;
+			// 	this.pageNo = 1;
+			// 	this.showNext();
+			// 	this.dialogVisible = true;
+			// }
 		},
 		async handleExport() {
-			const url = '/gov/project/icEvent/export';
+			const url = '/gov/org/ichouse/export';
 			const { pageSize, pageNo, formData } = this;
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
@@ -629,7 +676,11 @@ export default {
 				data: {
 					pageSize,
 					pageNo,
-					...formData
+					orgIdPath: this.orgId,
+					timeStart: this.formData.startDate,
+					timeEnd: this.formData.endDate,
+					purpose:  this.purpose,
+					rentFlag: this.rentFlag
 				},
 				responseType: 'blob'
 			})
@@ -674,6 +725,8 @@ export default {
 		},
 		handleSearch(val) {
 			this.pageNo = 1;
+			this.purpose="";
+			this.rentFlag="";
 			this.getTableData();
 			this.getsubData();
 			this.getsubData2();
@@ -681,7 +734,6 @@ export default {
 		handleChangeAgency(val) {
 			// let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			let tmp = this.formData.orgId;
-			
 
 			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 0ce8e1d84..ec31817e3 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -315,39 +315,25 @@ export default {
 		},
 		setPieData() {
 			let data = [...this.pieData];
-			let type = {
-				0: '50岁以下',
-				1: '50-59岁',
-				2: '60-69岁',
-				3: '70-79岁',
-				4: '80岁以上'
-			};
-			this.chartData.name = data.map(item => type[item.code]);
+			this.chartData.name = data.map(item => item.codeName);
 			this.chartData.data = data.map(item => {
 				return {
 					value: item.totalResi,
-					name: type[item.code],
+					name: item.codeName,
 					code: item.code,
 					radio: item.totalResi == 0 ? '0' : ((item.totalResi / 100) * 100).toFixed(2)
 				};
 			});
-
 			console.log('chartData', this.chartData);
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			let data = [...this.pieData2.list];
-			let type = {
-				1: '本科',
-				0: '硕士',
-				2: '博士',
-				3: '博士后'
-			};
-			this.chartData2.name = data.map(item => type[item.code]);
+			let data = [...this.pieData2];
+			this.chartData2.name = data.map(item => item.codeName);
 			this.chartData2.data = data.map(item => {
 				return {
 					value: item.totalResi,
-					name: type[item.code],
+					name: item.codeName,
 					code: item.code,
 					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData2.total) * 100).toFixed(2)
 				};
@@ -606,7 +592,7 @@ export default {
 			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.orgType = '';
-				this.code="";
+				this.code = '';
 			}
 
 			axios({
@@ -617,7 +603,7 @@ export default {
 					pageNo,
 					orgId: this.orgId,
 					orgType: this.orgType,
-					code:this.code
+					code: this.code
 				},
 				responseType: 'blob'
 			})

From 0dde9f7b4848b1276369f580afe6297a17b6ce07 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 12 Apr 2023 12:59:10 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=B1=85=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{addForm.vue => addFormEnterprise.vue}    |   0
 src/views/modules/census/addFormResident.vue  | 491 ++++++++++++++++++
 src/views/modules/census/census-houseList.vue |  60 +--
 src/views/modules/census/census-nineList.vue  |  32 +-
 .../modules/census/census-residentList.vue    | 115 ++--
 5 files changed, 592 insertions(+), 106 deletions(-)
 rename src/views/modules/census/{addForm.vue => addFormEnterprise.vue} (100%)
 create mode 100644 src/views/modules/census/addFormResident.vue

diff --git a/src/views/modules/census/addForm.vue b/src/views/modules/census/addFormEnterprise.vue
similarity index 100%
rename from src/views/modules/census/addForm.vue
rename to src/views/modules/census/addFormEnterprise.vue
diff --git a/src/views/modules/census/addFormResident.vue b/src/views/modules/census/addFormResident.vue
new file mode 100644
index 000000000..b5cdde320
--- /dev/null
+++ b/src/views/modules/census/addFormResident.vue
@@ -0,0 +1,491 @@
+<template>
+	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="场所名称" prop="placeOrgName">
+								<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类型" prop="placeType">
+								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="占地面积" prop="areaCovered">
+								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所规模" prop="scaleTotal">
+								<el-input
+									type="number"
+									v-model="formData.scaleTotal"
+									:disabled="disabled"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入可容纳人数"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="所属组织" prop="gridId">
+								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
+									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所类别" prop="placeCategory">
+								<el-select v-model="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+									<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="personInCharge">
+								<el-input v-model="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="mobile">
+								<el-input v-model="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="address" style="display: block">
+								<el-select
+									v-model="formData.address"
+									:disabled="disabled"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="12">
+							<el-form-item label="房屋名称" prop="fullName">{{ formData.fullName }}</el-form-item>
+						</el-col>
+						<!-- <el-col :span="12">
+							<el-form-item label="" prop="placeCategory"></el-form-item>
+							<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
+						</el-col> -->
+						<el-col :span="12">
+							<el-form-item label="单元号" prop="unitName">{{ formData.unitName ? formData.unitName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="门牌号" prop="doorName">{{ formData.doorName }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋编码" prop="coding">{{ formData.coding ? formData.coding : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋类型" prop="houseTypeName">{{ formData.houseTypeName ? formData.houseTypeName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋用途" prop="purposeName">{{ formData.purposeName ? formData.purposeName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房屋状态" prop="rentName">{{ formData.rentName ? formData.rentName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房主姓名" prop="ownerName">{{ formData.ownerName ? formData.ownerName : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="联系方式" prop="showOwnerPhone">{{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="房主身份证" prop="showOwnerIdCard">{{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }}</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item label="备注" prop="remark">{{ formData.remark ? formData.remark : '--' }}</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- <div id="app_event" class="div_map"></div> -->
+				</el-form>
+			</div>
+			<div class="div_btn" v-if="pageType != 'view'">
+				<el-button size="small" @click="handleCancle">取 消</el-button>
+				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+			</div>
+			<!-- <div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div> -->
+		</div>
+
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import { isMobile } from '@/utils/validate';
+import { mapGetters } from 'vuex';
+import { Loading } from 'element-ui'; // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
+import nextTick from 'dai-js/tools/nextTick';
+import record from './record';
+let loading; // 加载动画
+let map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+export default {
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		defaultData: {
+			type: Object,
+			default: null
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		detailId: {
+			type: String,
+			default: ''
+		},
+		detailData: {
+			type: Object,
+			default: null
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+
+	data() {
+		let checkNum = (rule, value, callback) => {
+			if (!value) {
+				return callback(new Error('场所规模不能为空'));
+			}
+			setTimeout(() => {
+				if (!Number.isInteger(value)) {
+					callback(new Error('请输入数字值'));
+				}
+			}, 1000);
+		};
+		let checkMObile = (rule, value, callback) => {
+			if (value === '') {
+				callback(new Error('请输入联系电话'));
+			} else {
+				if (!isMobile(value)) {
+					callback(new Error('联系电话格式不正确'));
+				}
+				callback();
+			}
+		};
+		return {
+			agencyObj: {},
+			view_real_data: false,
+			btnDisable: false,
+			user: '',
+			agencyId: '',
+			gridList: [], //所属网格list--场所区域
+			placeTypeList: [], //场所类型
+			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
+			placeCategoryArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+			list: {},
+			formData: {
+				placeOrgName: '',
+				scaleTotal: '',
+				gridId: '',
+				latestResult: '',
+				placeCategory: '',
+				placeType: '',
+				personInCharge: '',
+				address: '',
+				mobile: '',
+				// result: '',
+				remark: ''
+			},
+			dataRule: {
+				placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
+				placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }],
+				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
+				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
+				scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
+				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
+				personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
+				mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+				address: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+			},
+			//地图
+			loading: false,
+
+			searchValue: '',
+			searchOptions: []
+		};
+	},
+	watch: {},
+	components: { record },
+	created() {},
+	async mounted() {
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
+		this.startLoading();
+		this.loadGrid();
+		this.loadplaceType();
+		if (this.pageType != 'add') {
+			this.getDetail();
+		} else {
+			// this.initMap();
+		}
+		await this.endLoading();
+		this.endLoading();
+	},
+
+	methods: {
+		async handleTuomin() {
+			const url = '/data/aggregator/epmetuser/detailByType';
+
+			const { data, code, msg } = await requestPost(url, {
+				id: this.detailId,
+				type: 'checkHouse'
+			});
+
+			if (code === 0) {
+				this.$set(this.formData, 'showOwnerPhone', data.mobile);
+				this.$set(this.formData, 'showOwnerIdCard', data.idCard);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async loadGrid() {
+			const url = '/gov/org/customergrid/gridoption';
+			let params = {
+				agencyId: this.agencyId,
+				purpose: 'query'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.gridList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//场所类型
+		async loadplaceType() {
+			const url = '/sys/dict/data/dictlist';
+
+			let params = {
+				dictType: 'ic_enterprise_place_type'
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetail() {
+			const url = `/gov/org/ichouse/${this.detailId}`;
+			const { data, code, msg } = await requestGet(url);
+			if (code === 0) {
+				this.formData = { ...data };
+				this.houseType = this.formData.houseType;
+				this.purpose = this.formData.purpose;
+				this.rentFlag = parseInt(this.formData.rentFlag);
+
+				// this.initMap();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		handleComfirm() {
+			this.save();
+		},
+		async handleAdd() {
+			// this.btnDisable = true;
+			// setTimeout(() => {
+			// 	this.btnDisable = false;
+			// }, 10000);
+			// nextTick(1000);
+			// const form = new Promise((resolve, reject) => {
+			// 	this.$refs['form'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// const form1 = new Promise((resolve, reject) => {
+			// 	this.$refs['form1'].validate(valid => {
+			// 		if (valid) resolve();
+			// 	});
+			// });
+			// Promise.all([form1, form])
+			// 	.then(() => {
+			// 		this.addFuwu();
+			// 	})
+			// 	.catch(() => {
+			// 		app.util.validateRule(messageObj);
+			// 		this.btnDisable = false;
+			// 	});
+		},
+
+		async save() {
+			this.formData.agencyId = this.agencyId;
+			var url = '';
+			var params = {};
+			url = '/gov/org/enterprise/addOrUpdate';
+			params = { ...this.formData };
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success('操作成功');
+
+				this.handleCancle();
+				// // this.resetData();
+				// this.$emit('handleComfirm');
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
+		handleCancle() {
+			// this.resetData();
+			this.$emit('handleClose');
+		},
+		resetData() {
+			this.$refs.form.resetFields();
+		},
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: '正在加载……', // 加载中需要显示的文字
+				background: 'rgba(0,0,0,.7)' // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap() {
+			let { latitude, longitude } = this.$store.state.user;
+
+			if (this.formData.latitude && this.formData.longitude) {
+				latitude = this.formData.latitude;
+				longitude = this.formData.longitude;
+			}
+			if (!latitude || latitude == '' || latitude == '0') {
+				latitude = 39.9088810666821;
+				longitude = 116.39743841556731;
+			}
+
+			this.$nextTick(() => {
+				map = new daiMap(
+					document.getElementById('app_event'),
+					{ latitude, longitude },
+					{
+						zoom: 16.2, // 设置地图缩放级别
+						pitch: 43.5, // 设置俯仰角
+						rotation: 45 // 设置地图旋转角度
+					}
+				);
+				// 监听地图平移结束
+				map.on('dragend', e => {
+					this.handleMoveCenter(e);
+				});
+
+				map.setCenter(latitude, longitude);
+				if (this.formData.latitude) {
+					map.setMarker(latitude, longitude);
+				}
+			});
+		},
+		async handleMoveCenter() {
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			this.formData.latitude = lat;
+			this.formData.longitude = lng;
+			map.setMarker(lat, lng);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == 'success') {
+				this.formData.address = data.address;
+				this.searchValue = data.address;
+				this.searchOptions = [];
+			}
+		},
+		async remoteMethod(query) {
+			if (query !== '') {
+				this.loading = true;
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				this.resultList = [];
+
+				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+					if (data.resultList && data.resultList.length > 0) {
+						this.resultList = data.resultList;
+						this.searchOptions = this.resultList.map(item => {
+							return { value: `${item.id}`, label: `${item.address + item.name}` };
+						});
+					}
+				} else {
+					this.searchOptions = [
+						{
+							value: '0',
+							label: '未检索到结果'
+						}
+					];
+				}
+			} else {
+				this.searchOptions = [];
+			}
+		},
+		handleClickKey(index) {
+			let selPosition = this.resultList[index];
+			let lonlat = selPosition.lonlat.split(' ');
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+			this.formData.latitude = lonlat[1];
+			this.formData.longitude = lonlat[0];
+			this.formData.address = selPosition.address + selPosition.name;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+// @import '@/assets/scss/modules/visual/a_customize.scss';
+</style>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 5319789fc..ac20e4650 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -90,7 +90,7 @@
 							<el-col :span="12">
 								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
 									<div class="legend2">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
 											<div class="kuai" v-if="item.name == '自住'"><img src="../../../assets/img/census/自住.png" /></div>
 											<div class="kuai" v-if="item.name == '出租'"><img src="../../../assets/img/census/出租.png" /></div>
 											<div class="kuai" v-if="item.name == '闲置'"><img src="../../../assets/img/census/闲置.png" /></div>
@@ -166,14 +166,14 @@
 <script>
 import screenEchartsFrame from './chart';
 import screenEchartsFrame2 from './chart';
-import { requestPost,requestGet  } from '@/js/dai/request';
+import { requestPost, requestGet } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
 import addForm from './addFormHouse';
 import axios from 'axios';
 
 export default {
-	components: { screenEchartsFrame, screenEchartsFrame2,addForm },
+	components: { screenEchartsFrame, screenEchartsFrame2, addForm },
 	data() {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -195,7 +195,7 @@ export default {
 			detailId: '',
 			detailData: {},
 			pageType: '',
-			disabled:false,
+			disabled: false,
 			tableLoading: false,
 			user: {},
 			gridList: [], //所属网格list--场所区域
@@ -271,8 +271,8 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.houseId;
-			console.log("detailId",row)
-			console.log("detailId",this.detailId)
+			console.log('detailId', row);
+			console.log('detailId', this.detailId);
 			this.detailData = row;
 		},
 		handleClose() {
@@ -293,7 +293,7 @@ export default {
 				orgIdPath: this.orgId,
 				timeStart: this.formData.startDate,
 				timeEnd: this.formData.endDate,
-				purpose:  this.purpose,
+				purpose: this.purpose,
 				rentFlag: this.rentFlag
 			});
 
@@ -634,38 +634,21 @@ export default {
 			this.purpose = param.data.code;
 			this.rentFlag = '';
 			this.getTableData();
-			// if (param.data.level != 'community') {
-			// 	if (param.data.level == 'district') {
-			// 		this.orgType = 'street';
-			// 	}
-			// 	if (param.data.level == 'street') {
-			// 		this.orgType = 'community';
-			// 	}
-
-			// 	this.orgId = param.data.id;
-			// 	this.orgName = param.data.name;
-			// 	this.pageNo = 1;
-			// 	this.showNext();
-			// 	this.dialogVisible = true;
-			// }
 		},
 		handelClickMyPei2(param) {
 			this.purpose = '';
 			this.rentFlag = param.data.code;
 			this.getTableData();
-			// if (param.data.level != 'community') {
-			// 	if (param.data.level == 'district') {
-			// 		this.orgType = 'street';
-			// 	}
-			// 	if (param.data.level == 'street') {
-			// 		this.orgType = 'community';
-			// 	}
-			// 	this.orgId = param.data.id;
-			// 	this.orgName = param.data.name;
-			// 	this.pageNo = 1;
-			// 	this.showNext();
-			// 	this.dialogVisible = true;
-			// }
+		},
+		handleClickItem(item) {
+			this.purpose = item.code;
+			this.rentFlag = '';
+			this.getTableData();
+		},
+		handleClickItem2(item) {
+			this.purpose = '';
+			this.rentFlag = item.code;
+			this.getTableData();
 		},
 		async handleExport() {
 			const url = '/gov/org/ichouse/export';
@@ -679,7 +662,7 @@ export default {
 					orgIdPath: this.orgId,
 					timeStart: this.formData.startDate,
 					timeEnd: this.formData.endDate,
-					purpose:  this.purpose,
+					purpose: this.purpose,
 					rentFlag: this.rentFlag
 				},
 				responseType: 'blob'
@@ -725,8 +708,8 @@ export default {
 		},
 		handleSearch(val) {
 			this.pageNo = 1;
-			this.purpose="";
-			this.rentFlag="";
+			this.purpose = '';
+			this.rentFlag = '';
 			this.getTableData();
 			this.getsubData();
 			this.getsubData2();
@@ -743,6 +726,7 @@ export default {
 			}
 			console.log('this.orgId', this.orgId);
 		},
+		
 		deepTree(arr) {
 			if (Array.isArray(arr)) {
 				return arr.map(item => {
@@ -765,6 +749,7 @@ export default {
 	display: flex;
 	flex-flow: row wrap;
 	.legend-row {
+		cursor: pointer;
 		min-width: 100px;
 		display: flex;
 		margin-bottom: 30px;
@@ -799,6 +784,7 @@ export default {
 	// flex-flow: row wrap;
 
 	.legend-row {
+		cursor: pointer;
 		width: 100%;
 		display: flex;
 		margin-bottom: 16px;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 7bf008c15..38b8bb69b 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -16,29 +16,7 @@
 								@change="handleChangeAgency"
 							></el-cascader>
 						</el-form-item>
-						<!-- <el-form-item label="上报时间" prop="startTime">
-							<el-date-picker
-								v-model="formData.startDate"
-								:picker-options="startPickerOptions"
-								class="item_width_2"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="开始时间"
-							></el-date-picker>
-							<span class="data-tag">至</span>
-							<el-date-picker
-								v-model="formData.endDate"
-								:picker-options="endPickerOptions"
-								class="item_width_2 data-tag"
-								size="small"
-								type="date"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								value="yyyy-MM-dd"
-								placeholder="结束时间"
-							></el-date-picker>
-						</el-form-item> -->
+
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
 					</div>
 				</el-form>
@@ -135,7 +113,7 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-import addForm from './addForm';
+import addForm from './addFormEnterprise';
 
 import axios from 'axios';
 
@@ -453,7 +431,10 @@ export default {
 			this.placeType = param.data.placeType;
 			this.getTableData();
 		},
-
+		handleClickItem(item) {
+			this.placeType = item.placeType;
+			this.getTableData();
+		},
 		async handleExport() {
 			const url = '/gov/org/enterprise/export';
 
@@ -546,6 +527,7 @@ export default {
 	display: flex;
 	flex-flow: row wrap;
 	.legend-row {
+		cursor: pointer;
 		min-width: 100px;
 		display: flex;
 		margin-bottom: 30px;
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index ec31817e3..8c31d66ba 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -97,13 +97,17 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-							<el-table-column prop="streetName" label="姓名" align="center" :show-overflow-tooltip="true" />
-							<el-table-column prop="districtName" label="手机号" align="center" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="年龄" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="agencyName" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="name" label="姓名" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="mobile" label="手机号" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="genderName" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="age" align="center" label="年龄" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="educationName" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
+								<template slot-scope="scope">
+									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
+								</template>
+							</el-table-column>
 						</el-table>
 
 						<el-pagination
@@ -119,6 +123,17 @@
 				</el-row>
 			</div>
 		</div>
+		<div>
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
+				:pageType="pageType"
+				:disabled="disabled"
+				:detailId="detailId"
+				:detailData="detailData"
+				@handleClose="handleClose"
+			/>
+		</div>
 	</div>
 </template>
 
@@ -128,11 +143,12 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
+import addForm from './addFormResident';
 
 import axios from 'axios';
 
 export default {
-	components: { screenEchartsFrame, screenEchartsFrame2 },
+	components: { screenEchartsFrame, screenEchartsFrame2, addForm },
 	data() {
 		let endDisabledDate = time => {
 			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
@@ -150,6 +166,11 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			dialogVisible: false,
+			detailId: '',
+			detailData: {},
+			pageType: '',
+			disabled: false,
 			tableLoading: false,
 			user: {},
 			gridList: [], //所属网格list--场所区域
@@ -192,7 +213,10 @@ export default {
 			pieData2: [],
 			orgId: '',
 			orgType: '',
-			code: ''
+			code: '',
+			pieDatatotal: 0,
+			pieDatatotal2: 0,
+			codeType: 'education'
 		};
 	},
 	computed: {
@@ -216,11 +240,23 @@ export default {
 		this.agencyId = this.user.agencyId;
 		this.orgId = this.agencyId;
 		this.getOrgTreeList();
-		// this.getTableData();
+		this.getTableData();
 		this.getsubData();
 		this.getsubData2();
 	},
 	methods: {
+		show(row) {
+			this.dialogVisible = true;
+			this.pageType = 'view';
+			this.detailId = row.icResiUserId;
+			this.detailData = row;
+		},
+		handleClose() {
+			this.dialogVisible = false;
+			this.pageType = 'list';
+			this.detailId = '';
+			this.getTableData();
+		},
 		async getTableData() {
 			this.tableLoading = true;
 			// const url = '/gov/org/staffLoginLog/community-count';
@@ -232,7 +268,8 @@ export default {
 				pageNo,
 				orgId: this.orgId,
 				orgType: this.orgType,
-				code: this.code
+				code: this.code,
+				codeType: this.codeType
 			});
 
 			this.tableLoading = false;
@@ -283,6 +320,7 @@ export default {
 			this.$refs.pieChart2.hideLoading();
 			if (code === 0) {
 				this.pieData2 = data;
+
 				console.log('this.pieData2', this.pieData2);
 				this.getPie2();
 			} else {
@@ -315,13 +353,19 @@ export default {
 		},
 		setPieData() {
 			let data = [...this.pieData];
+			this.pieDatatotal = data
+				.map(item => item.totalResi)
+				.reduce(function(prev, cur, index, arr) {
+					console.log(prev, cur, index);
+					return prev + cur;
+				});
 			this.chartData.name = data.map(item => item.codeName);
 			this.chartData.data = data.map(item => {
 				return {
 					value: item.totalResi,
 					name: item.codeName,
 					code: item.code,
-					radio: item.totalResi == 0 ? '0' : ((item.totalResi / 100) * 100).toFixed(2)
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal) * 100).toFixed(2)
 				};
 			});
 			console.log('chartData', this.chartData);
@@ -329,13 +373,21 @@ export default {
 		},
 		setPieData2() {
 			let data = [...this.pieData2];
+
+			this.pieDatatotal2 = data
+				.map(item => item.totalResi)
+				.reduce(function(prev, cur, index, arr) {
+					console.log(prev, cur, index);
+					return prev + cur;
+				});
+
 			this.chartData2.name = data.map(item => item.codeName);
 			this.chartData2.data = data.map(item => {
 				return {
 					value: item.totalResi,
 					name: item.codeName,
 					code: item.code,
-					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData2.total) * 100).toFixed(2)
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal2) * 100).toFixed(2)
 				};
 			});
 
@@ -358,7 +410,7 @@ export default {
 				},
 				color: this.color,
 				title: {
-					text: this.pieData.total,
+					text: this.pieDatatotal,
 					subtext: '总数',
 					x: 'center',
 					y: 'center',
@@ -462,7 +514,7 @@ export default {
 				},
 				color: this.color,
 				title: {
-					text: this.pieData.total,
+					text: this.pieDatatotal2,
 					subtext: '总数',
 					x: 'center',
 					y: 'center',
@@ -551,37 +603,10 @@ export default {
 			this.$refs.pieChart2.setOption(this.pieOption2);
 		},
 		handelClickMyPei(param) {
-			if (param.data.level != 'community') {
-				if (param.data.level == 'district') {
-					this.orgType = 'street';
-				}
-				if (param.data.level == 'street') {
-					this.orgType = 'community';
-				}
-
-				this.code = param.data.code;
-				this.getTableData();
-				// this.orgName = param.data.name;
-				// this.pageNo = 1;
-				// this.showNext();
-				// this.dialogVisible = true;
-			}
+			this.code = param.data.code;
+			this.getTableData();
 		},
 		handelClickMyPei2(param) {
-			// if (param.data.level != 'community') {
-			// 	if (param.data.level == 'district') {
-			// 		this.orgType = 'street';
-			// 	}
-			// 	if (param.data.level == 'street') {
-			// 		this.orgType = 'community';
-			// 	}
-
-			// 	this.orgId = param.data.id;
-			// 	this.orgName = param.data.name;
-			// 	this.pageNo = 1;
-			// 	this.showNext();
-			// 	this.dialogVisible = true;
-			// }
 			this.code = param.data.code;
 			this.getTableData();
 		},
@@ -693,6 +718,7 @@ export default {
 	display: flex;
 	flex-flow: row wrap;
 	.legend-row {
+		cursor: pointer;
 		min-width: 100px;
 		display: flex;
 		margin-bottom: 30px;
@@ -727,6 +753,7 @@ export default {
 	// flex-flow: row wrap;
 
 	.legend-row {
+		cursor: pointer;
 		width: 100%;
 		display: flex;
 		margin-bottom: 16px;

From 1bfac3c861d2529a400beb454188b99133fb41a5 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 12 Apr 2023 17:30:10 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-residentList.vue    |  40 +-
 src/views/modules/census/people-more.vue      | 577 ++++++++++++++++++
 2 files changed, 602 insertions(+), 15 deletions(-)
 create mode 100644 src/views/modules/census/people-more.vue

diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 8c31d66ba..92a8c9a56 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -68,7 +68,7 @@
 							<el-col :span="12">
 								<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -124,15 +124,9 @@
 			</div>
 		</div>
 		<div>
-			<addForm
-				v-if="dialogVisible"
-				:dialogVisible="dialogVisible"
-				:pageType="pageType"
-				:disabled="disabled"
-				:detailId="detailId"
-				:detailData="detailData"
-				@handleClose="handleClose"
-			/>
+			<!-- :pageType="pageType" -->
+			<!-- :disabled="disabled" -->
+			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :userId="detailId" :pageType="pageType" :gridName="detailData" @handleClose="handleClose" />
 		</div>
 	</div>
 </template>
@@ -143,7 +137,7 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-import addForm from './addFormResident';
+import addForm from './people-more.vue';
 
 import axios from 'axios';
 
@@ -221,7 +215,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 700 + this.iframeHeigh : this.clientHeight - 700;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -249,7 +243,7 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.icResiUserId;
-			this.detailData = row;
+			this.detailData = row.educationName;
 		},
 		handleClose() {
 			this.dialogVisible = false;
@@ -604,10 +598,24 @@ export default {
 		},
 		handelClickMyPei(param) {
 			this.code = param.data.code;
+			this.codeType = 'education';
 			this.getTableData();
 		},
+
 		handelClickMyPei2(param) {
 			this.code = param.data.code;
+			this.codeType = 'age';
+			this.getTableData();
+		},
+		handleClickItem(item) {
+			this.code = item.code;
+			this.codeType = 'education';
+
+			this.getTableData();
+		},
+		handleClickItem2(item) {
+			this.code = item.code;
+			this.codeType = 'age';
 			this.getTableData();
 		},
 		async handleExport() {
@@ -618,6 +626,7 @@ export default {
 				this.formData.orgId = '';
 				this.orgType = '';
 				this.code = '';
+				this.codeType = '';
 			}
 
 			axios({
@@ -628,7 +637,8 @@ export default {
 					pageNo,
 					orgId: this.orgId,
 					orgType: this.orgType,
-					code: this.code
+					code: this.code,
+					codeType: this.codeType
 				},
 				responseType: 'blob'
 			})
@@ -674,7 +684,7 @@ export default {
 		handleSearch(val) {
 			this.pageNo = 1;
 			this.code = '';
-
+			this.codeType = '';
 			this.getTableData();
 			this.getsubData();
 			this.getsubData2();
diff --git a/src/views/modules/census/people-more.vue b/src/views/modules/census/people-more.vue
new file mode 100644
index 000000000..960a1166b
--- /dev/null
+++ b/src/views/modules/census/people-more.vue
@@ -0,0 +1,577 @@
+<template>
+	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<div v-if="view_real_data" class="div_tuomin"><el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button></div>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<template v-for="(fieldSubList, index) in fieldList">
+							<!-- :key="'fieldSubList' + index" -->
+							<el-col :span="12">
+								<div v-if="index == 0">
+									<el-form-item label="所属网格">{{ gridName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div v-if="index == 0">
+									<el-form-item label="所属小区">{{ xiaoquName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div v-if="index == 0">
+									<el-form-item label="所属楼栋">{{ louName }}-{{ danyuanName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div v-if="index == 0">
+									<el-form-item label="所属家庭">{{ homeName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<div :key="field.itemId" v-for="field in fieldSubList">
+									<el-form-item :label="field.label">
+										<span v-if="field.columnName === 'MOBILE' || field.columnName === 'ID_CARD'">{{ info[field.columnName] || '--' }}</span>
+										<span v-else-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+											{{ info[field.columnName] == null ? '--' : getOptionLabel(field.options, info[field.columnName], field.itemType) }}
+										</span>
+										<span v-else>{{ info[field.columnName] == null ? '--' : info[field.columnName] }}</span>
+									</el-form-item>
+								</div>
+							</el-col>
+						</template>
+					</el-row>
+				</el-form>
+				<div class="tabs">
+					<div class="tab-btn" @click="subStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
+					<div
+						v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+						class="tab"
+						:class="groupIndex % groupList.length == index ? 'z-on' : ''"
+						:key="'tab' + index"
+						@click="groupIndex = index"
+						v-for="(item, index) in groupList"
+					>
+						{{ item.label }}
+					</div>
+					<div class="tab-btn" @click="addStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
+				</div>
+
+				<div :key="'group' + index" v-show="groupIndex % groupList.length == index" v-for="(group, index) in groupList">
+					<div v-if="group.tableName == 'ic_resi_demand' && Array.isArray(allInfo.ic_resi_demand) && allInfo.ic_resi_demand.length > 0">
+						<div class="list" :key="'ic_resi_demand' + infoIndex" v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
+							<div class="item" :key="field.itemId" v-for="field in group.itemList">
+								<span class="item-field">{{ field.label }}：</span>
+								<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+									{{ infoItem[field.columnName] == null ? '--' : getOptionLabel(field.options, infoItem[field.columnName], field.itemType) }}
+								</span>
+
+								<span v-else>{{ infoItem[field.columnName] == null ? '--' : infoItem[field.columnName] }}</span>
+							</div>
+						</div>
+					</div>
+					<div v-else-if="group.tableName == 'ic_hs'" style="margin-top: 10px; padding: 0 20px">
+						<el-table class="table" :data="natList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="testTime" header-align="center" align="center" label="检测时间" width="150"></el-table-column>
+							<el-table-column prop="address" header-align="center" align="center" label="检测机构" show-overflow-tooltip min-width="180"></el-table-column>
+							<el-table-column prop="result" header-align="center" align="center" label="检测结果" width="240"></el-table-column>
+						</el-table>
+					</div>
+					<div v-else-if="group.tableName == 'ic_xc'" style="margin-top: 10px; padding: 0 20px">
+						<el-table class="table" :data="tripList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="fromRegion" header-align="center" align="center" label="来自地区" show-overflow-tooltip min-width="100"></el-table-column>
+							<el-table-column prop="arrivalTime" header-align="center" align="center" label="来到本地时间" width="140"></el-table-column>
+							<el-table-column prop="leaveTime" header-align="center" align="center" label="离开本地时间" width="140"></el-table-column>
+							<el-table-column prop="noticeTime" header-align="center" align="center" label="最近一次通知时间" width="140"></el-table-column>
+							<el-table-column prop="remark" header-align="center" align="center" label="备注" show-overflow-tooltip width="120"></el-table-column>
+						</el-table>
+					</div>
+					<div v-else-if="group.tableName == 'ic_ym'" style="margin-top: 10px; padding: 0 20px">
+						<el-table
+							v-if="vaccineList"
+							class="table"
+							:data="vaccineList"
+							border
+							height="400"
+							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+							style="width: 100%"
+						>
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="vaccinateTime" header-align="center" align="center" label="接种时间" show-overflow-tooltip min-width="100"></el-table-column>
+							<el-table-column prop="address" header-align="center" align="center" label="接种地点"></el-table-column>
+							<el-table-column prop="manufactor" header-align="center" align="center" label="疫苗厂家"></el-table-column>
+						</el-table>
+					</div>
+					<div class="list" v-else>
+						<div class="item" :class="{ 'z-long': group.itemList.length == 1 }" :key="field.itemId" v-for="field in group.itemList">
+							<span class="item-field">{{ field.label }}：</span>
+							<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+								{{
+									!allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null
+										? '--'
+										: getOptionLabel(field.options, allInfo[group.tableName][0][field.columnName], field.itemType)
+								}}
+							</span>
+
+							<span v-else>
+								{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? '--' : allInfo[group.tableName][0][field.columnName] }}
+							</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+import cptCard from '@/views/modules/visual/cpts/card';
+import { requestPost } from '@/js/dai/request';
+
+export default {
+	name: 'peopleMore',
+	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
+		pageType: {
+			type: String,
+			default: ''
+		},
+		userId: {
+			type: String,
+			default: ''
+		},
+		gridName: {
+			type: String,
+			default: ''
+		}
+	},
+
+	components: {
+		cptCard
+	},
+
+	data() {
+		return {
+			view_real_data: false,
+			formData: {},
+			customerId: '',
+			isXiaozhaizi: false,
+
+			fieldList: [],
+			groupList: [],
+			groupIndex: 0,
+			startGroupIndex: 0,
+			info: {},
+			allInfo: {},
+
+			xiaoquList: [],
+			louList: [],
+			danyuanList: [],
+			homeList: [],
+			natList: [], // 核酸检测
+			tripList: [], // 行程信息
+
+			vaccineList: []
+		};
+	},
+
+	computed: {
+		isShundeju() {
+			return this.$store.state.user.customerId == '1550309684576591874';
+		},
+
+		xiaoquName() {
+			const {
+				xiaoquList,
+				info: { VILLAGE_ID }
+			} = this;
+			if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
+				let item = xiaoquList.find(item => item.value == VILLAGE_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		},
+		louName() {
+			const {
+				louList,
+				info: { BUILD_ID }
+			} = this;
+			if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
+				let item = louList.find(item => item.value == BUILD_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		},
+		danyuanName() {
+			const {
+				danyuanList,
+				info: { UNIT_ID }
+			} = this;
+			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+				let item = danyuanList.find(item => item.value == UNIT_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		},
+		danyuanName() {
+			const {
+				danyuanList,
+				info: { UNIT_ID }
+			} = this;
+			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+				let item = danyuanList.find(item => item.value == UNIT_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		},
+		homeName() {
+			const {
+				homeList,
+				info: { HOME_ID }
+			} = this;
+			if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
+				let item = homeList.find(item => item.value == HOME_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		}
+	},
+
+	watch: {
+		userId() {
+			this.getApiData();
+		}
+	},
+
+	mounted() {
+		//磐石街道：1580460084738760705
+		//烟台客户id:   1535072605621841922
+		//小寨子客户id:   1536638904600752130
+		this.customerId = localStorage.getItem('customerId');
+
+		this.isXiaozhaizi = false;
+
+		if (this.customerId === '1536638904600752130') {
+			this.isXiaozhaizi = true;
+		}
+		this.getApiData();
+	},
+
+	methods: {
+		async handleTuomin() {
+			const url = '/data/aggregator/epmetuser/detailByType';
+
+			const { data, code, msg } = await requestPost(url, {
+				id: this.userId,
+				type: 'checkIcResiUser'
+			});
+ console.log(data)
+			if (code === 0) {
+				this.$set(this.info, 'MOBILE', data.mobile);
+				this.$set(this.info, 'ID_CARD', data.idCard);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		addStartGroupIndex() {
+			const { startGroupIndex, groupList } = this;
+			if (startGroupIndex < groupList.length - 9) {
+				this.startGroupIndex = startGroupIndex + 1;
+			} else {
+				this.startGroupIndex = groupList.length - 9;
+			}
+		},
+		subStartGroupIndex() {
+			const { startGroupIndex, groupList } = this;
+			if (startGroupIndex > 0) {
+				this.startGroupIndex = startGroupIndex - 1;
+			} else {
+				this.startGroupIndex = 0;
+			}
+		},
+		handleCancle() {
+			// this.resetData();
+			this.$emit('handleClose');
+		},
+
+		async getApiData() {
+			await this.getField();
+			await this.getInfo();
+			this.getDetailList();
+			this.getXiaoquList();
+			this.getLouList();
+			this.getDanyuanList();
+			this.getHomeList();
+		},
+
+		getOptionLabel(options, value, type = '') {
+			if (Array.isArray(options)) {
+				let valueArr = value.split(',');
+				if (type == 'cascader') {
+					let finalValue = [];
+					this.getNodePath(options, value, finalValue);
+					return finalValue.join('-');
+				} else {
+					return valueArr
+						.map(val => {
+							let item = options.find(item => item.value == val);
+							if (item && item.label) {
+								return item.label;
+							}
+							return '--';
+						})
+						.join('、');
+				}
+			}
+			return '--';
+		},
+
+		getNodePath(node, val, path) {
+			// node:所有数据，val:后台返回的id, path:要渲染的数组id
+			for (let i = 0; i < node.length; i++) {
+				const ele = node[i];
+				if (ele.value === val) {
+					path.push(ele.label);
+					return path;
+				} else if (ele.children && ele.children.length > 0) {
+					if (ele.children.some(row => row.value === val)) {
+						path.unshift(ele.label);
+						this.getNodePath(ele.children, val, path);
+					} else {
+						this.getNodePath(ele.children, val, path);
+					}
+				}
+			}
+			return path;
+		},
+
+		//加载组织数据
+		async getField() {
+			const url = '/oper/customize/icform/getcustomerform';
+
+			const { data, code, msg } = await requestPost(url, {
+				dynamic: true,
+				formCode: 'resi_base_info'
+			});
+
+			if (code === 0) {
+				this.groupList = data.groupList;
+				this.fieldList = (function(arr) {
+					let col = [];
+					let ele = [];
+					for (let i = 0; i < arr.length; i++) {
+						let item = arr[i];
+						if (item.itemType == 'divider' || i == arr.length - 1) {
+							col.push([...ele]);
+							ele = [];
+						} else {
+							ele.push(item);
+						}
+					}
+					return col;
+				})(data.itemList);
+
+				this.fieldList.forEach((subList, index) => {
+					subList.forEach(async (item, subIndex) => {
+						if (item.optionSourceType == 'remote' && item.optionSourceValue) {
+							this.fieldList[index][subIndex].options = await this.getOptions(item.optionSourceValue);
+						}
+					});
+				});
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//加载组织数据
+		async getInfo() {
+			const url = '/epmetuser/icresiuser/detail';
+
+			const { data, code, msg } = await requestPost(url, {
+				icResiUserId: this.userId,
+				formCode: 'resi_base_info'
+			});
+
+			if (code === 0) {
+				this.info = data.ic_resi_user[0];
+				this.allInfo = data;
+
+				this.fieldList.forEach((subList, index) => {
+					subList.forEach((item, subIndex) => {
+						if (item.itemType == 'radio' && item.childGroup && this.allInfo[item.tableName] && this.allInfo[item.tableName][0][item.columnName] == '1') {
+							this.groupList = [...this.groupList, item.childGroup];
+						}
+					});
+				});
+
+				await Promise.all(
+					this.groupList.map((subList, index) => {
+						return Promise.all(
+							subList.itemList.map(async (item, subIndex) => {
+								if (item.optionSourceType == 'remote' && item.optionSourceValue) {
+									this.groupList[index].itemList[subIndex].options = await this.getOptions(item.optionSourceValue);
+								}
+							})
+						);
+					})
+				);
+				console.log('44444444', this.groupList);
+				let arr = [
+					{
+						groupId: 'hs123',
+						itemList: [],
+						label: '核酸检测信息',
+						sort: 998,
+						supportAdd: false,
+						tableName: 'ic_hs'
+					}
+				];
+
+				if (!this.isShundeju && !this.isXiaozhaizi) {
+					arr = [
+						...arr,
+						{
+							groupId: 'hs124',
+							itemList: [],
+							label: '行程信息',
+							sort: 999,
+							supportAdd: false,
+							tableName: 'ic_xc'
+						},
+						{
+							groupId: 'hs125',
+							itemList: [],
+							label: '疫苗信息',
+							sort: 999,
+							supportAdd: false,
+							tableName: 'ic_ym'
+						}
+					];
+					this.groupList = [...this.groupList, ...arr];
+				} else {
+					this.groupList = [...arr, ...this.groupList];
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//加载组织数据
+		async getOptions(url) {
+			if (!url) return [];
+
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				return data;
+			} else {
+				return [];
+			}
+		},
+
+		async getXiaoquList() {
+			const url = '/gov/org/icneighborhood/neighborhoodoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				agencyId: this.info.AGENCY_ID,
+				gridId: this.info.GRID_ID
+			});
+
+			if (code === 0) {
+				this.xiaoquList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getLouList() {
+			const url = '/gov/org/icbuilding/buildingoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				neighborHoodId: this.info.VILLAGE_ID
+			});
+
+			if (code === 0) {
+				this.louList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDanyuanList() {
+			const url = '/gov/org/icbuildingunit/unitoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				buildingId: this.info.BUILD_ID
+			});
+
+			if (code === 0) {
+				this.danyuanList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getHomeList() {
+			const url = '/gov/org/ichouse/houseoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				unitId: this.info.UNIT_ID
+			});
+
+			if (code === 0) {
+				this.homeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getDetailList() {
+			const url = '/epmetuser/epidemicPrevention/info';
+			let params = {
+				id: this.userId
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				const { vaccineList, natList, tripList } = data;
+				this.vaccineList = vaccineList;
+				this.natList = natList;
+				this.tripList = tripList;
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
+<style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+// @import '@/assets/scss/modules/visual/a_customize.scss';
+</style>

From 83e94cd3d681dad60362dd678b9c93a68b927092 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 13 Apr 2023 09:42:18 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E4=BC=A0=E5=8F=82bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/people-info2.scss             | 132 +++
 src/views/modules/census/addFormHouse.vue     |  11 +-
 src/views/modules/census/addFormResident.vue  | 872 ++++++++++--------
 src/views/modules/census/census-houseList.vue |   2 +-
 .../modules/census/census-residentList.vue    |   8 +-
 src/views/modules/census/people-more.vue      | 577 ------------
 6 files changed, 627 insertions(+), 975 deletions(-)
 create mode 100644 src/assets/scss/people-info2.scss
 delete mode 100644 src/views/modules/census/people-more.vue

diff --git a/src/assets/scss/people-info2.scss b/src/assets/scss/people-info2.scss
new file mode 100644
index 000000000..7a28a1e3c
--- /dev/null
+++ b/src/assets/scss/people-info2.scss
@@ -0,0 +1,132 @@
+@import "c/config";
+@import "c/function";
+
+
+
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1180px;
+            overflow-y: auto;
+            overflow-x: hidden;
+            position: relative;
+        }
+
+        .title {
+            padding: 10px;
+            font-size: 22px;
+            font-family: PingFang SC;
+            font-weight: 800;
+            color: #333;
+            display: flex;
+            align-items: center;
+
+            img {
+                display: block;
+                margin-right: 5px;
+            }
+            span {
+                display: block;
+            }
+        }
+
+        .div_tuomin{
+          position: absolute;
+          top:25px;
+          right:40px;
+        }
+
+        .btn-close {
+            position: absolute;
+            z-index: 2;
+            top: -30px;
+            right: -30px;
+            cursor: pointer;
+        }
+
+        .list {
+            display: flex;
+            flex-wrap: wrap;
+            padding: 10px 30px;
+
+            .item {
+                position: relative;
+                box-sizing: border-box;
+                padding: 0 15px;
+                width: 33%;
+                color: #fff;
+                font-size: 18px;
+                font-family: PingFang SC;
+                font-weight: 400;
+                color: #333;
+                line-height: 24px;
+                margin: 15px 0;
+
+                &.z-long {
+                    width: 100%;
+                }
+
+                &::before {
+                    position: absolute;
+                    left: 0;
+                    top: 9px;
+                    content: "";
+                    display: block;
+                    width: 7px;
+                    height: 7px;
+                    background: #ddd;
+                    border-radius: 3px;
+                }
+            }
+        }
+
+        .line {
+            margin: 20px auto;
+            width: 900px;
+            height: 1px;
+            border: 1px dashed #ddd;
+        }
+
+        .tabs {
+            margin-top: 30px;
+            display: flex;
+            align-items: center;
+            padding-left: 20px;
+
+            .tab-btn {
+                margin: 0 5px;
+                width: 30px;
+                text-align: center;
+                cursor: pointer;
+                padding: 10px 0;
+                border-radius: 3px;
+                background-color: rgba(#000, 0.3);
+            }
+
+            .tab {
+                @include toe;
+                margin: 0 5px;
+                min-width: 80px;
+                padding: 0 8px;
+                height: 36px;
+                background: #fff;
+                border: 1px solid #eee;
+                box-shadow: 0 0 10px 0 inset #ddd;
+                border-radius: 2px;
+                text-align: center;
+                font-size: 17px;
+                font-family: PingFang SC;
+                font-weight: 400;
+                color: #333;
+                line-height: 36px;
+                cursor: pointer;
+                transition: all ease 0.1s;
+                &.z-on {
+                    background: linear-gradient(90deg, #1a5afd, #009cff);
+                    box-shadow: none;
+                    color: #ffffff;
+                    border: 1px solid #1a5afd;
+                }
+            }
+        }
diff --git a/src/views/modules/census/addFormHouse.vue b/src/views/modules/census/addFormHouse.vue
index b5cdde320..7a84e7156 100644
--- a/src/views/modules/census/addFormHouse.vue
+++ b/src/views/modules/census/addFormHouse.vue
@@ -7,6 +7,9 @@
 		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
+				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;">
+					<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
+				</div>
 				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
@@ -89,6 +92,7 @@
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
+
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
 					<el-row>
 						<el-col :span="12">
@@ -213,7 +217,7 @@ export default {
 		};
 		return {
 			agencyObj: {},
-			view_real_data: false,
+			view_real_data: true,
 			btnDisable: false,
 			user: '',
 			agencyId: '',
@@ -488,4 +492,9 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 // @import '@/assets/scss/modules/visual/a_customize.scss';
+.div_tuomin {
+	position: absolute;
+	top: 25px;
+	right: 40px;
+}
 </style>
diff --git a/src/views/modules/census/addFormResident.vue b/src/views/modules/census/addFormResident.vue
index b5cdde320..bec9b8ce3 100644
--- a/src/views/modules/census/addFormResident.vue
+++ b/src/views/modules/census/addFormResident.vue
@@ -7,139 +7,132 @@
 		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
-					<el-row>
-						<el-col :span="6">
-							<el-form-item label="场所名称" prop="placeOrgName">
-								<el-input v-model="formData.placeOrgName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="场所类型" prop="placeType">
-								<el-select class="u-item-width-normal" :disabled="disabled" v-model="formData.placeType" placeholder="全部" size="small" clearable>
-									<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="占地面积" prop="areaCovered">
-								<el-input v-model="formData.areaCovered" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="场所规模" prop="scaleTotal">
-								<el-input
-									type="number"
-									v-model="formData.scaleTotal"
-									:disabled="disabled"
-									class="u-item-width-normal"
-									size="small"
-									clearable
-									placeholder="请输入可容纳人数"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="所属组织" prop="gridId">
-								<el-select v-model="formData.gridId" class="u-item-width-normal" :disabled="disabled" placeholder="全部" size="small" clearable>
-									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="场所类别" prop="placeCategory">
-								<el-select v-model="formData.placeCategory" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
-									<el-option v-for="item in placeCategoryArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-
-						<el-col :span="6">
-							<el-form-item label="负责人" prop="personInCharge">
-								<el-input v-model="formData.personInCharge" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="联系电话" prop="mobile">
-								<el-input v-model="formData.mobile" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="6">
-							<el-form-item label="场所地址" prop="address" style="display: block">
-								<el-select
-									v-model="formData.address"
-									:disabled="disabled"
-									filterable
-									remote
-									:reserve-keyword="true"
-									placeholder="请输入关键词"
-									:remote-method="remoteMethod"
-									:loading="loading"
-								>
-									<el-option
-										v-for="(item, index) in searchOptions"
-										@click.native="handleClickKey(index)"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<div id="app_event" class="div_map"></div>
-				</el-form>
+				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;"><el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button></div>
 				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
-					<el-row>
-						<el-col :span="12">
-							<el-form-item label="房屋名称" prop="fullName">{{ formData.fullName }}</el-form-item>
-						</el-col>
-						<!-- <el-col :span="12">
-							<el-form-item label="" prop="placeCategory"></el-form-item>
-							<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
-						</el-col> -->
-						<el-col :span="12">
-							<el-form-item label="单元号" prop="unitName">{{ formData.unitName ? formData.unitName : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="门牌号" prop="doorName">{{ formData.doorName }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房屋编码" prop="coding">{{ formData.coding ? formData.coding : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房屋类型" prop="houseTypeName">{{ formData.houseTypeName ? formData.houseTypeName : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房屋用途" prop="purposeName">{{ formData.purposeName ? formData.purposeName : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房屋状态" prop="rentName">{{ formData.rentName ? formData.rentName : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房主姓名" prop="ownerName">{{ formData.ownerName ? formData.ownerName : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="联系方式" prop="showOwnerPhone">{{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="房主身份证" prop="showOwnerIdCard">{{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }}</el-form-item>
-						</el-col>
-						<el-col :span="12">
-							<el-form-item label="备注" prop="remark">{{ formData.remark ? formData.remark : '--' }}</el-form-item>
-						</el-col>
-					</el-row>
-					<!-- <div id="app_event" class="div_map"></div> -->
+					<template v-for="(fieldSubList, index) in fieldList">
+						<el-row>
+							<!-- :key="'fieldSubList' + index" -->
+							<el-col :span="6">
+								<div v-if="index == 0">
+									<el-form-item label="所属网格">{{ gridName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="6">
+								<div v-if="index == 0">
+									<el-form-item label="所属小区">{{ xiaoquName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="6">
+								<div v-if="index == 0">
+									<el-form-item label="所属楼栋">{{ louName }}-{{ danyuanName }}</el-form-item>
+								</div>
+							</el-col>
+							<el-col :span="6">
+								<div v-if="index == 0">
+									<el-form-item label="所属家庭">{{ homeName }}</el-form-item>
+								</div>
+							</el-col>
+
+							<template v-for="field in fieldSubList">
+								<el-col :span="6">
+									<el-form-item :label="field.label">
+										<span v-if="field.columnName === 'MOBILE' || field.columnName === 'ID_CARD'">{{ info[field.columnName] || '--' }}</span>
+										<span v-else-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+											{{ info[field.columnName] == null ? '--' : getOptionLabel(field.options, info[field.columnName], field.itemType) }}
+										</span>
+										<span v-else>{{ info[field.columnName] == null ? '--' : info[field.columnName] }}</span>
+									</el-form-item>
+								</el-col>
+							</template>
+						</el-row>
+						<div style="border-bottom:dashed 1px #ccc"></div>
+					</template>
 				</el-form>
+
+				<div class="tabs">
+					<div class="tab-btn" @click="subStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
+					<div
+						v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+						class="tab"
+						:class="groupIndex % groupList.length == index ? 'z-on' : ''"
+						:key="'tab' + index"
+						@click="groupIndex = index"
+						v-for="(item, index) in groupList"
+					>
+						{{ item.label }}
+					</div>
+					<div class="tab-btn" @click="addStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
+				</div>
+
+				<div :key="'group' + index" v-show="groupIndex % groupList.length == index" v-for="(group, index) in groupList">
+					<div v-if="group.tableName == 'ic_resi_demand' && Array.isArray(allInfo.ic_resi_demand) && allInfo.ic_resi_demand.length > 0">
+						<div class="list" :key="'ic_resi_demand' + infoIndex" v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
+							<div class="item" :key="field.itemId" v-for="field in group.itemList">
+								<span class="item-field">{{ field.label }}：</span>
+								<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+									{{ infoItem[field.columnName] == null ? '--' : getOptionLabel(field.options, infoItem[field.columnName], field.itemType) }}
+								</span>
+
+								<span v-else>{{ infoItem[field.columnName] == null ? '--' : infoItem[field.columnName] }}</span>
+							</div>
+						</div>
+					</div>
+					<div v-else-if="group.tableName == 'ic_hs'" style="margin-top: 10px; padding: 0 20px">
+						<el-table class="table" :data="natList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="testTime" header-align="center" align="center" label="检测时间" width="150"></el-table-column>
+							<el-table-column prop="address" header-align="center" align="center" label="检测机构" show-overflow-tooltip min-width="180"></el-table-column>
+							<el-table-column prop="result" header-align="center" align="center" label="检测结果" width="240"></el-table-column>
+						</el-table>
+					</div>
+					<div v-else-if="group.tableName == 'ic_xc'" style="margin-top: 10px; padding: 0 20px">
+						<el-table class="table" :data="tripList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="fromRegion" header-align="center" align="center" label="来自地区" show-overflow-tooltip min-width="100"></el-table-column>
+							<el-table-column prop="arrivalTime" header-align="center" align="center" label="来到本地时间" width="140"></el-table-column>
+							<el-table-column prop="leaveTime" header-align="center" align="center" label="离开本地时间" width="140"></el-table-column>
+							<el-table-column prop="noticeTime" header-align="center" align="center" label="最近一次通知时间" width="140"></el-table-column>
+							<el-table-column prop="remark" header-align="center" align="center" label="备注" show-overflow-tooltip width="120"></el-table-column>
+						</el-table>
+					</div>
+					<div v-else-if="group.tableName == 'ic_ym'" style="margin-top: 10px; padding: 0 20px">
+						<el-table
+							v-if="vaccineList"
+							class="table"
+							:data="vaccineList"
+							border
+							height="400"
+							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+							style="width: 100%"
+						>
+							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+							<el-table-column prop="vaccinateTime" header-align="center" align="center" label="接种时间" show-overflow-tooltip min-width="100"></el-table-column>
+							<el-table-column prop="address" header-align="center" align="center" label="接种地点"></el-table-column>
+							<el-table-column prop="manufactor" header-align="center" align="center" label="疫苗厂家"></el-table-column>
+						</el-table>
+					</div>
+					<div class="list" v-else>
+						<div class="item" :class="{ 'z-long': group.itemList.length == 1 }" :key="field.itemId" v-for="field in group.itemList">
+							<span class="item-field">{{ field.label }}：</span>
+							<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
+								{{
+									!allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null
+										? '--'
+										: getOptionLabel(field.options, allInfo[group.tableName][0][field.columnName], field.itemType)
+								}}
+							</span>
+
+							<span v-else>
+								{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? '--' : allInfo[group.tableName][0][field.columnName] }}
+							</span>
+						</div>
+					</div>
+				</div>
 			</div>
-			<div class="div_btn" v-if="pageType != 'view'">
-				<el-button size="small" @click="handleCancle">取 消</el-button>
-				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
-			</div>
-			<!-- <div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div> -->
 		</div>
-
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle">关 闭</el-button>
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
@@ -148,128 +141,149 @@
 </template>
 
 <script>
-import { isMobile } from '@/utils/validate';
-import { mapGetters } from 'vuex';
-import { Loading } from 'element-ui'; // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request';
-import daiMap from '@/utils/dai-map';
-import nextTick from 'dai-js/tools/nextTick';
-import record from './record';
-let loading; // 加载动画
-let map;
-var search;
-var markers;
-var infoWindowList;
-var geocoder; // 新建一个正逆地址解析类
+import cptCard from '@/views/modules/visual/cpts/card';
+import { requestPost } from '@/js/dai/request';
 
 export default {
+	name: 'peopleMore',
 	props: {
 		dialogVisible: {
 			type: Boolean,
 			default: ''
 		},
-		defaultData: {
-			type: Object,
-			default: null
-		},
 		pageType: {
 			type: String,
 			default: ''
 		},
-		detailId: {
+		userId: {
 			type: String,
 			default: ''
 		},
-		detailData: {
-			type: Object,
-			default: null
-		},
-		disabled: {
-			type: Boolean,
-			default: false
+		gridName: {
+			type: String,
+			default: ''
 		}
 	},
 
+	components: {
+		cptCard
+	},
+
 	data() {
-		let checkNum = (rule, value, callback) => {
-			if (!value) {
-				return callback(new Error('场所规模不能为空'));
+		return {
+			view_real_data: true,
+			formData: {},
+			customerId: '',
+			isXiaozhaizi: false,
+
+			fieldList: [],
+			groupList: [],
+			groupIndex: 0,
+			startGroupIndex: 0,
+			info: {},
+			allInfo: {},
+
+			xiaoquList: [],
+			louList: [],
+			danyuanList: [],
+			homeList: [],
+			natList: [], // 核酸检测
+			tripList: [], // 行程信息
+
+			vaccineList: []
+		};
+	},
+
+	computed: {
+		isShundeju() {
+			return this.$store.state.user.customerId == '1550309684576591874';
+		},
+
+		xiaoquName() {
+			const {
+				xiaoquList,
+				info: { VILLAGE_ID }
+			} = this;
+			if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
+				let item = xiaoquList.find(item => item.value == VILLAGE_ID);
+				if (item) {
+					return item.label;
+				}
 			}
-			setTimeout(() => {
-				if (!Number.isInteger(value)) {
-					callback(new Error('请输入数字值'));
+			return '';
+		},
+		louName() {
+			const {
+				louList,
+				info: { BUILD_ID }
+			} = this;
+			if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
+				let item = louList.find(item => item.value == BUILD_ID);
+				if (item) {
+					return item.label;
 				}
-			}, 1000);
-		};
-		let checkMObile = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入联系电话'));
-			} else {
-				if (!isMobile(value)) {
-					callback(new Error('联系电话格式不正确'));
+			}
+			return '';
+		},
+		danyuanName() {
+			const {
+				danyuanList,
+				info: { UNIT_ID }
+			} = this;
+			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+				let item = danyuanList.find(item => item.value == UNIT_ID);
+				if (item) {
+					return item.label;
 				}
-				callback();
 			}
-		};
-		return {
-			agencyObj: {},
-			view_real_data: false,
-			btnDisable: false,
-			user: '',
-			agencyId: '',
-			gridList: [], //所属网格list--场所区域
-			placeTypeList: [], //场所类型
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			placeCategoryArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
-			list: {},
-			formData: {
-				placeOrgName: '',
-				scaleTotal: '',
-				gridId: '',
-				latestResult: '',
-				placeCategory: '',
-				placeType: '',
-				personInCharge: '',
-				address: '',
-				mobile: '',
-				// result: '',
-				remark: ''
-			},
-			dataRule: {
-				placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }],
-				placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }],
-				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
-				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
-				scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }],
-				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
-				personInCharge: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
-				mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
-				address: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
-				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
-			},
-			//地图
-			loading: false,
-
-			searchValue: '',
-			searchOptions: []
-		};
+			return '';
+		},
+		danyuanName() {
+			const {
+				danyuanList,
+				info: { UNIT_ID }
+			} = this;
+			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+				let item = danyuanList.find(item => item.value == UNIT_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		},
+		homeName() {
+			const {
+				homeList,
+				info: { HOME_ID }
+			} = this;
+			if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
+				let item = homeList.find(item => item.value == HOME_ID);
+				if (item) {
+					return item.label;
+				}
+			}
+			return '';
+		}
 	},
-	watch: {},
-	components: { record },
-	created() {},
-	async mounted() {
-		this.user = this.$store.state.user;
-		this.agencyId = this.user.agencyId;
-		this.startLoading();
-		this.loadGrid();
-		this.loadplaceType();
-		if (this.pageType != 'add') {
-			this.getDetail();
-		} else {
-			// this.initMap();
+
+	watch: {
+		userId() {
+			this.getApiData();
 		}
-		await this.endLoading();
-		this.endLoading();
+	},
+
+	mounted() {
+		//磐石街道：1580460084738760705
+		//烟台客户id:   1535072605621841922
+		//小寨子客户id:   1536638904600752130
+		this.customerId = localStorage.getItem('customerId');
+
+		this.isXiaozhaizi = false;
+
+		if (this.customerId === '1536638904600752130') {
+			this.isXiaozhaizi = true;
+		}
+		this.getApiData();
 	},
 
 	methods: {
@@ -277,215 +291,289 @@ export default {
 			const url = '/data/aggregator/epmetuser/detailByType';
 
 			const { data, code, msg } = await requestPost(url, {
-				id: this.detailId,
-				type: 'checkHouse'
+				id: this.userId,
+				type: 'checkIcResiUser'
 			});
-
+			console.log(data);
 			if (code === 0) {
-				this.$set(this.formData, 'showOwnerPhone', data.mobile);
-				this.$set(this.formData, 'showOwnerIdCard', data.idCard);
+				this.$set(this.info, 'MOBILE', data.mobile);
+				this.$set(this.info, 'ID_CARD', data.idCard);
 			} else {
 				this.$message.error(msg);
 			}
 		},
-		async loadGrid() {
-			const url = '/gov/org/customergrid/gridoption';
-			let params = {
-				agencyId: this.agencyId,
-				purpose: 'query'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridList = data;
+		addStartGroupIndex() {
+			const { startGroupIndex, groupList } = this;
+			if (startGroupIndex < groupList.length - 9) {
+				this.startGroupIndex = startGroupIndex + 1;
 			} else {
-				this.$message.error(msg);
+				this.startGroupIndex = groupList.length - 9;
+			}
+		},
+		subStartGroupIndex() {
+			const { startGroupIndex, groupList } = this;
+			if (startGroupIndex > 0) {
+				this.startGroupIndex = startGroupIndex - 1;
+			} else {
+				this.startGroupIndex = 0;
 			}
 		},
-		//场所类型
-		async loadplaceType() {
-			const url = '/sys/dict/data/dictlist';
+		handleCancle() {
+			// this.resetData();
+			this.$emit('handleClose');
+		},
+
+		async getApiData() {
+			await this.getField();
+			await this.getInfo();
+			this.getDetailList();
+			this.getXiaoquList();
+			this.getLouList();
+			this.getDanyuanList();
+			this.getHomeList();
+		},
+
+		getOptionLabel(options, value, type = '') {
+			if (Array.isArray(options)) {
+				let valueArr = value.split(',');
+				if (type == 'cascader') {
+					let finalValue = [];
+					this.getNodePath(options, value, finalValue);
+					return finalValue.join('-');
+				} else {
+					return valueArr
+						.map(val => {
+							let item = options.find(item => item.value == val);
+							if (item && item.label) {
+								return item.label;
+							}
+							return '--';
+						})
+						.join('、');
+				}
+			}
+			return '--';
+		},
+
+		getNodePath(node, val, path) {
+			// node:所有数据，val:后台返回的id, path:要渲染的数组id
+			for (let i = 0; i < node.length; i++) {
+				const ele = node[i];
+				if (ele.value === val) {
+					path.push(ele.label);
+					return path;
+				} else if (ele.children && ele.children.length > 0) {
+					if (ele.children.some(row => row.value === val)) {
+						path.unshift(ele.label);
+						this.getNodePath(ele.children, val, path);
+					} else {
+						this.getNodePath(ele.children, val, path);
+					}
+				}
+			}
+			return path;
+		},
+
+		//加载组织数据
+		async getField() {
+			const url = '/oper/customize/icform/getcustomerform';
+
+			const { data, code, msg } = await requestPost(url, {
+				dynamic: true,
+				formCode: 'resi_base_info'
+			});
 
-			let params = {
-				dictType: 'ic_enterprise_place_type'
-			};
-			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
-				this.placeTypeList = data;
+				this.groupList = data.groupList;
+				this.fieldList = (function(arr) {
+					let col = [];
+					let ele = [];
+					for (let i = 0; i < arr.length; i++) {
+						let item = arr[i];
+						if (item.itemType == 'divider' || i == arr.length - 1) {
+							col.push([...ele]);
+							ele = [];
+						} else {
+							ele.push(item);
+						}
+					}
+					return col;
+				})(data.itemList);
+
+				this.fieldList.forEach((subList, index) => {
+					subList.forEach(async (item, subIndex) => {
+						if (item.optionSourceType == 'remote' && item.optionSourceValue) {
+							this.fieldList[index][subIndex].options = await this.getOptions(item.optionSourceValue);
+						}
+					});
+				});
 			} else {
 				this.$message.error(msg);
 			}
 		},
-		async getDetail() {
-			const url = `/gov/org/ichouse/${this.detailId}`;
-			const { data, code, msg } = await requestGet(url);
+
+		//加载组织数据
+		async getInfo() {
+			const url = '/epmetuser/icresiuser/detail';
+
+			const { data, code, msg } = await requestPost(url, {
+				icResiUserId: this.userId,
+				formCode: 'resi_base_info'
+			});
+
 			if (code === 0) {
-				this.formData = { ...data };
-				this.houseType = this.formData.houseType;
-				this.purpose = this.formData.purpose;
-				this.rentFlag = parseInt(this.formData.rentFlag);
+				this.info = data.ic_resi_user[0];
+				this.allInfo = data;
 
-				// this.initMap();
+				this.fieldList.forEach((subList, index) => {
+					subList.forEach((item, subIndex) => {
+						if (item.itemType == 'radio' && item.childGroup && this.allInfo[item.tableName] && this.allInfo[item.tableName][0][item.columnName] == '1') {
+							this.groupList = [...this.groupList, item.childGroup];
+						}
+					});
+				});
+
+				await Promise.all(
+					this.groupList.map((subList, index) => {
+						return Promise.all(
+							subList.itemList.map(async (item, subIndex) => {
+								if (item.optionSourceType == 'remote' && item.optionSourceValue) {
+									this.groupList[index].itemList[subIndex].options = await this.getOptions(item.optionSourceValue);
+								}
+							})
+						);
+					})
+				);
+				console.log('44444444', this.groupList);
+				let arr = [
+					{
+						groupId: 'hs123',
+						itemList: [],
+						label: '核酸检测信息',
+						sort: 998,
+						supportAdd: false,
+						tableName: 'ic_hs'
+					}
+				];
+
+				if (!this.isShundeju && !this.isXiaozhaizi) {
+					arr = [
+						...arr,
+						{
+							groupId: 'hs124',
+							itemList: [],
+							label: '行程信息',
+							sort: 999,
+							supportAdd: false,
+							tableName: 'ic_xc'
+						},
+						{
+							groupId: 'hs125',
+							itemList: [],
+							label: '疫苗信息',
+							sort: 999,
+							supportAdd: false,
+							tableName: 'ic_ym'
+						}
+					];
+					this.groupList = [...this.groupList, ...arr];
+				} else {
+					this.groupList = [...arr, ...this.groupList];
+				}
 			} else {
 				this.$message.error(msg);
 			}
 		},
 
-		handleComfirm() {
-			this.save();
-		},
-		async handleAdd() {
-			// this.btnDisable = true;
-			// setTimeout(() => {
-			// 	this.btnDisable = false;
-			// }, 10000);
-			// nextTick(1000);
-			// const form = new Promise((resolve, reject) => {
-			// 	this.$refs['form'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// const form1 = new Promise((resolve, reject) => {
-			// 	this.$refs['form1'].validate(valid => {
-			// 		if (valid) resolve();
-			// 	});
-			// });
-			// Promise.all([form1, form])
-			// 	.then(() => {
-			// 		this.addFuwu();
-			// 	})
-			// 	.catch(() => {
-			// 		app.util.validateRule(messageObj);
-			// 		this.btnDisable = false;
-			// 	});
-		},
+		//加载组织数据
+		async getOptions(url) {
+			if (!url) return [];
+
+			const { data, code, msg } = await requestPost(url, {});
 
-		async save() {
-			this.formData.agencyId = this.agencyId;
-			var url = '';
-			var params = {};
-			url = '/gov/org/enterprise/addOrUpdate';
-			params = { ...this.formData };
-			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
-				this.$message.success('操作成功');
+				return data;
+			} else {
+				return [];
+			}
+		},
+
+		async getXiaoquList() {
+			const url = '/gov/org/icneighborhood/neighborhoodoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				agencyId: this.info.AGENCY_ID,
+				gridId: this.info.GRID_ID
+			});
 
-				this.handleCancle();
-				// // this.resetData();
-				// this.$emit('handleComfirm');
-			} else if (code >= 8000) {
+			if (code === 0) {
+				this.xiaoquList = data;
+			} else {
 				this.$message.error(msg);
 			}
 		},
-		handleCancle() {
-			// this.resetData();
-			this.$emit('handleClose');
-		},
-		resetData() {
-			this.$refs.form.resetFields();
-		},
-		// 开启加载动画
-		startLoading() {
-			loading = Loading.service({
-				lock: true, // 是否锁定
-				text: '正在加载……', // 加载中需要显示的文字
-				background: 'rgba(0,0,0,.7)' // 背景颜色
+		async getLouList() {
+			const url = '/gov/org/icbuilding/buildingoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				neighborHoodId: this.info.VILLAGE_ID
 			});
-		},
-		// 结束加载动画
-		endLoading() {
-			// clearTimeout(timer);
-			if (loading) {
-				loading.close();
-			}
-		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-		initMap() {
-			let { latitude, longitude } = this.$store.state.user;
 
-			if (this.formData.latitude && this.formData.longitude) {
-				latitude = this.formData.latitude;
-				longitude = this.formData.longitude;
-			}
-			if (!latitude || latitude == '' || latitude == '0') {
-				latitude = 39.9088810666821;
-				longitude = 116.39743841556731;
+			if (code === 0) {
+				this.louList = data;
+			} else {
+				this.$message.error(msg);
 			}
+		},
+		async getDanyuanList() {
+			const url = '/gov/org/icbuildingunit/unitoption';
 
-			this.$nextTick(() => {
-				map = new daiMap(
-					document.getElementById('app_event'),
-					{ latitude, longitude },
-					{
-						zoom: 16.2, // 设置地图缩放级别
-						pitch: 43.5, // 设置俯仰角
-						rotation: 45 // 设置地图旋转角度
-					}
-				);
-				// 监听地图平移结束
-				map.on('dragend', e => {
-					this.handleMoveCenter(e);
-				});
-
-				map.setCenter(latitude, longitude);
-				if (this.formData.latitude) {
-					map.setMarker(latitude, longitude);
-				}
+			const { data, code, msg } = await requestPost(url, {
+				buildingId: this.info.BUILD_ID
 			});
-		},
-		async handleMoveCenter() {
-			//修改地图中心点
-			const { lat, lng } = map.getCenter();
-			this.formData.latitude = lat;
-			this.formData.longitude = lng;
-			map.setMarker(lat, lng);
-
-			let { msg, data } = await map.getAddress(lat, lng);
-			if (msg == 'success') {
-				this.formData.address = data.address;
-				this.searchValue = data.address;
-				this.searchOptions = [];
+
+			if (code === 0) {
+				this.danyuanList = data;
+			} else {
+				this.$message.error(msg);
 			}
 		},
-		async remoteMethod(query) {
-			if (query !== '') {
-				this.loading = true;
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
-
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.id}`, label: `${item.address + item.name}` };
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
-							value: '0',
-							label: '未检索到结果'
-						}
-					];
-				}
+		async getHomeList() {
+			const url = '/gov/org/ichouse/houseoption';
+
+			const { data, code, msg } = await requestPost(url, {
+				unitId: this.info.UNIT_ID
+			});
+
+			if (code === 0) {
+				this.homeList = data;
 			} else {
-				this.searchOptions = [];
+				this.$message.error(msg);
 			}
 		},
-		handleClickKey(index) {
-			let selPosition = this.resultList[index];
-			let lonlat = selPosition.lonlat.split(' ');
-			map.setCenter(lonlat[1], lonlat[0]);
-			map.setMarker(lonlat[1], lonlat[0]);
-			this.formData.latitude = lonlat[1];
-			this.formData.longitude = lonlat[0];
-			this.formData.address = selPosition.address + selPosition.name;
+		async getDetailList() {
+			const url = '/epmetuser/epidemicPrevention/info';
+			let params = {
+				id: this.userId
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				const { vaccineList, natList, tripList } = data;
+				this.vaccineList = vaccineList;
+				this.natList = natList;
+				this.tripList = tripList;
+			} else {
+				this.$message.error(msg);
+			}
 		}
 	}
 };
 </script>
 
+<style lang="scss" src="@/assets/scss/people-info2.scss" scoped></style>
 <style lang="scss" scoped>
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
-// @import '@/assets/scss/modules/visual/a_customize.scss';
 </style>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ac20e4650..52aa515c0 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -243,7 +243,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 92a8c9a56..cb3d500da 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -137,7 +137,7 @@ import screenEchartsFrame2 from './chart';
 import { requestPost } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-import addForm from './people-more.vue';
+import addForm from './addFormResident.vue';
 
 import axios from 'axios';
 
@@ -215,7 +215,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -232,7 +232,7 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
-		this.orgId = this.agencyId;
+		// this.orgId = this.agencyId;
 		this.getOrgTreeList();
 		this.getTableData();
 		this.getsubData();
@@ -243,7 +243,7 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.icResiUserId;
-			this.detailData = row.educationName;
+			this.detailData = row.gridName;
 		},
 		handleClose() {
 			this.dialogVisible = false;
diff --git a/src/views/modules/census/people-more.vue b/src/views/modules/census/people-more.vue
deleted file mode 100644
index 960a1166b..000000000
--- a/src/views/modules/census/people-more.vue
+++ /dev/null
@@ -1,577 +0,0 @@
-<template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
-		<span slot="title">
-			<span v-if="pageType == 'add'">新增</span>
-			<span v-if="pageType == 'edit'">修改</span>
-			<span v-if="pageType == 'view'">查看</span>
-		</span>
-		<div>
-			<div class="dialog-h-content scroll-h">
-				<div v-if="view_real_data" class="div_tuomin"><el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button></div>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
-					<el-row>
-						<template v-for="(fieldSubList, index) in fieldList">
-							<!-- :key="'fieldSubList' + index" -->
-							<el-col :span="12">
-								<div v-if="index == 0">
-									<el-form-item label="所属网格">{{ gridName }}</el-form-item>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div v-if="index == 0">
-									<el-form-item label="所属小区">{{ xiaoquName }}</el-form-item>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div v-if="index == 0">
-									<el-form-item label="所属楼栋">{{ louName }}-{{ danyuanName }}</el-form-item>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div v-if="index == 0">
-									<el-form-item label="所属家庭">{{ homeName }}</el-form-item>
-								</div>
-							</el-col>
-							<el-col :span="12">
-								<div :key="field.itemId" v-for="field in fieldSubList">
-									<el-form-item :label="field.label">
-										<span v-if="field.columnName === 'MOBILE' || field.columnName === 'ID_CARD'">{{ info[field.columnName] || '--' }}</span>
-										<span v-else-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
-											{{ info[field.columnName] == null ? '--' : getOptionLabel(field.options, info[field.columnName], field.itemType) }}
-										</span>
-										<span v-else>{{ info[field.columnName] == null ? '--' : info[field.columnName] }}</span>
-									</el-form-item>
-								</div>
-							</el-col>
-						</template>
-					</el-row>
-				</el-form>
-				<div class="tabs">
-					<div class="tab-btn" @click="subStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
-					<div
-						v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-						class="tab"
-						:class="groupIndex % groupList.length == index ? 'z-on' : ''"
-						:key="'tab' + index"
-						@click="groupIndex = index"
-						v-for="(item, index) in groupList"
-					>
-						{{ item.label }}
-					</div>
-					<div class="tab-btn" @click="addStartGroupIndex" v-if="groupList.length > 9"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
-				</div>
-
-				<div :key="'group' + index" v-show="groupIndex % groupList.length == index" v-for="(group, index) in groupList">
-					<div v-if="group.tableName == 'ic_resi_demand' && Array.isArray(allInfo.ic_resi_demand) && allInfo.ic_resi_demand.length > 0">
-						<div class="list" :key="'ic_resi_demand' + infoIndex" v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
-							<div class="item" :key="field.itemId" v-for="field in group.itemList">
-								<span class="item-field">{{ field.label }}：</span>
-								<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
-									{{ infoItem[field.columnName] == null ? '--' : getOptionLabel(field.options, infoItem[field.columnName], field.itemType) }}
-								</span>
-
-								<span v-else>{{ infoItem[field.columnName] == null ? '--' : infoItem[field.columnName] }}</span>
-							</div>
-						</div>
-					</div>
-					<div v-else-if="group.tableName == 'ic_hs'" style="margin-top: 10px; padding: 0 20px">
-						<el-table class="table" :data="natList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
-							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-
-							<el-table-column prop="testTime" header-align="center" align="center" label="检测时间" width="150"></el-table-column>
-							<el-table-column prop="address" header-align="center" align="center" label="检测机构" show-overflow-tooltip min-width="180"></el-table-column>
-							<el-table-column prop="result" header-align="center" align="center" label="检测结果" width="240"></el-table-column>
-						</el-table>
-					</div>
-					<div v-else-if="group.tableName == 'ic_xc'" style="margin-top: 10px; padding: 0 20px">
-						<el-table class="table" :data="tripList" border height="400" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%">
-							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-
-							<el-table-column prop="fromRegion" header-align="center" align="center" label="来自地区" show-overflow-tooltip min-width="100"></el-table-column>
-							<el-table-column prop="arrivalTime" header-align="center" align="center" label="来到本地时间" width="140"></el-table-column>
-							<el-table-column prop="leaveTime" header-align="center" align="center" label="离开本地时间" width="140"></el-table-column>
-							<el-table-column prop="noticeTime" header-align="center" align="center" label="最近一次通知时间" width="140"></el-table-column>
-							<el-table-column prop="remark" header-align="center" align="center" label="备注" show-overflow-tooltip width="120"></el-table-column>
-						</el-table>
-					</div>
-					<div v-else-if="group.tableName == 'ic_ym'" style="margin-top: 10px; padding: 0 20px">
-						<el-table
-							v-if="vaccineList"
-							class="table"
-							:data="vaccineList"
-							border
-							height="400"
-							:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-							style="width: 100%"
-						>
-							<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-
-							<el-table-column prop="vaccinateTime" header-align="center" align="center" label="接种时间" show-overflow-tooltip min-width="100"></el-table-column>
-							<el-table-column prop="address" header-align="center" align="center" label="接种地点"></el-table-column>
-							<el-table-column prop="manufactor" header-align="center" align="center" label="疫苗厂家"></el-table-column>
-						</el-table>
-					</div>
-					<div class="list" v-else>
-						<div class="item" :class="{ 'z-long': group.itemList.length == 1 }" :key="field.itemId" v-for="field in group.itemList">
-							<span class="item-field">{{ field.label }}：</span>
-							<span v-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
-								{{
-									!allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null
-										? '--'
-										: getOptionLabel(field.options, allInfo[group.tableName][0][field.columnName], field.itemType)
-								}}
-							</span>
-
-							<span v-else>
-								{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? '--' : allInfo[group.tableName][0][field.columnName] }}
-							</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
-			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
-		</span>
-	</el-dialog>
-</template>
-
-<script>
-import cptCard from '@/views/modules/visual/cpts/card';
-import { requestPost } from '@/js/dai/request';
-
-export default {
-	name: 'peopleMore',
-	props: {
-		dialogVisible: {
-			type: Boolean,
-			default: ''
-		},
-		pageType: {
-			type: String,
-			default: ''
-		},
-		userId: {
-			type: String,
-			default: ''
-		},
-		gridName: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: {
-		cptCard
-	},
-
-	data() {
-		return {
-			view_real_data: false,
-			formData: {},
-			customerId: '',
-			isXiaozhaizi: false,
-
-			fieldList: [],
-			groupList: [],
-			groupIndex: 0,
-			startGroupIndex: 0,
-			info: {},
-			allInfo: {},
-
-			xiaoquList: [],
-			louList: [],
-			danyuanList: [],
-			homeList: [],
-			natList: [], // 核酸检测
-			tripList: [], // 行程信息
-
-			vaccineList: []
-		};
-	},
-
-	computed: {
-		isShundeju() {
-			return this.$store.state.user.customerId == '1550309684576591874';
-		},
-
-		xiaoquName() {
-			const {
-				xiaoquList,
-				info: { VILLAGE_ID }
-			} = this;
-			if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
-				let item = xiaoquList.find(item => item.value == VILLAGE_ID);
-				if (item) {
-					return item.label;
-				}
-			}
-			return '';
-		},
-		louName() {
-			const {
-				louList,
-				info: { BUILD_ID }
-			} = this;
-			if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
-				let item = louList.find(item => item.value == BUILD_ID);
-				if (item) {
-					return item.label;
-				}
-			}
-			return '';
-		},
-		danyuanName() {
-			const {
-				danyuanList,
-				info: { UNIT_ID }
-			} = this;
-			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
-				let item = danyuanList.find(item => item.value == UNIT_ID);
-				if (item) {
-					return item.label;
-				}
-			}
-			return '';
-		},
-		danyuanName() {
-			const {
-				danyuanList,
-				info: { UNIT_ID }
-			} = this;
-			if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
-				let item = danyuanList.find(item => item.value == UNIT_ID);
-				if (item) {
-					return item.label;
-				}
-			}
-			return '';
-		},
-		homeName() {
-			const {
-				homeList,
-				info: { HOME_ID }
-			} = this;
-			if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
-				let item = homeList.find(item => item.value == HOME_ID);
-				if (item) {
-					return item.label;
-				}
-			}
-			return '';
-		}
-	},
-
-	watch: {
-		userId() {
-			this.getApiData();
-		}
-	},
-
-	mounted() {
-		//磐石街道：1580460084738760705
-		//烟台客户id:   1535072605621841922
-		//小寨子客户id:   1536638904600752130
-		this.customerId = localStorage.getItem('customerId');
-
-		this.isXiaozhaizi = false;
-
-		if (this.customerId === '1536638904600752130') {
-			this.isXiaozhaizi = true;
-		}
-		this.getApiData();
-	},
-
-	methods: {
-		async handleTuomin() {
-			const url = '/data/aggregator/epmetuser/detailByType';
-
-			const { data, code, msg } = await requestPost(url, {
-				id: this.userId,
-				type: 'checkIcResiUser'
-			});
- console.log(data)
-			if (code === 0) {
-				this.$set(this.info, 'MOBILE', data.mobile);
-				this.$set(this.info, 'ID_CARD', data.idCard);
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		addStartGroupIndex() {
-			const { startGroupIndex, groupList } = this;
-			if (startGroupIndex < groupList.length - 9) {
-				this.startGroupIndex = startGroupIndex + 1;
-			} else {
-				this.startGroupIndex = groupList.length - 9;
-			}
-		},
-		subStartGroupIndex() {
-			const { startGroupIndex, groupList } = this;
-			if (startGroupIndex > 0) {
-				this.startGroupIndex = startGroupIndex - 1;
-			} else {
-				this.startGroupIndex = 0;
-			}
-		},
-		handleCancle() {
-			// this.resetData();
-			this.$emit('handleClose');
-		},
-
-		async getApiData() {
-			await this.getField();
-			await this.getInfo();
-			this.getDetailList();
-			this.getXiaoquList();
-			this.getLouList();
-			this.getDanyuanList();
-			this.getHomeList();
-		},
-
-		getOptionLabel(options, value, type = '') {
-			if (Array.isArray(options)) {
-				let valueArr = value.split(',');
-				if (type == 'cascader') {
-					let finalValue = [];
-					this.getNodePath(options, value, finalValue);
-					return finalValue.join('-');
-				} else {
-					return valueArr
-						.map(val => {
-							let item = options.find(item => item.value == val);
-							if (item && item.label) {
-								return item.label;
-							}
-							return '--';
-						})
-						.join('、');
-				}
-			}
-			return '--';
-		},
-
-		getNodePath(node, val, path) {
-			// node:所有数据，val:后台返回的id, path:要渲染的数组id
-			for (let i = 0; i < node.length; i++) {
-				const ele = node[i];
-				if (ele.value === val) {
-					path.push(ele.label);
-					return path;
-				} else if (ele.children && ele.children.length > 0) {
-					if (ele.children.some(row => row.value === val)) {
-						path.unshift(ele.label);
-						this.getNodePath(ele.children, val, path);
-					} else {
-						this.getNodePath(ele.children, val, path);
-					}
-				}
-			}
-			return path;
-		},
-
-		//加载组织数据
-		async getField() {
-			const url = '/oper/customize/icform/getcustomerform';
-
-			const { data, code, msg } = await requestPost(url, {
-				dynamic: true,
-				formCode: 'resi_base_info'
-			});
-
-			if (code === 0) {
-				this.groupList = data.groupList;
-				this.fieldList = (function(arr) {
-					let col = [];
-					let ele = [];
-					for (let i = 0; i < arr.length; i++) {
-						let item = arr[i];
-						if (item.itemType == 'divider' || i == arr.length - 1) {
-							col.push([...ele]);
-							ele = [];
-						} else {
-							ele.push(item);
-						}
-					}
-					return col;
-				})(data.itemList);
-
-				this.fieldList.forEach((subList, index) => {
-					subList.forEach(async (item, subIndex) => {
-						if (item.optionSourceType == 'remote' && item.optionSourceValue) {
-							this.fieldList[index][subIndex].options = await this.getOptions(item.optionSourceValue);
-						}
-					});
-				});
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载组织数据
-		async getInfo() {
-			const url = '/epmetuser/icresiuser/detail';
-
-			const { data, code, msg } = await requestPost(url, {
-				icResiUserId: this.userId,
-				formCode: 'resi_base_info'
-			});
-
-			if (code === 0) {
-				this.info = data.ic_resi_user[0];
-				this.allInfo = data;
-
-				this.fieldList.forEach((subList, index) => {
-					subList.forEach((item, subIndex) => {
-						if (item.itemType == 'radio' && item.childGroup && this.allInfo[item.tableName] && this.allInfo[item.tableName][0][item.columnName] == '1') {
-							this.groupList = [...this.groupList, item.childGroup];
-						}
-					});
-				});
-
-				await Promise.all(
-					this.groupList.map((subList, index) => {
-						return Promise.all(
-							subList.itemList.map(async (item, subIndex) => {
-								if (item.optionSourceType == 'remote' && item.optionSourceValue) {
-									this.groupList[index].itemList[subIndex].options = await this.getOptions(item.optionSourceValue);
-								}
-							})
-						);
-					})
-				);
-				console.log('44444444', this.groupList);
-				let arr = [
-					{
-						groupId: 'hs123',
-						itemList: [],
-						label: '核酸检测信息',
-						sort: 998,
-						supportAdd: false,
-						tableName: 'ic_hs'
-					}
-				];
-
-				if (!this.isShundeju && !this.isXiaozhaizi) {
-					arr = [
-						...arr,
-						{
-							groupId: 'hs124',
-							itemList: [],
-							label: '行程信息',
-							sort: 999,
-							supportAdd: false,
-							tableName: 'ic_xc'
-						},
-						{
-							groupId: 'hs125',
-							itemList: [],
-							label: '疫苗信息',
-							sort: 999,
-							supportAdd: false,
-							tableName: 'ic_ym'
-						}
-					];
-					this.groupList = [...this.groupList, ...arr];
-				} else {
-					this.groupList = [...arr, ...this.groupList];
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载组织数据
-		async getOptions(url) {
-			if (!url) return [];
-
-			const { data, code, msg } = await requestPost(url, {});
-
-			if (code === 0) {
-				return data;
-			} else {
-				return [];
-			}
-		},
-
-		async getXiaoquList() {
-			const url = '/gov/org/icneighborhood/neighborhoodoption';
-
-			const { data, code, msg } = await requestPost(url, {
-				agencyId: this.info.AGENCY_ID,
-				gridId: this.info.GRID_ID
-			});
-
-			if (code === 0) {
-				this.xiaoquList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getLouList() {
-			const url = '/gov/org/icbuilding/buildingoption';
-
-			const { data, code, msg } = await requestPost(url, {
-				neighborHoodId: this.info.VILLAGE_ID
-			});
-
-			if (code === 0) {
-				this.louList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getDanyuanList() {
-			const url = '/gov/org/icbuildingunit/unitoption';
-
-			const { data, code, msg } = await requestPost(url, {
-				buildingId: this.info.BUILD_ID
-			});
-
-			if (code === 0) {
-				this.danyuanList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getHomeList() {
-			const url = '/gov/org/ichouse/houseoption';
-
-			const { data, code, msg } = await requestPost(url, {
-				unitId: this.info.UNIT_ID
-			});
-
-			if (code === 0) {
-				this.homeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getDetailList() {
-			const url = '/epmetuser/epidemicPrevention/info';
-			let params = {
-				id: this.userId
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				const { vaccineList, natList, tripList } = data;
-				this.vaccineList = vaccineList;
-				this.natList = natList;
-				this.tripList = tripList;
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
-<style lang="scss" scoped>
-@import '@/assets/scss/modules/management/form-main.scss';
-@import '@/assets/scss/modules/management/form.scss';
-// @import '@/assets/scss/modules/visual/a_customize.scss';
-</style>

From 8800cd5c0fc22ba08305f76388a1d5f6a26c6cd7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 13 Apr 2023 11:10:25 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/dyhx/chart.vue     |  163 ++
 .../modules/communityParty/dyhx/party.vue     | 2136 ++++++++---------
 2 files changed, 1142 insertions(+), 1157 deletions(-)
 create mode 100644 src/views/modules/communityParty/dyhx/chart.vue

diff --git a/src/views/modules/communityParty/dyhx/chart.vue b/src/views/modules/communityParty/dyhx/chart.vue
new file mode 100644
index 000000000..b78f0595c
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/chart.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="screenEchartsFrame"
+       ref="screenEchartsFrame"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+  name: 'screen-echarts-frame',
+  data () {
+    return {
+      myChart: ''
+    }
+  },
+  props: {
+    chartMethod: {
+      type: Function
+    }
+  },
+  mounted () {
+    this.initChart()
+    window.onresize = () => {
+      this.myChart.resize()
+    }
+  },
+  beforeDestroy () {
+    // 销毁echarts实例对象
+    if (this.myChart) this.myChart.dispose()
+  },
+  watch: {},
+  methods: {
+    initChart () {
+      this.$nextTick(() => {
+        const dom = this.$refs.screenEchartsFrame
+        this.myChart = echarts.init(dom)
+        // this.myChart.setOption(this.chartMethod())
+        this.$emit('myChartMethod', this.myChart)
+      })
+    },
+    // 配置option
+    setOption (option) {
+      this.myChart.setOption(option)
+     let than = this
+      this.myChart.on('click',function(param){
+        than.$emit('handelClickMyPei',param)
+				})
+    },
+    // 获取option
+    getOption () {
+      if (this.myChart) {
+        return this.myChart.getOption()
+      } else {
+        return null
+      }
+    },
+    //
+    resize () {
+      if (this.myChart) {
+        this.myChart.resize()
+      }
+    },
+    clear () {
+      if (this.myChart) {
+        this.myChart.clear()
+      }
+    },
+    showLoading () {
+      if (this.myChart) {
+        this.$nextTick(() => {
+          this.myChart.showLoading({
+            text: '',
+            color: '#29cdff',
+            textColor: '#29cdff',
+            maskColor: 'rgba(255, 255, 255, 0)',
+            zlevel: 0
+          })
+        })
+      }
+    },
+    hideLoading () {
+      if (this.myChart) {
+        this.myChart.hideLoading()
+      }
+    },
+    // 启动动画时使用
+    tooltipAnimate (chart, length) {
+      // 清除上一次动画
+      this.timeTicket && clearInterval(this.timeTicket)
+      const count = 0
+      // 启动动画
+      this._action(chart, count, length)
+      chart && // 移除动画
+        chart.on('mouseover', params => {
+          this._cleanAction(chart, params)
+        })
+      // 重写启动动画
+      chart &&
+        chart.on('mouseout', () => {
+          this._action(chart, count, length)
+        })
+    },
+    // tooltip动画action
+    _action (chart, count, length) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      this.timeTicket = setInterval(() => {
+        if (!chart) {
+          clearInterval(this.timeTicket)
+          return
+        }
+        chart &&
+          chart.dispatchAction({
+            type: 'downplay',
+            seriesIndex: 0
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'highlight',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        chart &&
+          chart.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 0,
+            dataIndex: count % length
+          })
+        count++
+      }, 1000 * 3)
+    },
+    _cleanAction (chart, params) {
+      this.timeTicket && clearInterval(this.timeTicket)
+      if (!chart) {
+        clearInterval(this.timeTicket)
+        return
+      }
+      chart &&
+        chart.dispatchAction({
+          type: 'downplay',
+          seriesIndex: 0
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'highlight',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+      chart &&
+        chart.dispatchAction({
+          type: 'showTip',
+          seriesIndex: 0,
+          dataIndex: params.dataIndex
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.screenEchartsFrame {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 93ed4b792..90e9eb8a5 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -1,1184 +1,1006 @@
 <template>
-  <div class="div_main">
-
-    <div class="card-title">
-
-      <div class="title-label">
-        <span>所属组织</span>
-        <el-cascader style="margin-left:10px"
-                     v-model="partyOrgs"
-                     :options="partyOrgList"
-                     filterable
-                     :props="{
-              label: 'partyOrgName',
-              value: 'id',
-              checkStrictly: true 
-            }"
-                     :show-all-levels="false"
-                     clearable
-                     @change="handlePartyCascader">
-        </el-cascader>
-      </div>
-    </div>
-    <div class="card-echart">
-      <div class="card-left">
-        <div class="card-left-title">党员年龄统计</div>
-        <div class="card-flex">
-          <div class="echart-wr">
-            <!-- <div class="echart-cicle"></div>  -->
-            <screen-echarts-frame class="echart-org"
-                                  @myChartMethod="pieInitOk"
-                                  ref="ageChart"></screen-echarts-frame>
-            <!-- <div id="echartOrg" class="echart-org"></div> -->
-          </div>
-          <div class="echarts-tips echarts-tips-wd50">
-            <div class="tips-lists">
-              <div v-for="(item, index) in ageItem"
-                   :key="index"
-                   class="tips-items">
-                <div class="tips-items-title"
-                     :class="'tips-items-title' + item.code">
-                  {{ item.name }}
-                </div>
-                <div class="tips-items-num">
-                  <div class="tips-item-count">{{item.value}}</div>
-                  <div class="tips-item-has">{{ item.radio }}</div>
-                </div>
-              </div>
-
-            </div>
-          </div>
-
-        </div>
-        <div class="ecahrts-button">
-          <el-button type="primary"
-                     size="small"
-                     @click="handleExport('age')">导出</el-button>
-        </div>
-        <div class="warning-box-bottom">
-          <el-table class="table"
-                    :data="tableDataAge"
-                    border
-                    :height="tableHeight"
-                    v-loading="tableLoadingAge"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    style="width: 100%">
-            <el-table-column label="序号"
-                             header-align="center"
-                             align="center"
-                             type="index"
-                             width="50"></el-table-column>
-
-            <el-table-column prop="name"
-                             header-align="center"
-                             align="center"
-                             label="姓名"
-                             :show-overflow-tooltip="true"
-                             min-width="120">
-            </el-table-column>
-            <el-table-column prop="age"
-                             header-align="center"
-                             align="center"
-                             :show-overflow-tooltip="true"
-                             label="年龄"
-                             min-width="100">
-            </el-table-column>
-
-            <el-table-column prop="mobile"
-                             header-align="center"
-                             align="center"
-                             :show-overflow-tooltip="true"
-                             label="手机号码"
-                             min-width="130">
-            </el-table-column>
-
-            <el-table-column label="操作"
-                             fixed="right"
-                             width="120"
-                             header-align="center"
-                             align="center"
-                             class="operate">
-              <template slot-scope="scope">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleDetail(scope.row)">查看</el-button>
-
-              </template>
-            </el-table-column>
-          </el-table>
-          <div>
-            <el-pagination @size-change="pageSizeChangeHandleAge"
-                           @current-change="pageCurrentChangeHandleAge"
-                           :current-page.sync="agePageNo"
-                           :page-sizes="[10,20, 50, 100, 200]"
-                           :page-size="agePageSize"
-                           layout="sizes, prev, pager, next, total"
-                           :total="ageTotal">
-            </el-pagination>
-          </div>
-        </div>
-      </div>
-      <div class="card-left">
-        <div class="card-left-title">党员学历统计</div>
-        <div class="card-flex">
-          <div class="echart-wr echart-wr100">
-            <!-- <div class="echart-cicle echart-cicle0"></div> -->
-            <!-- <div id="echartType" class="echart-org"></div> -->
-            <screen-echarts-frame class="echart-org"
-                                  @myChartMethod="pieInitOks"
-                                  ref="eduChart"></screen-echarts-frame>
-          </div>
-          <div v-if="false"
-               class="echarts-tips">
-            <div class="tips-list">
-              <div v-for="item in eduItem"
-                   :key="item.value"
-                   class="tips-item">
-                <div class="tips-item-icon"
-                     :style="'background:' + item.color"></div>
-                <div class="tips-item-text">{{item.name}}</div>
-              </div>
-
-            </div>
-          </div>
-        </div>
-        <div class="ecahrts-button">
-          <el-button type="primary"
-                     size="small"
-                     @click="handleExport('edu')">导出</el-button>
-        </div>
-        <div class="warning-box-bottom">
-          <el-table class="table"
-                    :data="tableData"
-                    border
-                    :height="tableHeight"
-                    v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    style="width: 100%">
-            <el-table-column label="序号"
-                             header-align="center"
-                             align="center"
-                             type="index"
-                             width="50"></el-table-column>
-
-            <el-table-column prop="name"
-                             header-align="center"
-                             align="center"
-                             label="姓名"
-                             :show-overflow-tooltip="true"
-                             min-width="120">
-            </el-table-column>
-            <el-table-column prop="education"
-                             header-align="center"
-                             align="center"
-                             :show-overflow-tooltip="true"
-                             label="学历"
-                             min-width="130">
-            </el-table-column>
-
-            <el-table-column prop="mobile"
-                             header-align="center"
-                             align="center"
-                             :show-overflow-tooltip="true"
-                             label="手机号码"
-                             min-width="130">
-            </el-table-column>
-
-            <el-table-column label="操作"
-                             fixed="right"
-                             width="120"
-                             header-align="center"
-                             align="center"
-                             class="operate">
-              <template slot-scope="scope">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleDetail(scope.row)">查看</el-button>
-
-              </template>
-            </el-table-column>
-          </el-table>
-          <div>
-            <el-pagination @size-change="pageSizeChangeHandleNew"
-                           @current-change="pageCurrentChangeHandleNew"
-                           :current-page.sync="pageNo"
-                           :page-sizes="[10,20, 50, 100, 200]"
-                           :page-size="pageSize"
-                           layout="sizes, prev, pager, next, total"
-                           :total="total">
-            </el-pagination>
-
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- <crate-form v-if="memberDialog"
+	<div class="div_main">
+		<div class="div_search">
+			<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'80px'">
+				<div>
+					<el-form-item label="所属组织" prop="orgId">
+						<el-cascader
+							class="customer_cascader"
+							ref="myCascader"
+							clearable
+							v-model="formData.orgId"
+							:options="orgOptions"
+							:props="orgOptionProps"
+							:show-all-levels="false"
+							@change="handleChangeAgency"
+						></el-cascader>
+					</el-form-item>
+
+					<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+				</div>
+			</el-form>
+		</div>
+		<div class="div_table">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<div class="div_table_title">党员年龄统计</div>
+					<el-row>
+						<el-col :span="12">
+							<div :style="'height:220px;margin-top:20px'">
+								<screen-echarts-frame
+									@handelClickMyPei="handelClickMyPei"
+									:style="{ width: '100%', height: '100%' }"
+									@myChartMethod="pieInitOk"
+									ref="pieChart"
+								></screen-echarts-frame>
+							</div>
+						</el-col>
+						<el-col :span="12">
+							<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="legend">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
+										<div class="content">
+											<div class="name">{{ item.name }}</div>
+											<div class="num">{{ item.value }}</div>
+											<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</el-col>
+						<el-col :span="24">
+							<div class="census_searchcensus2">
+								<div class="census_searchcensus_box"></div>
+								<el-button size="small" class="diy-button--output" @click="handleExport('age')">导出</el-button>
+							</div>
+						</el-col>
+						<el-col :span="24">
+							<el-table
+								class="table"
+								:data="tableDataAge"
+								border
+								:height="tableHeight"
+								v-loading="tableLoadingAge"
+								:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+								style="width: 100%"
+							>
+								<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+								<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
+								<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column>
+
+								<el-table-column
+									prop="mobile"
+									header-align="center"
+									align="center"
+									:show-overflow-tooltip="true"
+									label="手机号码"
+									min-width="130"
+								></el-table-column>
+
+								<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
+									<template slot-scope="scope">
+										<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
+									</template>
+								</el-table-column>
+							</el-table>
+
+							<el-pagination
+								@size-change="pageSizeChangeHandleAge"
+								@current-change="pageCurrentChangeHandleAge"
+								:current-page.sync="agePageNo"
+								:page-sizes="[10, 20, 50, 100, 200]"
+								:page-size="agePageSize"
+								layout="sizes, prev, pager, next, total"
+								:total="ageTotal"
+							></el-pagination>
+						</el-col>
+					</el-row>
+				</el-col>
+				<el-col :span="12">
+					<div class="div_table_title">党员学历统计</div>
+					<el-row>
+						<el-col :span="12">
+							<div :style="'height:220px;margin-top:20px'">
+								<screen-echarts-frame2
+									@handelClickMyPei="handelClickMyPei2"
+									:style="{ width: '100%', height: '100%' }"
+									@myChartMethod="pieInitOk2"
+									ref="pieChart2"
+								></screen-echarts-frame2>
+							</div>
+						</el-col>
+						<el-col :span="12">
+							<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="legend">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
+										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
+										<div class="content">
+											<div class="name">{{ item.name }}</div>
+											<div class="num">{{ item.value }}</div>
+											<div class="unit" :style="{ color: color[index] }">{{ item.value / 100 }}%</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</el-col>
+						<el-col :span="24">
+							<div class="census_searchcensus2">
+								<div class="census_searchcensus_box"></div>
+								<el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button>
+							</div>
+						</el-col>
+						<el-col :span="24">
+							<el-table
+								class="table"
+								:data="tableData"
+								border
+								:height="tableHeight"
+								v-loading="tableLoading"
+								:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+								style="width: 100%"
+							>
+								<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+
+								<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
+								<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
+
+								<el-table-column
+									prop="mobile"
+									header-align="center"
+									align="center"
+									:show-overflow-tooltip="true"
+									label="手机号码"
+									min-width="130"
+								></el-table-column>
+
+								<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
+									<template slot-scope="scope">
+										<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
+									</template>
+								</el-table-column>
+							</el-table>
+
+							<el-pagination
+								@size-change="pageSizeChangeHandleNew"
+								@current-change="pageCurrentChangeHandleNew"
+								:current-page.sync="pageNo"
+								:page-sizes="[10, 20, 50, 100, 200]"
+								:page-size="pageSize"
+								layout="sizes, prev, pager, next, total"
+								:total="total"
+							></el-pagination>
+						</el-col>
+					</el-row>
+				</el-col>
+			</el-row>
+		</div>
+
+		<!-- <crate-form v-if="memberDialog"
                 :info="memberDetailInfo"
                 :partyList="optionsG"
                 :disabled="disabled"
                 @saveBase="jumpDetail"
                 @cancle="handlerCancle" /> -->
-    <el-dialog title="党员信息"
-               :visible.sync="memberDialog"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               append-to-body
-               :close-on-click-modal="false"
-               :before-close="handlerCancle">
-      <crate-form v-if="memberDialog"
-                  :info="memberDetailInfo"
-                  :partyList="optionsG"
-                  :disabled="disabled"
-                  @saveBase="jumpDetail"
-                  @cancle="handlerCancle" />
-    </el-dialog>
-  </div>
+		<el-dialog
+			title="党员信息"
+			:visible.sync="memberDialog"
+			width="850px"
+			top="5vh"
+			class="dialog-h"
+			append-to-body
+			:close-on-click-modal="false"
+			:before-close="handlerCancle"
+		>
+			<crate-form v-if="memberDialog" :info="memberDetailInfo" :partyList="optionsG" :disabled="disabled" @saveBase="jumpDetail" @cancle="handlerCancle" />
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { requestPost, requestGet } from "@/js/dai/request";
+import { requestPost, requestGet } from '@/js/dai/request';
 
-import nextTick from "dai-js/tools/nextTick";
-import screenEchartsFrame from "@c/screen-echarts-frame";
+import nextTick from 'dai-js/tools/nextTick';
+import screenEchartsFrame from './chart';
+import screenEchartsFrame2 from './chart';
 import crateForm from './crateForm.vue';
-import { pieOption } from './options'
-import { mapGetters } from 'vuex'
+import { pieOption } from './options';
+import { mapGetters } from 'vuex';
 
 import * as echarts from 'echarts';
 export default {
-  name: "warning-box",
-  components: {
-
-    screenEchartsFrame,
-    crateForm
-  },
-  data () {
-    return {
-      memberDialog: false,
-      disabled: true,
-      memberDetailInfo: {},
-      optionsG: [],
-
-
-      tableData: [
-        // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
-      ],
-      tableLoading: false,
-      tableLoadingAge: false,
-      tableDataAge: [],
-      noInit: false,
-      noEduInit: false,
-      selectAgency: null,
-      ageTotalCount: 0,
-      eduTotalCount: 0,
-      propTree: [],
-      value2: '',
-      visibleAgeLoading: true,
-      visibleLoading: true,
-      agencyId: '',
-      orgType: '',
-      ageCode: '',
-      eduCode: '',
-      pageNo: 1,
-      pageSize: 10,
-      agePageNo: 1,
-      agePageSize: 10,
-      total: 0,
-      ageTotal: 0,
-      eduItem: [
-        {
-          name: '小学',
-          value: 0,
-          color: 'rgba(27, 81, 255, 1)'
-        }, {
-          name: '初中',
-          value: 1,
-          color: 'rgba(0, 229, 237, 1)'
-        }, {
-          name: '高中',
-          value: 2,
-          color: 'rgba(120, 0, 255, 1)'
-        }, {
-          name: '中专',
-          value: 3,
-          color: 'rgba(255, 120, 0, 1)'
-        }, {
-          name: '大专',
-          value: 4,
-          color: 'rgba(255, 186, 0, 1)'
-        }, {
-          name: '本科',
-          value: 5,
-          color: 'rgba(22, 215, 131, 1)'
-        }, {
-          name: '硕士',
-          value: 6,
-          color: 'rgba(42, 0, 255, 1)'
-        }, {
-          name: '博士',
-          value: 7,
-          color: 'rgba(198, 0, 255, 1)'
-        }, {
-          name: '其他',
-          value: 8,
-          color: 'rgba(255, 42, 0, 1)'
-        }
-      ],
-      ageItem: [
-        {
-          name: '50岁以下',
-          value: 1,
-          color: 'rgba(27, 81, 255, 1)'
-        }, {
-          name: '50-59岁',
-          value: 2,
-          color: 'rgba(0, 229, 237, 1)'
-        }, {
-          name: '60-69岁',
-          value: 3,
-          color: 'rgba(120, 0, 255, 1)'
-        }, {
-          name: '70-79岁',
-          value: 4,
-          color: 'rgba(255, 120, 0, 1)'
-        }, {
-          name: '80岁以上',
-          value: 5,
-          color: 'rgba(255, 186, 0, 1)'
-        }
-      ],
-      partyOrgs: [],
-
-      partyOrgList: [],
-      pieAgeChartS: null,
-      pieEduChartSs: null,
-      pieAgeOptions: null,
-      pieEduOptions: null
-    };
-  },
-  computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 500 + this.iframeHeight : this.clientHeight - 500
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  async mounted () {
-    await nextTick(100);
-    await this.getAgencyList()
-    await this.getPartyOggList()
-    // this.getAgeCount(this.$store.state.user.agencyId, 'agency')
-    // this.getEduCount(this.$store.state.user.agencyId, 'agency')
-    // this.getAgeList(this.$store.state.user.agencyId, 'agency')
-    // this.getEduList(this.$store.state.user.agencyId, 'agency')
-    this.getAgeCount()
-    this.getEduCount()
-    this.getAgeList()
-    this.getEduList()
-    // this.initAgeCharts()
-    // this.initEduCharts()
-
-    // this.initChartType()
-  },
-  async created () {
-    this.getGridList('query')
-  },
-  methods: {
-    handleDetail (val) {
-      this.getDetail(val.userId)
-      this.memberDialog = true
-    },
-    handleSearch () {
-      this.memberDialog = false
-    },
-    handlerCancle () {
-      this.memberDialog = false
-    },
-    async getGridList (type, agencyId) {
-      const { user } = await this.$store.state
-      // addorupdate  query
-      await this.$http
-        .get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: agencyId || user.agencyId } })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.optionsG = this.deepArrTOnull(res.data)
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    pieInitOk (dom) {
-      console.log('pie准备好了', dom)
-      this.pieAgeChartS = dom
-      // this.pieInitState = true
-
-    },
-    pieInitOks (dom) {
-      console.log('pies准备好了', dom)
-      this.pieEduChartS = dom
-      // this.pieInitState = true
-
-    },
-    initAgeCharts () {
-      // const eId = document.getElementById('echartOrg')
-      // let _charts = echarts.init(eId)
-      let option = {
-
-      }
-      this.pieAgeOptions = pieOption(this.pieAgeChartS)
-      this.clickAgePie(0)
-      let fun = params => {
-        // if (params.seriesIndex == 0 || params.seriesIndex == 2) {
-        //   this.ageCode = ''
-        //   this.getAgeList()
-        //   return
-        // }
-        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
-          console.log('请求了吗')
-          this.ageCode = ''
-          // this.getUnitList(this.agencyId)
-          this.getAgeList()
-          this.$refs.ageChart.clear()
-          this.noInit = false
-          this.clickAgePie(0)
-          // return
-        } else this.clickAgePie(params.dataIndex)
-        // this.clickAgePie(params.dataIndex)
-      }
-      this.$refs.ageChart.handleClick(fun)
-      // option && this.$refs.pieChart.setOption(option);
-
-    },
-    initEduCharts () {
-      // const eId = document.getElementById('echartOrg')
-      // let _charts = echarts.init(eId)
-      let option = {
-
-      }
-      let legend = {
-        show: true,
-        orient: 'vertical',
-        top: '20%',
-        right: 0,
-        textStyle: {
-          width: 90,
-          // color: '#fff',
-          rich: {
-            a: {
-              width: 90
-            }
-          }
-        },
-        formatter: name => {
-          for (let a = 0; a < this.eduItem.length; a++) {
-            // this.data  这个数据中有名称和次数
-            if (this.eduItem[a].name === name) {
-              //两个名称进行对比，取出对应的次数
-              let params1 = name + "\n"; //然后return你需要的legend格式即可
-              console.log(params1);
-              let tmp = params1.split("\n");
-              let res = "" + params1;
-              for (let i in tmp) {
-                res = res.replace(tmp[i], "");
-              }
-              return res + params1;
-            }
-          }
-        }
-      }
-      this.pieEduOptions = pieOption(this.pieEduChartS)
-      this.pieEduOptions.legend = { ...legend }
-      // this.pieEduOptions.series[1].width = 400
-      const maxValue = Math.max(...this.eduItem.map(i => Number(i.value)));
-      const maxIndex = this.eduItem.findIndex(a => Number(a.value) == maxValue);
-      this.clickEduPie(maxIndex)
-      console.log('----------------------最大值', maxValue, maxIndex)
-      let fun = params => {
-        // if (params.seriesIndex == 0 || params.seriesIndex == 2) {
-        //   this.eduCode = ''
-        //   this.getEduList()
-        //   return
-        // }
-        // this.clickEduPie(params.dataIndex)
-        if (params.seriesIndex == 0 || params.seriesIndex == 2) {
-          this.eduCode = ''
-          this.getEduList()
-          this.$refs.eduChart.clear()
-          this.noEduInit = false
-          this.clickEduPie(0)
-          // return
-        } else this.clickEduPie(params.dataIndex)
-      }
-      this.$refs.eduChart.handleClick(fun)
-      // this.noInit = true
-      // option && this.$refs.pieChart.setOption(option);
-
-    },
-
-    clickAgePie (seriesIndex) {
-      let _code = ''
-      let isClick = false
-      console.log('seriesIndex---', seriesIndex)
-      this.ageItem.forEach((element, index) => {
-        if (index === seriesIndex) {
-          _code = element.code
-
-          if (!this.noInit) isClick = false
-          else {
-            element.isClick = !element.isClick
-            isClick = element.isClick
-          }
-
-          element.label = {
-            show: true,
-
-          };
-          element.labelLine = {
-            show: true,
-            lineStyle: {
-              opacity: 1,
-            }
-
-          };
-          console.log('zlcm', element)
-        } else {
-          element.isClick = false
-          element.label = {
-            show: false,
-
-          };
-          element.labelLine = {
-            show: false,
-            lineStyle: {
-              opacity: 0,
-              color: 'rgba(255,255,255,0)'
-            }
-
-          };
-
-        }
-      });
-      this.ageCode = isClick && _code || ''
-      this.pieAgeOptions.title.text = this.ageTotalCount
-      this.pieAgeOptions.series[1].data = this.ageItem
-      // this.$refs.pieChart.hideLoading()
-      this.$refs.ageChart.setOption(this.pieAgeOptions)
-      if (this.noInit) {
-        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-        //  console.log('zlcm---isClick', isClick)
-        //  this.agePageNo = 1
-        // this.getAgeList(_arr[0], orgType, isClick && _code || '')
-        const i = this.partyOrgs.length - 1
-        this.agePageNo = 1
-        this.getAgeList(this.partyOrgs[i], '', isClick && _code || '')
-      }
-      this.noInit = true
-
-    },
-    clickEduPie (seriesIndex) {
-      let _code = ''
-      let isClick = false
-      this.eduItem.forEach((element, index) => {
-        if (index === seriesIndex) {
-          _code = element.code
-
-          if (!this.noEduInit) isClick = false
-          else {
-            element.isClick = !element.isClick
-            isClick = element.isClick
-          }
-
-          element.label = {
-            show: true,
-
-          };
-          element.labelLine = {
-            show: true,
-            lineStyle: {
-              opacity: 1,
-            }
-
-          };
-          console.log('zlcm')
-        } else {
-          element.isClick = false
-          element.label = {
-            show: false,
-
-          };
-          element.labelLine = {
-            show: false,
-            lineStyle: {
-              opacity: 0,
-              color: 'rgba(255,255,255,0)'
-            }
-
-          };
-
-        }
-      });
-      this.eduCode = isClick && _code || ''
-      this.pieEduOptions.title.text = this.eduTotalCount
-      this.pieEduOptions.series[1].data = this.eduItem
-      // this.$refs.pieChart.hideLoading()
-      this.$refs.eduChart.setOption(this.pieEduOptions)
-      if (this.noEduInit) {
-        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-        // this.pageNo = 1
-        // this.getEduList(_arr[0], orgType, isClick && _code || '')
-        const i = this.partyOrgs.length - 1
-        this.pageNo = 1
-        this.getEduList(this.partyOrgs[i], '', isClick && _code || '')
-
-      }
-      this.noEduInit = true
-
-
-    },
-    async getAgeCount (orgId, orgType) {
-      // const url = "/epmetuser/icresiuser/partymemberagestatistics";
-      const url = '/resi/partymember/icPartyMember/partymemberagestatistics'
-      let params = {
-        orgId: orgId || '',
-        orgType
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        const colorList = [
-          {
-            name: '50岁以下',
-            value: 1,
-            color: '#FAC126'
-          }, {
-            name: '50-59岁',
-            value: 2,
-            color: '#3DDA83'
-          }, {
-            name: '60-69岁',
-            value: 3,
-            color: '#A800FF'
-          }, {
-            name: '70-79岁',
-            value: 4,
-            color: '#2865FA'
-          }, {
-            name: '80岁以上',
-            value: 5,
-            color: '#00DAD2'
-          }
-        ]
-        this.ageItem = data.map((item, index) => {
-          return {
-            ...item,
-            name: item.label,
-            isClick: false,
-            itemStyle: {
-              color: colorList[index].color
-            }
-          }
-        })
-        this.ageTotalCount = 0
-        data.forEach(item => {
-          this.ageTotalCount += Number(item.value)
-        })
-        this.initAgeCharts()
-      } else {
-      }
-    },
-    async getEduCount (orgId, orgType) {
-      // const url = "/epmetuser/icresiuser/partymembereducationstatistics";
-      const url = '/resi/partymember/icPartyMember/partymembereducationstatistics'
-      let params = {
-        orgId: orgId || '',
-        orgType
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.eduItem = data.map(item => {
-          return {
-            ...item,
-            name: item.label,
-            isClick: false
-          }
-        })
-        console.log('&&&&&&&&&&&&', this.eduItem)
-        this.eduTotalCount = 0
-        data.forEach(item => {
-          this.eduTotalCount += Number(item.value)
-        })
-        this.initEduCharts()
-      } else {
-      }
-    },
-    async getAgeList (orgId, orgType, _code) {
-      this.tableLoadingAge = true
-      this.visibleAgeLoading = true
-      // const url = "/epmetuser/icresiuser/partymemberagelist";
-      const url = '/resi/partymember/icPartyMember/partymemberagelist'
-      let params = {
-        orgId: orgId || '',
-        orgType,
-        code: _code || '',
-        pageNo: this.agePageNo,
-        pageSize: this.agePageSize
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      this.tableLoadingAge = false
-      if (code === 0) {
-        this.tableDataAge = data.list
-
-        this.ageTotal = data.total
-      } else {
-        this.$message.error(msg)
-      }
-      // if (_code == 0 || _code) this.noInit = true
-      this.visibleAgeLoading = false
-    },
-    async getEduList (orgId, orgType, _code) {
-      this.tableLoading = true
-      this.visibleLoading = true
-      // const url = "/epmetuser/icresiuser/partymembereducationlist";
-      const url = '/resi/partymember/icPartyMember/partymembereducationlist'
-      let params = {
-        orgId: orgId || '',
-        orgType,
-        code: _code || '',
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      this.tableLoading = false
-      if (code === 0) {
-        this.tableData = data.list
-
-
-        this.total = data.total
-      } else {
-        this.$message.error(msg)
-      }
-      this.visibleLoading = false
-    },
-    async getPartyOggList (node, resolve) {
-      // const url = "/gov/org/customeragency/staffinagencylist";
-      // const url = '/gov/org/customeragency/agencygridtree'
-      // const url = '/resi/partymember/icPartyOrg/getTreelist'
-      const url = '/resi/partymember/icPartyOrg/getSearchTreelist'
-      let params = {
-        agencyId: this.$store.state.user.agencyId,
-      };
-      const { data, code, msg } = await requestGet(url, params);
-      console.log('data-orgparty----o', data)
-      if (code === 0) {
-
-        this.partyOrgList = this.deepArrTOnull(data)
-
-      } else {
-      }
-    },
-    deepArrTOnull (arr) {
-      let a = []
-      a = arr.map(item => {
-        return {
-          ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
-        }
-      })
-      return a
-    },
-    async getAgencyList (node, resolve) {
-      // const url = "/gov/org/customeragency/staffinagencylist";
-      const url = '/gov/org/customeragency/agencygridtree'
-      // let params = {
-      //   agencyId: this.$store.state.user.agencyId,
-      // };
-      const { data, code, msg } = await requestPost(url);
-      if (code === 0) {
-        console.log('data-org----o', data)
-        this.selectAgency = [`${data.agencyId}-${data.level}`]
-        this.orgType = data.level
-        this.agencyId = data.agencyId
-        let arr = []
-        arr.push(data)
-        this.propTree = arr && this.getTreeData(arr)
-
-      } else {
-      }
-    },
-    getTreeData (data) {
-      if (!Array.isArray(data)) return []
-      let arr = data.map(item => {
-        let _item = {}
-        if (item.subAgencyList) {
-          if (item.subAgencyList.length === 0) {
-            _item = {
-              label: item.agencyName,
-              value: item.agencyId + '-' + item.level,
-              level: item.level,
-              children: undefined
-            }
-          } else _item = {
-            label: item.agencyName,
-            value: item.agencyId + '-' + item.level,
-            level: item.level,
-            children: this.getTreeData(item.subAgencyList)
-          }
-        } else {
-          _item = {
-            label: item.agencyName,
-            value: item.agencyId + '-' + item.level,
-            level: item.level,
-          }
-        }
-        return _item
-      })
-      return arr
-    },
-
-    jumpDetail (val) {
-      this.memberDialog = false
-      this.$router.push({
-        path: `/main-shuju/visual-basicinfo-people/${val}`,
-      });
-    },
-    getDetail (id) {
-      let params = {
-        id,
-      }
-      this.$http
-        .post(`/resi/partymember/icPartyMember/${id}`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.memberDetailInfo = { ...res.data }
-          }
-        })
-        .catch((err) => {
-          return this.$message.error('网络错误')
-        })
-    },
-    handleCascader (val) {
-      console.log('val-vvv', val)
-      const _arr = val[val.length - 1].split('-')
-      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
-      this.agencyId = _arr[0]
-      this.orgType = orgType
-      this.noInit = false
-      this.noEduInit = false
-      this.$refs.ageChart.clear()
-      this.$refs.eduChart.clear()
-      this.getAgeCount(_arr[0], orgType)
-      this.getEduCount(_arr[0], orgType)
-      this.getAgeList(_arr[0], orgType)
-      this.getEduList(_arr[0], orgType)
-    },
-    handlePartyCascader (val) {
-      console.log('val-vvvpppppp', val)
-      this.noInit = false
-      this.noEduInit = false
-      this.$refs.ageChart.clear()
-      this.$refs.eduChart.clear()
-      if (val.length > 0) {
-        const i = val.length - 1
-        this.agencyId = val[i]
-        this.getAgeCount(val[i])
-        this.getEduCount(val[i])
-        this.getAgeList(val[i])
-        this.getEduList(val[i])
-      } else {
-        this.agencyId = ''
-        this.getAgeCount('')
-        this.getEduCount('')
-        this.getAgeList('')
-        this.getEduList('')
-      }
-
-    },
-    getCheckedNodes (val) {
-      console.log('val-nnn', val)
-    },
-    lazyLoad (node, resolve) {
-      setTimeout(() => {
-        this.getAgeList(node, resolve)
-      }, 500)
-    },
-    pageSizeChangeHandleAge (val) {
-      this.agePageNo = 1
-      this.agePageSize = val
-      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
-    },
-    pageCurrentChangeHandleAge (val) {
-      this.agePageNo = val
-      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
-    },
-    pageSizeChangeHandleNew (val) {
-      this.pageNo = 1;
-      this.pageSize = val;
-      this.getEduList(this.agencyId, this.orgType, this.eduCode)
-    },
-    pageCurrentChangeHandleNew (val) {
-      this.pageNo = val;
-      this.getEduList(this.agencyId, this.orgType, this.eduCode)
-    },
-    async handleExport (type) {
-      const urls = {
-        age: '/epmetuser/icresiuser/partymemberagelist/export',
-        edu: '/epmetuser/icresiuser/partymembereducationlist/export'
-      }
-      const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-      const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'
-      let params = {
-        orgId: _arr[0],
-        orgType: orgType,
-        code: type == 'age' ? this.ageCode : this.eduCode,
-      }
-      // .post('epmetuser/icresiuser/exportExcel', params)
-      await this.$http({
-        method: 'POST',
-        url: urls[type],
-        responseType: 'blob',
-        data: params
-      })
-        .then(res => {
-          console.log('resllll', res)
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-          var url = window.URL.createObjectURL(blob)
-          var aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          aLink.setAttribute('download', fileName)
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink) //下载完成移除元素
-          window.URL.revokeObjectURL(url) //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log('获取导出失败', err)
-          return this.$message.error('网络错误')
-        })
-    },
-  },
+	name: 'warning-box',
+	components: {
+		screenEchartsFrame,
+		screenEchartsFrame2,
+		crateForm
+	},
+	data() {
+		return {
+			orgOptions: [], //组织
+			orgOptionProps: {
+				//组织
+				multiple: false,
+				value: 'agencyId',
+				label: 'agencyName',
+				children: 'subAgencyList',
+				emitPath: false,
+				checkStrictly: true
+			},
+			pieInitState: false,
+			pieInitState2: false,
+			pieOption: [],
+			pieOption2: [],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			chartData: [],
+			chartData2: [],
+			pieData: [],
+			pieData2: [],
+			orgId: '',
+			orgType: '',
+			code: '',
+			pieDatatotal: 0,
+			pieDatatotal2: 0,
+			memberDialog: false,
+			disabled: true,
+			memberDetailInfo: {},
+			optionsG: [],
+
+			tableData: [
+				// [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
+			],
+			tableLoading: false,
+			tableLoadingAge: false,
+			tableDataAge: [],
+			noInit: false,
+			noEduInit: false,
+			selectAgency: null,
+			ageTotalCount: 0,
+			eduTotalCount: 0,
+			propTree: [],
+			value2: '',
+			visibleAgeLoading: true,
+			visibleLoading: true,
+			agencyId: '',
+			orgType: '',
+			ageCode: '',
+			eduCode: '',
+			pageNo: 1,
+			pageSize: 10,
+			agePageNo: 1,
+			agePageSize: 10,
+			total: 0,
+			ageTotal: 0,
+
+			partyOrgs: [],
+
+			partyOrgList: [],
+			pieAgeChartS: null,
+			pieEduChartSs: null,
+			pieAgeOptions: null,
+			pieEduOptions: null,
+			formData: {
+				orgId: ''
+			}
+		};
+	},
+	computed: {
+		tableHeight() {
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
+			return this.TableHeight;
+		},
+
+		...mapGetters(['clientHeight', 'iframeHeight'])
+	},
+	async mounted() {
+		await nextTick(100);
+		await this.getOrgTreeList();
+		// await this.getPartyOggList();
+
+		this.getAgeCount();
+		this.getEduCount();
+		this.getAgeList();
+		this.getEduList();
+	},
+	async created() {
+		// this.getGridList('query');
+	},
+	methods: {
+		handleChangeAgency(val) {
+			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			if (obj) {
+				this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
+			} else {
+				this.orgType = '';
+			}
+
+			let tmp = this.formData.orgId;
+
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+				this.orgId = this.formData.orgId;
+			} else {
+				this.orgId = '';
+			}
+			console.log('this.orgId', this.orgId);
+		},
+		handleDetail(val) {
+			this.getDetail(val.userId);
+			this.memberDialog = true;
+		},
+
+		handlerCancle() {
+			this.memberDialog = false;
+		},
+		handleSearch(val) {
+			this.memberDialog = false;
+			this.eduCode = '';
+			this.ageCode = '';
+			this.getAgeCount();
+			this.getEduCount();
+			this.getAgeList();
+			this.getEduList();
+		},
+		// async getGridList(type, agencyId) {
+		// 	const { user } = await this.$store.state;
+		// 	// addorupdate  query
+		// 	await this.$http
+		// 		.get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: agencyId || user.agencyId } })
+		// 		.then(({ data: res }) => {
+		// 			if (res.code !== 0) {
+		// 				return this.$message.error(res.msg);
+		// 			} else {
+		// 				this.optionsG = this.deepArrTOnull(res.data);
+		// 			}
+		// 		})
+		// 		.catch(() => {
+		// 			return this.$message.error('网络错误');
+		// 		});
+		// },
+		// pieInitOk(dom) {
+		// 	console.log('pie准备好了', dom);
+		// 	this.pieAgeChartS = dom;
+		// 	// this.pieInitState = true
+		// },
+		// pieInitOks(dom) {
+		// 	console.log('pies准备好了', dom);
+		// 	this.pieEduChartS = dom;
+		// 	// this.pieInitState = true
+		// },
+
+		// 获取饼状图
+		async initAgeCharts(chartData) {
+			this.$refs.pieChart.clear();
+			// 获取pieChart配置
+			this.pieOption = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
+				color: this.color,
+				title: {
+					text: this.pieDatatotal,
+					subtext: '总数',
+					x: 'center',
+					y: 'center',
+					textStyle: {
+						fontSize: 26,
+						color: '#333333',
+						fontWeight: 'bold'
+					},
+					subtextStyle: {
+						fontSize: 14,
+						color: '#333333'
+					}
+				},
+
+				series: [
+					{
+						type: 'pie',
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '65%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+					{
+						type: 'pie',
+						radius: ['80%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					}
+				]
+			};
+			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		async initEduCharts(chartData) {
+			this.$refs.pieChart2.clear();
+			// 获取pieChart配置
+
+			this.pieOption2 = {
+				tooltip: {
+					trigger: 'item',
+					formatter: '{b}<br/>总数  :  {c}<br/> 占比  :  {d}%',
+					backgroundColor: 'rgb(134,134,134)',
+					borderColor: 'rgb(134,134,134)',
+					textStyle: {
+						color: '#fff'
+					}
+				},
+				color: this.color,
+				title: {
+					text: this.pieDatatotal2,
+					subtext: '总数',
+					x: 'center',
+					y: 'center',
+					textStyle: {
+						fontSize: 26,
+						color: '#333333',
+						fontWeight: 'bold'
+					},
+					subtextStyle: {
+						fontSize: 14,
+						color: '#333333'
+					}
+				},
+
+				series: [
+					{
+						type: 'pie',
+						radius: ['65%', '80%'],
+						avoidLabelOverlap: false,
+						label: {
+							show: false,
+							position: 'center'
+						},
+						tooltip: {
+							show: true
+						},
+
+						data: chartData.data
+					},
+					{
+						type: 'pie',
+						radius: ['60%', '65%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					},
+					{
+						type: 'pie',
+						radius: ['80%', '85%'],
+						center: ['50%', '50%'],
+						selectedMode: false,
+						hoverAnimation: false,
+						data: [{ value: 1, name: '' }],
+						itemStyle: {
+							color: '#f7f7f7'
+						},
+						label: {
+							show: false
+						},
+						labelLine: {
+							show: false
+						},
+						tooltip: {
+							show: false
+						},
+						animation: false,
+						cursor: 'auto',
+						emphasis: {
+							itemStyle: {
+								color: '#f7f7f7'
+							}
+						}
+					}
+				]
+			};
+			this.$refs.pieChart2.setOption(this.pieOption2);
+		},
+		handelClickMyPei(param) {
+			this.ageCode = param.data.code;
+
+			this.getAgeList()();
+		},
+		handelClickMyPei2(param) {
+			console.log(param);
+			this.eduCode = param.data.code;
+			this.getEduList();
+		},
+		handleClickItem(item) {
+			this.ageCode = item.code;
+
+			this.getAgeList();
+		},
+		handleClickItem2(item) {
+			this.eduCode = item.code;
+			this.getEduList();
+		},
+
+		async getAgeCount() {
+			this.$refs.pieChart.showLoading();
+			let url = '/resi/partymember/icPartyMember/partymemberagestatistics';
+			let param = {
+				orgId: this.orgId,
+				orgType: this.orgType
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart.hideLoading();
+			if (code === 0) {
+				this.pieData = data;
+				this.getPie();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getEduCount() {
+			this.$refs.pieChart2.showLoading();
+			let url = '/resi/partymember/icPartyMember/partymembereducationstatistics';
+			let param = {
+				orgId: this.orgId,
+				orgType: this.orgType
+			};
+			const { data, code, msg } = await requestPost(url, param);
+			this.$refs.pieChart2.hideLoading();
+			if (code === 0) {
+				this.pieData2 = data;
+
+				console.log('this.pieData2', this.pieData2);
+				this.getPie2();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		pieInitOk() {
+			this.pieInitState = true;
+		},
+		pieInitOk2() {
+			this.pieInitState2 = true;
+		},
+		getPie() {
+			if (this.pieInitState) {
+				this.setPieData();
+			} else {
+				setTimeout(() => {
+					this.getPie();
+				}, 500);
+			}
+		},
+		getPie2() {
+			if (this.pieInitState2) {
+				this.setPieData2();
+			} else {
+				setTimeout(() => {
+					this.getPie2();
+				}, 500);
+			}
+		},
+		setPieData() {
+			console.log('this.pieData1', this.pieData);
+			let data = [...this.pieData];
+			this.pieDatatotal = data
+				.map(item => parseInt(item.value))
+				.reduce(function(prev, cur, index, arr) {
+					console.log(prev, cur, index);
+					return prev + cur;
+				});
+			this.chartData.name = data.map(item => item.value);
+			this.chartData.data = data.map(item => {
+				return {
+					value: parseInt(item.value),
+					name: item.label,
+					code: item.code,
+					radio: item.radio
+				};
+			});
+			console.log('chartData', this.chartData);
+			this.initAgeCharts(this.chartData);
+		},
+		setPieData2() {
+			console.log('this.pieData2', this.pieData2);
+			let data = [...this.pieData2];
+
+			this.pieDatatotal2 = data
+				.map(item => parseInt(item.value))
+				.reduce(function(prev, cur, index, arr) {
+					console.log(prev, cur, index);
+					return prev + cur;
+				});
+
+			this.chartData2.name = data.map(item => item.label);
+			this.chartData2.data = data.map(item => {
+				return {
+					value: parseInt(item.value),
+					name: item.label,
+					code: item.code,
+					radio: item.radio
+				};
+			});
+
+			console.log('chartData', this.chartData2);
+			this.initEduCharts(this.chartData2);
+		},
+
+		async getAgeList() {
+			this.tableLoadingAge = true;
+			this.visibleAgeLoading = true;
+			// const url = "/epmetuser/icresiuser/partymemberagelist";
+			const url = '/resi/partymember/icPartyMember/partymemberagelist';
+			let params = {
+				orgId: this.orgId,
+				orgType: this.orgType,
+				code: this.ageCode,
+				pageNo: this.agePageNo,
+				pageSize: this.agePageSize
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			this.tableLoadingAge = false;
+			if (code === 0) {
+				this.tableDataAge = data.list;
+
+				this.ageTotal = data.total;
+			} else {
+				this.$message.error(msg);
+			}
+			// if (_code == 0 || _code) this.noInit = true
+			this.visibleAgeLoading = false;
+		},
+		async getEduList() {
+			this.tableLoading = true;
+			this.visibleLoading = true;
+			// const url = "/epmetuser/icresiuser/partymembereducationlist";
+			const url = '/resi/partymember/icPartyMember/partymembereducationlist';
+			let params = {
+				orgId: this.orgId,
+				orgType: this.orgType,
+				code: this.eduCode,
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			this.tableLoading = false;
+			if (code === 0) {
+				this.tableData = data.list;
+
+				this.total = data.total;
+			} else {
+				this.$message.error(msg);
+			}
+			this.visibleLoading = false;
+		},
+
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post('/gov/org/customeragency/agencygridtree', {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log('获取组织树成功', res.data);
+						// let { agencyList, subAgencyList } = res.data;
+						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+						// this.orgOptions = this.deepTree(_arr);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
+					}
+				})
+				.catch(() => {
+					return this.$message.error('网络错误');
+				});
+		},
+
+		jumpDetail(val) {
+			this.memberDialog = false;
+			this.$router.push({
+				path: `/main-shuju/visual-basicinfo-people/${val}`
+			});
+		},
+		getDetail(id) {
+			let params = {
+				id
+			};
+			this.$http
+				.post(`/resi/partymember/icPartyMember/${id}`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.memberDetailInfo = { ...res.data };
+					}
+				})
+				.catch(err => {
+					return this.$message.error('网络错误');
+				});
+		},
+
+		lazyLoad(node, resolve) {
+			setTimeout(() => {
+				this.getAgeList(node, resolve);
+			}, 500);
+		},
+		pageSizeChangeHandleAge(val) {
+			this.agePageNo = 1;
+			this.agePageSize = val;
+			this.getAgeList(this.agencyId, this.orgType, this.ageCode);
+		},
+		pageCurrentChangeHandleAge(val) {
+			this.agePageNo = val;
+			this.getAgeList(this.agencyId, this.orgType, this.ageCode);
+		},
+		pageSizeChangeHandleNew(val) {
+			this.pageNo = 1;
+			this.pageSize = val;
+			this.getEduList(this.agencyId, this.orgType, this.eduCode);
+		},
+		pageCurrentChangeHandleNew(val) {
+			this.pageNo = val;
+			this.getEduList(this.agencyId, this.orgType, this.eduCode);
+		},
+		async handleExport(type) {
+			const urls = {
+				age: '/epmetuser/icresiuser/partymemberagelist/export',
+				edu: '/epmetuser/icresiuser/partymembereducationlist/export'
+			};
+			const _arr = this.selectAgency[this.selectAgency.length - 1].split('-');
+			const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid';
+			let params = {
+				orgId: _arr[0],
+				orgType: orgType,
+				code: type == 'age' ? this.ageCode : this.eduCode
+			};
+			// .post('epmetuser/icresiuser/exportExcel', params)
+			await this.$http({
+				method: 'POST',
+				url: urls[type],
+				responseType: 'blob',
+				data: params
+			})
+				.then(res => {
+					console.log('resllll', res);
+					let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
+					console.log('filename', fileName);
+					let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement('a');
+					aLink.style.display = 'none';
+					aLink.href = url;
+					aLink.setAttribute('download', fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch(err => {
+					console.log('获取导出失败', err);
+					return this.$message.error('网络错误');
+				});
+		}
+	}
 };
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/modules/visual/warning.scss"
-  scoped
-></style>
 <style lang="scss" scoped>
-.div_main {
-  background: #fff;
-  margin: 10px;
-  padding: 10px;
-}
-.card-title {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  margin-bottom: 10px;
-  padding: 4px 2px;
-  .title-icon {
-    display: block;
-    width: 46px;
-    height: 34px;
-    box-sizing: border-box;
-    margin-right: 6px;
-  }
-
-  .title-time {
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
-    margin-left: 30px;
-    font-size: 14px;
-    color: #fff;
-    .title-time-label {
-      margin-right: 10px;
-    }
-  }
-  .title-label {
-    font-size: 16px;
-    font-family: PingFang SC;
-    // font-weight: 800;
-  }
-}
-.card-echart {
-  display: flex;
-  margin-top: 40px;
-  height: 100%;
-  .card-left {
-    position: relative;
-    flex: 1;
-    // display: flex;
-    height: 100%;
-    .card-flex {
-      width: 100%;
-      display: flex;
-    }
-  }
-}
-.card-left-title {
-  position: relative;
-  padding-left: 40px;
-  font-size: 16px;
-  font-weight: 500;
-}
-.card-left-title::after {
-  content: "";
-  position: absolute;
-  top: 50%;
-  left: 20px;
-  width: 12px;
-  height: 12px;
-  box-sizing: border-box;
-  margin-top: -6px;
-  background: #2865fa;
-  border-radius: 50%;
-}
-.echart-wr {
-  position: relative;
-  flex-shrink: 0;
-  width: 50%;
-  height: 320px;
-  box-sizing: border-box;
-  .echart-org {
-    width: 100%;
-    height: 100%;
-  }
-  .echart-cicle {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 240px;
-    height: 240px;
-    box-sizing: border-box;
-    margin-top: -120px;
-    margin-left: -120px;
-    border: 1px dashed rgba(0, 96, 240, 1);
-    border-radius: 50%;
-  }
-  .echart-cicle0 {
-    left: 80px;
-    margin-left: 0;
-  }
-}
-.echart-wr100 {
-  width: 70%;
-}
-.echarts-tips {
-  width: 40%;
-  // flex: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+@import '@/assets/scss/buttonstyle.scss';
+@import '@/assets/scss/modules/management/list-main.scss';
+@import '@/assets/scss/modules/shequzhili/event-info.scss';
+
+.legend {
+	display: flex;
+	flex-flow: row wrap;
+	.legend-row {
+		cursor: pointer;
+		min-width: 100px;
+		display: flex;
+		margin-bottom: 30px;
+		margin-right: 25px;
+		.kuai {
+			width: 12px;
+			height: 12px;
+			margin-right: 10px;
+			border-radius: 4px;
+		}
+		.content {
+			.name {
+				font-size: 14px;
+				color: #999;
+				margin-bottom: 10px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
 }
-.echarts-tips-wd50 {
-  width: 320px;
+.legend2 {
+	// display: flex;
+	// flex-flow: row wrap;
+
+	.legend-row {
+		cursor: pointer;
+		width: 100%;
+		display: flex;
+		margin-bottom: 16px;
+		.kuai {
+			margin-right: 10px;
+			border-radius: 4px;
+			img {
+				width: 40px;
+				height: 40px;
+			}
+		}
+		.content {
+			display: flex;
+			align-items: center;
+			.name {
+				font-size: 14px;
+				color: #999;
+				width: 60px;
+			}
+			.num {
+				font-size: 16px;
+				font-weight: bold;
+				display: inline-block;
+			}
+			.unit {
+				font-size: 16px;
+				display: inline-block;
+				margin-left: 7px;
+			}
+		}
+	}
 }
-.tips-list,
-.tips-item,
-.tips-lists,
-.tips-items-num {
-  display: flex;
-  align-items: center;
+.btnSearch {
+	width: 100px;
+	height: 36px;
+	background: #2195fe;
+	box-shadow: 0px 2px 6px 0px rgba(28, 107, 253, 0.31);
+	border-radius: 6px;
+	color: #fff;
 }
-.tips-list {
-  // width: 100%;
-  // height: 100%;
-  flex-wrap: wrap;
-  // justify-content: center;
-  .tips-item {
-    // flex: 1;
-    width: 50%;
-    margin-top: 20px;
-    // margin-right: 40px;
-    cursor: pointer;
-    .tips-item-icon {
-      width: 20px;
-      height: 10px;
-      box-sizing: border-box;
-      margin-right: 8px;
-      background: #1b51ff;
-      border-radius: 2px;
-    }
-    .tips-item-text {
-      font-size: 16px;
-      color: #d2e7ff;
-    }
-  }
+.div_search {
+	.item_width_2 {
+		width: 200px;
+	}
 }
-.tips-lists {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 30px 0 0 30px;
-  flex-wrap: wrap;
-  .tips-items {
-    margin-bottom: 30px;
-    margin-right: 40px;
-    // width: 50%;
-    cursor: pointer;
-    .tips-items-title {
-      position: relative;
-      width: 100px;
-      height: 26px;
-      box-sizing: border-box;
-      padding-left: 6px;
-      font-size: 16px;
-      // color: #eff0f1;
-      background: url("../../../../assets/img/shuju/measure/huang@2x.png")
-        no-repeat left bottom;
-      &1 {
-        background: url("../../../../assets/img/shuju/measure/lv@2x.png")
-          no-repeat left bottom;
-      }
-      &2 {
-        background: url("../../../../assets/img/shuju/measure/zi@2x.png")
-          no-repeat left bottom;
-      }
-      &3 {
-        background: url("../../../../assets/img/shuju/measure/lan@2x.png")
-          no-repeat left bottom;
-      }
-      &4 {
-        background: url("../../../../assets/img/shuju/measure/lanlv@2x.png")
-          no-repeat left bottom;
-      }
-    }
-    .tips-items-num {
-      justify-content: space-between;
-      box-sizing: border-box;
-      margin-top: 10px;
-      // padding-right: 30px;
-      font-size: 20px;
-      .tips-item-has {
-        font-size: 14px;
-      }
-    }
-  }
+// /这里是不一样的,居左，从下对齐
+.census_searchcensus2 {
+	text-align: center;
+	margin: 0 auto;
+	display: flex;
+
+	justify-content: space-between;
+	align-items: flex-end;
+	margin-bottom: 0px;
+	margin-top: 0px;
+	.census_searchcensus_box {
+		align-items: flex-end;
+		display: flex;
+		img {
+			width: 64px;
+			height: 64px;
+			margin-right: 20px;
+		}
+		h2 {
+			font-size: 28px;
+			color: #333333;
+
+			text-align: left;
+			line-height: 40px;
+			margin: 0px;
+		}
+		h3 {
+			font-size: 14px;
+			color: #333333;
+
+			text-align: left;
+
+			margin: 0px;
+			font-weight: normal;
+		}
+	}
 }
+.div_table_title {
+	margin-top: 20px;
+	line-height: 30px;
+	font-size: 20px;
 
-.warning-box-bottom {
-  height: calc(100% - 500px);
-  box-sizing: border-box;
-  margin-top: 10px;
-  padding: 0 30px;
-  // overflow-y: scroll;
+	font-weight: bold;
+	color: #333333;
 }
-.ecahrts-button {
-  width: 100%;
-  padding-left: 30px;
-  // text-align: right;
+.diy-button--output {
+	width: 100px;
+	height: 38px;
+
+	background: #feb349;
+	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
+	border-radius: 6px;
+	color: #fff;
 }
 </style>

From 13a22d8309624a58780da087c62173b72c53e9f3 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 13 Apr 2023 14:36:57 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/addFormEnterprise.vue      | 76 +++++++++++++----
 src/views/modules/census/addFormHouse.vue     | 77 +++++++++++++----
 src/views/modules/census/addFormResident.vue  | 83 +++++++++++++++----
 .../modules/census/census-residentList.vue    | 45 +++++++++-
 src/views/modules/census/record.vue           | 12 ++-
 5 files changed, 238 insertions(+), 55 deletions(-)

diff --git a/src/views/modules/census/addFormEnterprise.vue b/src/views/modules/census/addFormEnterprise.vue
index 293eb3649..f9f34d765 100644
--- a/src/views/modules/census/addFormEnterprise.vue
+++ b/src/views/modules/census/addFormEnterprise.vue
@@ -1,13 +1,13 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="1100px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
 			<span v-if="pageType == 'view'">查看</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+			<div class="dialog-h-content2 scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="placeOrgName">
@@ -89,7 +89,7 @@
 					</el-row>
 					<div id="app_event" class="div_map"></div>
 				</el-form>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+				<el-form :inline="false" :model="formData" ref="form" label-width="140px" v-if="pageType == 'view'">
 					<el-row>
 						<el-col :span="12">
 							<el-form-item label="场所类别" prop="placeCategory">{{ formData.placeCategoryName }}</el-form-item>
@@ -117,23 +117,27 @@
 						<el-col :span="12">
 							<el-form-item label="联系电话" prop="mobile">{{ formData.mobile }}</el-form-item>
 						</el-col>
-						<el-col :span="24">
-							<el-form-item label="场所地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
+						<el-col :span="12">
+							<el-form-item label="场所地址" prop="address">
+								<div id="app_event" class="div_map"></div>
+								{{ formData.address }}
+							</el-form-item>
 						</el-col>
 					</el-row>
-					<div id="app_event" class="div_map"></div>
 				</el-form>
+
+				<div class="div_btn" style="text-align: center;"><el-button size="small" @click="handleCancle">取消</el-button></div>
+				<div class="div_btn" v-if="pageType != 'view'">
+					<el-button size="small" @click="handleCancle">取 消</el-button>
+					<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
+					<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+				</div>
+				<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 			</div>
-			<div class="div_btn" v-if="pageType != 'view'">
-				<el-button size="small" @click="handleCancle">取 消</el-button>
-				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
-			</div>
-			<div class="recordBox"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
 		</div>
 
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button @click="handleCancle">关 闭</el-button> -->
 			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
 		</span>
 	</el-dialog>
@@ -459,4 +463,48 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 // @import '@/assets/scss/modules/visual/a_customize.scss';
+/deep/.el-dialog__header {
+	padding: 25px 20px 10px 25px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: normal;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding: 30px 0px 30px 40px;
+}
+/deep/.el-dialog__footer {
+	text-align: center;
+}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		margin-bottom: 22px;
+		.el-form-item__label {
+			font-size: 14px;
+			padding-left: 15px;
+			text-align: left;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 14px;
+		}
+	}
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/addFormHouse.vue b/src/views/modules/census/addFormHouse.vue
index 7a84e7156..43f8bc68c 100644
--- a/src/views/modules/census/addFormHouse.vue
+++ b/src/views/modules/census/addFormHouse.vue
@@ -1,16 +1,16 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="900px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
-			<span v-if="pageType == 'view'">查看</span>
+			<span v-if="pageType == 'view'">查看房屋</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
+			<div class="dialog-h-content2 scroll-h">
 				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;">
 					<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
 				</div>
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule"  v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="6">
 							<el-form-item label="场所名称" prop="placeOrgName">
@@ -93,43 +93,43 @@
 					<div id="app_event" class="div_map"></div>
 				</el-form>
 
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+				<el-form :inline="false" :model="formData" ref="form"  v-if="pageType == 'view'">
 					<el-row>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋名称" prop="fullName">{{ formData.fullName }}</el-form-item>
 						</el-col>
-						<!-- <el-col :span="12">
+						<!-- <el-col :span="24">
 							<el-form-item label="" prop="placeCategory"></el-form-item>
 							<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
 						</el-col> -->
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="单元号" prop="unitName">{{ formData.unitName ? formData.unitName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="门牌号" prop="doorName">{{ formData.doorName }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋编码" prop="coding">{{ formData.coding ? formData.coding : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋类型" prop="houseTypeName">{{ formData.houseTypeName ? formData.houseTypeName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋用途" prop="purposeName">{{ formData.purposeName ? formData.purposeName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房屋状态" prop="rentName">{{ formData.rentName ? formData.rentName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房主姓名" prop="ownerName">{{ formData.ownerName ? formData.ownerName : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="联系方式" prop="showOwnerPhone">{{ formData.showOwnerPhone ? formData.showOwnerPhone : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="房主身份证" prop="showOwnerIdCard">{{ formData.showOwnerIdCard ? formData.showOwnerIdCard : '--' }}</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="24">
 							<el-form-item label="备注" prop="remark">{{ formData.remark ? formData.remark : '--' }}</el-form-item>
 						</el-col>
 					</el-row>
@@ -217,7 +217,7 @@ export default {
 		};
 		return {
 			agencyObj: {},
-			view_real_data: true,
+			view_real_data: false,
 			btnDisable: false,
 			user: '',
 			agencyId: '',
@@ -497,4 +497,45 @@ export default {
 	top: 25px;
 	right: 40px;
 }
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: normal;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding:30px 0px 30px 90px;
+}
+/deep/.el-dialog__footer{text-align: center;}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		margin-bottom: 12px;
+		.el-form-item__label {
+			font-size: 15px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 15px;
+		}
+	}
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/addFormResident.vue b/src/views/modules/census/addFormResident.vue
index bec9b8ce3..d30c3a45f 100644
--- a/src/views/modules/census/addFormResident.vue
+++ b/src/views/modules/census/addFormResident.vue
@@ -1,40 +1,42 @@
 <template>
-	<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+	<el-dialog :visible.sync="dialogVisible" width="1180px" :before-close="handleCancle" top="5vh">
 		<span slot="title">
 			<span v-if="pageType == 'add'">新增</span>
 			<span v-if="pageType == 'edit'">修改</span>
-			<span v-if="pageType == 'view'">查看</span>
+			<span v-if="pageType == 'view'">更多信息</span>
 		</span>
 		<div>
-			<div class="dialog-h-content scroll-h">
-				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;"><el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button></div>
-				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+			<div class="dialog-h-content2 scroll-h">
+				<div v-if="view_real_data" class="div_tuomin" style="margin-top: 20px;">
+					<el-button size="mini" class="diy-button--search" @click="handleTuomin">显示脱敏信息</el-button>
+				</div>
+				<el-form :inline="false" :model="formData" ref="form" v-if="pageType == 'view'">
 					<template v-for="(fieldSubList, index) in fieldList">
 						<el-row>
 							<!-- :key="'fieldSubList' + index" -->
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属网格">{{ gridName }}</el-form-item>
+									<el-form-item label="所属网格">{{ detailData.gridName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属小区">{{ xiaoquName }}</el-form-item>
+									<el-form-item label="所属小区">{{ detailData.villageName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属楼栋">{{ louName }}-{{ danyuanName }}</el-form-item>
+									<el-form-item label="所属楼栋">{{ detailData.buildName }}</el-form-item>
 								</div>
 							</el-col>
-							<el-col :span="6">
+							<el-col :span="8">
 								<div v-if="index == 0">
-									<el-form-item label="所属家庭">{{ homeName }}</el-form-item>
+									<el-form-item label="所属家庭">{{ detailData.doorName }}</el-form-item>
 								</div>
 							</el-col>
 
 							<template v-for="field in fieldSubList">
-								<el-col :span="6">
+								<el-col :span="8">
 									<el-form-item :label="field.label">
 										<span v-if="field.columnName === 'MOBILE' || field.columnName === 'ID_CARD'">{{ info[field.columnName] || '--' }}</span>
 										<span v-else-if="field.itemType == 'select' || field.itemType == 'radio' || field.itemType == 'checkbox' || field.itemType == 'cascader'">
@@ -45,7 +47,7 @@
 								</el-col>
 							</template>
 						</el-row>
-						<div style="border-bottom:dashed 1px #ccc"></div>
+						<div class="line"></div>
 					</template>
 				</el-form>
 
@@ -159,8 +161,8 @@ export default {
 			type: String,
 			default: ''
 		},
-		gridName: {
-			type: String,
+		detailData: {
+			type: Object,
 			default: ''
 		}
 	},
@@ -171,7 +173,7 @@ export default {
 
 	data() {
 		return {
-			view_real_data: true,
+			view_real_data: false,
 			formData: {},
 			customerId: '',
 			isXiaozhaizi: false,
@@ -576,4 +578,49 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 22px;
+	font-family: PingFang SC;
+	font-weight: 800;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding:30px 0px 30px 50px;
+}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		.el-form-item__label {
+			font-size: 18px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #ddd;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 18px;
+		}
+	}
+}
+.line {
+	margin: 20px auto;
+	width: 900px;
+	height: 1px;
+	border: 1px dashed #ddd;
+}
+/deep/.dialog-h-content2 {
+	max-height: calc(83vh - 130px);
+	box-sizing: border-box;
+	padding: 0 10px;
+	overflow: auto;
+}
 </style>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index cb3d500da..84e6cd183 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -126,7 +126,7 @@
 		<div>
 			<!-- :pageType="pageType" -->
 			<!-- :disabled="disabled" -->
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :userId="detailId" :pageType="pageType" :gridName="detailData" @handleClose="handleClose" />
+			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible" :userId="detailId" :pageType="pageType" :detailData="detailData" @handleClose="handleClose" />
 		</div>
 	</div>
 </template>
@@ -243,7 +243,14 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.icResiUserId;
-			this.detailData = row.gridName;
+			this.detailData = {
+				gridName: row.gridName,
+				homeName: row.homeName,
+				villageName: row.villageName,
+				buildName: row.buildName,
+				unitName: row.unitName,
+				doorName: row.doorName
+			};
 		},
 		handleClose() {
 			this.dialogVisible = false;
@@ -863,4 +870,38 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+/deep/.el-dialog__header {
+	padding: 30px 20px 10px 30px;
+	font-size: 22px;
+	font-family: PingFang SC;
+	font-weight: 800;
+	color: #333;
+}
+/deep/.el-dialog__body {
+	padding: 30px 50px;
+}
+/deep/.el-dialog__footer{text-align: center;}
+/deep/.el-form {
+	.el-form-item {
+		position: relative;
+		.el-form-item__label {
+			font-size: 18px;
+			padding-left: 15px;
+			&::before {
+				position: absolute;
+				left: 0;
+				top: 12px;
+				content: '';
+				display: block;
+				width: 7px;
+				height: 7px;
+				background: #0c81fe;
+				border-radius: 3px;
+			}
+		}
+		.el-form-item__content {
+			font-size: 18px;
+		}
+	}
+}
 </style>
diff --git a/src/views/modules/census/record.vue b/src/views/modules/census/record.vue
index 07cde7c06..ba5d8ef36 100644
--- a/src/views/modules/census/record.vue
+++ b/src/views/modules/census/record.vue
@@ -1,12 +1,12 @@
 <template>
 	<div class="m-record">
-		<h3>检查记录</h3>
+		<h3>巡查记录</h3>
 		<div>
 			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
 				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
 			</div>
 			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
+				<el-table :data="tableData" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="resi-table" row-key="id" border style="width: 100%">
 					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
 					<el-table-column prop="patrolTime" label="检查时间" align="center" width="200px">
 						<template slot-scope="scope">
@@ -406,7 +406,13 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/scss/buttonstyle.scss';
 @import '@/assets/scss/modules/management/list-main.scss';
-
+.m-record h3{
+	font-size: 1.17em;
+	&::before {
+		display: none;
+	}
+	
+}
 .mt10 {
 	margin-bottom: 10px;
 }

From 6c3053fc5966376a13e8c4c110384b7acabe3e5d Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 13 Apr 2023 14:53:52 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/addFormEnterprise.vue      |  5 ++-
 src/views/modules/census/census-houseList.vue |  2 +-
 .../modules/census/census-residentList.vue    | 35 +------------------
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/views/modules/census/addFormEnterprise.vue b/src/views/modules/census/addFormEnterprise.vue
index f9f34d765..14b4104f9 100644
--- a/src/views/modules/census/addFormEnterprise.vue
+++ b/src/views/modules/census/addFormEnterprise.vue
@@ -463,6 +463,9 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 // @import '@/assets/scss/modules/visual/a_customize.scss';
+.div_map{
+	width: 350px;
+}
 /deep/.el-dialog__header {
 	padding: 25px 20px 10px 25px;
 	font-size: 18px;
@@ -502,7 +505,7 @@ export default {
 	}
 }
 /deep/.dialog-h-content2 {
-	max-height: calc(83vh - 130px);
+	max-height: calc(83vh - 90px);
 	box-sizing: border-box;
 	padding: 0 10px;
 	overflow: auto;
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 52aa515c0..ac20e4650 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -243,7 +243,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 84e6cd183..144f1ffc2 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -870,38 +870,5 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
-/deep/.el-dialog__header {
-	padding: 30px 20px 10px 30px;
-	font-size: 22px;
-	font-family: PingFang SC;
-	font-weight: 800;
-	color: #333;
-}
-/deep/.el-dialog__body {
-	padding: 30px 50px;
-}
-/deep/.el-dialog__footer{text-align: center;}
-/deep/.el-form {
-	.el-form-item {
-		position: relative;
-		.el-form-item__label {
-			font-size: 18px;
-			padding-left: 15px;
-			&::before {
-				position: absolute;
-				left: 0;
-				top: 12px;
-				content: '';
-				display: block;
-				width: 7px;
-				height: 7px;
-				background: #0c81fe;
-				border-radius: 3px;
-			}
-		}
-		.el-form-item__content {
-			font-size: 18px;
-		}
-	}
-}
+
 </style>