From 8587f7a0a1f20fcf9de48b0982653850e8375598 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 11:03:51 +0800
Subject: [PATCH 1/5] =?UTF-8?q?chart=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=AB=98=E5=BA=A6=EF=BC=8C=E8=A1=A8=E6=A0=BC=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E7=AD=89=E7=AD=89=E7=AD=89?=
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     | 36 +++++++--
 src/views/modules/census/census-houseList.vue | 76 +++++++++++++------
 src/views/modules/census/census-nineList.vue  | 47 +++++++++---
 .../modules/census/census-orgStatusList.vue   | 59 +++++++++-----
 .../modules/census/census-residentList.vue    | 71 ++++++++++++-----
 .../modules/communityParty/dyhx/party.vue     | 62 +++++++++++----
 7 files changed, 267 insertions(+), 93 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 16c58cc89..31d1150a1 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -68,7 +68,7 @@
 						>
 							<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="loginCount" label="登录次数" min-width="140" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="loginCount" label="登录次数" width="110" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
@@ -199,7 +199,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			return this.$store.state.inIframe ? this.clientHeight - 439 + this.iframeHeigh : this.clientHeight - 439;
+			return this.$store.state.inIframe ? this.clientHeight - 448 + this.iframeHeigh : this.clientHeight - 448;
 		},
 
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -481,8 +481,11 @@ export default {
 		}
 	}
 }
+.div_table{
+	padding: 30px!important;
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 8b1772342..9ed73c649 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -250,7 +250,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeigh : this.clientHeight - 425;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 431 + this.iframeHeigh : this.clientHeight - 431;
 			return this.TableHeight;
 		},
 
@@ -541,13 +541,26 @@ export default {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = {
+				grid: {
+					x: 50,
+					y: 50,
+					x2: 50,
+					y2: 50
+				},
 				tooltip: {
 					trigger: 'axis'
 				},
 				xAxis: {
 					type: 'category',
 					data: chartData.name,
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#F3F7FD'
+						}
+					},
 					axisLabel: {
+						color: '#666666',
 						interval: 0,
 						interval: 0, //设置横坐标为斜
 						rotate: 30, //文字倾斜角度
@@ -557,8 +570,7 @@ export default {
 							}
 							return value;
 						}
-					},
-					triggerEvent: true
+					}
 				},
 				yAxis: {
 					type: 'value',
@@ -567,14 +579,25 @@ export default {
 						areaStyle: {
 							color: ['#fff', '#F3F7FD']
 						}
+					},
+					axisLabel: {
+						color: '#666666'
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#F3F7FD'
+						}
 					}
 				},
 				series: [
 					{
 						data: chartData.data,
+						barWidth: 24,
 						type: 'bar',
 						itemStyle: {
-							color: 'rgb(33, 149, 254)'
+							color: 'rgb(33, 149, 254)',
+							borderRadius: [4, 4, 0, 0],
 						}
 					}
 				]
@@ -657,8 +680,11 @@ export default {
 		}
 	}
 }
+.div_table{
+	padding: 30px!important;
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ede0515de..df122a6ee 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -50,7 +50,7 @@
 						<div class="div_table_title">房屋用途统计</div>
 						<div class="flex">
 							<div class="width1">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+								<div class="box">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
@@ -60,7 +60,7 @@
 								</div>
 							</div>
 							<div class="flex1">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="box">
 									<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: color1[index] }"></div>
@@ -79,7 +79,7 @@
 						<div class="div_table_title">房屋状态统计</div>
 						<div class="flex">
 							<div class="width1">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
+								<div class="box">
 									<screen-echarts-frame2
 										@handelClickMyPei="handelClickMyPei2"
 										:style="{ width: '100%', height: '100%' }"
@@ -89,7 +89,7 @@
 								</div>
 							</div>
 							<div class="flex1">
-								<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="box">
 									<div class="legend2">
 										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
 											<div class="kuai" v-if="item.name == '自住'"><img src="../../../assets/img/census/自住.png" /></div>
@@ -123,13 +123,13 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-							<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
-							<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="communityName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="gridName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="gridName" align="center" width="110" label="网格" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="houseName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="purposeName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="rentFlagName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="purposeName" align="center" width="110" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="rentFlagName" align="center" width="110" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
 								<template slot-scope="scope">
 									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
@@ -233,8 +233,8 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
-			color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],
@@ -247,7 +247,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 675 + this.iframeHeigh : this.clientHeight - 675;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -469,7 +469,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -478,12 +478,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -500,6 +505,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -510,7 +516,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -573,7 +579,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -582,12 +588,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -604,6 +615,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -614,7 +626,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -777,8 +789,10 @@ export default {
 		cursor: pointer;
 		min-width: 100px;
 		display: flex;
-		margin-bottom: 30px;
+		margin-top: 10px;
+		margin-bottom: 10px;
 		margin-right: 25px;
+		width: 160px;
 		.kuai {
 			width: 12px;
 			height: 12px;
@@ -813,6 +827,7 @@ export default {
 		width: 100%;
 		display: flex;
 		margin-bottom: 16px;
+		width: 160px;
 		.kuai {
 			margin-right: 10px;
 			border-radius: 4px;
@@ -893,8 +908,12 @@ export default {
 		}
 	}
 }
+.div_table {
+	padding: 30px !important;
+	.table{margin-top: 16px!important;}
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
@@ -904,7 +923,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;
@@ -914,9 +933,22 @@ export default {
 	display: flex;
 	.width1 {
 		width: 220px;
+		margin-right: 50px;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 	.flex1 {
 		flex: 1;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 }
 </style>
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index e1b728725..4708566c2 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -28,7 +28,7 @@
 						<div class="div_table_title">九小场所分析</div>
 						<div class="flex">
 							<div class="width1">
-								<div style="height:220px;margin-top:20px">
+								<div class="box">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
@@ -38,7 +38,7 @@
 								</div>
 							</div>
 							<div class="flex1">
-								<div style="height:220px;margin-top:20px;display:flex;align-items: center;">
+								<div class="box">
 									<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>
@@ -69,10 +69,13 @@
 							: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="placeOrgName" align="center" label="镇街" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="placeOrgName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column> -->
 							<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="scaleName" align="center" width="110" label="规模" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="personInCharge" align="center"  width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="mobile" align="center" label="联系方式" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
 								<template slot-scope="scope">
@@ -178,7 +181,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: []
@@ -186,7 +189,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 630 + this.iframeHeigh : this.clientHeight - 630;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 641 + this.iframeHeigh : this.clientHeight - 641;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -363,7 +366,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -372,12 +375,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -394,6 +402,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -404,7 +413,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -539,6 +548,7 @@ export default {
 		display: flex;
 		margin-bottom: 30px;
 		margin-right: 25px;
+		width: 160px;
 		.kuai {
 			width: 12px;
 			height: 12px;
@@ -651,8 +661,12 @@ export default {
 		}
 	}
 }
+.div_table {
+	padding: 30px !important;
+	.table{margin-top: 16px!important;}
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
@@ -672,9 +686,22 @@ export default {
 	display: flex;
 	.width1 {
 		width: 220px;
+		margin-right: 50px;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 	.flex1 {
 		flex: 1;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 }
 </style>
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 02bb76907..ffe89e150 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -101,7 +101,7 @@
 				<el-col :span="24">
 					<div class="div_table">
 						<div class="div_table_title">下级社区数量统计</div>
-						<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :h="maxTableHeight">
+						<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :height="maxTableHeight">
 							<screen-echarts-frame
 								@handelClickMyPei="handelClickMyPei"
 								:style="{ width: '100%', height: '100%' }"
@@ -217,7 +217,8 @@ export default {
 			multipleSelection: [],
 			TableHeight: '',
 			pieData: {},
-			agencyId: ''
+			agencyId: '',
+			level:'',
 		};
 	},
 	components: {
@@ -225,8 +226,8 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
-			console.log('this.TableHeight', this.TableHeight);
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 431 + this.iframeHeigh : this.clientHeight - 431;
+			console.log("this.TableHeight",this.TableHeight)
 			return this.TableHeight;
 		},
 
@@ -444,13 +445,26 @@ export default {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = {
+				grid: {
+					x: 50,
+					y: 50,
+					x2: 50,
+					y2: 50
+				},
 				tooltip: {
 					trigger: 'axis'
 				},
 				xAxis: {
 					type: 'category',
 					data: chartData.name,
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#F3F7FD'
+						}
+					},
 					axisLabel: {
+						color: '#666666',
 						interval: 0,
 						interval: 0, //设置横坐标为斜
 						rotate: 30, //文字倾斜角度
@@ -469,14 +483,25 @@ export default {
 						areaStyle: {
 							color: ['#fff', '#F3F7FD']
 						}
+					},
+					axisLabel: {
+						color: '#666666'
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: '#F3F7FD'
+						}
 					}
 				},
 				series: [
 					{
 						data: chartData.data,
+						barWidth: 24,
 						type: 'bar',
 						itemStyle: {
-							color: 'rgb(33, 149, 254)'
+							color: 'rgb(33, 149, 254)',
+							borderRadius: [4, 4, 0, 0],
 						}
 					}
 				]
@@ -559,24 +584,24 @@ export default {
 		}
 	}
 }
+.div_table {
+	padding: 30px !important;
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
 	font-weight: bold;
 	color: #333333;
 }
-.cur {
-	cursor: pointer;
-}
-.flex {
-	display: flex;
-	.width1 {
-		width: 220px;
-	}
-	.flex1 {
-		flex: 1;
-	}
+.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-residentList.vue b/src/views/modules/census/census-residentList.vue
index cbe450483..53ac0c342 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -28,17 +28,17 @@
 						<div class="div_table_title">居民年龄统计</div>
 						<div class="flex">
 							<div class="width1">
-								
+								<div class="box">
 									<screen-echarts-frame
 										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
 										@myChartMethod="pieInitOk"
 										ref="pieChart"
 									></screen-echarts-frame>
-								
+								</div>
 							</div>
 							<div class="flex1">
-								<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="box">
 									<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>
@@ -57,17 +57,17 @@
 						<div class="div_table_title">居民学历统计</div>
 						<div class="flex">
 							<div class="width1">
-								
+								<div class="box">
 									<screen-echarts-frame2
 										@handelClickMyPei="handelClickMyPei2"
 										:style="{ width: '100%', height: '100%' }"
 										@myChartMethod="pieInitOk2"
 										ref="pieChart2"
 									></screen-echarts-frame2>
-								
+								</div>
 							</div>
 							<div class="flex1">
-								<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+								<div class="box">
 									<div class="legend">
 										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
@@ -98,12 +98,12 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-							<el-table-column prop="name" label="姓名" align="center" :show-overflow-tooltip="true" />
-							<el-table-column prop="mobile" label="手机号" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="genderName" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="age" align="center" label="年龄" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="educationName" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="genderName" width="110" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="age" align="center" width="110" label="年龄" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="educationName" width="110" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
 								<template slot-scope="scope">
 									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
@@ -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: [],
@@ -216,7 +216,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -437,7 +437,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -446,12 +446,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -468,6 +473,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -478,7 +484,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -541,7 +547,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -550,12 +556,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -572,6 +583,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -582,7 +594,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -748,6 +760,7 @@ export default {
 		display: flex;
 		margin-bottom: 30px;
 		margin-right: 25px;
+		width: 160px;
 		.kuai {
 			width: 12px;
 			height: 12px;
@@ -782,6 +795,7 @@ export default {
 		width: 100%;
 		display: flex;
 		margin-bottom: 16px;
+		width: 160px;
 		.kuai {
 			margin-right: 10px;
 			border-radius: 4px;
@@ -861,8 +875,12 @@ export default {
 		}
 	}
 }
+.div_table {
+	padding: 30px !important;
+	.table{margin-top: 16px!important;}
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
@@ -882,9 +900,22 @@ export default {
 	display: flex;
 	.width1 {
 		width: 220px;
+		margin-right: 50px;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 	.flex1 {
 		flex: 1;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 }
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index a1f546fb5..e5d4710c2 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -16,7 +16,7 @@
 						></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>
+					<el-button class="diy-button--output" size="small" @click="resetForm">重置</el-button>
 				</div>
 			</el-form>
 		</div>
@@ -26,7 +26,7 @@
 					<div class="div_table_title">党员年龄统计</div>
 					<div class="flex">
 						<div class="width1">
-							<div :style="'height:220px;margin-top:20px'">
+							<div class="box">
 								<screen-echarts-frame
 									@handelClickMyPei="handelClickMyPei"
 									:style="{ width: '100%', height: '100%' }"
@@ -36,7 +36,7 @@
 							</div>
 						</div>
 						<div class="flex1">
-							<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+							<div class="box">
 								<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>
@@ -49,7 +49,6 @@
 								</div>
 							</div>
 						</div>
-						>
 					</div>
 					<div class="census_searchcensus2">
 						<div class="census_searchcensus_box"></div>
@@ -93,7 +92,7 @@
 					<div class="div_table_title">党员学历统计</div>
 					<div class="flex">
 						<div class="width1">
-							<div :style="'height:220px;margin-top:20px'">
+							<div class="box">
 								<screen-echarts-frame2
 									@handelClickMyPei="handelClickMyPei2"
 									:style="{ width: '100%', height: '100%' }"
@@ -103,7 +102,7 @@
 							</div>
 						</div>
 						<div class="flex1">
-							<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
+							<div class="box">
 								<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>
@@ -220,7 +219,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: [],
@@ -275,7 +274,7 @@ export default {
 	},
 	computed: {
 		tableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 635 + this.iframeHeigh : this.clientHeight - 635;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
 			return this.TableHeight;
 		},
 
@@ -400,7 +399,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['70%', '90%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -409,12 +408,16 @@ export default {
 						tooltip: {
 							show: true
 						},
-
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -441,7 +444,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['90%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -504,7 +507,7 @@ export default {
 				series: [
 					{
 						type: 'pie',
-						radius: ['65%', '80%'],
+						radius: ['65%', '88%'],
 						avoidLabelOverlap: false,
 						label: {
 							show: false,
@@ -513,12 +516,17 @@ export default {
 						tooltip: {
 							show: true
 						},
+						itemStyle: {
+							// 间隔
+							borderWidth: 2,
+							borderColor: '#fff'
+						},
 
 						data: chartData.data
 					},
 					{
 						type: 'pie',
-						radius: ['60%', '65%'],
+						radius: ['0%', '70%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -535,6 +543,7 @@ export default {
 						tooltip: {
 							show: false
 						},
+
 						animation: false,
 						cursor: 'auto',
 						emphasis: {
@@ -545,7 +554,7 @@ export default {
 					},
 					{
 						type: 'pie',
-						radius: ['80%', '85%'],
+						radius: ['88%', '100%'],
 						center: ['50%', '50%'],
 						selectedMode: false,
 						hoverAnimation: false,
@@ -890,6 +899,7 @@ export default {
 		display: flex;
 		margin-bottom: 30px;
 		margin-right: 25px;
+		width: 160px;
 		.kuai {
 			width: 12px;
 			height: 12px;
@@ -924,6 +934,7 @@ export default {
 		width: 100%;
 		display: flex;
 		margin-bottom: 16px;
+		width: 160px;
 		.kuai {
 			margin-right: 10px;
 			border-radius: 4px;
@@ -1003,8 +1014,14 @@ export default {
 		}
 	}
 }
+.div_table {
+	padding: 30px !important;
+	.table {
+		margin-top: 16px !important;
+	}
+}
 .div_table_title {
-	margin-top: 20px;
+	margin-top: -10px;
 	line-height: 30px;
 	font-size: 20px;
 
@@ -1024,9 +1041,22 @@ export default {
 	display: flex;
 	.width1 {
 		width: 220px;
+		margin-right: 50px;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 	.flex1 {
 		flex: 1;
+		.box {
+			height: 220px;
+			margin-top: 20px;
+			display: flex;
+			align-items: center;
+		}
 	}
 }
 </style>

From 7d28c45d0cc9a483461fd095984c3eaea3e05ae2 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 11:08:29 +0800
Subject: [PATCH 2/5] tiaozheng

---
 src/views/modules/census/census-houseList.vue |  1 +
 src/views/modules/census/census-nineList.vue  | 39 +----------------
 .../modules/census/census-residentList.vue    | 41 +-----------------
 .../modules/communityParty/dyhx/party.vue     | 42 +------------------
 4 files changed, 7 insertions(+), 116 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index df122a6ee..0eb4d905f 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -818,6 +818,7 @@ export default {
 		}
 	}
 }
+//这个是单独的，带图片
 .legend2 {
 	// display: flex;
 	// flex-flow: row wrap;
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 4708566c2..26cc71fc9 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -546,7 +546,8 @@ export default {
 		cursor: pointer;
 		min-width: 100px;
 		display: flex;
-		margin-bottom: 30px;
+	margin-top: 10px;
+	margin-bottom: 10px;
 		margin-right: 25px;
 		width: 160px;
 		.kuai {
@@ -574,43 +575,7 @@ export default {
 		}
 	}
 }
-.legend2 {
-	// display: flex;
-	// flex-flow: row wrap;
 
-	.legend-row {
-		width: 100%;
-		display: flex;
-		margin-bottom: 16px;
-		.kuai {
-			margin-right: 10px;
-			border-radius: 4px;
-			img {
-				width: 40px;
-				height: 40px;
-			}
-		}
-		.content {
-			display: flex;
-			align-items: center;
-			.name {
-				font-size: 14px;
-				color: #999;
-				width: 60px;
-			}
-			.num {
-				font-size: 16px;
-				font-weight: bold;
-				display: inline-block;
-			}
-			.unit {
-				font-size: 16px;
-				display: inline-block;
-				margin-left: 7px;
-			}
-		}
-	}
-}
 .btnSearch {
 	width: 100px;
 	height: 36px;
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 53ac0c342..5a92a37f6 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -758,7 +758,8 @@ export default {
 		cursor: pointer;
 		min-width: 100px;
 		display: flex;
-		margin-bottom: 30px;
+	margin-top: 10px;
+	margin-bottom: 10px;
 		margin-right: 25px;
 		width: 160px;
 		.kuai {
@@ -786,45 +787,7 @@ export default {
 		}
 	}
 }
-.legend2 {
-	// display: flex;
-	// flex-flow: row wrap;
 
-	.legend-row {
-		cursor: pointer;
-		width: 100%;
-		display: flex;
-		margin-bottom: 16px;
-		width: 160px;
-		.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;
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index e5d4710c2..8a88ce5e2 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -7,7 +7,6 @@
 						<el-cascader
 							class="customer_cascader"
 							ref="myCascader"
-							clearable
 							v-model="formData.orgId"
 							:options="orgOptions"
 							:props="orgOptionProps"
@@ -897,7 +896,8 @@ export default {
 		cursor: pointer;
 		min-width: 100px;
 		display: flex;
-		margin-bottom: 30px;
+		margin-top: 10px;
+		margin-bottom: 10px;
 		margin-right: 25px;
 		width: 160px;
 		.kuai {
@@ -925,45 +925,7 @@ export default {
 		}
 	}
 }
-.legend2 {
-	// display: flex;
-	// flex-flow: row wrap;
 
-	.legend-row {
-		cursor: pointer;
-		width: 100%;
-		display: flex;
-		margin-bottom: 16px;
-		width: 160px;
-		.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;

From eb7bee558ad973fca6b20456a1d868a6798f6652 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 12:58:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E7=9A=84=E5=A4=9A=E5=87=BA=E7=9A=84=E5=8D=8A=E6=A0=BC=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-nineList.vue     |  5 +++--
 src/views/modules/census/census-residentList.vue |  7 ++++---
 src/views/modules/communityParty/dyhx/party.vue  | 14 +++++++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 26cc71fc9..75cec240f 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -39,7 +39,7 @@
 							</div>
 							<div class="flex1">
 								<div class="box">
-									<div class="legend">
+									<div class="legend"  style="max-width: 1000px;">
 										<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">
@@ -68,7 +68,7 @@
 							style="width: 100%;"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  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="placeOrgName" align="center" label="镇街" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="placeOrgName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column> -->
@@ -669,4 +669,5 @@ export default {
 		}
 	}
 }
+
 </style>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 5a92a37f6..9ded3ce79 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -97,7 +97,7 @@
 							style="width: 100%;"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  type="index" align="center" width="50" />
 							<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
@@ -216,7 +216,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 668 + this.iframeHeigh : this.clientHeight - 668;
 			return this.TableHeight;
 		},
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -810,7 +810,7 @@ export default {
 	justify-content: space-between;
 	align-items: flex-end;
 	margin-bottom: 0px;
-	margin-top: 0px;
+	margin-top: 30px;
 	.census_searchcensus_box {
 		align-items: flex-end;
 		display: flex;
@@ -881,4 +881,5 @@ export default {
 		}
 	}
 }
+
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 8a88ce5e2..c4f8a07cd 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -58,7 +58,7 @@
 						class="table"
 						:data="tableDataAge"
 						border
-						:height="tableHeight"
+						:height="maxTableHeight"
 						v-loading="tableLoadingAge"
 						:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
 						style="width: 100%"
@@ -124,7 +124,7 @@
 						class="table"
 						:data="tableData"
 						border
-						:height="tableHeight"
+						:height="maxTableHeight"
 						v-loading="tableLoading"
 						:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
 						style="width: 100%"
@@ -272,8 +272,8 @@ export default {
 		};
 	},
 	computed: {
-		tableHeight() {
-			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 638 + this.iframeHeigh : this.clientHeight - 638;
+		maxTableHeight() {
+			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 668 + this.iframeHeigh : this.clientHeight - 668;
 			return this.TableHeight;
 		},
 
@@ -669,6 +669,7 @@ export default {
 					console.log(prev, cur, index);
 					return prev + cur;
 				});
+			console.log('this.pieDatatotal',this.pieDatatotal);
 			this.chartData.name = data.map(item => item.value);
 			this.chartData.data = data.map(item => {
 				return {
@@ -679,6 +680,7 @@ export default {
 				};
 			});
 			console.log('chartData', this.chartData);
+			this.$forceUpdate();
 			this.initAgeCharts(this.chartData);
 		},
 		setPieData2() {
@@ -703,6 +705,7 @@ export default {
 			});
 
 			console.log('chartData', this.chartData2);
+			this.$forceUpdate();
 			this.initEduCharts(this.chartData2);
 		},
 
@@ -948,7 +951,7 @@ export default {
 	justify-content: space-between;
 	align-items: flex-end;
 	margin-bottom: 0px;
-	margin-top: 0px;
+	margin-top: 30px;
 	.census_searchcensus_box {
 		align-items: flex-end;
 		display: flex;
@@ -1021,4 +1024,5 @@ export default {
 		}
 	}
 }
+
 </style>

From 6489191ec1a7b8249b7397e19ea26164332daaee Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 13:05:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountActiveList.vue | 7 ++++---
 src/views/modules/census/census-accountList.vue       | 9 +++++----
 src/views/modules/census/census-houseList.vue         | 9 ++++++---
 src/views/modules/census/census-orgStatusList.vue     | 5 +++--
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 31d1150a1..9987471cc 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -15,7 +15,7 @@
 								@change="handleChangeAgency"
 							/>
 						</el-form-item>
-						<el-form-item label="上报时间" prop="startTime">
+						<el-form-item label="活跃时间" prop="startTime">
 							<el-date-picker
 								v-model="formData.startDate"
 								:picker-options="startPickerOptions"
@@ -66,7 +66,7 @@
 							style="width: 100%"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  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="loginCount" label="登录次数" width="110" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -105,7 +105,7 @@
 							style="width: 100%"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  type="index" align="center" width="50" />
 							<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 						<el-pagination
@@ -509,4 +509,5 @@ export default {
 		flex: 1;
 	}
 }
+
 </style>
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 9ed73c649..50c9d68cc 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -97,7 +97,7 @@
 							style="width: 100%"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  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>
@@ -130,20 +130,20 @@
 			</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 label="序号"  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>
 				</template>
 				<template v-if="orgType == 'street'">
-					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+					<el-table-column label="序号"  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>
 				</template>
 				<template v-if="orgType == 'district'">
-					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+					<el-table-column label="序号"  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>
 				</template>
@@ -712,4 +712,5 @@ export default {
 		flex: 1;
 	}
 }
+
 </style>
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 0eb4d905f..ecf0896c9 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -16,7 +16,7 @@
 								@change="handleChangeAgency"
 							></el-cascader>
 						</el-form-item>
-						<el-form-item label="上报时间" prop="startTime">
+						<el-form-item label="更新时间" prop="startTime">
 							<el-date-picker
 								v-model="formData.startDate"
 								:picker-options="startPickerOptions"
@@ -122,7 +122,7 @@
 							style="width: 100%;"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+							<el-table-column label="序号"  type="index" align="center" width="50" />
 							<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
@@ -911,7 +911,9 @@ export default {
 }
 .div_table {
 	padding: 30px !important;
-	.table{margin-top: 16px!important;}
+	.table {
+		margin-top: 16px !important;
+	}
 }
 .div_table_title {
 	margin-top: -10px;
@@ -952,4 +954,5 @@ export default {
 		}
 	}
 }
+
 </style>
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index ffe89e150..dabe90fc4 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -17,7 +17,7 @@
 							></el-cascader>
 						</el-form-item>
 
-						<el-form-item label="" prop="startDate">
+						<el-form-item label="更新时间" prop="startDate">
 							<el-date-picker
 								v-model="formData.startDate"
 								:picker-options="startPickerOptions"
@@ -115,7 +115,7 @@
 		</div>
 		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
-				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+				<el-table-column label="序号"  type="index" align="center" width="50" />
 				<el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
 				<el-table-column prop="streeName" label="所属街道" align="center" :show-overflow-tooltip="true" />
 				<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -604,4 +604,5 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
+
 </style>

From 95b0e4762dbd5417a3ff5b65d360c238c9f647c2 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 13:19:01 +0800
Subject: [PATCH 5/5] =?UTF-8?q?y=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountList.vue |  8 +++++++-
 .../modules/census/census-orgStatusList.vue     | 17 +++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 50c9d68cc..0062d99f4 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -539,6 +539,7 @@ export default {
 		// 获取饼状图
 		async iniPieChart(chartData) {
 			this.$refs.pieChart.clear();
+			
 			// 获取pieChart配置
 			this.pieOption = {
 				grid: {
@@ -588,7 +589,9 @@ export default {
 						lineStyle: {
 							color: '#F3F7FD'
 						}
-					}
+					},
+					min:0,
+					max:1000,
 				},
 				series: [
 					{
@@ -602,6 +605,9 @@ export default {
 					}
 				]
 			};
+			if (chartData.data.length>0) {
+				this.pieOption.yAxis.max=null
+			} 
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index dabe90fc4..f6757a57b 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -115,7 +115,7 @@
 		</div>
 		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
-				<el-table-column label="序号"  type="index" align="center" width="50" />
+				<el-table-column label="序号" type="index" align="center" width="50" />
 				<el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
 				<el-table-column prop="streeName" label="所属街道" align="center" :show-overflow-tooltip="true" />
 				<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -218,7 +218,7 @@ export default {
 			TableHeight: '',
 			pieData: {},
 			agencyId: '',
-			level:'',
+			level: ''
 		};
 	},
 	components: {
@@ -227,7 +227,7 @@ export default {
 	computed: {
 		maxTableHeight() {
 			this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 431 + this.iframeHeigh : this.clientHeight - 431;
-			console.log("this.TableHeight",this.TableHeight)
+			console.log('this.TableHeight', this.TableHeight);
 			return this.TableHeight;
 		},
 
@@ -443,6 +443,7 @@ export default {
 		// 获取饼状图
 		async iniPieChart(chartData) {
 			this.$refs.pieChart.clear();
+			
 			// 获取pieChart配置
 			this.pieOption = {
 				grid: {
@@ -492,7 +493,9 @@ export default {
 						lineStyle: {
 							color: '#F3F7FD'
 						}
-					}
+					},
+					min: 0,
+					max: 1000
 				},
 				series: [
 					{
@@ -501,11 +504,14 @@ export default {
 						type: 'bar',
 						itemStyle: {
 							color: 'rgb(33, 149, 254)',
-							borderRadius: [4, 4, 0, 0],
+							borderRadius: [4, 4, 0, 0]
 						}
 					}
 				]
 			};
+			if (chartData.data.length>0) {
+				this.pieOption.yAxis.max=null
+			} 
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
@@ -604,5 +610,4 @@ export default {
 	border-radius: 6px;
 	color: #fff;
 }
-
 </style>