From a3f066579908ccd46a3d82c5ca391169ac225d02 Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Tue, 14 Mar 2023 09:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/dataBoard/listBox.scss        |   3 +-
 .../sida/cpts/{fwBar.vue => fw01gg.vue}       |  69 +++++-
 src/views/dataBoard/sida/cpts/fw02gxxq.vue    | 200 ++++++++++++++++
 src/views/dataBoard/sida/cpts/fw03zr.vue      | 173 ++++++++++++++
 src/views/dataBoard/sida/cpts/fw04gx.vue      | 225 ++++++++++++++++++
 src/views/dataBoard/sida/cpts/fw05zc.vue      | 219 +++++++++++++++++
 src/views/dataBoard/sida/fw.vue               |  67 +++---
 src/views/dataBoard/sida/index.vue            |   2 +-
 8 files changed, 913 insertions(+), 45 deletions(-)
 rename src/views/dataBoard/sida/cpts/{fwBar.vue => fw01gg.vue} (66%)
 create mode 100644 src/views/dataBoard/sida/cpts/fw02gxxq.vue
 create mode 100644 src/views/dataBoard/sida/cpts/fw03zr.vue
 create mode 100644 src/views/dataBoard/sida/cpts/fw04gx.vue
 create mode 100644 src/views/dataBoard/sida/cpts/fw05zc.vue

diff --git a/src/assets/scss/dataBoard/listBox.scss b/src/assets/scss/dataBoard/listBox.scss
index e33b8383c..356b5cced 100644
--- a/src/assets/scss/dataBoard/listBox.scss
+++ b/src/assets/scss/dataBoard/listBox.scss
@@ -24,9 +24,10 @@
 
   .title_line {
     margin-left: 8px;
-    width: 244px;
+    width: 60%;
     height: 1px;
     background: linear-gradient(270deg, rgba(55, 198, 255, 0.1) 0%, #1995ff 100%);
+	
   }
 
   .second-select {
diff --git a/src/views/dataBoard/sida/cpts/fwBar.vue b/src/views/dataBoard/sida/cpts/fw01gg.vue
similarity index 66%
rename from src/views/dataBoard/sida/cpts/fwBar.vue
rename to src/views/dataBoard/sida/cpts/fw01gg.vue
index 93dc3203f..60dbd8906 100644
--- a/src/views/dataBoard/sida/cpts/fwBar.vue
+++ b/src/views/dataBoard/sida/cpts/fw01gg.vue
@@ -14,14 +14,15 @@
 				</div>
 			</el-col>
 		</el-row>
-		<div class="pie-main" style="height: 300px;"><screen-echarts-frame class="" @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+		<div class="pieMain">
+			<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: {
@@ -44,7 +45,37 @@ export default {
 				// "下级人口分布",
 			],
 			currentTab: '人资源',
-			info: {}
+			info: {
+				male_count: 0,
+				female_count: 0,
+				resi_y_house_y_count: 0,
+				resi_y_house_n_count: 0,
+				resi_n_house_y_count: 0,
+				primary_count: 0,
+				junior_high_count: 0,
+				second_speci_count: 0,
+				high_school_count: 0,
+				junior_college_count: 0,
+				undergrad_count: 0,
+				master_count: 0,
+				doctor_count: 0,
+				local_count: 0,
+				field_count: 0,
+				age50_count: 0,
+				age5059_count: 0,
+				age6069_count: 0,
+				age7079_count: 0,
+				age80_count: 0,
+				culture_count: 0,
+				committee_count: 0,
+				capable_count: 0,
+				friend_count: 0,
+				agent_count: 0,
+				mediator_count: 0,
+				collector_count: 0,
+				security_count: 0,
+				party_mem_count: 0
+			}
 		};
 	},
 	components: {
@@ -80,7 +111,14 @@ export default {
 		},
 		// 获取房屋总数等
 		async getInfo() {
-			let url = 'house_trend';
+			let url = '';
+			if (this.currentTab == '人资源') {
+				url = 'people_res_view';
+			} else if (this.currentTab == '物资源') {
+				url = 'goods_res_view';
+			} else {
+				url = 'people_res_view';
+			}
 
 			this.$refs.pieChart.showLoading();
 			const { data, code, msg } = await requestPostBi(
@@ -131,7 +169,28 @@ export default {
 		setPieData() {
 			const { currentTab, info } = this;
 
-			
+			let data = [
+				{
+					name: '江',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				},
+				{
+					name: '平',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 63
+				},
+				{
+					name: '究',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 66
+				},
+				{
+					name: '布',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				}
+			];
 			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
 			console.log('data', data);
 			this.pieData = data;
diff --git a/src/views/dataBoard/sida/cpts/fw02gxxq.vue b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
new file mode 100644
index 000000000..72c4b9051
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
@@ -0,0 +1,200 @@
+<template>
+	<div class="m-zyqd">
+		
+		<div class="pieMain">
+			<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 './fwqdPieOption.js';
+import { requestPostBi } from '@/js/dai/request-bipass';
+export default {
+	props: {
+		orgId: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			showNoData: false,
+			timer: null,
+			pieChart: '',
+			pieOption: {},
+			pieInitState: false,
+			pieData: [],
+			tabList: [
+				'人资源',
+				'物资源',
+				'场所资源'
+				// "下级人口分布",
+			],
+			currentTab: '人资源',
+			info: {
+				male_count: 0,
+				female_count: 0,
+				resi_y_house_y_count: 0,
+				resi_y_house_n_count: 0,
+				resi_n_house_y_count: 0,
+				primary_count: 0,
+				junior_high_count: 0,
+				second_speci_count: 0,
+				high_school_count: 0,
+				junior_college_count: 0,
+				undergrad_count: 0,
+				master_count: 0,
+				doctor_count: 0,
+				local_count: 0,
+				field_count: 0,
+				age50_count: 0,
+				age5059_count: 0,
+				age6069_count: 0,
+				age7079_count: 0,
+				age80_count: 0,
+				culture_count: 0,
+				committee_count: 0,
+				capable_count: 0,
+				friend_count: 0,
+				agent_count: 0,
+				mediator_count: 0,
+				collector_count: 0,
+				security_count: 0,
+				party_mem_count: 0
+			}
+		};
+	},
+	components: {
+		screenEchartsFrame
+	},
+	mounted() {
+		this.init();
+	},
+	watch: {
+		currentTab() {
+			this.setPieData();
+		},
+		orgId() {
+			this.init();
+		}
+	},
+	methods: {
+		async init() {
+			await this.getInfo();
+			this.getPie();
+		},
+		handleClickItem(item) {
+			// const { type, name } = item;
+			// this.$router.push({
+			// 	path: '/dataBoard/renfang/resi-analyze',
+			// 	query: {
+			// 		org_id: this.orgId,
+			// 		type,
+			// 		type_category: this.currentTab,
+			// 		type_name: name
+			// 	}
+			// });
+		},
+		// 获取房屋总数等
+		async getInfo() {
+			let url = '';
+			if (this.currentTab == '人资源') {
+				url = 'people_res_view';
+			} else if (this.currentTab == '物资源') {
+				url = 'goods_res_view';
+			} else {
+				url = 'people_res_view';
+			}
+
+			this.$refs.pieChart.showLoading();
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						org_id: this.orgId
+					}
+				},
+				{
+					// 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() {
+			const { currentTab, info } = this;
+
+			let data = [
+				{
+					name: '江',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				},
+				{
+					name: '平',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 63
+				},
+				{
+					name: '究',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 66
+				},
+				{
+					name: '布',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				}
+			];
+			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>
diff --git a/src/views/dataBoard/sida/cpts/fw03zr.vue b/src/views/dataBoard/sida/cpts/fw03zr.vue
new file mode 100644
index 000000000..202bb6f89
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fw03zr.vue
@@ -0,0 +1,173 @@
+<template>
+	<div class="m-sqpj">
+		<el-row :gutter="16">
+			<el-col :span="12">
+				<div class="kuangkuang">
+					<h3>公共服务数量</h3>
+					<h2>256</h2>
+				</div>
+			</el-col>
+			<el-col :span="12">
+				<div class="kuangkuang">
+					<h3>指派服务数量</h3>
+					<h2>2545</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>
+		<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>{{ ('0' + (index + 1)).substr(-2) }}.</div>
+					<div class="item-name">{{ item.name }}</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" />
+						<img v-else src="~@/assets/images/shuju/renfang/index/down.png" />
+						<b>{{ item.growthAbs }}</b>
+						<span>人</span>
+					</div> -->
+				</div>
+			</div>
+			<div class="empty" v-else><img src="~@/assets/images/shuju/renfang/index/empty.png" /></div>
+		</div>
+	</div>
+</template>
+<script>
+import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
+import { requestPostBi } from '@/js/dai/request-bipass';
+export default {
+	props: {
+		orgId: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			resiCategoryData: [],
+			showNoData: false,
+			timer: null,
+			pieChart: '',
+			pieOption: {},
+			pieInitState: false,
+			pieData: [],
+			tabList: ['服务次数排名', '服务人数排名'],
+			currentTab: '服务次数排名',
+			info: {
+				male_count: 0,
+				female_count: 0,
+				resi_y_house_y_count: 0,
+				resi_y_house_n_count: 0,
+				resi_n_house_y_count: 0,
+				primary_count: 0,
+				junior_high_count: 0,
+				second_speci_count: 0,
+				high_school_count: 0,
+				junior_college_count: 0,
+				undergrad_count: 0,
+				master_count: 0,
+				doctor_count: 0,
+				local_count: 0,
+				field_count: 0,
+				age50_count: 0,
+				age5059_count: 0,
+				age6069_count: 0,
+				age7079_count: 0,
+				age80_count: 0,
+				culture_count: 0,
+				committee_count: 0,
+				capable_count: 0,
+				friend_count: 0,
+				agent_count: 0,
+				mediator_count: 0,
+				collector_count: 0,
+				security_count: 0,
+				party_mem_count: 0
+			}
+		};
+	},
+	components: {
+		screenEchartsFrame
+	},
+	mounted() {
+		this.init();
+	},
+	watch: {
+		currentTab() {
+			this.getResiCategoryData();
+		},
+		orgId() {
+			this.init();
+		}
+	},
+	methods: {
+		async init() {
+			this.getResiCategoryData();
+		},
+		handleClickItem(item) {
+			// const { type, name } = item;
+			// this.$router.push({
+			// 	path: '/dataBoard/renfang/resi-analyze',
+			// 	query: {
+			// 		org_id: this.orgId,
+			// 		type,
+			// 		type_category: this.currentTab,
+			// 		type_name: name
+			// 	}
+			// });
+		},
+		selItem(selItem, selIndex) {
+			this.tabList.forEach((element, index) => {
+				if (index === selIndex) {
+					element.sel = true;
+				} else {
+					element.sel = false;
+				}
+			});
+		},
+		async getResiCategoryData() {
+			let url = '';
+			if (this.currentTab == '服务次数排名') {
+				url = 'self_need_view';
+			} else if (this.currentTab == '服务人数排名') {
+				url = 'attention_eval_view';
+			} 
+
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						org_id: this.orgId
+					}
+				},
+				{
+					// mockId: 60031937,
+				}
+			);
+			if (code === 0) {
+				this.resiCategoryData = data.map(item => {
+					return {
+						code: item.label_id,
+						name: item.label,
+						count: item.count,
+						ratio: item.ratio,
+						growth: item.growth,
+						growthAbs: Math.abs(item.growth)
+					};
+				});
+			} else {
+				this.$message.error(msg);
+			}
+		}
+	}
+};
+</script>
+<style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/cpts/fw04gx.vue b/src/views/dataBoard/sida/cpts/fw04gx.vue
new file mode 100644
index 000000000..616dfc127
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fw04gx.vue
@@ -0,0 +1,225 @@
+<template>
+	<div class="m-zyqd">
+		<el-row :gutter="16">
+			<el-col :span="6">
+				<div class="kuangkuang">
+					<h3>个性服务数量</h3>
+					<h2>256</h2>
+				</div>
+			</el-col>
+			<el-col :span="6">
+				<div class="kuangkuang">
+					<h3>完成服务数量</h3>
+					<h2>2545</h2>
+				</div>
+			</el-col>
+			<el-col :span="6">
+				<div class="kuangkuang">
+					<h3>服务完成率</h3>
+					<h2>2545</h2>
+				</div>
+			</el-col>
+			<el-col :span="6">
+				<div class="kuangkuang">
+					<h3>服务满意度</h3>
+					<h2>2545</h2>
+				</div>
+			</el-col>
+		</el-row>
+		<div class="pieMain">
+			<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: ''
+		}
+	},
+	data() {
+		return {
+			showNoData: false,
+			timer: null,
+			pieChart: '',
+			pieOption: {},
+			pieInitState: false,
+			pieData: [],
+			tabList: [
+				'人资源',
+				'物资源',
+				'场所资源'
+				// "下级人口分布",
+			],
+			currentTab: '人资源',
+			info: {
+				male_count: 0,
+				female_count: 0,
+				resi_y_house_y_count: 0,
+				resi_y_house_n_count: 0,
+				resi_n_house_y_count: 0,
+				primary_count: 0,
+				junior_high_count: 0,
+				second_speci_count: 0,
+				high_school_count: 0,
+				junior_college_count: 0,
+				undergrad_count: 0,
+				master_count: 0,
+				doctor_count: 0,
+				local_count: 0,
+				field_count: 0,
+				age50_count: 0,
+				age5059_count: 0,
+				age6069_count: 0,
+				age7079_count: 0,
+				age80_count: 0,
+				culture_count: 0,
+				committee_count: 0,
+				capable_count: 0,
+				friend_count: 0,
+				agent_count: 0,
+				mediator_count: 0,
+				collector_count: 0,
+				security_count: 0,
+				party_mem_count: 0
+			}
+		};
+	},
+	components: {
+		screenEchartsFrame
+	},
+	mounted() {
+		this.init();
+	},
+	watch: {
+		currentTab() {
+			this.setPieData();
+		},
+		orgId() {
+			this.init();
+		}
+	},
+	methods: {
+		async init() {
+			await this.getInfo();
+			this.getPie();
+		},
+		handleClickItem(item) {
+			// const { type, name } = item;
+			// this.$router.push({
+			// 	path: '/dataBoard/renfang/resi-analyze',
+			// 	query: {
+			// 		org_id: this.orgId,
+			// 		type,
+			// 		type_category: this.currentTab,
+			// 		type_name: name
+			// 	}
+			// });
+		},
+		// 获取房屋总数等
+		async getInfo() {
+			let url = '';
+			if (this.currentTab == '人资源') {
+				url = 'people_res_view';
+			} else if (this.currentTab == '物资源') {
+				url = 'goods_res_view';
+			} else {
+				url = 'people_res_view';
+			}
+
+			this.$refs.pieChart.showLoading();
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						org_id: this.orgId
+					}
+				},
+				{
+					// 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() {
+			const { currentTab, info } = this;
+
+			let data = [
+				{
+					name: '江',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				},
+				{
+					name: '平',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 63
+				},
+				{
+					name: '究',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 66
+				},
+				{
+					name: '布',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				}
+			];
+			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>
diff --git a/src/views/dataBoard/sida/cpts/fw05zc.vue b/src/views/dataBoard/sida/cpts/fw05zc.vue
new file mode 100644
index 000000000..a0bfe776f
--- /dev/null
+++ b/src/views/dataBoard/sida/cpts/fw05zc.vue
@@ -0,0 +1,219 @@
+<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">
+			<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: ''
+		}
+	},
+	data() {
+		return {
+			showNoData: false,
+			timer: null,
+			pieChart: '',
+			pieOption: {},
+			pieInitState: false,
+			pieData: [],
+			tabList: [
+				'人资源',
+				'物资源',
+				'场所资源'
+				// "下级人口分布",
+			],
+			currentTab: '人资源',
+			info: {
+				male_count: 0,
+				female_count: 0,
+				resi_y_house_y_count: 0,
+				resi_y_house_n_count: 0,
+				resi_n_house_y_count: 0,
+				primary_count: 0,
+				junior_high_count: 0,
+				second_speci_count: 0,
+				high_school_count: 0,
+				junior_college_count: 0,
+				undergrad_count: 0,
+				master_count: 0,
+				doctor_count: 0,
+				local_count: 0,
+				field_count: 0,
+				age50_count: 0,
+				age5059_count: 0,
+				age6069_count: 0,
+				age7079_count: 0,
+				age80_count: 0,
+				culture_count: 0,
+				committee_count: 0,
+				capable_count: 0,
+				friend_count: 0,
+				agent_count: 0,
+				mediator_count: 0,
+				collector_count: 0,
+				security_count: 0,
+				party_mem_count: 0
+			}
+		};
+	},
+	components: {
+		screenEchartsFrame
+	},
+	mounted() {
+		this.init();
+	},
+	watch: {
+		currentTab() {
+			this.setPieData();
+		},
+		orgId() {
+			this.init();
+		}
+	},
+	methods: {
+		async init() {
+			await this.getInfo();
+			this.getPie();
+		},
+		handleClickItem(item) {
+			// const { type, name } = item;
+			// this.$router.push({
+			// 	path: '/dataBoard/renfang/resi-analyze',
+			// 	query: {
+			// 		org_id: this.orgId,
+			// 		type,
+			// 		type_category: this.currentTab,
+			// 		type_name: name
+			// 	}
+			// });
+		},
+		// 获取房屋总数等
+		async getInfo() {
+			let url = '';
+			if (this.currentTab == '人资源') {
+				url = 'people_res_view';
+			} else if (this.currentTab == '物资源') {
+				url = 'goods_res_view';
+			} else {
+				url = 'people_res_view';
+			}
+
+			this.$refs.pieChart.showLoading();
+			const { data, code, msg } = await requestPostBi(
+				url,
+				{
+					queryParam: {
+						org_id: this.orgId
+					}
+				},
+				{
+					// 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() {
+			const { currentTab, info } = this;
+
+			let data = [
+				{
+					name: '江',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				},
+				{
+					name: '平',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 63
+				},
+				{
+					name: '究',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 66
+				},
+				{
+					name: '布',
+					org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
+					count: 61
+				}
+			];
+			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>
diff --git a/src/views/dataBoard/sida/fw.vue b/src/views/dataBoard/sida/fw.vue
index 2d5f21a76..384ce4a74 100644
--- a/src/views/dataBoard/sida/fw.vue
+++ b/src/views/dataBoard/sida/fw.vue
@@ -6,70 +6,65 @@
 				<div class="m-box">
 					<div class="m-title">
 						<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
-						<div class="tip_title">图层公共服务数据统计</div>
+						<div class="tip_title">公共服务数据统计</div>
 						<div class="title_line"></div>
 					</div>
-					<div class="m-subbox">
-						<fwBar :orgId="orgData.org_id"></fwBar>
-					</div>
+					<div class="m-subbox"><fw01 :orgId="orgId"></fw01></div>
 				</div>
 			</div>
-			<!-- <div class="g-center">
+			<div class="g-center">
 				<div class="m-box">
 					<div class="m-title">
 						<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
 						<div class="tip_title">共性需求待响应</div>
 						<div class="title_line"></div>
 					</div>
-					<div class="m-subbox"><wtqd :orgId="orgData.org_id"></wtqd></div>
+					<div class="m-subbox"><fw02 :orgId="orgId"></fw02></div>
 				</div>
-			</div> -->
-			<!-- <div class="g-right">
+			</div>
+			<div class="g-right">
 				<div class="m-box">
 					<div class="m-title">
 						<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
 						<div class="tip_title">服务找人数据统计</div>
 						<div class="title_line"></div>
 					</div>
-					<div class="m-subbox"><wtqd :orgId="orgData.org_id"></wtqd></div>
+					<div class="m-subbox"><fw03 :orgId="orgId"></fw03></div>
 				</div>
-			</div> -->
+			</div>
 		</div>
-		<!-- <div class="g-row">
-			<div class="g-left" style="flex:1">
+		<div class="g-row">
+			<div class="g-left" style="width:920px">
 				<div class="m-box">
 					<div class="m-title">
 						<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
 						<div class="tip_title">个性服务数据统计</div>
 						<div class="title_line"></div>
 					</div>
-					<div
-						class="m-subbox "
-						:class="{
-							'z-shrink': orgLevel == 'district' || orgLevel == 'street' || orgLevel == 'city'
-						}"
-					>
-						<fwqd :orgId="orgData.org_id"></fwqd>
-					</div>
+					<div class="m-subbox "><fw04 :orgId="orgId"></fw04></div>
 				</div>
-			
-			<div class="g-left" style="flex:1">
+			</div>
+			<div class="g-left" style="width:920px">
 				<div class="m-box">
 					<div class="m-title">
 						<img class="title_img" src="@/assets/images/index/list-logo.png" alt />
 						<div class="tip_title">政策找人数据统计</div>
 						<div class="title_line"></div>
 					</div>
-					<div class="m-subbox"><zyqd :orgId="orgData.org_id"></zyqd></div>
+					<div class="m-subbox"><fw05 :orgId="orgId"></fw05></div>
 				</div>
 			</div>
-			<cpt-loading v-show="false" />
-		</div> -->
+			<!-- <cpt-loading v-show="false" /> -->
+		</div>
 	</div>
 </template>
 <script>
+import fw01 from '@/views/dataBoard/sida/cpts/fw01gg';
+import fw02 from '@/views/dataBoard/sida/cpts/fw02gxxq';
+import fw03 from '@/views/dataBoard/sida/cpts/fw03zr';
+import fw04 from '@/views/dataBoard/sida/cpts/fw04gx';
+import fw05 from '@/views/dataBoard/sida/cpts/fw05zc';
 
-import fwBar from '@/views/dataBoard/sida/cpts/fwBar';
 export default {
 	props: {
 		orgId: {
@@ -78,7 +73,11 @@ export default {
 		}
 	},
 	components: {
-		fwBar
+		fw01,
+		fw02,
+		fw03,
+		fw04,
+		fw05
 	},
 
 	data() {
@@ -90,12 +89,8 @@ export default {
 			barData: []
 		};
 	},
-	mounted() {
-		
-	},
-	watch: {
-		
-	},
+	mounted() {},
+	watch: {},
 	methods: {
 		toListPage(type = '', type_name = '') {
 			this.$router.push({
@@ -106,11 +101,7 @@ export default {
 					type_name
 				}
 			});
-		},
-
-		
-		
-		
+		}
 	}
 };
 </script>
diff --git a/src/views/dataBoard/sida/index.vue b/src/views/dataBoard/sida/index.vue
index 02c844f55..4e90e31fe 100644
--- a/src/views/dataBoard/sida/index.vue
+++ b/src/views/dataBoard/sida/index.vue
@@ -36,7 +36,7 @@
 			<div class="g-right">
 				<div class="m-box">
 					<div class="box-title">
-						<div class="box-title-btn" v-if="!displayedForecast" @click="fwMore">
+						<div class="box-title-btn"  @click="fwMore">
 							<img src="~@/assets/images/shuju/sida/index/more.png" />
 							<span>查看更多</span>
 						</div>