From 1121e8d4f11e94ef15f8fa523f99c422671119f2 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Fri, 31 Mar 2023 16:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E5=A4=A7=E6=B8=85=E5=8D=95-=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1-mock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/dataBoard/renfang/index.scss  |   1 +
 src/views/dataBoard/sida/cpts/fw01gg.vue      |  80 ++---
 src/views/dataBoard/sida/cpts/fw02gxxq.vue    |  70 +---
 src/views/dataBoard/sida/cpts/fw03zr.vue      |  67 ++--
 src/views/dataBoard/sida/cpts/fw04gx.vue      |  85 ++---
 src/views/dataBoard/sida/cpts/fw05zc.vue      | 308 ++++++++----------
 src/views/dataBoard/sida/cpts/fwBarOption.js  | 130 --------
 .../dataBoard/sida/cpts/fwBarOption01.js      | 130 ++++++++
 .../dataBoard/sida/cpts/fwBarOption04.js      | 130 ++++++++
 .../dataBoard/sida/cpts/fwBarOption05.js      | 132 ++++++++
 src/views/dataBoard/sida/fw.vue               |   2 +-
 11 files changed, 643 insertions(+), 492 deletions(-)
 delete mode 100644 src/views/dataBoard/sida/cpts/fwBarOption.js
 create mode 100644 src/views/dataBoard/sida/cpts/fwBarOption01.js
 create mode 100644 src/views/dataBoard/sida/cpts/fwBarOption04.js
 create mode 100644 src/views/dataBoard/sida/cpts/fwBarOption05.js

diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss
index 4de9f0966..870d934f3 100644
--- a/src/assets/scss/dataBoard/renfang/index.scss
+++ b/src/assets/scss/dataBoard/renfang/index.scss
@@ -691,6 +691,7 @@
 	}
 }
 .kuangkuang {
+	height: 122px;
 	width: 100%;
 	// height: calc(100% - 120px);
 	border: 0px solid rgb(26, 149, 255);
diff --git a/src/views/dataBoard/sida/cpts/fw01gg.vue b/src/views/dataBoard/sida/cpts/fw01gg.vue
index e121eb14e..4e50a63a0 100644
--- a/src/views/dataBoard/sida/cpts/fw01gg.vue
+++ b/src/views/dataBoard/sida/cpts/fw01gg.vue
@@ -4,24 +4,24 @@
 			<el-col :span="12">
 				<div class="kuangkuang">
 					<h3>公共服务数量</h3>
-					<h2>256</h2>
+					<h2>{{ info.common_service_total }}</h2>
 				</div>
 			</el-col>
 			<el-col :span="12">
 				<div class="kuangkuang">
 					<h3>指派服务数量</h3>
-					<h2>2545</h2>
+					<h2>{{ info.appoint_service_num }}</h2>
 				</div>
 			</el-col>
 		</el-row>
-		<div class="pieMain pieMain2" >
+		<div class="pieMain pieMain2">
 			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
 		</div>
 	</div>
 </template>
 <script>
 import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
-import { pieOption } from './fwBarOption.js';
+import { pieOption } from './fwBarOption01.js';
 import { requestPostBi } from '@/js/dai/request-bipass';
 export default {
 	props: {
@@ -49,17 +49,16 @@ export default {
 	mounted() {
 		this.init();
 	},
-	
+
 	methods: {
 		async init() {
 			await this.getInfo();
 			this.getPie();
 		},
 
-		// 获取房屋总数等
+		// 公共服务数据统计
 		async getInfo() {
-			let url = 'common_service_view';
-
+			let url = 'common_service_count';
 			this.$refs.pieChart.showLoading();
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -71,7 +70,7 @@ export default {
 					}
 				},
 				{
-					// mockId: 60041615,
+					// mockId: 69354010,
 				}
 			);
 			this.$refs.pieChart.hideLoading();
@@ -109,47 +108,19 @@ export default {
 			}
 		},
 		setPieData() {
-			let { data } = this;
-			data = [
-				{
-					org_id: '',
-					name: '健康医疗',
-					count: 10
-				},
-				{
-					org_id: '',
-					name: '社区安全',
-					count: 20
-				},
-				{
-					org_id: '',
-					name: '社区治安',
-					count: 30
-				},
-				{
-					org_id: '',
-					name: '社区卫生',
-					count: 40
-				},
-				{
-					org_id: '',
-					name: '社区环境',
-					count: 50
-				},
-				{
-					org_id: '',
-					name: '社区救助',
-					count: 60
-				},
-				{
-					org_id: '',
-					name: '社区养老',
-					count:70
-				}
-			];
-			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
-			console.log('data', data);
-			this.pieData = data;
+			let data = [...this.info.child];
+			let pieData0 = [];
+			let pieData1 = [];
+			let pieData2 = [];
+			let pieData3 = [];
+			data.forEach((item, index) => {
+				pieData0.push(item.service_category);
+				pieData1.push(item.common_service_num);
+				pieData2.push(item.appoint_service_num);
+				pieData3.push(item.served_person_qty_num);
+			});
+
+			this.pieData = [pieData0, pieData1, pieData2, pieData3];
 			this.iniPieChart();
 		},
 		// 获取饼状图
@@ -157,8 +128,10 @@ export default {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = pieOption();
-			this.pieOption.series[0].name = this.currentTab;
-			this.pieOption.series[0].data = this.pieData;
+			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.$refs.pieChart.setOption(this.pieOption);
 		}
 	}
@@ -166,3 +139,6 @@ export default {
 </script>
 
 <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
+<style scoped>
+	.pieMain2{margin-left:0px!important}
+</style>
diff --git a/src/views/dataBoard/sida/cpts/fw02gxxq.vue b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
index 099be1849..748dcc22a 100644
--- a/src/views/dataBoard/sida/cpts/fw02gxxq.vue
+++ b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
@@ -35,7 +35,7 @@ export default {
 			pieInitState: false,
 			pieData: [],
 
-			info: {}
+			info: []
 		};
 	},
 	components: {
@@ -44,7 +44,7 @@ export default {
 	mounted() {
 		this.init();
 	},
-	
+
 	watch: {
 		currentTab() {
 			this.setPieData();
@@ -61,7 +61,7 @@ export default {
 
 		// 获取房屋总数等
 		async getInfo() {
-			let url = 'common_service_view';
+			let url = 'common_demand_response';
 			this.$refs.pieChart.showLoading();
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -73,17 +73,13 @@ export default {
 					}
 				},
 				{
-					// mockId: 60041615,
+					// mockId: 69366649,
 				}
 			);
 			this.$refs.pieChart.hideLoading();
 			if (code === 0) {
 				if (data && Array.isArray(data) && data.length > 0) {
-					let info = data[0];
-					this.info = {
-						...this.info,
-						...info
-					};
+					this.info = data;
 				}
 			} else {
 				this.$message.error(msg);
@@ -103,6 +99,7 @@ export default {
 		},
 		getPie() {
 			if (this.pieInitState) {
+				console.log('d');
 				this.setPieData();
 			} else {
 				setTimeout(() => {
@@ -111,50 +108,10 @@ export default {
 			}
 		},
 		setPieData() {
-			const { currentTab, info } = this;
-
-			let { data } = this;
-			data = [
-				{
-					org_id: '',
-					name: '健康医疗',
-					count: 10
-				},
-				{
-					org_id: '',
-					name: '社区安全',
-					count: 20
-				},
-				{
-					org_id: '',
-					name: '社区治安',
-					count: 30
-				},
-				{
-					org_id: '',
-					name: '社区卫生',
-					count: 40
-				},
-				{
-					org_id: '',
-					name: '社区环境',
-					count: 50
-				},
-				{
-					org_id: '',
-					name: '社区救助',
-					count: 60
-				},
-				{
-					org_id: '',
-					name: '社区养老',
-					count: 70
-				}
-			];
-			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
-			console.log('data', data);
+			let data = [...this.info];
+			data = JSON.parse(JSON.stringify(data).replace(/parent_type_name/g, 'name'));
+			data = JSON.parse(JSON.stringify(data).replace(/common_demand_num/g, 'value'));
 			this.pieData = data;
-
 			this.iniPieChart();
 		},
 		// 获取饼状图
@@ -171,3 +128,12 @@ export default {
 </script>
 
 <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
+				}
+		}
+	}
+</style>
diff --git a/src/views/dataBoard/sida/cpts/fw03zr.vue b/src/views/dataBoard/sida/cpts/fw03zr.vue
index 56f5983ba..0a818c05b 100644
--- a/src/views/dataBoard/sida/cpts/fw03zr.vue
+++ b/src/views/dataBoard/sida/cpts/fw03zr.vue
@@ -4,29 +4,28 @@
 			<el-col :span="12">
 				<div class="kuangkuang">
 					<h3>公共服务数量</h3>
-					<h2>256</h2>
+					<h2>{{ info.service_total }}</h2>
 				</div>
 			</el-col>
 			<el-col :span="12">
 				<div class="kuangkuang">
 					<h3>指派服务数量</h3>
-					<h2>2545</h2>
+					<h2>{{ info.service_person_total }}</h2>
 				</div>
 			</el-col>
 		</el-row>
 		<div class="tablist">
-			<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="currentTab = item">{{ item }}</div>
+			<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="changTab(item)">{{ item }}</div>
 		</div>
 		<div>
 			<div class="linecharts" v-if="resiCategoryData.length > 0">
-				<div class="item" @click="toResiClassPage(item.code, item.name)" :key="item.code + index" v-for="(item, index) in resiCategoryData">
+				<div class="item"  :key="index" v-for="(item, index) in resiCategoryData">
 					<div>{{ ('0' + (index + 1)).substr(-2) }}.</div>
 					<div class="item-name">{{ item.name }}</div>
+					<div class="item-progress"><b :style="{ width: + '0%' }"></b></div>
 					<div class="item-count">
 						<b>{{ item.count }}</b>
-						人
 					</div>
-					<div class="item-progress"><b :style="{ width: item.ratio + '%' }"></b></div>
 					<!-- <div class="item-per">
 						<span>较上月</span>
 						<img v-if="item.growth >= 0" src="~@/assets/images/shuju/renfang/index/up.png" />
@@ -48,10 +47,13 @@ export default {
 		orgId: {
 			type: String,
 			default: ''
-		}
+		},
+		searchDate: Array
 	},
 	data() {
 		return {
+			lineData1: [],
+			lineData2: [],
 			resiCategoryData: [],
 			showNoData: false,
 			timer: null,
@@ -61,9 +63,7 @@ export default {
 			pieData: [],
 			tabList: ['服务次数排名', '服务人数排名'],
 			currentTab: '服务次数排名',
-			info: {
-				
-			}
+			info: {}
 		};
 	},
 	components: {
@@ -72,13 +72,17 @@ export default {
 	mounted() {
 		this.init();
 	},
-	watch: {
-		currentTab() {
-			this.getResiCategoryData();
-		},
-		
-	},
+	watch: {},
 	methods: {
+		changTab(item) {
+			this.currentTab=item
+			if (item == '服务次数排名') {
+				this.resiCategoryData = [...this.lineData1];
+			} else {
+				this.resiCategoryData = [...this.lineData2];
+			}
+		},
+
 		async init() {
 			this.getResiCategoryData();
 		},
@@ -104,18 +108,15 @@ export default {
 			});
 		},
 		async getResiCategoryData() {
-			let url = '';
-			if (this.currentTab == '服务次数排名') {
-				url = 'self_need_view';
-			} else if (this.currentTab == '服务人数排名') {
-				url = 'attention_eval_view';
-			} 
+			let url = 'service_search_person';
 
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
 					queryParam: {
-						org_id: this.orgId
+						org_id: this.orgId,
+						start_date: this.searchDate[0],
+						end_date: this.searchDate[1]
 					}
 				},
 				{
@@ -123,16 +124,22 @@ export default {
 				}
 			);
 			if (code === 0) {
-				this.resiCategoryData = data.map(item => {
+				this.info = data[0];
+				console.log(this.info);
+				this.lineData1 = this.info.child_service_num.map(item => {
+					return {
+						name: item.common_service_type_name,
+						count: item.service_num
+					};
+				});
+				console.log(this.lineData1);
+				this.lineData2 = this.info.child_service_person_num.map(item => {
 					return {
-						code: item.label_id,
-						name: item.label,
-						count: item.count,
-						ratio: item.ratio,
-						growth: item.growth,
-						growthAbs: Math.abs(item.growth)
+						name: item.common_service_type_name,
+						count: item.service_person_num
 					};
 				});
+				this.resiCategoryData = [...this.lineData1];
 			} else {
 				this.$message.error(msg);
 			}
diff --git a/src/views/dataBoard/sida/cpts/fw04gx.vue b/src/views/dataBoard/sida/cpts/fw04gx.vue
index 91c2c411c..ec59e0e91 100644
--- a/src/views/dataBoard/sida/cpts/fw04gx.vue
+++ b/src/views/dataBoard/sida/cpts/fw04gx.vue
@@ -1,28 +1,29 @@
 <template>
 	<div class="m-zyqd">
+		
 		<el-row :gutter="16">
 			<el-col :span="6">
 				<div class="kuangkuang">
 					<h3>个性服务数量</h3>
-					<h2>256</h2>
+					<h2>{{info.user_service_total}}</h2>
 				</div>
 			</el-col>
 			<el-col :span="6">
 				<div class="kuangkuang">
 					<h3>完成服务数量</h3>
-					<h2>2545</h2>
+					<h2>{{info.service_complete_total}}</h2>
 				</div>
 			</el-col>
 			<el-col :span="6">
 				<div class="kuangkuang">
 					<h3>服务完成率</h3>
-					<h2>2545</h2>
+					<h2>{{info.service_complete_ratio_total}}</h2>
 				</div>
 			</el-col>
 			<el-col :span="6">
 				<div class="kuangkuang">
 					<h3>服务满意度</h3>
-					<h2>2545</h2>
+					<h2>{{info.service_score_tatal}}</h2>
 				</div>
 			</el-col>
 		</el-row>
@@ -33,7 +34,7 @@
 </template>
 <script>
 import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
-import { pieOption } from './fwBarOption.js';
+import { pieOption } from './fwBarOption04.js';
 import { requestPostBi } from '@/js/dai/request-bipass';
 export default {
 	props: {
@@ -50,7 +51,9 @@ export default {
 			pieChart: '',
 			pieOption: {},
 			pieInitState: false,
-			pieData: []
+			pieData: [],
+
+			info: {}
 		};
 	},
 	components: {
@@ -59,7 +62,6 @@ export default {
 	mounted() {
 		this.init();
 	},
-	
 
 	methods: {
 		async init() {
@@ -67,10 +69,9 @@ export default {
 			this.getPie();
 		},
 
-		// 获取房屋总数等
+		// 公共服务数据统计
 		async getInfo() {
-			let url = 'self_service_view';
-
+			let url = 'user_demand_count';
 			this.$refs.pieChart.showLoading();
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -82,7 +83,7 @@ export default {
 					}
 				},
 				{
-					// mockId: 60041615,
+					mockId: 69450870,
 				}
 			);
 			this.$refs.pieChart.hideLoading();
@@ -120,48 +121,19 @@ export default {
 			}
 		},
 		setPieData() {
-			let { data } = this;
-			data = [
-				{
-					org_id: '',
-					name: '健康医疗',
-					count: 10
-				},
-				{
-					org_id: '',
-					name: '社区安全',
-					count: 20
-				},
-				{
-					org_id: '',
-					name: '社区治安',
-					count: 30
-				},
-				{
-					org_id: '',
-					name: '社区卫生',
-					count: 40
-				},
-				{
-					org_id: '',
-					name: '社区环境',
-					count: 50
-				},
-				{
-					org_id: '',
-					name: '社区救助',
-					count: 60
-				},
-				{
-					org_id: '',
-					name: '社区养老',
-					count: 70
-				}
-			];
-			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
-			console.log('data', data);
-			this.pieData = data;
+			let data = [...this.info.child];
+			let pieData0 = [];
+			let pieData1 = [];
+			let pieData2 = [];
+			let pieData3 = [];
+			data.forEach((item, index) => {
+				pieData0.push(item.category);
+				pieData1.push(item.user_service_num);
+				pieData2.push(item.service_complete_num);
+				pieData3.push(item.service_complete_ratio);
+			});
 
+			this.pieData = [pieData0, pieData1, pieData2, pieData3];
 			this.iniPieChart();
 		},
 		// 获取饼状图
@@ -169,8 +141,10 @@ export default {
 			this.$refs.pieChart.clear();
 			// 获取pieChart配置
 			this.pieOption = pieOption();
-			this.pieOption.series[0].name = this.currentTab;
-			this.pieOption.series[0].data = this.pieData;
+			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.$refs.pieChart.setOption(this.pieOption);
 		}
 	}
@@ -178,3 +152,6 @@ export default {
 </script>
 
 <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
+<style scoped>
+	.pieMain2{margin-left:0px!important}
+</style>
diff --git a/src/views/dataBoard/sida/cpts/fw05zc.vue b/src/views/dataBoard/sida/cpts/fw05zc.vue
index f03112d28..90fdb9755 100644
--- a/src/views/dataBoard/sida/cpts/fw05zc.vue
+++ b/src/views/dataBoard/sida/cpts/fw05zc.vue
@@ -1,173 +1,135 @@
-<template>
-	<div class="m-zyqd">
-		<el-row :gutter="16">
-			<el-col :span="8">
-				<div class="kuangkuang">
-					<h3>发布政策数</h3>
-					<h2>256</h2>
-				</div>
-			</el-col>
-			<el-col :span="8">
-				<div class="kuangkuang">
-					<h3>指派服务数</h3>
-					<h2>2545</h2>
-				</div>
-			</el-col>
-			<el-col :span="8">
-				<div class="kuangkuang">
-					<h3>政策找人数</h3>
-					<h2>2545</h2>
-				</div>
-			</el-col>
-		</el-row>
-		<div class="pieMain pieMain2">
-			<div class="pie" ><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
-		</div>
-	</div>
-</template>
-<script>
-import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
-import { pieOption } from './fwBarOption.js';
-import { requestPostBi } from '@/js/dai/request-bipass';
-export default {
-	props: {
-		orgId: {
-			type: String,
-			default: ''
-		},
-		searchDate: Array
-	},
-	data() {
-		return {
-			showNoData: false,
-			timer: null,
-			pieChart: '',
-			pieOption: {},
-			pieInitState: false,
-			pieData: []
-		};
-	},
-	components: {
-		screenEchartsFrame
-	},
-	mounted() {
-		this.init();
-	},
-
-	methods: {
-		async init() {
-			await this.getInfo();
-			this.getPie();
-		},
-
-		// 获取房屋总数等
-		async getInfo() {
-			let url = 'common_service_view';
-
-			this.$refs.pieChart.showLoading();
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					queryParam: {
-						org_id: this.orgId,
-						start_date: this.searchDate[0],
-						end_date: this.searchDate[1]
-					}
-				},
-				{
-					// mockId: 60041615,
-				}
-			);
-			this.$refs.pieChart.hideLoading();
-			if (code === 0) {
-				if (data && Array.isArray(data) && data.length > 0) {
-					let info = data[0];
-					this.info = {
-						...this.info,
-						...info
-					};
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		selItem(selItem, selIndex) {
-			this.tabList.forEach((element, index) => {
-				if (index === selIndex) {
-					element.sel = true;
-				} else {
-					element.sel = false;
-				}
-			});
-		},
-		pieInitOk() {
-			this.pieInitState = true;
-		},
-		getPie() {
-			if (this.pieInitState) {
-				this.setPieData();
-			} else {
-				setTimeout(() => {
-					this.getPie();
-				}, 500);
-			}
-		},
-		setPieData() {
-			let { data } = this;
-			data = [
-				{
-					org_id: '',
-					name: '健康医疗',
-					count: 10
-				},
-				{
-					org_id: '',
-					name: '社区安全',
-					count: 20
-				},
-				{
-					org_id: '',
-					name: '社区治安',
-					count: 30
-				},
-				{
-					org_id: '',
-					name: '社区卫生',
-					count: 40
-				},
-				{
-					org_id: '',
-					name: '社区环境',
-					count: 50
-				},
-				{
-					org_id: '',
-					name: '社区救助',
-					count: 60
-				},
-				{
-					org_id: '',
-					name: '社区养老',
-					count: 70
-				}
-			];
-			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
-			console.log('data', data);
-			this.pieData = data;
-
-			this.iniPieChart();
-		},
-		// 获取饼状图
-		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);
-		}
-	}
-};
-</script>
-
-<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
+<template>
+	<div class="m-zyqd">
+		
+		<el-row :gutter="16">
+			<el-col :span="8">
				<div class="kuangkuang">
					<h3>发布政策数</h3>
					<h2>{{info.pub_policy_total}}</h2>
				</div>
			</el-col>
			<el-col :span="8">
				<div class="kuangkuang">
					<h3>指派服务数</h3>
				<h2>{{info.assign_service_total}}</h2>
				</div>
			</el-col>
			<el-col :span="8">
				<div class="kuangkuang">
					<h3>政策找人数</h3>
				<h2>{{info.policy_search_person_total}}</h2>
				</div>
			</el-col>
+			
+		</el-row>
+		<div class="pieMain pieMain2">
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+		</div>
+	</div>
+</template>
+<script>
+import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
+import { pieOption } from './fwBarOption05.js';
+import { requestPostBi } from '@/js/dai/request-bipass';
+export default {
+	props: {
+		orgId: {
+			type: String,
+			default: ''
+		},
+		searchDate: Array
+	},
+	data() {
+		return {
+			showNoData: false,
+			timer: null,
+			pieChart: '',
+			pieOption: {},
+			pieInitState: false,
+			pieData: [],
+
+			info: {}
+		};
+	},
+	components: {
+		screenEchartsFrame
+	},
+	mounted() {
+		this.init();
+	},
+
+	methods: {
+		async init() {
+			await this.getInfo();
+			this.getPie();
+		},
+
+		// 公共服务数据统计
+		async getInfo() {
+			let url = 'policy_search_person';
+			this.$refs.pieChart.showLoading();
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						org_id: this.orgId,
+						start_date: this.searchDate[0],
+						end_date: this.searchDate[1]
+					}
+				},
+				{
+					mockId: 69463163,
+				}
+			);
+			this.$refs.pieChart.hideLoading();
+			if (code === 0) {
+				if (data && Array.isArray(data) && data.length > 0) {
+					let info = data[0];
+					this.info = {
+						...this.info,
+						...info
+					};
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		selItem(selItem, selIndex) {
+			this.tabList.forEach((element, index) => {
+				if (index === selIndex) {
+					element.sel = true;
+				} else {
+					element.sel = false;
+				}
+			});
+		},
+		pieInitOk() {
+			this.pieInitState = true;
+		},
+		getPie() {
+			if (this.pieInitState) {
+				this.setPieData();
+			} else {
+				setTimeout(() => {
+					this.getPie();
+				}, 500);
+			}
+		},
+		setPieData() {
+			let data = [...this.info.child];
+			let pieData0 = [];
+			let pieData1 = [];
+			let pieData2 = [];
+			let pieData3 = [];
+			data.forEach((item, index) => {
+				pieData0.push(item.common_service_type_name);
+				pieData1.push(item.assign_service_num);
+				pieData2.push(item.pub_policy_num);
+				
+			});
+
+			this.pieData = [pieData0, pieData1, pieData2];
+			this.iniPieChart();
+		},
+		// 获取饼状图
+		async iniPieChart() {
+			this.$refs.pieChart.clear();
+			// 获取pieChart配置
+			this.pieOption = pieOption();
+			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.$refs.pieChart.setOption(this.pieOption);
+		}
+	}
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
+<style scoped>
+	.pieMain2{margin-left:0px!important}
+</style>
diff --git a/src/views/dataBoard/sida/cpts/fwBarOption.js b/src/views/dataBoard/sida/cpts/fwBarOption.js
deleted file mode 100644
index b1c8cc35b..000000000
--- a/src/views/dataBoard/sida/cpts/fwBarOption.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import * as echarts from 'echarts'
-export function pieOption () {
-
-  return {
-    title: {
-      text: '单位（户）',
-      left: 5,
-      textStyle: {
-      
-        fontSize: 14,
-        color: " rgba(255,255,255,0.65)",
-        fontWeight: 400,
-      },
-    },
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'shadow'
-      }
-    },
-    // legend: {},
-    grid: {
-      top:40,
-      left: '3%',
-      right: '4%',
-      bottom: 19,
-      containLabel: true
-    },
-    xAxis: [
-      {
-        type: 'category',
-        axisLine: {
-          lineStyle: {
-            color:'rgba(255,255,255,0.15)',
-            width: 1, 
-            type: 'solid' 
-          }
-        },
-        axisTick: {
-          alignWithLabel: true
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: 'rgba(255,255,255,0.85)',  //更改坐标轴文字颜色
-            fontSize : 12      //更改坐标轴文字大小
-          }
-        },
-
-        data: []
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value',
-        max : 1000,
-        splitNumber : 5,
-        splitLine: { 
-          show: true, 
-          lineStyle:{ 
-            color:'rgba(255,255,255,0.15)',
-            width: 1, 
-            type: 'solid' 
-          } 
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: 'rgba(255,255,255,0.85)',  //更改坐标轴文字颜色
-            fontSize : 12      //更改坐标轴文字大小
-          }
-        },
-      }
-    ],
-    series: [
-  
-      {
-        name: '自住房屋',
-        type: 'bar',
-        stack: 'Ad',
-        barWidth:12,
-        emphasis: {
-          focus: 'series'
-        },
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#6FDEFF' },
-            { offset: 1, color: 'rgba(168,241,255,0)' }
-          ])
-        },
-        data: []
-      },
-      {
-        name: '出租房屋',
-        type: 'bar',
-        barWidth:12,
-        stack: 'Ad',
-        emphasis: {
-          focus: 'series'
-        },
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#1A95FF' },
-            { offset: 1, color: 'rgba(168,241,255,0)' }
-          ])
-        },
-        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/fwBarOption01.js b/src/views/dataBoard/sida/cpts/fwBarOption01.js
new file mode 100644
index 000000000..c83c4468d
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fwBarOption01.js
@@ -0,0 +1,130 @@
+import * as echarts from 'echarts'
+export function pieOption() {
+	return {
+		title: {
+			text: '单位（次）',
+			left: 5,
+			textStyle: {
+				fontSize: 14,
+				color: " rgba(255,255,255,0.65)",
+				fontWeight: 400,
+			},
+		},
+		tooltip: {
+			trigger: 'axis',
+			axisPointer: {
+				type: 'shadow'
+			}
+		},
+		legend: {
+			right: '0%',
+			textStyle: {
+				fontSize: 14, //字体大小
+				color: '#ffffff' //字体颜色
+			},
+		},
+		grid: {
+			top: 40,
+			left: '0%',
+			right: '0%',
+			bottom: 19,
+			containLabel: true
+		},
+		xAxis: [{
+			type: 'category',
+			axisLine: {
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisTick: {
+				alignWithLabel: true
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+			data: []
+		}],
+		yAxis: [{
+			type: 'value',
+			max: 1000,
+			splitNumber: 5,
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+		}],
+		series: [{
+			name: '公共服务',
+			type: 'bar',
+			stack: 'Ad',
+			barWidth: 12,
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#6FDEFF'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			data: []
+		}, {
+			name: '指派服务',
+			type: 'bar',
+			barWidth: 12,
+			stack: 'Ad',
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#eaff27'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			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/fwBarOption04.js b/src/views/dataBoard/sida/cpts/fwBarOption04.js
new file mode 100644
index 000000000..3f1669c9d
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fwBarOption04.js
@@ -0,0 +1,130 @@
+import * as echarts from 'echarts'
+export function pieOption() {
+	return {
+		title: {
+			text: '单位（次）',
+			left: 5,
+			textStyle: {
+				fontSize: 14,
+				color: " rgba(255,255,255,0.65)",
+				fontWeight: 400,
+			},
+		},
+		tooltip: {
+			trigger: 'axis',
+			axisPointer: {
+				type: 'shadow'
+			}
+		},
+		legend: {
+			right: '0%',
+			textStyle: {
+				fontSize: 14, //字体大小
+				color: '#ffffff' //字体颜色
+			},
+		},
+		grid: {
+			top: 40,
+			left: '0%',
+			right: '0%',
+			bottom: 19,
+			containLabel: true
+		},
+		xAxis: [{
+			type: 'category',
+			axisLine: {
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisTick: {
+				alignWithLabel: true
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+			data: []
+		}],
+		yAxis: [{
+			type: 'value',
+			max: 1000,
+			splitNumber: 5,
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+		}],
+		series: [{
+			name: '个性服务',
+			type: 'bar',
+			stack: 'Ad',
+			barWidth: 12,
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#6FDEFF'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			data: []
+		}, {
+			name: '完成服务',
+			type: 'bar',
+			barWidth: 12,
+			stack: 'Ad',
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#eaff27'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			data: []
+		}, {
+			name: '服务完成率',
+			type: 'line',
+			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/fwBarOption05.js b/src/views/dataBoard/sida/cpts/fwBarOption05.js
new file mode 100644
index 000000000..822853e1e
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fwBarOption05.js
@@ -0,0 +1,132 @@
+import * as echarts from 'echarts'
+export function pieOption() {
+	return {
+		title: {
+			text: '单位（次）',
+			left: 5,
+			textStyle: {
+				fontSize: 14,
+				color: " rgba(255,255,255,0.65)",
+				fontWeight: 400,
+			},
+		},
+		tooltip: {
+			trigger: 'axis',
+			axisPointer: {
+				type: 'shadow'
+			}
+		},
+		legend: {
+			right: '0%',
+			textStyle: {
+				fontSize: 14, //字体大小
+				color: '#ffffff' //字体颜色
+			},
+		},
+		grid: {
+			top: 40,
+			left: '0%',
+			right: '0%',
+			bottom: 19,
+			containLabel: true
+		},
+		xAxis: [{
+			type: 'category',
+			axisLine: {
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisTick: {
+				alignWithLabel: true
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+			data: []
+		}],
+		yAxis: [{
+			type: 'value',
+			max: 1000,
+			splitNumber: 5,
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+		}],
+		series: [{
+			name: '发布政策数',
+			type: 'bar',
+			stack: 'Ad',
+			barWidth: 12,
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#6FDEFF'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			data: []
+		}, {
+			name: '指派服务数',
+			type: 'bar',
+			barWidth: 12,
+			stack: 'Ad',
+			emphasis: {
+				focus: 'series'
+			},
+			itemStyle: {
+				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+					offset: 0,
+					color: '#eaff27'
+				}, {
+					offset: 1,
+					color: 'rgba(168,241,255,0)'
+				}])
+			},
+			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/fw.vue b/src/views/dataBoard/sida/fw.vue
index d48ed1395..51d7e4378 100644
--- a/src/views/dataBoard/sida/fw.vue
+++ b/src/views/dataBoard/sida/fw.vue
@@ -54,7 +54,7 @@
 					<div class="m-height"><fw05 :searchDate="searchDate" :orgId="orgId"></fw05></div>
 				</div>
 			</div>
-			<!-- <cpt-loading v-show="false" /> -->
+			 <cpt-loading v-show="false" /> 
 		</div>
 	</div>
 </template>