From d3f08c6fcf8fe89d7c0ff1cdc6b3678c996665a7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Sun, 23 Apr 2023 09:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=AD=E6=97=A5=E5=9B=BE=E5=A5=BD=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/sida/cpts/fw01gg.vue      |   4 +-
 src/views/dataBoard/sida/cpts/fw02gxxq.vue    |  52 ++++++-
 .../dataBoard/sida/cpts/fwBarOption01.js      |  20 +--
 src/views/dataBoard/sida/cpts/zyqd.vue        | 130 +++---------------
 4 files changed, 65 insertions(+), 141 deletions(-)

diff --git a/src/views/dataBoard/sida/cpts/fw01gg.vue b/src/views/dataBoard/sida/cpts/fw01gg.vue
index 9c40eb228..1123cf9a5 100644
--- a/src/views/dataBoard/sida/cpts/fw01gg.vue
+++ b/src/views/dataBoard/sida/cpts/fw01gg.vue
@@ -117,7 +117,7 @@ export default {
 				pieData0.push(item.service_category);
 				pieData1.push(item.common_service_num);
 				pieData2.push(item.appoint_service_num);
-				pieData3.push(item.served_person_qty_num);
+				// pieData3.push(item.served_person_qty_num);
 			});
 
 			this.pieData = [pieData0, pieData1, pieData2, pieData3];
@@ -131,7 +131,7 @@ export default {
 			this.pieOption.xAxis[0].data = this.pieData[0];
 			this.pieOption.series[0].data = this.pieData[1];
 			this.pieOption.series[1].data = this.pieData[2];
-			this.pieOption.series[2].data = this.pieData[3];
+			// this.pieOption.series[2].data = this.pieData[3];
 			this.$refs.pieChart.setOption(this.pieOption);
 		}
 	}
diff --git a/src/views/dataBoard/sida/cpts/fw02gxxq.vue b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
index 748dcc22a..01931a688 100644
--- a/src/views/dataBoard/sida/cpts/fw02gxxq.vue
+++ b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
-import { pieOption } from './fwqdPieOption.js';
+// import { pieOption } from './fwqdPieOption.js';
 import { requestPostBi } from '@/js/dai/request-bipass';
 export default {
 	props: {
@@ -31,7 +31,45 @@ export default {
 			showNoData: false,
 			timer: null,
 			pieChart: '',
-			pieOption: {},
+			pieOption: {
+				color: ['#1A95FF', '#FF6138', '#2adcea', '#2cc4ad', '#7377f5', '#32de66', '#8155d4', '#c7ea48', '#ef47c2', 'd43349'],
+				tooltip: {
+					trigger: 'item'
+				},
+				series: [
+					{
+						name: '',
+						type: 'pie',
+						radius: [40, 130],
+						center: ['50%', '50%'],
+						// roseType: 'area',
+						itemStyle: {
+							borderRadius: 1
+						},
+						avoidLabelOverlap: false,
+						labelLine: {
+							show: false
+						},
+						label: {
+							normal: {
+								position: 'inner',
+								show: true,
+								formatter: '{d}%',
+								fontSize: 24,
+								color: '#FFFFFF'
+							}
+						},
+						emphasis: {
+							label: {
+								show: true,
+								// fontSize: 36,
+								fontWeight: 'bold'
+							}
+						},
+						data: []
+					}
+				]
+			},
 			pieInitState: false,
 			pieData: [],
 
@@ -118,7 +156,7 @@ export default {
 		async iniPieChart() {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
-			this.pieOption = pieOption();
+		
 			this.pieOption.series[0].name = this.currentTab;
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
@@ -130,10 +168,10 @@ export default {
 <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
 <style scoped lang="scss">
 /deep/.pieMain3 {
-		.legend {
-			.legend-row{
-				margin-top:10px!important
-				}
+	.legend {
+		.legend-row {
+			margin-top: 10px !important;
 		}
 	}
+}
 </style>
diff --git a/src/views/dataBoard/sida/cpts/fwBarOption01.js b/src/views/dataBoard/sida/cpts/fwBarOption01.js
index c83c4468d..b6d8b6c2a 100644
--- a/src/views/dataBoard/sida/cpts/fwBarOption01.js
+++ b/src/views/dataBoard/sida/cpts/fwBarOption01.js
@@ -107,24 +107,6 @@ export function pieOption() {
 				}])
 			},
 			data: []
-		}, {
-			name: '服务人数',
-			type: 'bar',
-			barWidth: 12,
-			stack: 'Ad',
-			emphasis: {
-				focus: 'series'
-			},
-			itemStyle: {
-				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-					offset: 0,
-					color: '#FFAA00'
-				}, {
-					offset: 1,
-					color: 'rgba(168,241,255,0)'
-				}])
-			},
-			data: []
-		}, ]
+		} ]
 	}
 }
diff --git a/src/views/dataBoard/sida/cpts/zyqd.vue b/src/views/dataBoard/sida/cpts/zyqd.vue
index 0e2e3f23c..b6ae63100 100644
--- a/src/views/dataBoard/sida/cpts/zyqd.vue
+++ b/src/views/dataBoard/sida/cpts/zyqd.vue
@@ -114,7 +114,6 @@ export default {
 		},
 		// 获取房屋总数等
 		async getInfo() {
-			console.log('this.orgId', this.orgId);
 			let url = '';
 			if (this.currentTab == '人资源') {
 				url = 'people_res_view';
@@ -195,7 +194,6 @@ export default {
 						type: 'sunburst',
 						radius: ['20%', '100%'],
 						center: ['50%', '50%'],
-						// roseType: 'area',
 						itemStyle: {
 							borderRadius: 1
 						},
@@ -203,24 +201,21 @@ export default {
 						labelLine: {
 							show: false
 						},
-						// {a}：系列名。
-						// {b}：数据名。
-						// {c}：数据值。
-						// {@xxx}：数据中名为 'xxx' 的维度的值，如 {@product} 表示名为 'product' 的维度的值。
-						// {@[n]}：数据中维度 n 的值，如 {@[3]} 表示维度 3 的值，从 0 开始计数。
 						label: {
 							normal: {
 								position: 'inner',
 								show: true,
-								formatter: '{@radio}',
-								fontSize: 16,
+								formatter: function(e) {
+									let data = e.data;
+									return `${data.radio}`;
+								},
+								fontSize:24,
 								color: '#FFFFFF'
 							}
 						},
 						emphasis: {
 							label: {
 								show: true,
-								// fontSize: 36,
 								fontWeight: 'bold'
 							}
 						},
@@ -229,119 +224,28 @@ export default {
 				]
 			};
 			this.pieOption.series[0].name = this.currentTab;
-			console.log('ddd', 'pieDatatotal');
+
 			let data = this.pieData;
 			let pieDatatotal = data
 				.map(item => item.value)
 				.reduce(function(prev, cur, index, arr) {
-					console.log(prev, cur, index);
 					return prev + cur;
 				});
-			console.log(pieDatatotal, 'pieDatatotal');
-			let data2 = data.map(item => {
-				return {
-					value: item.value,
-					name: item.name,
-					children: item.children,
-					radio: item.value == 0 ? '0' : ((item.value / pieDatatotal) * 100).toFixed(2)
-				};
+
+			data.forEach(item => {
+				item.radio = item.value == 0 ? '0%' : ((item.value / pieDatatotal) * 100).toFixed(2) + '%';
+				if (item.children.length > 0) {
+					let children = item.children;
+					children.forEach(item2 => {
+						item2.radio = item2.value == 0 ? '0%' : ((item2.value / pieDatatotal) * 100).toFixed(2) + '%';
+					});
+				}
 			});
-console.log(data2, 'data2');
+			let data2 = [...data];
+			console.log('data2', data2);
 			this.pieOption.series[0].data = data2;
 
 			this.$refs.pieChart.setOption(this.pieOption);
-
-			// [
-			//     {
-			//         "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
-			//         "name": "志愿者",
-			//         "count": 19,
-			//         "child": [
-			//             {
-			//                 "name": "调解员",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "文化队伍",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "楼委会",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "老友俱乐部",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "能人达人",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "代办员",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "采集员",
-			//                 "count": 0
-			//             }
-			//         ]
-			//     },
-			//     {
-			//         "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
-			//         "name": "联建单位",
-			//         "count": 7,
-			//         "child": [
-			//             {
-			//                 "name": "其他",
-			//                 "count": 1
-			//             },
-			//             {
-			//                 "name": "两新组织",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "基金会",
-			//                 "count": 1
-			//             },
-			//             {
-			//                 "name": "楼宇党建",
-			//                 "count": 1
-			//             },
-			//             {
-			//                 "name": "民办非企业单位",
-			//                 "count": 1
-			//             },
-			//             {
-			//                 "name": "区域单位党建",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "社会团体",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "机关直属部门",
-			//                 "count": 2
-			//             }
-			//         ]
-			//     },
-			//     {
-			//         "org_id": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28",
-			//         "name": "社区自组织",
-			//         "count": 0,
-			//         "child": [
-			//             {
-			//                 "name": "组织",
-			//                 "count": 0
-			//             },
-			//             {
-			//                 "name": "网格",
-			//                 "count": 0
-			//             }
-			//         ]
-			//     }
-			// ]
 		},
 		handelClickMyPei(item) {
 			this.handleClickItem(item);