diff --git a/src/views/dataBoard/cpts/enterpriseInfo-detail.vue b/src/views/dataBoard/cpts/enterpriseInfo-detail.vue
index d66b4be1f..66fcc416a 100644
--- a/src/views/dataBoard/cpts/enterpriseInfo-detail.vue
+++ b/src/views/dataBoard/cpts/enterpriseInfo-detail.vue
@@ -7,42 +7,34 @@
 						<div class="field">场所名称：</div>
 						<div class="value">{{ info.place_org_name }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">占地面积：</div>
 						<div class="value">{{ info.area_covered }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所规模：</div>
 						<div class="value">{{ info.scale_total }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">所属组织：</div>
 						<div class="value">{{ info.grid }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所类别：</div>
 						<div class="value">{{ info.place_category }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所类型：</div>
 						<div class="value">{{ info.place_type }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">负责人：</div>
 						<div class="value">{{ info.person_in_charge }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">联系电话：</div>
 						<div class="value">{{ info.mobile }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所地址：</div>
 						<div class="value">{{ info.mobile }}</div>
@@ -57,77 +49,91 @@
 		</template>
 	</popup>
 </template>
-
 <script>
-import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
-
-export default {
-	name: 'eventdetail',
-	props: {
-		detailId: {
-			type: String,
-			default: ''
+	import popup from '@/views/dataBoard/cpts/popup';
+	import daiMap from "@/utils/dai-map";
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
+	export default {
+		name: 'eventdetail',
+		props: {
+			detailId: {
+				type: String,
+				default: ''
+			},
+			detailType: {
+				type: String,
+				default: ''
+			}
 		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: { popup },
-	created() {},
-	data() {
-		return {
-			progress: [],
-			info: {},
-			title: '事件'
-		};
-	},
-
-	mounted() {
-		this.getApiData();
-	},
-
-	methods: {
-		handleClose() {
-			this.$emit('close');
+		components: {
+			popup
+		},
+		created() {},
+		data() {
+			return {
+				progress: [],
+				info: {},
+				title: '事件'
+			};
 		},
-
-		async getApiData() {
-			this.getInfo();
+		mounted() {
+			this.getApiData();
 		},
-
-		// 根据房屋id获取详情
-		async getInfo() {
-			let url = 'enterprise_info';
-			this.title = '安全生产巡查详情';
-
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+		methods: {
+			handleClose() {
+				this.$emit('close');
+			},
+			async getApiData() {
+				this.getInfo();
+			},
+			iniMap() {
+				let latitude = this.info.latitude;
+				let longitude = this.info.longitude;
+				let map = new daiMap(document.getElementById("map"), {
+					latitude,
+					longitude
+				}, {
+					zoom: 16.2, // 设置地图缩放级别
+					pitch: 43.5, // 设置俯仰角
+					rotation: 45, // 设置地图旋转角度
+				});
+				map.setCenter(latitude, longitude);
+				map.setMarker(latitude, longitude);
+			},
+			// 根据房屋id获取详情
+			async getInfo() {
+				let url = 'enterprise_info';
+				this.title = '安全生产巡查详情';
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(url, {
 					queryParam: {
 						enterprise_id: this.detailId
 					}
-				},
-				{
+				}, {
 					// mockId: 60235478,
+				});
+				if (code === 0) {
+					this.info = {
+						...this.info,
+						...data[0]
+					};
+					console.log("安全生产巡查详情", this.info)
+					// this.iniMap();
+				} else {
+					this.$message.error(msg);
 				}
-			);
-			if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
-				console.log("安全生产巡查详情",this.info)
-			} else {
-				this.$message.error(msg);
 			}
 		}
-	}
-};
+	};
 </script>
 <style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
+	.m-info .row .item .field {
+		width: 120px !important;
+	}
 </style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/cpts/fw02gxxq.vue b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
index 9fc2aa3d2..a605d7955 100644
--- a/src/views/dataBoard/sida/cpts/fw02gxxq.vue
+++ b/src/views/dataBoard/sida/cpts/fw02gxxq.vue
@@ -53,20 +53,17 @@
 						avoidLabelOverlap: false,
 						labelLine: {
 							show: true,
-						
 						},
 						label: {
-							
 							normal: {
-								show: false,
+								show: true,
 								formatter: '{title|{b}}\n{d}%',
-								fontSize:24,
+								fontSize: 24,
 								color: '#FFFFFF',
 								rich: {
 									title: {
 										fontSize: 12,
 										height: 25,
-										
 									},
 								}
 							}
@@ -126,6 +123,7 @@
 				if (code === 0) {
 					if (data && Array.isArray(data) && data.length > 0) {
 						this.info = data;
+						console.log("this.info", this.info)
 					}
 				} else {
 					this.$message.error(msg);
@@ -157,6 +155,13 @@
 				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'));
+				data.map((item) => {
+					if (item.value == 0) {
+						item.value = null
+					}
+					return item
+				})
+				console.log("da2ta", data)
 				this.pieData = data;
 				this.iniPieChart();
 			},
diff --git a/src/views/dataBoard/sida/cpts/fw04gx.vue b/src/views/dataBoard/sida/cpts/fw04gx.vue
index 3f1f3914e..072eb6201 100644
--- a/src/views/dataBoard/sida/cpts/fw04gx.vue
+++ b/src/views/dataBoard/sida/cpts/fw04gx.vue
@@ -1,6 +1,5 @@
 <template>
 	<div class="m-zyqd">
-		
 		<el-row :gutter="16">
 			<el-col :span="6">
 				<div class="kuangkuang">
@@ -28,131 +27,137 @@
 			</el-col>
 		</el-row>
 		<div class="pieMain pieMain2">
-			<div class="pie"><screen-echarts-frame @myChartMethod="pieInitOk" ref="pieChart"></screen-echarts-frame></div>
+			<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 './fwBarOption04.js';
-import { requestPostBi } from '@/js/dai/request-bipass';
-export default {
-	props: {
-		orgId: {
-			type: String,
-			default: ''
+	import screenEchartsFrame from '@/views/dataBoard/cpts/screen-echarts-frame/index';
+	import {
+		pieOption
+	} from './fwBarOption04.js';
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
+	export default {
+		props: {
+			orgId: {
+				type: String,
+				default: ''
+			},
+			searchDate: Array
 		},
-		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();
+		data() {
+			return {
+				showNoData: false,
+				timer: null,
+				pieChart: '',
+				pieOption: {},
+				pieInitState: false,
+				pieData: [],
+				info: {}
+			};
 		},
-
-		// 公共服务数据统计
-		async getInfo() {
-			let url = 'user_demand_count';
-			this.$refs.pieChart.showLoading();
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+		components: {
+			screenEchartsFrame
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				await this.getInfo();
+				this.getPie();
+			},
+			// 公共服务数据统计
+			async getInfo() {
+				let url = 'user_demand_count';
+				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: 69450870,
+				});
+				this.$refs.pieChart.hideLoading();
+				if (code === 0) {
+					let data1 = data.slice(0, 10)
+					if (data1 && Array.isArray(data1) && data1.length > 0) {
+						let info = data1[0];
+						this.info = {
+							...this.info,
+							...info
+						};
+					}
+				} else {
+					this.$message.error(msg);
 				}
-			);
-			this.$refs.pieChart.hideLoading();
-			if (code === 0) {
-				let data1 = data.slice(0, 10)
-				if (data1 && Array.isArray(data1) && data1.length > 0) {
-					let info = data1[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;
+			},
+			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 {
-					element.sel = false;
+					setTimeout(() => {
+						this.getPie();
+					}, 500);
 				}
-			});
-		},
-		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 = [];
+				console.log("data22",data)
+				data.forEach((item, index) => {
+					if(index<10)
+					{
+						pieData0.push(item.category);
+						pieData1.push(item.service_complete_ratio);
+						pieData2.push(item.user_service_num);
+						pieData3.push(item.service_complete_num);}
+					
+				});
+				this.pieData = [pieData0, pieData1, pieData2, pieData3];
+				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);
 			}
-		},
-		setPieData() {
-			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();
-		},
-		// 获取饼状图
-		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>
+	.pieMain2 {
+		margin-left: 0px !important
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/cpts/fwBarOption01.js b/src/views/dataBoard/sida/cpts/fwBarOption01.js
index ec6d6d6c0..a2855d658 100644
--- a/src/views/dataBoard/sida/cpts/fwBarOption01.js
+++ b/src/views/dataBoard/sida/cpts/fwBarOption01.js
@@ -75,9 +75,10 @@ export function pieOption() {
 			},
 		}],
 		series: [{
+			realtimeSort: true,
 			name: '公共服务',
 			type: 'bar',
-			stack: 'Ad',
+			// stack: 'Ad',
 			barWidth: 12,
 			emphasis: {
 				focus: 'series'
@@ -93,10 +94,11 @@ export function pieOption() {
 			},
 			data: []
 		}, {
+			
 			name: '指派服务',
 			type: 'bar',
 			barWidth: 12,
-			stack: 'Ad',
+			// stack: 'Ad',
 			emphasis: {
 				focus: 'series'
 			},
diff --git a/src/views/dataBoard/sida/cpts/fwBarOption04.js b/src/views/dataBoard/sida/cpts/fwBarOption04.js
index 2b5f00d37..1289a2def 100644
--- a/src/views/dataBoard/sida/cpts/fwBarOption04.js
+++ b/src/views/dataBoard/sida/cpts/fwBarOption04.js
@@ -43,8 +43,7 @@ export function pieOption() {
 				alignWithLabel: true
 			},
 			axisLabel: {
-				interval:3,
-				
+				interval: 1,
 				show: true,
 				textStyle: {
 					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
@@ -55,8 +54,23 @@ export function pieOption() {
 		}],
 		yAxis: [{
 			type: 'value',
-		
-			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 //更改坐标轴文字大小
+				}
+			},
+		}, {
+			type: 'value',
 			splitLine: {
 				show: true,
 				lineStyle: {
@@ -74,9 +88,9 @@ export function pieOption() {
 			},
 		}],
 		series: [{
-			name: '个性服务',
-			type: 'bar',
-		
+			yAxisIndex: 0,
+			name: '服务完成率',
+			type: 'line',
 			barWidth: 12,
 			emphasis: {
 				focus: 'series'
@@ -84,7 +98,7 @@ export function pieOption() {
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,
-					color: '#6FDEFF'
+					color: '#FFAA00'
 				}, {
 					offset: 1,
 					color: 'rgba(168,241,255,0)'
@@ -92,17 +106,18 @@ export function pieOption() {
 			},
 			data: []
 		}, {
-			name: '完成服务',
+			realtimeSort: true,
+			yAxisIndex: 1,
+			name: '个性服务',
 			type: 'bar',
 			barWidth: 12,
-		
 			emphasis: {
 				focus: 'series'
 			},
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,
-					color: '#eaff27'
+					color: '#6FDEFF'
 				}, {
 					offset: 1,
 					color: 'rgba(168,241,255,0)'
@@ -110,17 +125,18 @@ export function pieOption() {
 			},
 			data: []
 		}, {
-			name: '服务完成率',
-			type: 'line',
+			// realtimeSort: true,
+			yAxisIndex: 1,
+			name: '完成服务',
+			type: 'bar',
 			barWidth: 12,
-			stack: 'Ad',
 			emphasis: {
 				focus: 'series'
 			},
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,
-					color: '#FFAA00'
+					color: '#eaff27'
 				}, {
 					offset: 1,
 					color: 'rgba(168,241,255,0)'
@@ -129,4 +145,4 @@ export function pieOption() {
 			data: []
 		}, ]
 	}
-}
+}
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/cpts/fwBarOption05.js b/src/views/dataBoard/sida/cpts/fwBarOption05.js
index b484f6320..b742c545a 100644
--- a/src/views/dataBoard/sida/cpts/fwBarOption05.js
+++ b/src/views/dataBoard/sida/cpts/fwBarOption05.js
@@ -75,35 +75,36 @@ export function pieOption() {
 			},
 		}],
 		series: [{
-			name: '发布政策数',
+			name: '指派服务数',
 			type: 'bar',
-			
 			barWidth: 12,
+			
 			emphasis: {
 				focus: 'series'
 			},
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,
-					color: '#6FDEFF'
+					color: '#eaff27'
 				}, {
 					offset: 1,
 					color: 'rgba(168,241,255,0)'
 				}])
 			},
 			data: []
-		}, {
-			name: '指派服务数',
+		},
+		{
+			name: '发布政策数',
 			type: 'bar',
-			barWidth: 12,
 			
+			barWidth: 12,
 			emphasis: {
 				focus: 'series'
 			},
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,
-					color: '#eaff27'
+					color: '#6FDEFF'
 				}, {
 					offset: 1,
 					color: 'rgba(168,241,255,0)'
diff --git a/src/views/dataBoard/sida/fuwu/gexingDetail.vue b/src/views/dataBoard/sida/fuwu/gexingDetail.vue
deleted file mode 100644
index 21d94e9a1..000000000
--- a/src/views/dataBoard/sida/fuwu/gexingDetail.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-	<popup :title="title" @close="handleClose">
-		<template v-slot:cnt>
-			<div class="m-info">
-				<div class="row">
-					<div class="item">
-						<div class="field">需求类型：</div>
-						<div class="value">{{ info.category }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">需求内容：</div>
-						<div class="value">{{ info.content }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">状态：</div>
-						<div class="value">{{ info.demand_status }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">需求人：</div>
-						<div class="value">{{ info.demand_user_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">完成情况：</div>
-						<div class="value">{{ info.finish_result }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">所属网格：</div>
-						<div class="value">{{ info.grid }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">备注：</div>
-						<div class="value">{{ info.remark }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">上报时间：</div>
-						<div class="value">{{ info.report_time }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">上报类型：</div>
-						<div class="value">{{ info.report_type }}</div>
-					</div>
-					<div class="item">
-						<div class="field">上报人：</div>
-						<div class="value">{{ info.report_user_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">联系电话：</div>
-						<div class="value">{{ info.report_user_mobile }}</div>
-					</div>
-					<div class="item">
-						<div class="field">评价：</div>
-						<div class="value">{{ info.score }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">服务方：</div>
-						<div class="value">{{ info.server_name }}</div>
-					</div>
-					<div class="item">
-						<div class="field">服务时间：</div>
-						<div class="value">{{ info.service_start_time }}</div>
-					</div>
-				</div>
-			</div>
-		</template>
-	</popup>
-</template>
-
-<script>
-import { Scene } from '@antv/l7';
-import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
-
-export default {
-	name: 'eventdetail',
-	props: {
-		detailId: {
-			type: String,
-			default: ''
-		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: { popup },
-	created() {},
-	data() {
-		return {
-			progress: [],
-			info: {},
-			title: '个性服务详情',
-			currentTabIndex: 0,
-			startTabIndex: 0,
-			currentTabIndex2: 0,
-			startTabIndex2: 0,
-			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: [],
-			tabList2: [],
-			userArray: [],
-			userList: {}
-		};
-	},
-
-	mounted() {
-		this.getApiData();
-	},
-	computed: {},
-	methods: {
-		handleClose() {
-			this.$emit('close');
-		},
-
-		async getApiData() {
-			this.getInfo();
-		},
-
-		// 根据房屋id获取详情
-		async getInfo() {
-			const url = 'user_service_intro';
-
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					user_demand_id: this.detailId
-				},
-				{
-					// mockId: 69964568,
-				}
-			);
-			if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
-				console.log('this.info', this.info);
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-<style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
-</style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/fuwu/gexingList.vue b/src/views/dataBoard/sida/fuwu/gexingList.vue
deleted file mode 100644
index d1ebbdfcf..000000000
--- a/src/views/dataBoard/sida/fuwu/gexingList.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-	<div>
-		<cpt-tb
-			:col-list="colList"
-			:loading="loading"
-			:header="header"
-			:list="list"
-			:total="total"
-			@handleSizeChange="handleSizeChange"
-			@handlePageNoChange="handlePageNoChange"
-			@operate="showInfo"
-		></cpt-tb>
-
-		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
-	</div>
-</template>
-
-<script>
-import cptTb from '@/views/dataBoard/cpts/tb';
-import detail from './gexingDetail';
-import { requestPostBi } from '@/js/dai/request-bipass';
-import getQueryPara from 'dai-js/modules/getQueryPara';
-
-export default {
-	name: 'event-list',
-	props: {
-		id: {
-			type: String,
-			default: ''
-		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-	components: {
-		cptTb,
-
-		detail
-	},
-
-	data() {
-		return {
-			detailId: '',
-			searchDate: '',
-			org_id: '',
-			listType: '', // 流动 常驻 全部
-			loading: true,
-			page_size: parseInt(localStorage.getItem('dataBoard_PageSize')) || 20,
-
-			page_num: 1,
-			total: 0,
-			srcTableData: [],
-			list: [],
-
-			colList: [
-				{
-					align: 'left'
-				},
-				{
-					align: 'left'
-				},
-				{
-					align: 'left'
-				},
-				{
-					align: 'left'
-				},
-
-				{
-					align: 'left'
-				},
-				{
-					align: 'left'
-				},
-
-				{
-					align: 'left',
-					width: '10%'
-				}
-			],
-			header: ['序号', '服务时间', '需求类型', '需求内容', '满意度', '状态', '操作']
-		};
-	},
-	created() {
-		this.init();
-	},
-
-	methods: {
-		init() {
-			console.log("个性列表",this.id,this.detailType)
-			this.getList(), this.getCount();
-		},
-
-		showInfo(index) {
-			let item = this.srcTableData[index];
-			this.detailType = item.peop_child_type;
-			this.detailId = item.user_demand_id;
-			// ceshi
-			// this.detailType = '志愿者';
-			// this.detailId = '1501821704551272449';
-		},
-
-		handlePageNoChange(page_num) {
-			this.page_num = page_num;
-			this.getList();
-		},
-
-		handleSizeChange(page_size) {
-			localStorage.setItem('dataBoard_page_size', page_size);
-			this.page_size = page_size;
-			this.getList();
-		},
-
-		async getList() {
-			
-			const { org_id, listType, page_num, page_size, searchDate } = this;
-
-			let peop_type = this.type2;
-
-			this.loading = true;
-			const url = 'self_service_list';
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					queryParam: {
-						user_demand_id: this.id,
-						service_type: this.detailType,
-						page_size:page_size,
-						page_num:page_num
-					}
-				},
-				{
-					// mockId: 69844538
-				}
-			);
-
-			this.loading = false;
-
-			if (code === 0) {
-				this.srcTableData = data;
-				
-				this.list = data.map((item, index) => {
-					return [
-						index + 1,
-						item.service_time ? item.service_time : '--',
-						// item.user_demand_id ? item.user_demand_id : '--',
-						item.demand_category ? item.demand_category : '--',
-						item.content ? item.content : '--',
-						item.score ? item.score : '--',
-						item.demand_status ? item.demand_status : '--',
-						// 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished；
-						{ type: 'operate', list: ['查看'] }
-					];
-				});
-
-				console.log('this.list', this.list);
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		async getCount() {
-			const { org_id, listType, page_num, page_size, searchDate } = this;
-			const start_date = searchDate[0];
-			const end_date = searchDate[1];
-			const url = 'self_service_list_total';
-			let peop_type = this.type2;
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					queryParam: {
-						user_demand_id: this.id,
-						service_type: this.detailType,
-						// page_size:page_size,
-						// page_num:page_num
-					}
-				},
-				{
-					// mockId: 63070189,
-				}
-			);
-
-			if (code === 0) {
-				this.total = parseInt(data[0].total);
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	},
-
-	destroyed() {
-		console.log('我已经离开了！');
-	}
-};
-</script>
-
-<style lang="scss" src="@/assets/scss/dataBoard/listBox.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/fuwu/gonggongDetail.vue b/src/views/dataBoard/sida/fuwu/gonggongDetail.vue
deleted file mode 100644
index ddabee70d..000000000
--- a/src/views/dataBoard/sida/fuwu/gonggongDetail.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-	<popup :title="title" @close="handleClose">
-		<template v-slot:cnt>
-			<div class="m-info">
-				<div class="row">
-					<div class="item">
-					
-						<div class="field">政策依据：</div>
-						<div class="value">{{ info.policy_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">联系方式：</div>
-						<div class="value">{{ info.principal_contact }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">经办人：</div>
-						<div class="value">{{ info.principal_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">备注：</div>
-						<div class="value">{{ info.remark }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">服务范围：</div>
-						<div class="value">{{ info.scope_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">服务名称：</div>
-						<div class="value">{{ info.service_name }}</div>
-					</div>
-
-					<div class="item">
-						<div class="field">服务组织：</div>
-						<div class="value">{{ info.service_org_name }}</div>
-					</div>
-
-				<!-- 	<div class="item">
-						<div class="field">公共服务主键：</div>
-						<div class="value">{{ info.service_record_id }}</div>
-					</div> -->
-
-					
-				</div>
-			</div>
-		</template>
-	</popup>
-</template>
-
-<script>
-import { Scene } from '@antv/l7';
-import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
-
-export default {
-	name: 'eventdetail',
-	props: {
-		detailId: {
-			type: String,
-			default: ''
-		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: { popup },
-	created() {},
-	data() {
-		return {
-			progress: [],
-			info: {},
-			title: '公共服务详情',
-			currentTabIndex: 0,
-			startTabIndex: 0,
-			currentTabIndex2: 0,
-			startTabIndex2: 0,
-			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: [],
-			tabList2: [],
-			userArray: [],
-			userList: {}
-		};
-	},
-
-	mounted() {
-		this.getApiData();
-	},
-	computed: {},
-	methods: {
-		handleClose() {
-			this.$emit('close');
-		},
-
-		async getApiData() {
-			this.getInfo();
-		},
-
-		// 根据房屋id获取详情
-		async getInfo() {
-			const url = 'common_service_intro';
-
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					service_record_id: this.detailId
-				},
-				{
-					// mockId: 69980718,
-				}
-			);
-			if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
-				console.log('this.info', this.info);
-			} else {
-				this.$message.error(msg);
-			}
-		}
-	}
-};
-</script>
-<style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
-</style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
diff --git a/src/views/dataBoard/sida/fuwu/gonggongList.vue b/src/views/dataBoard/sida/fuwu/gonggongList.vue
deleted file mode 100644
index 4445f23d6..000000000
--- a/src/views/dataBoard/sida/fuwu/gonggongList.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-	<div>
-		<cpt-tb :col-list="colList" :loading="loading" :header="header" :list="list" :total="total"
-			@handleSizeChange="handleSizeChange" @handlePageNoChange="handlePageNoChange" @operate="showInfo"></cpt-tb>
-		<detail @close="detailId = ''" :detailId="detailId" :detailType="detailType" v-if="detailId != ''" />
-	</div>
-</template>
-<script>
-	import cptTb from '@/views/dataBoard/cpts/tb';
-	import detail from './gonggongDetail';
-	import {
-		requestPostBi
-	} from '@/js/dai/request-bipass';
-	import getQueryPara from 'dai-js/modules/getQueryPara';
-	export default {
-		name: 'event-list',
-		props: {
-			id: {
-				type: String,
-				default: ''
-			},
-			detailType: {
-				type: String,
-				default: ''
-			}
-		},
-		components: {
-			cptTb,
-			detail
-		},
-		data() {
-			return {
-				detailId: '',
-				searchDate: '',
-				org_id: '',
-				listType: '', // 流动 常驻 全部
-				loading: true,
-				page_size: parseInt(localStorage.getItem('dataBoard_PageSize')) || 20,
-				page_num: 1,
-				total: 0,
-				srcTableData: [],
-				list: [],
-				sourceName: '0', //0公共服务，1共性需求，2政策找人 3服务找人
-				colList: [{
-					align: 'left'
-				}, {
-					align: 'left'
-				}, {
-					align: 'left'
-				}, {
-					align: 'left'
-				}, {
-					align: 'left'
-				}, {
-					align: 'left'
-				}, {
-					align: 'left',
-					width: '10%'
-				}],
-				header: ['序号', '服务时间', '服务名称', '服务范围', '满意度', '状态', '操作']
-			};
-		},
-		created() {
-			this.init()
-		},
-		methods: {
-			init() {
-				this.getList(), this.getCount();
-			},
-			showInfo(index) {
-				let item = this.srcTableData[index];
-				this.detailType = item.peop_child_type;
-				this.detailId = item.service_record_id;
-				// this.detailType = '志愿者';
-				// this.detailId = '1501821704551272449';
-			},
-			handlePageNoChange(page_num) {
-				this.page_num = page_num;
-				this.getList();
-			},
-			handleSizeChange(page_size) {
-				localStorage.setItem('dataBoard_page_size', page_size);
-				this.page_size = page_size;
-				this.getList();
-			},
-			async getList() {
-				const {
-					org_id,
-					listType,
-					page_num,
-					page_size,
-					searchDate
-				} = this;
-				const start_date = searchDate[0];
-				const end_date = searchDate[1];
-				let peop_type = this.type2;
-				let service_org_type = "";
-				if(this.detailType=="volunteer")
-				{service_org_type="ic_user_volunteer"}
-				else if(this.detailType=="community_org")
-				{service_org_type="party_unit"}
-				else if(this.detailType=="party_unit")
-				{service_org_type="community_org"}
-				this.loading = true;
-				const url = 'common_service_list';
-				const {
-					data,
-					code,
-					msg
-				} = await requestPostBi(url, {
-					queryParam: {
-						service_org_id: this.id,
-						service_org_type: service_org_type,
-						// source_name: '0',
-						page_size: page_size,
-						page_num: page_num
-					}
-				}, {
-					// mockId: 69852161
-				});
-				this.loading = false;
-				if (code === 0) {
-					this.srcTableData = data;
-					console.log('this.srcTableData ', this.srcTableData);
-					this.list = data.map((item, index) => {
-						return [
-							index + 1,
-							// service_record_id
-							item.service_time ? item.service_time : '--',
-							item.service_name ? item.service_name : '--',
-							item.scope_name ? item.scope_name : '--',
-							item.score ? item.score : '--',
-							item.demand_status ? item.demand_status : '--',
-							// 待处理：pending；已取消canceled；已派单：assigned；已接单：have_order；已完成：finished；
-							{
-								type: 'operate',
-								list: ['查看']
-							}
-						];
-					});
-					console.log('公共', this.list);
-				} else {
-					this.$message.error(msg);
-				}
-			},
-			async getCount() {
-				const {
-					org_id,
-					listType,
-					page_num,
-					page_size,
-					searchDate
-				} = this;
-				const start_date = searchDate[0];
-				const end_date = searchDate[1];
-				const url = 'common_service_list_total';
-				let service_org_type = "";
-				if(this.detailType=="volunteer")
-				{service_org_type="ic_user_volunteer"}
-				  else if(this.detailType=="community_org")
-				{service_org_type="party_unit"}
-				else if(this.detailType=="party_unit")
-				{service_org_type="community_org"}
-				let peop_type = this.type2;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPostBi(url, {
-					queryParam: {
-						service_org_id: this.id,
-						service_org_type: service_org_type,
-					}
-				}, {
-					//mockId: 63070189
-				});
-				if (code === 0) {
-					this.total = parseInt(data[0].total);
-				} else {
-					this.$message.error(msg);
-				}
-			}
-		},
-		destroyed() {
-			console.log('我已经离开了！');
-		}
-	};
-</script>
-<style lang="scss" src="@/assets/scss/dataBoard/listBox.scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue b/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
index 9914d411a..0ac1e2d26 100644
--- a/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
+++ b/src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
@@ -7,42 +7,34 @@
 						<div class="field">场所名称：</div>
 						<div class="value">{{ info.place_org_name }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">占地面积：</div>
 						<div class="value">{{ info.area_covered }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所规模：</div>
 						<div class="value">{{ info.scale_total }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">所属组织：</div>
 						<div class="value">{{ info.grid }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所类别：</div>
 						<div class="value">{{ info.place_category }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所类型：</div>
 						<div class="value">{{ info.place_type }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">负责人：</div>
 						<div class="value">{{ info.person_in_charge }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">联系电话：</div>
 						<div class="value">{{ info.mobile }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">场所地址：</div>
 						<div class="value">{{ info.mobile }}</div>
@@ -60,7 +52,6 @@
 						<div class="field">隐患场所：</div>
 						<div class="value">{{ info.danger_place_name }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">隐患内容：</div>
 						<div class="value">{{ info.danger_content }}</div>
@@ -69,17 +60,14 @@
 						<div class="field">所属组织：</div>
 						<div class="value">{{ info.grid }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">上报人：</div>
 						<div class="value">{{ info.report_person }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">联系电话：</div>
 						<div class="value">{{ info.mobile }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">上报时间：</div>
 						<div class="value">{{ info.report_time }}</div>
@@ -88,9 +76,7 @@
 			</div>
 			<div class="m-info" v-if="detailType == '群租房'">
 				<div class="subtitle">
-					<i class="i-chunk"></i>
-					基本信息
-					<i class="i-line"></i>
+					<i class="i-chunk"></i> 基本信息 <i class="i-line"></i>
 				</div>
 				<div class="row">
 					<div class="item">
@@ -123,23 +109,19 @@
 					</div>
 				</div>
 				<div class="subtitle">
-					<i class="i-chunk"></i>
-					人员信息
-					<i class="i-line"></i>
+					<i class="i-chunk"></i> 人员信息 <i class="i-line"></i>
 				</div>
 				<div class="m-tabs">
-					<div class="tab-btn" @click="subStartTabIndex2" v-if="userArray.length > 7"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
-					<div
-						v-for="(item, index) in userArray"
-						class="tab"
-						:class="currentTabIndex2 % userArray.length == index ? 'z-on' : ''"
-						:key="'tab' + index"
+					<div class="tab-btn" @click="subStartTabIndex2" v-if="userArray.length > 7"><img
+							src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
+					<div v-for="(item, index) in userArray" class="tab"
+						:class="currentTabIndex2 % userArray.length == index ? 'z-on' : ''" :key="'tab' + index"
 						v-show="index >= startTabIndex2 && index < startTabIndex2 + 7"
-						@click="(currentTabIndex2 = index), gettab2(item)"
-					>
+						@click="(currentTabIndex2 = index), gettab2(item)">
 						{{ item.name }}
 					</div>
-					<div class="tab-btn" @click="addStartTabIndex2" v-if="userArray.length > 7"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
+					<div class="tab-btn" @click="addStartTabIndex2" v-if="userArray.length > 7"><img
+							src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
 				</div>
 				<div class="row">
 					<div class="item">
@@ -184,7 +166,6 @@
 					<span>分类信息</span>
 					<i class="i-line"></i>
 				</div>
-
 				<div class="row">
 					<div class="item">
 						<div class="field">居民分类：</div>
@@ -214,28 +195,22 @@
 						</div>
 					</div>
 				</div>
-
 				<div class="subtitle">
 					<i class="i-chunk"></i>
 					<span>其他信息</span>
 					<i class="i-line"></i>
 				</div>
-
 				<div class="m-tabs">
-					<div class="tab-btn" @click="subStartTabIndex" v-if="tabList.length > 7"><img src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
-					<div
-						v-show="index >= startTabIndex && index < startTabIndex + 7"
-						class="tab"
-						:class="currentTabIndex % tabList.length == index ? 'z-on' : ''"
-						:key="'tab' + index"
-						@click="currentTabIndex = index"
-						v-for="(item, index) in tabList"
-					>
+					<div class="tab-btn" @click="subStartTabIndex" v-if="tabList.length > 7"><img
+							src="@/assets/img/shuju/people/arrow-double-left.png" /></div>
+					<div v-show="index >= startTabIndex && index < startTabIndex + 7" class="tab"
+						:class="currentTabIndex % tabList.length == index ? 'z-on' : ''" :key="'tab' + index"
+						@click="currentTabIndex = index" v-for="(item, index) in tabList">
 						{{ item }}
 					</div>
-					<div class="tab-btn" @click="addStartTabIndex" v-if="tabList.length > 7"><img src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
+					<div class="tab-btn" @click="addStartTabIndex" v-if="tabList.length > 7"><img
+							src="@/assets/img/shuju/people/arrow-double-right.png" /></div>
 				</div>
-
 				<div v-if="currentTab == '教育信息'">
 					<div class="row">
 						<div class="item">
@@ -248,7 +223,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '兴趣爱好'">
 					<div class="row">
 						<div class="item">
@@ -261,7 +235,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '宗教'">
 					<div class="row">
 						<div class="item">
@@ -274,7 +247,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '健康'">
 					<div class="row">
 						<div class="item">
@@ -347,7 +319,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '工作'">
 					<div class="row">
 						<div class="item">
@@ -368,7 +339,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '经济状况'">
 					<div class="row">
 						<div class="item">
@@ -381,7 +351,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '居住'">
 					<div class="row">
 						<div class="item">
@@ -406,7 +375,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '家庭'">
 					<div class="row">
 						<div class="item">
@@ -443,7 +411,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '党员'">
 					<div class="row">
 						<div class="item">
@@ -492,7 +459,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '保障房'">
 					<div class="row">
 						<div class="item">
@@ -517,7 +483,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '失业'">
 					<div class="row">
 						<div class="item">
@@ -554,7 +519,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '退役军人'">
 					<div class="row">
 						<div class="item">
@@ -599,7 +563,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '统战人员'">
 					<div class="row">
 						<div class="item">
@@ -612,7 +575,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '志愿者'">
 					<div class="row">
 						<div class="item">
@@ -625,7 +587,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '老年人'">
 					<div class="row">
 						<div class="item">
@@ -634,7 +595,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '特殊人群'">
 					<div class="row">
 						<div class="item">
@@ -643,7 +603,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '出生信息'">
 					<div class="row">
 						<div class="item">
@@ -668,7 +627,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '死亡信息'">
 					<div class="row">
 						<div class="item">
@@ -689,7 +647,6 @@
 						</div>
 					</div>
 				</div>
-
 				<div v-if="currentTab == '迁出'">
 					<div class="row">
 						<div class="item">
@@ -734,238 +691,248 @@
 		</template>
 	</popup>
 </template>
-
 <script>
-import { Scene } from '@antv/l7';
-import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
-
-export default {
-	name: 'eventdetail',
-	props: {
-		// eventId:
-		detailId: {
-			type: String,
-			default: ''
-		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: { popup },
-	created() {},
-	data() {
-		return {
-			progress: [],
-			info: {},
-			title: '事件',
-			currentTabIndex: 0,
-			startTabIndex: 0,
-			currentTabIndex2: 0,
-			startTabIndex2: 0,
-			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: [],
-			tabList2: [],
-			userArray: [],
-			userList: {}
-		};
-	},
-
-	mounted() {
-		this.getApiData();
-	},
-	computed: {
-		currentTab() {
-			return this.tabList[this.currentTabIndex];
-		},
-		currentTab2() {
-			return this.tabList2[this.currentTabIndex2];
-		}
-	},
-	methods: {
-		addStartTabIndex() {
-			const { startTabIndex, tabList } = this;
-			if (startTabIndex < tabList.length - 7) {
-				this.startTabIndex = startTabIndex + 1;
-			} else {
-				this.startTabIndex = tabList.length - 7;
+	import {
+		Scene
+	} from '@antv/l7';
+	import popup from '@/views/dataBoard/cpts/popup';
+	import daiMap from "@/utils/dai-map";
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
+	export default {
+		name: 'eventdetail',
+		props: {
+			// eventId:
+			detailId: {
+				type: String,
+				default: ''
+			},
+			detailType: {
+				type: String,
+				default: ''
 			}
 		},
-		subStartTabIndex() {
-			const { startTabIndex, tabList } = this;
-			if (startTabIndex > 0) {
-				this.startTabIndex = startTabIndex - 1;
-			} else {
-				this.startTabIndex = 0;
-			}
-		},
-		addStartTabIndex2() {
-			const { startTabIndex2, tabList2 } = this;
-			if (startTabIndex2 < tabList2.length - 7) {
-				this.startTabIndex2 = startTabIndex2 + 1;
-			} else {
-				this.startTabIndex2 = tabList2.length - 7;
-			}
-		},
-		subStartTabIndex2() {
-			const { startTabIndex2, tabList2 } = this;
-			if (startTabIndex2 > 0) {
-				this.startTabIndex2 = startTabIndex2 - 1;
-			} else {
-				this.startTabIndex2 = 0;
-			}
-		},
-		iniMap() {
-			const scene = new Scene({
-				id: 'map',
-				map: new GaodeMap({
-					pitch: 35.210526315789465,
-					style: 'dark',
-					center: [this.info.latitude, this.info.longitude],
-					zoom: 4.4
-				})
-			});
+		components: {
+			popup
 		},
-		handleClose() {
-			this.$emit('close');
+		created() {},
+		data() {
+			return {
+				progress: [],
+				info: {},
+				title: '事件',
+				currentTabIndex: 0,
+				startTabIndex: 0,
+				currentTabIndex2: 0,
+				startTabIndex2: 0,
+				BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
+				tabList: [],
+				tabList2: [],
+				userArray: [],
+				userList: {}
+			};
 		},
-
-		async getApiData() {
-			this.getInfo();
+		mounted() {
+			this.getApiData();
 		},
-
-		gettab() {
-			this.info.group_rental.forEach(item => {
-				this.getUserInfo(item.user_id);
-			});
+		computed: {
+			currentTab() {
+				return this.tabList[this.currentTabIndex];
+			},
+			currentTab2() {
+				return this.tabList2[this.currentTabIndex2];
+			}
 		},
-
-		getUserInfo(id) {
-			const url = 'resident_info';
-
-			requestPostBi(
-				url,
-				{
+		methods: {
+			addStartTabIndex() {
+				const {
+					startTabIndex,
+					tabList
+				} = this;
+				if (startTabIndex < tabList.length - 7) {
+					this.startTabIndex = startTabIndex + 1;
+				} else {
+					this.startTabIndex = tabList.length - 7;
+				}
+			},
+			subStartTabIndex() {
+				const {
+					startTabIndex,
+					tabList
+				} = this;
+				if (startTabIndex > 0) {
+					this.startTabIndex = startTabIndex - 1;
+				} else {
+					this.startTabIndex = 0;
+				}
+			},
+			addStartTabIndex2() {
+				const {
+					startTabIndex2,
+					tabList2
+				} = this;
+				if (startTabIndex2 < tabList2.length - 7) {
+					this.startTabIndex2 = startTabIndex2 + 1;
+				} else {
+					this.startTabIndex2 = tabList2.length - 7;
+				}
+			},
+			subStartTabIndex2() {
+				const {
+					startTabIndex2,
+					tabList2
+				} = this;
+				if (startTabIndex2 > 0) {
+					this.startTabIndex2 = startTabIndex2 - 1;
+				} else {
+					this.startTabIndex2 = 0;
+				}
+			},
+			iniMap() {
+				let latitude = this.info.latitude;
+				let longitude = this.info.longitude;
+				let map = new daiMap(document.getElementById("map"), {
+					latitude,
+					longitude
+				}, {
+					zoom: 16.2, // 设置地图缩放级别
+					pitch: 43.5, // 设置俯仰角
+					rotation: 45, // 设置地图旋转角度
+				});
+				map.setCenter(latitude, longitude);
+				map.setMarker(latitude, longitude);
+			},
+			handleClose() {
+				this.$emit('close');
+			},
+			async getApiData() {
+				this.getInfo();
+			},
+			gettab() {
+				this.info.group_rental.forEach(item => {
+					this.getUserInfo(item.user_id);
+				});
+			},
+			getUserInfo(id) {
+				const url = 'resident_info';
+				requestPostBi(url, {
 					queryParam: {
 						resident_id: id
 					}
-				},
-				{
+				}, {
 					// mockId: 61172054,
-				}
-			).then(res => {
-				console.log(res);
-				if (res.code === 0) {
-					this.userArray.push(res.data[0]);
-					if (this.userArray.length == 1) {
-						this.gettab2(this.userArray[0]);
+				}).then(res => {
+					console.log(res);
+					if (res.code === 0) {
+						this.userArray.push(res.data[0]);
+						if (this.userArray.length == 1) {
+							this.gettab2(this.userArray[0]);
+						}
 					}
+				});
+			},
+			gettab2(item) {
+				this.userList = {
+					...item
+				};
+				console.log('当前人员信息', this.userList);
+				let tabList = this.BaseTabList;
+				this.userList.crowd && tabList.push('党员');
+				this.userList.srs && tabList.push('保障房');
+				this.userList.unemployed && tabList.push('失业');
+				this.userList.exs && tabList.push('退役军人');
+				this.userList.ufs && tabList.push('统战人员');
+				this.userList.volunteer && tabList.push('志愿者');
+				this.userList.aged && tabList.push('老年人');
+				this.userList.special_popu && tabList.push('特殊人群');
+				tabList.push('出生信息');
+				tabList.push('死亡信息');
+				tabList.push('迁出');
+				this.tabList = tabList;
+			},
+			// 根据房屋id获取详情
+			async getInfo() {
+				let url = '';
+				let queryParam = {};
+				if (this.detailType == '生产隐患') {
+					url = 'enterprise_info';
+					this.title = '安全生产巡查详情';
+					queryParam.enterprise_id = this.detailId;
+				} else if (this.detailType == '群租房') {
+					url = 'group_tenant_info';
+					this.title = '群租房详情';
+					queryParam.room_id = this.detailId;
+				} else if (this.detailType == '发现问题') {
+					url = 'group_tenant_info';
+					this.title = '发现问题详情';
+					queryParam.hidden_danger_id = this.detailId;
 				}
-			});
-		},
-
-		gettab2(item) {
-			this.userList = { ...item };
-			console.log('当前人员信息', this.userList);
-			let tabList = this.BaseTabList;
-			this.userList.crowd && tabList.push('党员');
-			this.userList.srs && tabList.push('保障房');
-			this.userList.unemployed && tabList.push('失业');
-			this.userList.exs && tabList.push('退役军人');
-			this.userList.ufs && tabList.push('统战人员');
-			this.userList.volunteer && tabList.push('志愿者');
-			this.userList.aged && tabList.push('老年人');
-			this.userList.special_popu && tabList.push('特殊人群');
-			tabList.push('出生信息');
-			tabList.push('死亡信息');
-			tabList.push('迁出');
-			this.tabList = tabList;
-		},
-		// 根据房屋id获取详情
-		async getInfo() {
-			let url = '';
-			let queryParam = {};
-
-			if (this.detailType == '生产隐患') {
-				url = 'enterprise_info';
-				this.title = '安全生产巡查详情';
-				queryParam.enterprise_id = this.detailId;
-			} else if (this.detailType == '群租房') {
-				url = 'group_tenant_info';
-				this.title = '群租房详情';
-				queryParam.room_id = this.detailId;
-			} else if (this.detailType == '发现问题') {
-				url = 'group_tenant_info';
-				this.title = '发现问题详情';
-				queryParam.hidden_danger_id = this.detailId;
-			}
-
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(url, {
 					queryParam: queryParam
-				},
-				{
+				}, {
 					// mockId: 60235478,
+				});
+				if (code === 0) {
+					this.info = {
+						...this.info,
+						...data[0]
+					};
+					console.log('this.info', this.info);
+					// this.info = {
+					// 	group_rental: [
+					// 		{
+					// 			user_id: '1501821708368089090'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708569415681'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708368089090'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708569415681'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708368089090'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708569415681'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708368089090'
+					// 		},
+					// 		{
+					// 			user_id: '1501821708569415681'
+					// 		}
+					// 	],
+					// 	house_state: null,
+					// 	homeowner_idcard: '53',
+					// 	homeowner: 'elit',
+					// 	room_id: '52',
+					// 	house_usage: 'ullamco culpa dolor',
+					// 	homeowner_telep: 'sed',
+					// 	house_type: 'mollit est eu commodo in'
+					// };
+					if (this.detailType == '生产隐患') {
+						this.iniMap();
+					} else if (this.detailType == '群租房') {
+						this.gettab();
+					}
+				} else {
+					this.$message.error(msg);
 				}
-			);
-			if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
-				console.log('this.info', this.info);
-				// this.info = {
-				// 	group_rental: [
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708368089090'
-				// 		},
-				// 		{
-				// 			user_id: '1501821708569415681'
-				// 		}
-				// 	],
-				// 	house_state: null,
-				// 	homeowner_idcard: '53',
-				// 	homeowner: 'elit',
-				// 	room_id: '52',
-				// 	house_usage: 'ullamco culpa dolor',
-				// 	homeowner_telep: 'sed',
-				// 	house_type: 'mollit est eu commodo in'
-				// };
-
-				if (this.detailType == '生产隐患') {
-					this.iniMap();
-				} else if (this.detailType == '群租房') {
-					this.gettab();
-				}
-			} else {
-				this.$message.error(msg);
 			}
 		}
-	}
-};
+	};
 </script>
 <style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
+	.m-info .row .item .field {
+		width: 120px !important;
+	}
 </style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/zy/gexingDetail.vue b/src/views/dataBoard/sida/zy/gexingDetail.vue
index 21d94e9a1..951a0a352 100644
--- a/src/views/dataBoard/sida/zy/gexingDetail.vue
+++ b/src/views/dataBoard/sida/zy/gexingDetail.vue
@@ -7,42 +7,34 @@
 						<div class="field">需求类型：</div>
 						<div class="value">{{ info.category }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">需求内容：</div>
 						<div class="value">{{ info.content }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">状态：</div>
 						<div class="value">{{ info.demand_status }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">需求人：</div>
 						<div class="value">{{ info.demand_user_name }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">完成情况：</div>
 						<div class="value">{{ info.finish_result }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">所属网格：</div>
 						<div class="value">{{ info.grid }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">备注：</div>
 						<div class="value">{{ info.remark }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">上报时间：</div>
 						<div class="value">{{ info.report_time }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">上报类型：</div>
 						<div class="value">{{ info.report_type }}</div>
@@ -59,7 +51,6 @@
 						<div class="field">评价：</div>
 						<div class="value">{{ info.score }}</div>
 					</div>
-
 					<div class="item">
 						<div class="field">服务方：</div>
 						<div class="value">{{ info.server_name }}</div>
@@ -73,84 +64,91 @@
 		</template>
 	</popup>
 </template>
-
 <script>
-import { Scene } from '@antv/l7';
-import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
-
-export default {
-	name: 'eventdetail',
-	props: {
-		detailId: {
-			type: String,
-			default: ''
+	import {
+		Scene
+	} from '@antv/l7';
+	import popup from '@/views/dataBoard/cpts/popup';
+	import {
+		GaodeMap,
+		Map
+	} from '@antv/l7-maps';
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
+	export default {
+		name: 'eventdetail',
+		props: {
+			detailId: {
+				type: String,
+				default: ''
+			},
+			detailType: {
+				type: String,
+				default: ''
+			}
 		},
-		detailType: {
-			type: String,
-			default: ''
-		}
-	},
-
-	components: { popup },
-	created() {},
-	data() {
-		return {
-			progress: [],
-			info: {},
-			title: '个性服务详情',
-			currentTabIndex: 0,
-			startTabIndex: 0,
-			currentTabIndex2: 0,
-			startTabIndex2: 0,
-			BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
-			tabList: [],
-			tabList2: [],
-			userArray: [],
-			userList: {}
-		};
-	},
-
-	mounted() {
-		this.getApiData();
-	},
-	computed: {},
-	methods: {
-		handleClose() {
-			this.$emit('close');
+		components: {
+			popup
+		},
+		created() {},
+		data() {
+			return {
+				progress: [],
+				info: {},
+				title: '个性服务详情',
+				currentTabIndex: 0,
+				startTabIndex: 0,
+				currentTabIndex2: 0,
+				startTabIndex2: 0,
+				BaseTabList: ['教育信息', '兴趣爱好', '宗教', '健康', '工作', '经济状况', '居住', '家庭'],
+				tabList: [],
+				tabList2: [],
+				userArray: [],
+				userList: {}
+			};
 		},
-
-		async getApiData() {
-			this.getInfo();
+		mounted() {
+			this.getApiData();
 		},
-
-		// 根据房屋id获取详情
-		async getInfo() {
-			const url = 'user_service_intro';
-
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
-					user_demand_id: this.detailId
-				},
-				{
+		computed: {},
+		methods: {
+			handleClose() {
+				this.$emit('close');
+			},
+			async getApiData() {
+				this.getInfo();
+			},
+			// 
+			async getInfo() {
+				const url = 'user_service_intro';
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(url, {
+					queryParam: {
+						user_demand_id: this.detailId,
+					}
+				}, {
 					// mockId: 69964568,
+				});
+				if (code === 0) {
+					this.info = {
+						...this.info,
+						...data[0]
+					};
+					console.log('this.info', this.info);
+				} else {
+					this.$message.error(msg);
 				}
-			);
-			if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
-				console.log('this.info', this.info);
-			} else {
-				this.$message.error(msg);
 			}
 		}
-	}
-};
+	};
 </script>
 <style scoped>
-.m-info .row .item .field {
-	width: 120px !important;
-}
+	.m-info .row .item .field {
+		width: 120px !important;
+	}
 </style>
-<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
+<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/dataBoard/sida/zy/gexingList.vue b/src/views/dataBoard/sida/zy/gexingList.vue
index d1ebbdfcf..57a2cf441 100644
--- a/src/views/dataBoard/sida/zy/gexingList.vue
+++ b/src/views/dataBoard/sida/zy/gexingList.vue
@@ -96,6 +96,7 @@ export default {
 			let item = this.srcTableData[index];
 			this.detailType = item.peop_child_type;
 			this.detailId = item.user_demand_id;
+			
 			// ceshi
 			// this.detailType = '志愿者';
 			// this.detailId = '1501821704551272449';
diff --git a/src/views/dataBoard/sida/zy/gonggongDetail.vue b/src/views/dataBoard/sida/zy/gonggongDetail.vue
index ddabee70d..e4b7917ba 100644
--- a/src/views/dataBoard/sida/zy/gonggongDetail.vue
+++ b/src/views/dataBoard/sida/zy/gonggongDetail.vue
@@ -109,7 +109,10 @@ export default {
 			const { data, code, msg } = await requestPostBi(
 				url,
 				{
-					service_record_id: this.detailId
+					queryParam: {
+						service_record_id: this.detailId
+					}
+					
 				},
 				{
 					// mockId: 69980718,
diff --git a/src/views/dataBoard/sida/zy/goodsRes-detail.vue b/src/views/dataBoard/sida/zy/goodsRes-detail.vue
index aa973b8a5..d32412344 100644
--- a/src/views/dataBoard/sida/zy/goodsRes-detail.vue
+++ b/src/views/dataBoard/sida/zy/goodsRes-detail.vue
@@ -73,7 +73,7 @@
 <script>
 import { Scene } from '@antv/l7';
 import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
+import daiMap from "@/utils/dai-map";
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
@@ -114,16 +114,18 @@ export default {
 	computed: {},
 	methods: {
 		iniMap() {
-			const scene = new Scene({
-				id: 'map',
-				map: new GaodeMap({
-					pitch: 35.210526315789465,
-					style: 'dark',
-					center: [this.info.latitude, this.info.longitude],
-					// center: [120.0, 36.1],
-					zoom: 4.4
-				})
+			let latitude = this.info.latitude;
+			let longitude = this.info.longitude;
+			let map = new daiMap(document.getElementById("map"), {
+				latitude,
+				longitude
+			}, {
+				zoom: 16.2, // 设置地图缩放级别
+				pitch: 43.5, // 设置俯仰角
+				rotation: 45, // 设置地图旋转角度
 			});
+			map.setCenter(latitude, longitude);
+			map.setMarker(latitude, longitude);
 		},
 		handleClose() {
 			this.$emit('close');
diff --git a/src/views/dataBoard/sida/zy/lianjianDetail.vue b/src/views/dataBoard/sida/zy/lianjianDetail.vue
index f03e477b9..3e09b8291 100644
--- a/src/views/dataBoard/sida/zy/lianjianDetail.vue
+++ b/src/views/dataBoard/sida/zy/lianjianDetail.vue
@@ -71,7 +71,7 @@
 <script>
 import { Scene } from '@antv/l7';
 import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
+import daiMap from "@/utils/dai-map";
 import { requestPostBi } from '@/js/dai/request-bipass';
 
 export default {
@@ -119,16 +119,18 @@ export default {
 			this.getInfo();
 		},
 		iniMap() {
-			const scene = new Scene({
-				id: 'map',
-				map: new GaodeMap({
-					pitch: 35.210526315789465,
-					style: 'dark',
-					center: [this.info.latitude, this.info.longitude],
-					// center: [120.11, 36.555],
-					zoom: 4.4
-				})
+			let latitude = this.info.latitude;
+			let longitude = this.info.longitude;
+			let map = new daiMap(document.getElementById("map"), {
+				latitude,
+				longitude
+			}, {
+				zoom: 16.2, // 设置地图缩放级别
+				pitch: 43.5, // 设置俯仰角
+				rotation: 45, // 设置地图旋转角度
 			});
+			map.setCenter(latitude, longitude);
+			map.setMarker(latitude, longitude);
 		},
 		// 根据房屋id获取详情
 		async getInfo() {