四大涂层联调，改一些接口

src/assets/scss/dataBoard/renfang/index.scss

@@ -591,43 +591,43 @@
 			justify-content: space-between;
 			align-items: center;
 
-			&:nth-child(1) .name::before {
+			&:nth-child(10n+1) .name::before {
 				background: #1a95ff;
 			}
 
-			&:nth-child(2) .name::before {
+			&:nth-child(10n+2) .name::before {
 				background: #ff6138;
 			}
 
-			&:nth-child(3) .name::before {
+			&:nth-child(10n+3) .name::before {
 				background: #2adcea;
 			}
 
-			&:nth-child(4) .name::before {
+			&:nth-child(10n+4) .name::before {
 				background: #2cc4ad;
 			}
 
-			&:nth-child(5) .name::before {
+			&:nth-child(10n+5) .name::before {
 				background: #7377f5;
 			}
 
-			&:nth-child(6) .name::before {
+			&:nth-child(10n+6) .name::before {
 				background: #32de66;
 			}
 
-			&:nth-child(7) .name::before {
+			&:nth-child(10n+7) .name::before {
 				background: #8155d4;
 			}
 
-			&:nth-child(8) .name::before {
+			&:nth-child(10n+8) .name::before {
 				background: #c7ea48;
 			}
 
-			&:nth-child(9) .name::before {
+			&:nth-child(10n+9) .name::before {
 				background: #ef47c2;
 			}
 
-			&:nth-child(10) .name::before {
+			&:nth-child(10n+10) .name::before {
 				background: #d43349;
 			}
 

src/views/dataBoard/sida/cpts/fwqd.vue

@@ -13,7 +13,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" aria-controls="" ref="pieChart"></screen-echarts-frame></div>
 		</div>
 	</div>
 </template>
@@ -57,7 +57,6 @@ export default {
 			this.init();
 		},
 		searchDate() {
-			
 			this.init();
 		}
 	},
@@ -92,8 +91,8 @@ export default {
 				url = 'common_service_view';
 				mockId = 66900331;
 			} else {
-				url = 'self_service_views';
+				url = 'self_service_view';
-				mockId=66902813
+				mockId = 66902813;
 			}
 
 			this.$refs.pieChart.showLoading();
@@ -107,7 +106,7 @@ export default {
 					}
 				},
 				{
-					mockId: mockId,
+					// mockId: mockId,
 				}
 			);
 			this.$refs.pieChart.hideLoading();
@@ -157,8 +156,14 @@ export default {
 			this.pieOption.series[0].name = this.currentTab;
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		handelClickMyPei(item) {
+			this.handleClickItem(item);
 		}
 	}
 };
 </script>
 <style lang="scss" src="@/assets/scss/dataBoard/renfang/index.scss" scoped></style>
+<style lang="scss" scoped>
+.pieMain .legend{margin-top:0px;}
+</style>

src/views/dataBoard/sida/cpts/sqpj.vue

@@ -100,10 +100,10 @@ export default {
 	},
 	methods: {
 		async init() {
-			if (this.orgId) {
+			// if (this.orgId) {
-				await  this.getResiCategoryData();
+			// 	await  this.getResiCategoryData();
-				this.getPie();
+			// 	this.getPie();
-			}
+			// }
 		},
 
 		handleClickItem(item) {

src/views/dataBoard/sida/cpts/wtqd.vue

@@ -14,7 +14,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk"  @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
 		</div>
 	</div>
 </template>
@@ -163,6 +163,9 @@ export default {
 			this.pieOption.series[0].name = this.currentTab;
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		handelClickMyPei(item){
+			this.handleClickItem(item)
 		}
 	}
 };

src/views/dataBoard/sida/cpts/xqqd.vue

@@ -13,7 +13,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
 		</div>
 	</div>
 </template>
@@ -151,6 +151,9 @@ export default {
 			this.pieOption.series[0].name = this.currentTab;
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		handelClickMyPei(item){
+			this.handleClickItem(item)
 		}
 	}
 };

src/views/dataBoard/sida/cpts/zyqd.vue

@@ -4,8 +4,8 @@
 			<div v-for="item in tabList" :key="item" :class="['item', { 'item-sel': currentTab == item }]" @click="handleClick(item)">{{ item }}</div>
 		</div>
 		<div class="pieMain">
-			<div class="legend">
+			<div class="legend cur">
-				<div class="legend-row" :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)">
+				<div class="legend-row cur" :key="'pie' + item.name" v-for="item in pieData" @click="handleClickItem(item)">
 					<div class="name">{{ item.name }}</div>
 					<div class="content">
 						<div class="num">{{ item.value }}</div>
@@ -13,7 +13,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" @handelClickMyPei="handelClickMyPei" ref="pieChart"></screen-echarts-frame></div>
 		</div>
 	</div>
 </template>
@@ -79,6 +79,7 @@ export default {
 			}
 		},
 		handleClickItem(item) {
+			let typeArr = { "全部": "all", "志愿者": "volunteer", "社区自组织": "community_org", "联建单位": "party_unit" };
 			// 场所资源
 			let path = '';
 			if (this.currentTab == '人资源') {
@@ -94,7 +95,7 @@ export default {
 				query: {
 					org_id: this.orgId,
 					type: this.currentTab,
-					type2: item.name,
+					type2: typeArr[item.name],
 					start_date: this.searchDate[0],
 					end_date: this.searchDate[1]
 				}
@@ -159,7 +160,7 @@ export default {
 		setPieData() {
 			let { data } = this;
 			data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
-			console.log('data', data);
+			console.log('pieDataata', data);
 			this.pieData = data;
 
 			this.iniPieChart();
@@ -172,6 +173,9 @@ export default {
 			this.pieOption.series[0].name = this.currentTab;
 			this.pieOption.series[0].data = this.pieData;
 			this.$refs.pieChart.setOption(this.pieOption);
+		},
+		handelClickMyPei(item) {
+			this.handleClickItem(item);
 		}
 	}
 };

src/views/dataBoard/sida/wt/hiddenDanger-detail.vue

@@ -744,7 +744,8 @@ import { requestPostBi } from '@/js/dai/request-bipass';
 export default {
 	name: 'eventdetail',
 	props: {
-		eventId: {
+		// eventId:
+		detailId: {
 			type: String,
 			default: ''
 		},
@@ -868,7 +869,7 @@ export default {
 
 		gettab2(item) {
 			this.userList = { ...item };
-			console.log("当前人员信息",this.userList)
+			console.log('当前人员信息', this.userList);
 			let tabList = this.BaseTabList;
 			this.userList.crowd && tabList.push('党员');
 			this.userList.srs && tabList.push('保障房');

src/views/dataBoard/sida/wt/hiddenDangerList.vue

@@ -156,7 +156,9 @@ export default {
 		handleSearch() {},
 
 		showInfo(index) {
+			
 			let item = this.srcTableData[index];
+			console.log("item",item)
 			this.detailType = item.danger_name;
 			this.detailId = item.hidden_danger_id;
 		},

src/views/dataBoard/sida/xq/list.vue

@@ -176,6 +176,7 @@ export default {
 		},
 		showInfo(index) {
 			let item = this.srcTableData[index];
+			console.log("index",index)
 			this.detailType = item.need_type;
 			this.detailId = item.need_id;
 		},
@@ -261,7 +262,7 @@ export default {
 				{
 					queryParam: {
 						org_id,
-						type: listType,
+						type: this.type2,
 						start_date,
 						end_date
 					}

src/views/dataBoard/sida/zy/gexingDetail.vue

@@ -135,7 +135,7 @@ export default {
 					user_demand_id: this.detailId
 				},
 				{
-					mockId: 69964568,
+					// mockId: 69964568,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/gexingList.vue

@@ -128,7 +128,7 @@ export default {
 					}
 				},
 				{
-					mockId: 69844538
+					// mockId: 69844538
 				}
 			);
 

src/views/dataBoard/sida/zy/gonggongDetail.vue

@@ -112,7 +112,7 @@ export default {
 					service_record_id: this.detailId
 				},
 				{
-					mockId: 69980718,
+					// mockId: 69980718,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/gonggongList.vue

@@ -131,7 +131,7 @@ export default {
 					}
 				},
 				{
-					mockId: 69852161
+					// mockId: 69852161
 				}
 			);
 

src/views/dataBoard/sida/zy/goodsRes-detail.vue

@@ -162,7 +162,7 @@ export default {
 					queryParam: queryParam
 				},
 				{
-					mockId: mockId
+					// mockId: mockId
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/goodsResList.vue

@@ -187,8 +187,8 @@ export default {
 
 		showInfo(index) {
 			let item = this.srcTableData[index];
-			// this.detailType = item.child_thing_type;
+			this.detailType = item.child_thing_type;
-			this.detailType =this.type2;
+			// this.detailType =this.type2;
 			this.detailId = item.thing_id;
 		},
 
@@ -225,7 +225,7 @@ export default {
 					}
 				},
 				{
-					mockId: 69679253,
+					// mockId: 69679253,
 				}
 			);
 
@@ -263,7 +263,7 @@ export default {
 			const { org_id, listType, page_num, page_size, searchDate } = this;
 			const start_date = searchDate[0];
 			const end_date = searchDate[1];
-			const url = 'thing_resour_list_num';
+			const url = 'thing_resour_list_total';
 			let parent_thing_type = this.type2;
 			const { data, code, msg } = await requestPostBi(
 				url,

src/views/dataBoard/sida/zy/lianjianDetail.vue

@@ -141,7 +141,7 @@ export default {
 					service_record_id: this.detailId
 				},
 				{
-					mockId: 69994184,
+					// mockId: 69994184,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/lianjianList.vue

@@ -137,7 +137,7 @@ created() {
 					}
 				},
 				{
-					mockId: 69950764,
+					// mockId: 69950764,
 				}
 			);
 

src/views/dataBoard/sida/zy/peopleRes-detail.vue

@@ -270,7 +270,7 @@ export default {
 					queryParam: queryParam
 				},
 				{
-					mockId: mockId
+					// mockId: mockId
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/peopleResList.vue

@@ -8,10 +8,11 @@
 			<div class="title_line"></div>
 			<div class="second-select" style="position:absolute;margin-left:300px;">
 				<el-select v-model="type2" @change="init" :clearable="true">
-					<el-option value="全部">全部</el-option>
+					<!-- all\volunteer\community_org\party_unit -->
-					<el-option value="志愿者">志愿者</el-option>
+					<el-option value="all" label="全部"></el-option>
-					<el-option value="社区自组织">社区自组织</el-option>
+					<el-option value="volunteer" label="志愿者"></el-option>
-					<el-option value="联建单位">联建单位</el-option>
+					<el-option value="community_org" label="社区自组织"></el-option>
+					<el-option value="party_unit" label="联建单位"></el-option>
 				</el-select>
 
 				<div class="m-search2 left10" style="display: inline-block;">
@@ -215,7 +216,7 @@ export default {
 					}
 				},
 				{
-					mockId: 69636829
+					// mockId: 69636829
 				}
 			);
 
@@ -250,7 +251,7 @@ export default {
 			const { org_id, listType, page_num, page_size, searchDate } = this;
 			const start_date = searchDate[0];
 			const end_date = searchDate[1];
-			const url = 'person_resour_list_num';
+			const url = 'person_resour_list_total';
 			let peop_type = this.type2;
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -266,7 +267,7 @@ export default {
 					// mockId: 63070189,
 				}
 			);
-
+			console.log(data);
 			if (code === 0) {
 				this.total = parseInt(data[0].total);
 			} else {

src/views/dataBoard/sida/zy/placeRes-detail.vue

@@ -127,7 +127,7 @@ export default {
 					queryParam: queryParam
 				},
 				{
-					mockId: 70051004,
+					// mockId: 70051004,
 				}
 			);
 			if (code === 0) {

src/views/dataBoard/sida/zy/placeResList.vue

@@ -210,7 +210,7 @@ export default {
 					}
 				},
 				{
-					mockId: mockId
+					// mockId: mockId
 				}
 			);