From 22113dbe74a05e51b66db805fe69a2b5b19efd74 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Mon, 17 Apr 2023 09:52:48 +0800
Subject: [PATCH 01/12] radio

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

diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 345177447..85dc95010 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -44,7 +44,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>
@@ -73,7 +73,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>

From 60f5337f8b50a56a8a49847f45af66274c970941 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Apr 2023 10:34:24 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=B9=B4=E9=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 21dfab753..fb4b098a7 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -409,7 +409,10 @@ export default {
       queryType: {
         AGENCY_ID: "like",
       },
-      ageObj: {},
+      ageObj: {
+        start:"",
+        end:""
+      },
     };
   },
   computed: {
@@ -538,6 +541,7 @@ export default {
       } else {
         let temp = [];
         for (let i in this.ageObj) {
+          if(this.ageObj[i]==null) this.ageObj[i] = ''
           temp.push(this.ageObj[i]);
         }
         let arr4 = [

From 1b4bc1a511792ac5bf1551ecc09b85cfc79aef8c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Apr 2023 17:09:31 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8A=9F=E8=83=BD=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountActiveList.vue | 1 -
 src/views/modules/census/census-accountList.vue       | 1 -
 src/views/modules/census/census-houseList.vue         | 2 +-
 src/views/modules/census/census-nineList.vue          | 2 +-
 src/views/modules/census/census-orgStatusList.vue     | 1 -
 src/views/modules/census/census-residentList.vue      | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 1da18b91e..53a1a5e39 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -11,7 +11,6 @@
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
-								clearable
 								:show-all-levels="false"
 								@change="handleChangeAgency"
 							/>
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 56ea1cbfe..7f5a48e75 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -11,7 +11,6 @@
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
-								clearable
 								@change="handleChangeAgency"
 								:show-all-levels="false"
 							/>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index cbe1bd72b..f2f6f0d3a 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -8,7 +8,7 @@
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								clearable
+								filterable
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 38b8bb69b..5ac08a2e8 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -8,9 +8,9 @@
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
+								filterable
 								:props="orgOptionProps"
 								:show-all-levels="false"
 								@change="handleChangeAgency"
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 888923402..e113d03d8 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -9,7 +9,6 @@
 								class="customer_cascader"
 								ref="myCascader"
 								filterable
-								clearable
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 85dc95010..f3bf142bc 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -8,7 +8,7 @@
 							<el-cascader
 								class="customer_cascader"
 								ref="myCascader"
-								clearable
+								filterable
 								v-model="formData.orgId"
 								:options="orgOptions"
 								:props="orgOptionProps"

From cd4ac5248169a6da3c405fafd0296589a2d51f2d Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 14:51:46 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index e113d03d8..fba39d254 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -194,7 +194,7 @@ export default {
 				startDate: '',
 				endDate: ''
 			},
-		
+
 			cateOptions: [],
 			eventTypeCheck: [],
 			pageNo: 1,
@@ -355,7 +355,7 @@ export default {
 			}
 
 			const url = '/gov/org/customeragency/getAgencyCountList';
-			let params = { agencyId: agencyId };
+			let params = { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate };
 			const { data, code, msg } = await requestGet(url, params);
 
 			if (code === 0) {

From 8c7750d7d3c49d6bf994d3113917ed58a0473c2c Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 14:52:08 +0800
Subject: [PATCH 05/12] 1

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

diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index fba39d254..8fb02dcab 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -356,7 +356,7 @@ export default {
 
 			const url = '/gov/org/customeragency/getAgencyCountList';
 			let params = { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate };
-			const { data, code, msg } = await requestGet(url, params);
+			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
 				data.map(item => {

From 01810e989fdcd99490e83ec7774839faf198a0e7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 15:39:51 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/dyhx/party.vue     | 90 ++++++++++++-------
 1 file changed, 60 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 90e9eb8a5..f6c347768 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -220,13 +220,20 @@ export default {
 		return {
 			orgOptions: [], //组织
 			orgOptionProps: {
-				//组织
 				multiple: false,
-				value: 'agencyId',
-				label: 'agencyName',
-				children: 'subAgencyList',
-				emitPath: false,
-				checkStrictly: true
+				value: 'id',
+				label: 'partyOrgName',
+				children: 'children',
+				checkStrictly: true,
+				emitPath: false
+
+				//组织
+				// multiple: false,
+				// value: 'agencyId',
+				// label: 'agencyName',
+				// children: 'subAgencyList',
+				// emitPath: false,
+				// checkStrictly: true
 			},
 			pieInitState: false,
 			pieInitState2: false,
@@ -297,7 +304,9 @@ export default {
 		await nextTick(100);
 		await this.getOrgTreeList();
 		// await this.getPartyOggList();
-
+		console.log(this.$store.state);
+		this.user = this.$store.state.user;
+		this.agencyId = this.user.agencyId;
 		this.getAgeCount();
 		this.getEduCount();
 		this.getAgeList();
@@ -309,8 +318,10 @@ export default {
 	methods: {
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			console.log('obj', obj);
 			if (obj) {
-				this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
+				// this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
+				// this.orgType = obj.level
 			} else {
 				this.orgType = '';
 			}
@@ -748,27 +759,46 @@ export default {
 			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);
+		async getOrgTreeList() {
+			function deleteChildren(arr) {
+				let childs = arr;
+				for (let i = childs.length; i--; i > 0) {
+					if (childs[i].children) {
+						if (childs[i].children.length) {
+							this.deleteChildren(childs[i].children);
+						} else {
+							delete childs[i].children;
+						}
 					}
-				})
-				.catch(() => {
-					return this.$message.error('网络错误');
-				});
-		},
+				}
+				return arr;
+			}
 
+			const { user } = this.$store.state;
+			const url = '/resi/partymember/icPartyOrg/getSearchTreelist';
+			let params = {
+				agencyId: user.agencyId
+			};
+
+			const { data, code, msg } = await requestGet(url, params);
+			console.log('data-orgparty----o', data);
+			if (code === 0) {
+				this.orgOptions = data;
+				this.changeKey(this.orgOptions);
+			} else {
+			}
+		},
+		changeKey(arr) {
+			for (var i = 0; i < arr.length; i++) {
+				arr[i].value = arr[i].userId;
+				arr[i].label = arr[i].userName;
+				if (arr[i].children.length) {
+					this.changeKey(arr[i].children);
+				} else {
+					delete arr[i].children;
+				}
+			}
+		},
 		jumpDetail(val) {
 			this.memberDialog = false;
 			this.$router.push({
@@ -822,10 +852,10 @@ export default {
 				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,
+				orgId: this.orgId,
+				orgType: this.orgType,
 				code: type == 'age' ? this.ageCode : this.eduCode
 			};
 			// .post('epmetuser/icresiuser/exportExcel', params)

From 79ed705612a058dd1cf9b71ed22c37c9cf06e0e7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 16:03:45 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../census/census-accountActiveList.vue       |   12 +-
 .../modules/census/census-accountList.vue     |   16 +
 src/views/modules/census/census-houseList.vue |   13 +
 src/views/modules/census/census-nineList.vue  |    8 +
 .../modules/census/census-orgStatusList.vue   |    7 +
 .../modules/census/census-residentList.vue    |   11 +-
 .../modules/communityParty/dyhx/party.vue     |    8 +-
 .../modules/communityParty/dyhx/party1.vue    | 1007 ++++++++++++++
 .../modules/communityParty/dyhx/party22.vue   | 1184 +++++++++++++++++
 9 files changed, 2261 insertions(+), 5 deletions(-)
 create mode 100644 src/views/modules/communityParty/dyhx/party1.vue
 create mode 100644 src/views/modules/communityParty/dyhx/party22.vue

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 53a1a5e39..9a265a0e7 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -39,6 +39,7 @@
 							></el-date-picker>
 						</el-form-item>
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 			</div>
@@ -222,6 +223,12 @@ export default {
 		this.getCountLevel();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+		},
 		handleSizeChange(val) {
 			this.pageSize = val;
 			window.localStorage.setItem('pageSize', val);
@@ -255,7 +262,8 @@ export default {
 				this.orgId = this.formData.orgId;
 			}
 			console.log(this.formData);
-			this.pageNo = 1;this.pageNo2 = 1;
+			this.pageNo = 1;
+			this.pageNo2 = 1;
 			this.getTableData();
 			this.getTableData2();
 			this.getCountLevel();
@@ -394,7 +402,7 @@ export default {
 			this.tableLoading2 = false;
 			if (code === 0) {
 				this.total2 = data.total || 0;
-			console.log(this.total2)
+				console.log(this.total2);
 				this.tableData2 = data.list
 					? data.list.map(item => {
 							return item;
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 7f5a48e75..e09471031 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -39,6 +39,7 @@
 							></el-date-picker>
 						</el-form-item>
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 				<div class="flex">
@@ -268,6 +269,12 @@ export default {
 		// this.getPie();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+		},
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
 			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
@@ -619,4 +626,13 @@ export default {
 .cur {
 	cursor: pointer;
 }
+.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>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index f2f6f0d3a..5fa1d1027 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -40,6 +40,7 @@
 							></el-date-picker>
 						</el-form-item>
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 			</div>
@@ -191,6 +192,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
+			optionData:{},
 			dialogVisible: false,
 			detailId: '',
 			detailData: {},
@@ -265,6 +267,15 @@ export default {
 		this.getOrgTreeList();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+			this.orgId = this.optionData.agencyId;
+			this.orgIdPath = this.optionData.orgIdPath;
+			this.orgType = this.optionData.level;
+		},
 		show(row) {
 			this.dialogVisible = true;
 			this.pageType = 'view';
@@ -703,6 +714,7 @@ export default {
 						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
 						// this.orgOptions = this.deepTree(_arr);
 						this.orgOptions = [];
+						this.optionData=data;
 						this.orgOptions.push(data);
 						this.orgId = data.agencyId;
 						this.orgIdPath = data.orgIdPath;
@@ -837,6 +849,7 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+
 .div_search {
 	.item_width_2 {
 		width: 200px;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 5ac08a2e8..4d9bf832d 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -18,6 +18,7 @@
 						</el-form-item>
 
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 			</div>
@@ -208,6 +209,13 @@ export default {
 		this.getPie();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+			this.orgType = '';
+		},
 		show(row) {
 			this.dialogVisible = true;
 			this.pageType = 'view';
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 8fb02dcab..302860480 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -44,6 +44,7 @@
 						</el-form-item>
 
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 				<div class="flex">
@@ -253,6 +254,12 @@ export default {
 		// this.getPie();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+		},
 		handleSearch(val) {
 			this.getTableData();
 			this.getsubData();
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index f3bf142bc..5a6d3d2b9 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -18,6 +18,7 @@
 						</el-form-item>
 
 						<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+						<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 					</div>
 				</el-form>
 			</div>
@@ -73,7 +74,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio  }}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -239,6 +240,13 @@ export default {
 		this.getsubData2();
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+			this.orgType = '';
+		},
 		show(row) {
 			this.dialogVisible = true;
 			this.pageType = 'view';
@@ -870,5 +878,4 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
-
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index f6c347768..144c89093 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -15,8 +15,8 @@
 							@change="handleChangeAgency"
 						></el-cascader>
 					</el-form-item>
-
 					<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
+					<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
 				</div>
 			</el-form>
 		</div>
@@ -316,6 +316,12 @@ export default {
 		// this.getGridList('query');
 	},
 	methods: {
+		resetForm() {
+			for (const n in this.formData) {
+				if (typeof this.formData[n] == 'object') this.formData[n] = [];
+				else this.formData[n] = '';
+			}
+		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log('obj', obj);
diff --git a/src/views/modules/communityParty/dyhx/party1.vue b/src/views/modules/communityParty/dyhx/party1.vue
new file mode 100644
index 000000000..0c9ddb806
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/party1.vue
@@ -0,0 +1,1007 @@
+<template>
+	<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>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request';
+
+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 * as echarts from 'echarts';
+export default {
+	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';
+				// this.orgType = obj.level
+			} 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('-');
+			
+			let params = {
+				orgId: this.orgId,
+				orgType: this.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" 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 {
+		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;
+			}
+		}
+	}
+}
+.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;
+			}
+		}
+	}
+}
+.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;
+
+	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/communityParty/dyhx/party22.vue b/src/views/modules/communityParty/dyhx/party22.vue
new file mode 100644
index 000000000..93ed4b792
--- /dev/null
+++ b/src/views/modules/communityParty/dyhx/party22.vue
@@ -0,0 +1,1184 @@
+<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"
+                :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>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+
+import nextTick from "dai-js/tools/nextTick";
+import screenEchartsFrame from "@c/screen-echarts-frame";
+import crateForm from './crateForm.vue';
+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('网络错误')
+        })
+    },
+  },
+};
+</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;
+}
+.echarts-tips-wd50 {
+  width: 320px;
+}
+.tips-list,
+.tips-item,
+.tips-lists,
+.tips-items-num {
+  display: flex;
+  align-items: center;
+}
+.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;
+    }
+  }
+}
+.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;
+      }
+    }
+  }
+}
+
+.warning-box-bottom {
+  height: calc(100% - 500px);
+  box-sizing: border-box;
+  margin-top: 10px;
+  padding: 0 30px;
+  // overflow-y: scroll;
+}
+.ecahrts-button {
+  width: 100%;
+  padding-left: 30px;
+  // text-align: right;
+}
+</style>

From 60acd1b659b017e7c42880f99d241650f2e826d1 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 16:24:50 +0800
Subject: [PATCH 08/12] jumper

---
 .../census/census-accountActiveList.vue       |  4 ++--
 .../modules/census/census-accountList.vue     | 19 ++++++++++---------
 src/views/modules/census/census-houseList.vue |  4 ++--
 src/views/modules/census/census-nineList.vue  |  6 +++---
 .../modules/census/census-orgStatusList.vue   |  2 +-
 .../modules/census/census-residentList.vue    |  4 ++--
 .../modules/communityParty/dyhx/party.vue     |  4 ++--
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 9a265a0e7..8b6824d77 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -78,7 +78,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</div>
@@ -114,7 +114,7 @@
 							:current-page.sync="pageNo2"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize2)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total2"
 						></el-pagination>
 					</div>
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index e09471031..e3def8b78 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -99,9 +99,9 @@
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 							<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="streetName" label="所属街道" min-width="140" align="center" :show-overflow-tooltip="true" />
+							<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="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 					</div>
 				</el-col>
@@ -120,25 +120,25 @@
 				</el-col>
 			</el-row>
 		</div>
-		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
+		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="500px" :before-close="handleClose">
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<template v-if="orgType == 'community'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<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="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'street'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" 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="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'district'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" label="区县名称" align="center" :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="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 			</el-table>
 
@@ -148,7 +148,7 @@
 				:current-page.sync="pageNo"
 				:page-sizes="[10, 20, 50, 100, 200]"
 				:page-size="parseInt(pageSize)"
-				layout="sizes, prev, pager, next, total"
+				layout="sizes, prev, pager, next, total,jumper"
 				:total="total"
 			></el-pagination>
 		</el-dialog>
@@ -394,7 +394,7 @@ export default {
 
 		async getCountLevel() {
 			const url = '/gov/org/staffLoginLog/count-level';
-			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level';
+			
 			let param = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, param);
 			console.log('getCountLeveldata', data);
@@ -408,13 +408,14 @@ export default {
 			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,
 				isPage: true,
+				dataRange:"exclude_zero",
 				...formData
 			});
 
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 5fa1d1027..ed995c358 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -143,7 +143,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -291,7 +291,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			// const url = '/gov/org/staffLoginLog/community-count';
+			
 			const url = '/gov/org/ichouse/getHousePictureList';
 
 			const { pageSize, pageNo, formData } = this;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 4d9bf832d..a91044925 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -27,7 +27,7 @@
 					<el-col :span="24">
 						<div class="div_table_title">九小场所分析</div>
 						<el-row>
-							<el-col :span="12">
+							<el-col :span="6">
 								<div style="height:220px;margin-top:20px">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
@@ -87,7 +87,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -244,7 +244,7 @@ export default {
 		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, {
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 302860480..2d5e37e62 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -128,7 +128,7 @@
 				:current-page.sync="pageNo"
 				:page-sizes="[10, 20, 50, 100, 200]"
 				:page-size="parseInt(pageSize)"
-				layout="sizes, prev, pager, next, total"
+				layout="sizes, prev, pager, next, total,jumper"
 				:total="total"
 			></el-pagination>
 		</el-dialog>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 5a6d3d2b9..b78323ccf 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -117,7 +117,7 @@
 							:current-page.sync="pageNo"
 							:page-sizes="[10, 20, 50, 100, 200]"
 							:page-size="parseInt(pageSize)"
-							layout="sizes, prev, pager, next, total"
+							layout="sizes, prev, pager, next, total,jumper"
 							:total="total"
 						></el-pagination>
 					</el-col>
@@ -268,7 +268,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			// const url = '/gov/org/staffLoginLog/community-count';
+			
 			const url = '/epmetuser/icresiuser/portrayal-list';
 
 			const { pageSize, pageNo, formData } = this;
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 144c89093..022a6b75d 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -92,7 +92,7 @@
 								:current-page.sync="agePageNo"
 								:page-sizes="[10, 20, 50, 100, 200]"
 								:page-size="agePageSize"
-								layout="sizes, prev, pager, next, total"
+								layout="sizes, prev, pager, next, total,jumper"
 								:total="ageTotal"
 							></el-pagination>
 						</el-col>
@@ -168,7 +168,7 @@
 								:current-page.sync="pageNo"
 								:page-sizes="[10, 20, 50, 100, 200]"
 								:page-size="pageSize"
-								layout="sizes, prev, pager, next, total"
+								layout="sizes, prev, pager, next, total,jumper"
 								:total="total"
 							></el-pagination>
 						</el-col>

From 523a704720e96e0cbb37dd10cfd934fb3d456080 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 16:34:05 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../census/census-accountActiveList.vue       |  2 +-
 .../modules/census/census-accountList.vue     | 59 ++++++++++++++++---
 .../modules/census/census-residentList.vue    |  4 +-
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 8b6824d77..4dd5df7f1 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -291,7 +291,7 @@ export default {
 		async handleExport(type) {
 			const url = '/gov/org/staffLoginLog/accountActivityInfo-export';
 
-			const { data, code, msg } = await requestPost(url, param);
+			// const { data, code, msg } = await requestPost(url, param);
 
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index e3def8b78..1c664b4e9 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -99,9 +99,9 @@
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 							<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="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="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 					</div>
 				</el-col>
@@ -120,25 +120,32 @@
 				</el-col>
 			</el-row>
 		</div>
-		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="500px" :before-close="handleClose">
+		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="50%" :before-close="handleClose">
+			<div
+				style=" text-align: right;
+    margin-top: -30px;
+    margin-bottom: 10px;"
+			>
+				<el-button size="small" class="diy-button--output" @click="handleExport()">导出</el-button>
+			</div>
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<template v-if="orgType == 'community'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<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="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'street'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" 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="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'district'">
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" label="区县名称" align="center" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="count" align="center"  label="登录次数" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 			</el-table>
 
@@ -275,6 +282,41 @@ export default {
 				else this.formData[n] = '';
 			}
 		},
+		async handleExport() {
+			const url = '/gov/org/staffLoginLog/community-count-export';
+
+			// const { data, code, msg } = await requestPost(url, param);
+
+			axios({
+				url: window.SITE_CONFIG['apiURL'] + url,
+				method: 'post',
+				data: {
+					orgId: this.orgId,
+					level: this.orgType,
+					startDate: this.formData.startDate,
+					endDate: this.formData.endDate
+				},
+				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('网络错误');
+				});
+		},
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
 			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
@@ -394,7 +436,7 @@ export default {
 
 		async getCountLevel() {
 			const url = '/gov/org/staffLoginLog/count-level';
-			
+
 			let param = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, param);
 			console.log('getCountLeveldata', data);
@@ -408,14 +450,13 @@ export default {
 			this.tableLoading = true;
 
 			const url = '/gov/org/staffLoginLog/community-count';
-			
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
 				isPage: true,
-				dataRange:"exclude_zero",
+				dataRange: 'exclude_zero',
 				...formData
 			});
 
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index b78323ccf..296019fcb 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -86,7 +86,7 @@
 					<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>
+							<el-button size="small" class="diy-button--output" @click="handleExport()">导出</el-button>
 						</div>
 						<el-table
 							:data="tableData"
@@ -872,7 +872,7 @@ export default {
 .diy-button--output {
 	width: 100px;
 	height: 38px;
-
+z-index: 99;
 	background: #feb349;
 	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
 	border-radius: 6px;

From 22b6bbe504054fa381a1243ff985b20c455d67c9 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 16:37:27 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ed995c358..e0de5e16c 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -233,7 +233,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],

From 80a134c0fadd8b04d7285a67f59b24a64b9893a9 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 17:12:10 +0800
Subject: [PATCH 11/12] =?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       |   9 +
 .../modules/census/census-accountList.vue     |   9 +
 src/views/modules/census/census-houseList.vue |  54 ++---
 src/views/modules/census/census-nineList.vue  |  22 ++-
 .../modules/census/census-orgStatusList.vue   |   9 +
 .../modules/census/census-residentList.vue    |  45 +++--
 .../modules/communityParty/dyhx/party.vue     | 186 +++++++++---------
 7 files changed, 189 insertions(+), 145 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 4dd5df7f1..16c58cc89 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -497,4 +497,13 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 1c664b4e9..8b1772342 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -677,4 +677,13 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index e0de5e16c..ebb956575 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -48,8 +48,8 @@
 				<el-row :gutter="20">
 					<el-col :span="12">
 						<div class="div_table_title">房屋用途统计</div>
-						<el-row>
-							<el-col :span="12">
+						<div class="flex">
+							<div class="width1">
 								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
@@ -58,27 +58,27 @@
 										ref="pieChart"
 									></screen-echarts-frame>
 								</div>
-							</el-col>
-							<el-col :span="12">
+							</div>
+							<div class="flex1">
 								<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="kuai" :style="{ backgroundColor: color1[index] }"></div>
 											<div class="content">
-												<div class="name">{{ item.name }}</div>
+												<div class="name">{{ index }}{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
+												<div class="unit" :style="{ color: color1[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
 								</div>
-							</el-col>
-						</el-row>
+							</div>
+						</div>
 					</el-col>
 					<el-col :span="12">
 						<div class="div_table_title">房屋状态统计</div>
-						<el-row>
-							<el-col :span="12">
+						<div class="flex">
+							<div class="width1">
 								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
 									<screen-echarts-frame2
 										@handelClickMyPei="handelClickMyPei2"
@@ -87,8 +87,8 @@
 										ref="pieChart2"
 									></screen-echarts-frame2>
 								</div>
-							</el-col>
-							<el-col :span="12">
+							</div>
+							<div class="flex1">
 								<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="handleClickItem2(item)">
@@ -99,13 +99,13 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
+												<div class="unit" :style="{ color: color2[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
 								</div>
-							</el-col>
-						</el-row>
+							</div>
+						</div>
 					</el-col>
 
 					<el-col :span="24">
@@ -192,7 +192,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
-			optionData:{},
+			optionData: {},
 			dialogVisible: false,
 			detailId: '',
 			detailData: {},
@@ -233,7 +233,8 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252', '#F0D915', '#5DC7F0'],
+			color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],
@@ -291,7 +292,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			
+
 			const url = '/gov/org/ichouse/getHousePictureList';
 
 			const { pageSize, pageNo, formData } = this;
@@ -448,7 +449,7 @@ export default {
 						color: '#fff'
 					}
 				},
-				color: this.color,
+				color: this.color1,
 				title: {
 					text: this.pieData.total,
 					subtext: '总数',
@@ -552,7 +553,7 @@ export default {
 						color: '#fff'
 					}
 				},
-				color: this.color,
+				color: this.color2,
 				title: {
 					text: this.pieData2.total,
 					subtext: '总数',
@@ -714,7 +715,7 @@ export default {
 						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
 						// this.orgOptions = this.deepTree(_arr);
 						this.orgOptions = [];
-						this.optionData=data;
+						this.optionData = data;
 						this.orgOptions.push(data);
 						this.orgId = data.agencyId;
 						this.orgIdPath = data.orgIdPath;
@@ -909,4 +910,13 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index a91044925..53731d513 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -26,8 +26,8 @@
 				<el-row :gutter="20">
 					<el-col :span="24">
 						<div class="div_table_title">九小场所分析</div>
-						<el-row>
-							<el-col :span="6">
+						<div class="flex">
+							<div class="width1">
 								<div style="height:220px;margin-top:20px">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
@@ -36,8 +36,8 @@
 										ref="pieChart"
 									></screen-echarts-frame>
 								</div>
-							</el-col>
-							<el-col :span="12">
+							</div>
+							<div class="flex1">
 								<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)">
@@ -50,8 +50,8 @@
 										</div>
 									</div>
 								</div>
-							</el-col>
-						</el-row>
+							</div>
+						</div>
 					</el-col>
 
 					<el-col :span="24">
@@ -244,7 +244,6 @@ export default {
 		async getTableData() {
 			this.tableLoading = true;
 			const url = '/gov/org/enterprise/list';
-			
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
@@ -669,4 +668,13 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 2d5e37e62..02bb76907 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -570,4 +570,13 @@ export default {
 .cur {
 	cursor: pointer;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 296019fcb..2e334d7f4 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -26,18 +26,18 @@
 				<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'">
+						<div class="flex">
+							<div class="width1">
+								
 									<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>
+							<div class="flex1">
 								<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)">
@@ -50,23 +50,23 @@
 										</div>
 									</div>
 								</div>
-							</el-col>
-						</el-row>
+							</div>
+						</div>
 					</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'">
+						<div class="flex">
+							<div class="width1">
+								
 									<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>
+							<div class="flex1">
 								<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="handleClickItem2(item)">
@@ -79,8 +79,8 @@
 										</div>
 									</div>
 								</div>
-							</el-col>
-						</el-row>
+							</div>
+						</div>
 					</el-col>
 
 					<el-col :span="24">
@@ -268,7 +268,7 @@ export default {
 		},
 		async getTableData() {
 			this.tableLoading = true;
-			
+
 			const url = '/epmetuser/icresiuser/portrayal-list';
 
 			const { pageSize, pageNo, formData } = this;
@@ -872,10 +872,19 @@ export default {
 .diy-button--output {
 	width: 100px;
 	height: 38px;
-z-index: 99;
+	z-index: 99;
 	background: #feb349;
 	box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31);
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 022a6b75d..7b42fb08f 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -24,8 +24,8 @@
 			<el-row :gutter="20">
 				<el-col :span="12">
 					<div class="div_table_title">党员年龄统计</div>
-					<el-row>
-						<el-col :span="12">
+					<div class="flex">
+						<div class="width1">
 							<div :style="'height:220px;margin-top:20px'">
 								<screen-echarts-frame
 									@handelClickMyPei="handelClickMyPei"
@@ -34,8 +34,8 @@
 									ref="pieChart"
 								></screen-echarts-frame>
 							</div>
-						</el-col>
-						<el-col :span="12">
+						</div>
+						<div class="flex1">
 							<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)">
@@ -48,60 +48,51 @@
 									</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>
+						</div>
+						>
+					</div>
+					<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-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="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 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-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,jumper"
-								:total="ageTotal"
-							></el-pagination>
-						</el-col>
-					</el-row>
+					<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,jumper"
+						:total="ageTotal"
+					></el-pagination>
 				</el-col>
 				<el-col :span="12">
 					<div class="div_table_title">党员学历统计</div>
-					<el-row>
-						<el-col :span="12">
+					<div class="flex">
+						<div class="width1">
 							<div :style="'height:220px;margin-top:20px'">
 								<screen-echarts-frame2
 									@handelClickMyPei="handelClickMyPei2"
@@ -110,8 +101,8 @@
 									ref="pieChart2"
 								></screen-echarts-frame2>
 							</div>
-						</el-col>
-						<el-col :span="12">
+						</div>
+						<div class="flex1">
 							<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)">
@@ -124,55 +115,45 @@
 									</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>
+						</div>
+					</div>
+					<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-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="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 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-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,jumper"
-								:total="total"
-							></el-pagination>
-						</el-col>
-					</el-row>
+					<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,jumper"
+						:total="total"
+					></el-pagination>
 				</el-col>
 			</el-row>
 		</div>
@@ -1039,4 +1020,13 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+.flex {
+	display: flex;
+	.width1 {
+		width: 220px;
+	}
+	.flex1 {
+		flex: 1;
+	}
+}
 </style>

From 02cc51b10a96b17cd6fb16ae8ed7b6e316c7d960 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 18 Apr 2023 17:28:23 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue    | 2 +-
 src/views/modules/census/census-nineList.vue     | 2 +-
 src/views/modules/census/census-residentList.vue | 2 +-
 src/views/modules/communityParty/dyhx/party.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ebb956575..ede0515de 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -233,7 +233,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252', '#F0D915', '#5DC7F0'],
+			color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 53731d513..e1b728725 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -178,7 +178,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: {},
 			placeType: '',
 			pieData: []
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 2e334d7f4..cbe450483 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -201,7 +201,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 7b42fb08f..a1f546fb5 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -220,7 +220,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],