Browse Source

bugs

1
V1.0
tianqian 2 years ago
parent
commit
41ae7a0ff9
  1. 19
      src/views/dataBoard/sida/cpts/fwBarOption04.js
  2. 159
      src/views/dataBoard/sida/wt/event-detail.vue
  3. 9
      src/views/dataBoard/sida/wt/hiddenDanger-detail.vue
  4. 177
      src/views/dataBoard/sida/zy/placeRes-detail.vue

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

@ -14,6 +14,18 @@ export function pieOption() {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow' 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: { legend: {
@ -96,6 +108,13 @@ export function pieOption() {
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
// label: {
// normal: {
// show: true,
// position: 'top',
// formatter: '{c} %'
// },
// },
itemStyle: { itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
offset: 0, offset: 0,

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

@ -29,8 +29,24 @@
</div> </div>
<div class="row"> <div class="row">
<div class="item" style="width: 100%;"> <div class="item" style="width: 100%;">
<div class="field">音频</div> <div class="field">{{attachment_url.attachment_type}}</div>
<div class="value">{{ info.attachment_url }}</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> </div>
<div class="row"> <div class="row">
@ -77,7 +93,8 @@
<i class="i-line"></i> <i class="i-line"></i>
</div> </div>
<el-timeline class="timeline"> <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="status-box">
<div class="status2" v-if="index == 0">回复</div> <div class="status2" v-if="index == 0">回复</div>
<div class="status1" v-else>回复</div> <div class="status1" v-else>回复</div>
@ -101,77 +118,97 @@
</template> </template>
<script> <script>
import popup from '@/views/dataBoard/cpts/popup'; import popup from '@/views/dataBoard/cpts/popup';
import { GaodeMap, Map } from '@antv/l7-maps'; import {
import { requestPostBi } from '@/js/dai/request-bipass'; GaodeMap,
Map
} from '@antv/l7-maps';
import {
requestPostBi
} from '@/js/dai/request-bipass';
export default { export default {
name: 'eventdetail', name: 'eventdetail',
props: { props: {
detailId: { detailId: {
type: String, type: String,
default: '' default: ''
},
detailType: {
type: String,
default: ''
}
}, },
detailType: {
type: String,
default: ''
}
},
components: { popup }, components: {
created() {}, popup
data() { },
return { created() {
progress: [], this.getApiData();
info: {}, },
title: '事件' data() {
}; return {
}, progress: [],
info: {},
title: '事件',
attachment_url: {}
};
},
mounted() { mounted() {
this.getApiData();
},
methods: {
handleClose() {
this.$emit('close');
}, },
async getApiData() { methods: {
this.getInfo(); handleClose() {
}, this.$emit('close');
},
// id async getApiData() {
async getInfo() { this.getInfo();
let url = 'event_info'; },
this.title = '事件详情';
const { data, code, msg } = await requestPostBi( // id
url, async getInfo() {
{ let url = 'event_info';
queryParam: { this.title = '事件详情';
event_id: this.detailId
const {
data,
code,
msg
} = await requestPostBi(
url, {
queryParam: {
event_id: this.detailId
}
}, {
// mockId: 60235478,
} }
}, );
{ if (code === 0) {
// mockId: 60235478,
} this.info = {
); ...this.info,
if (code === 0) { ...data[0]
this.info = { ...this.info, ...data[0] }; };
if (this.detailType == '治理事件') {
this.progress = this.info.progress; 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);
} }
} else {
this.$message.error(msg);
} }
} }
} };
};
</script> </script>
<style scoped> <style scoped>
.m-info .row .item .field { .m-info .row .item .field {
width: 120px !important; width: 120px !important;
} }
</style> </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>

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

@ -810,8 +810,11 @@
this.getInfo(); this.getInfo();
}, },
gettab() { 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) { getUserInfo(id) {
@ -864,7 +867,7 @@
this.title = '群租房详情'; this.title = '群租房详情';
queryParam.room_id = this.detailId; queryParam.room_id = this.detailId;
} else if (this.detailType == '发现问题') { } else if (this.detailType == '发现问题') {
url = 'group_tenant_info'; url = 'hidden_danger_info';
this.title = '发现问题详情'; this.title = '发现问题详情';
queryParam.hidden_danger_id = this.detailId; queryParam.hidden_danger_id = this.detailId;
} }

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

@ -54,96 +54,113 @@
</template> </template>
<script> <script>
import { Scene } from '@antv/l7'; import {
import popup from '@/views/dataBoard/cpts/popup'; Scene
import { GaodeMap, Map } from '@antv/l7-maps'; } from '@antv/l7';
import { requestPostBi } from '@/js/dai/request-bipass'; import popup from '@/views/dataBoard/cpts/popup';
import daiMap from "@/utils/dai-map";
import {
requestPostBi
} from '@/js/dai/request-bipass';
export default { export default {
name: 'eventdetail', name: 'eventdetail',
props: { props: {
detailId: { detailId: {
type: String, type: String,
default: '' 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
};
},
mounted() { components: {
this.getInfo(); popup
},
computed: {
currentTab() {
return this.tabList[this.currentTabIndex];
}, },
currentTab2() { created() {},
return this.tabList2[this.currentTabIndex2]; data() {
} return {
}, progress: [],
methods: { info: {},
iniMap() { title: '事件',
const scene = new Scene({ currentTabIndex: 0,
id: 'map', startTabIndex: 0,
map: new GaodeMap({ currentTabIndex2: 0,
pitch: 35.210526315789465, startTabIndex2: 0
style: 'dark', };
center: [this.info.latitude, this.info.longitude], },
// center: [120.00, 36.00],
zoom: 4.4 mounted() {
}) this.getInfo();
});
}, },
handleClose() { computed: {
this.$emit('close'); currentTab() {
return this.tabList[this.currentTabIndex];
},
currentTab2() {
return this.tabList2[this.currentTabIndex2];
}
}, },
methods: {
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');
},
// id // id
async getInfo() { async getInfo() {
let url = 'place_resources_intro'; let url = 'place_resources_intro';
let queryParam = {}; let queryParam = {};
this.title = '场所详情'; this.title = '场所详情';
queryParam.place_id = this.detailId; queryParam.place_id = this.detailId;
queryParam.parent_place_type = this.detailType; if (this.detailType == "enterprise") {
const { data, code, msg } = await requestPostBi( queryParam.parent_place_type = "enterprise_inspect"
url, } else {
{ queryParam.parent_place_type = this.detailType;
queryParam: queryParam }
}, const {
{ data,
// mockId: 70051004, code,
msg
} = await requestPostBi(
url, {
queryParam: queryParam
}, {
// mockId: 70051004,
}
);
if (code === 0) {
this.info = {
...this.info,
...data[0]
};
console.log('this.info', this.info);
this.iniMap();
} else {
this.$message.error(msg);
} }
);
if (code === 0) {
this.info = { ...this.info, ...data[0] };
console.log('this.info', this.info);
this.iniMap();
} else {
this.$message.error(msg);
} }
} }
} };
};
</script> </script>
<style scoped> <style scoped>
.m-info .row .item .field { .m-info .row .item .field {
width: 120px !important; width: 120px !important;
} }
</style> </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>
Loading…
Cancel
Save