bugs

1

src/views/dataBoard/sida/cpts/fwBarOption04.js

@@ -14,6 +14,18 @@ export function pieOption() {
 			trigger: 'axis',
 			axisPointer: {
 				type: 'shadow'
+			},
+			formatter: function(params) {
+
+				var relVal = params[0].name
+				for (var i = 0, l = params.length; i < l; i++) {
+					if (i == 0) {
+						relVal += '<br/>' + params[i].marker + params[i].value + '%'
+					} else {
+						relVal += '<br/>' + params[i].marker + params[i].value + ''
+					}
+				}
+				return relVal
 			}
 		},
 		legend: {
@@ -96,6 +108,13 @@ export function pieOption() {
 			emphasis: {
 				focus: 'series'
 			},
+			// label: {
+			// 	normal: {
+			// 		show: true,
+			// 		position: 'top',
+			// 		formatter: '{c} %'
+			// 	},
+			// },
 			itemStyle: {
 				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
 					offset: 0,

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

@@ -29,8 +29,24 @@
 						</div>
 						<div class="row">
 							<div class="item" style="width: 100%;">
-								<div class="field">音频：</div>
-								<div class="value">{{ info.attachment_url }}</div>
+								<div class="field">{{attachment_url.attachment_type}}：</div>
+								<div class="value">
+									<template v-if="attachment_url.attachment_type_code=='image'">
+										<el-image style="min-width: 100px;max-width:200px;"
+											:src="attachment_url.attachment_url" :fit="fit"></el-image>
+
+									</template>
+									<template v-if="attachment_url.attachment_type_code=='audio'">
+										<audio :src="attachment_url.attachment_url">
+											您的浏览器不支持 audio 标签。
+										</audio>
+									</template>
+									<template v-if="attachment_url.attachment_type_code=='video'">
+										<video :src="attachment_url.attachment_url" controls="controls">
+											您的浏览器不支持 video 标签。
+										</video>
+									</template>
+								</div>
 							</div>
 						</div>
 						<div class="row">
@@ -77,7 +93,8 @@
 							<i class="i-line"></i>
 						</div>
 						<el-timeline class="timeline">
-							<el-timeline-item v-for="(item, index) in progress" :key="index" :class="index == progress.length - 1 ? 'sucess' : ''">
+							<el-timeline-item v-for="(item, index) in progress" :key="index"
+								:class="index == progress.length - 1 ? 'sucess' : ''">
 								<div class="status-box">
 									<div class="status2" v-if="index == 0">回复</div>
 									<div class="status1" v-else>回复</div>
@@ -102,8 +119,13 @@
 
 <script>
 	import popup from '@/views/dataBoard/cpts/popup';
-import { GaodeMap, Map } from '@antv/l7-maps';
-import { requestPostBi } from '@/js/dai/request-bipass';
+	import {
+		GaodeMap,
+		Map
+	} from '@antv/l7-maps';
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
 
 	export default {
 		name: 'eventdetail',
@@ -118,18 +140,23 @@ export default {
 			}
 		},
 
-	components: { popup },
-	created() {},
+		components: {
+			popup
+		},
+		created() {
+			this.getApiData();
+		},
 		data() {
 			return {
 				progress: [],
 				info: {},
-			title: '事件'
+				title: '事件',
+				attachment_url: {}
 			};
 		},
 
 		mounted() {
-		this.getApiData();
+
 		},
 
 		methods: {
@@ -146,21 +173,31 @@ export default {
 				let url = 'event_info';
 				this.title = '事件详情';
 
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(
+					url, {
 						queryParam: {
 							event_id: this.detailId
 						}
-				},
-				{
+					}, {
 						// mockId: 60235478,
 					}
 				);
 				if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
+
+					this.info = {
+						...this.info,
+						...data[0]
+					};
+
+					this.attachment_url = (JSON.parse(this.info.attachment_url))[0]
+					console.log("ddd", this.attachment_url)
 					if (this.detailType == '治理事件') {
 						this.progress = this.info.progress;
+
 					}
 				} else {
 					this.$message.error(msg);

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

@@ -810,8 +810,11 @@
 				this.getInfo();
 			},
 			gettab() {
-				this.info.group_rental.forEach(item => {
-					this.getUserInfo(item.user_id);
+				
+				let users=this.info.group_rental.split(",");
+				console.log("this.info.group_rental",users)
+				users.forEach(item => {
+					this.getUserInfo(item);
 				});
 			},
 			getUserInfo(id) {
@@ -864,7 +867,7 @@
 					this.title = '群租房详情';
 					queryParam.room_id = this.detailId;
 				} else if (this.detailType == '发现问题') {
-					url = 'group_tenant_info';
+					url = 'hidden_danger_info';
 					this.title = '发现问题详情';
 					queryParam.hidden_danger_id = this.detailId;
 				}

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

@@ -54,10 +54,14 @@
 </template>
 
 <script>
-import { Scene } from '@antv/l7';
+	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';
+	import daiMap from "@/utils/dai-map";
+	import {
+		requestPostBi
+	} from '@/js/dai/request-bipass';
 
 	export default {
 		name: 'eventdetail',
@@ -72,7 +76,9 @@ export default {
 			}
 		},
 
-	components: { popup },
+		components: {
+			popup
+		},
 		created() {},
 		data() {
 			return {
@@ -99,16 +105,18 @@ export default {
 		},
 		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.00, 36.00],
-					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');
@@ -120,18 +128,27 @@ export default {
 				let queryParam = {};
 				this.title = '场所详情';
 				queryParam.place_id = this.detailId;
+				if (this.detailType == "enterprise") {
+					queryParam.parent_place_type = "enterprise_inspect"
+				} else {
 					queryParam.parent_place_type = this.detailType;
-			const { data, code, msg } = await requestPostBi(
-				url,
-				{
+				}
+				const {
+					data,
+					code,
+					msg
+				} = await requestPostBi(
+					url, {
 						queryParam: queryParam
-				},
-				{
+					}, {
 						// mockId: 70051004,
 					}
 				);
 				if (code === 0) {
-				this.info = { ...this.info, ...data[0] };
+					this.info = {
+						...this.info,
+						...data[0]
+					};
 					console.log('this.info', this.info);
 					this.iniMap();
 				} else {