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

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

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