From daf755e2e4510eb468c0dba1a46c9527fe7d38b4 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 12:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=8C=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-orgStatusList.vue   |  6 ++--
 .../modules/census/census-residentList.vue    | 36 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index e538903c8..936024bea 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -355,7 +355,7 @@ export default {
 
 			let agencyId = '';
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
 				agencyId = this.formData.orgId;
 				this.level = this.formData.level;
 			} else {
@@ -382,11 +382,13 @@ export default {
 			let url = '/gov/org/customeragency/getCommunityCountList';
 			let agencyId = '';
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+			
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
 				agencyId = this.formData.orgId;
 			} else {
 				agencyId = this.agencyId;
 			}
+			console.log("agencyId",agencyId)
 			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate });
 
 			this.$refs.pieChart.hideLoading();
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 68b23a91a..821eab078 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -25,22 +25,22 @@
 			<div class="div_table">
 				<el-row :gutter="20">
 					<el-col :span="12">
-						<div class="div_table_title">居民年龄统计</div>
+						<div class="div_table_title">居民学历统计</div>
 						<div class="flex">
 							<div class="width1">
 								<div class="box">
-									<screen-echarts-frame
-										@handelClickMyPei="handelClickMyPei"
+									<screen-echarts-frame2
+										@handelClickMyPei="handelClickMyPei2"
 										:style="{ width: '100%', height: '100%' }"
-										@myChartMethod="pieInitOk"
-										ref="pieChart"
-									></screen-echarts-frame>
+										@myChartMethod="pieInitOk2"
+										ref="pieChart2"
+									></screen-echarts-frame2>
 								</div>
 							</div>
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -54,22 +54,22 @@
 						</div>
 					</el-col>
 					<el-col :span="12">
-						<div class="div_table_title">居民学历统计</div>
+						<div class="div_table_title">居民年龄统计</div>
 						<div class="flex">
 							<div class="width1">
 								<div class="box">
-									<screen-echarts-frame2
-										@handelClickMyPei="handelClickMyPei2"
+									<screen-echarts-frame
+										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
-										@myChartMethod="pieInitOk2"
-										ref="pieChart2"
-									></screen-echarts-frame2>
+										@myChartMethod="pieInitOk"
+										ref="pieChart"
+									></screen-echarts-frame>
 								</div>
 							</div>
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -248,6 +248,8 @@ export default {
 				else this.formData[n] = '';
 			}
 			this.orgType = '';
+			this.code='';
+			this.codeType='';
 			this.handleSearch();
 		},
 		show(row) {
@@ -653,11 +655,11 @@ export default {
 			const url = '/epmetuser/icresiuser/portrayal-listexport';
 			const { pageSize, pageNo, formData } = this;
 			let tmp = this.formData.orgId;
-			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)){
 				this.formData.orgId = '';
 				this.orgType = '';
-				this.code = '';
-				this.codeType = '';
+				// this.code = '';
+				// this.codeType = '';
 			}
 
 			axios({