|
@@ -37,7 +37,6 @@
|
|
v-for="(item,index) in resourcesList">
|
|
v-for="(item,index) in resourcesList">
|
|
<div class="iconfont icon icon-normal" :class="item.icon"></div>
|
|
<div class="iconfont icon icon-normal" :class="item.icon"></div>
|
|
<div class="icon-text">
|
|
<div class="icon-text">
|
|
- <h6>{{ item.count }}</h6>
|
|
|
|
<h5>{{ item.resourceName }}</h5>
|
|
<h5>{{ item.resourceName }}</h5>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -52,11 +51,13 @@
|
|
</div> -->
|
|
</div> -->
|
|
<!-- 底部工具栏end -->
|
|
<!-- 底部工具栏end -->
|
|
<!-- 地图 -->
|
|
<!-- 地图 -->
|
|
- <supermapDialog ref="supermapDialog" :dynamicPlotting="true"
|
|
|
|
|
|
+ <supermapDialog ref="supermapDialog"
|
|
style="position: absolute; top:0;left: 0;"
|
|
style="position: absolute; top:0;left: 0;"
|
|
:mapDiv="'forestWarmSuperMap'"
|
|
:mapDiv="'forestWarmSuperMap'"
|
|
- :mapSite="{doubleClickZoom:false}" :codes="['9fa5']"
|
|
|
|
- :isSideBySide="false"></supermapDialog>
|
|
|
|
|
|
+ :mapSite="{zoom:16,doubleClickZoom:false,dragging:false,scrollWheelZoom:false}"
|
|
|
|
+ :codes="['9fa5']"
|
|
|
|
+ :isSideBySide="false"
|
|
|
|
+ :isdynamicPlotting="true"/>
|
|
<!-- 地图end -->
|
|
<!-- 地图end -->
|
|
</div>
|
|
</div>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -71,7 +72,7 @@
|
|
<div class="this-con h-45">
|
|
<div class="this-con h-45">
|
|
<div class="z-info-list" style="margin-top: 0;">
|
|
<div class="z-info-list" style="margin-top: 0;">
|
|
<el-timeline>
|
|
<el-timeline>
|
|
- <el-timeline-item color="#2bacf7" timestamp="2018/4/12"
|
|
|
|
|
|
+ <el-timeline-item color="#2bacf7" :timestamp="item.createTime"
|
|
placement="top" v-for="(item,index) in eventlog">
|
|
placement="top" v-for="(item,index) in eventlog">
|
|
<el-card>
|
|
<el-card>
|
|
<div class="z-info-list-con">
|
|
<div class="z-info-list-con">
|
|
@@ -164,7 +165,7 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- eventlog:[],
|
|
|
|
|
|
+ eventlog: [],
|
|
eventDialog: false,
|
|
eventDialog: false,
|
|
resourcesList: [{
|
|
resourcesList: [{
|
|
resourceName: '取水口',
|
|
resourceName: '取水口',
|
|
@@ -221,16 +222,16 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
cancelEventShow() {
|
|
cancelEventShow() {
|
|
console.log('关闭事件弹窗')
|
|
console.log('关闭事件弹窗')
|
|
- this.eventlog=[];
|
|
|
|
|
|
+ this.eventlog = []
|
|
},
|
|
},
|
|
showEventDialog(eventCode) {
|
|
showEventDialog(eventCode) {
|
|
let that = this
|
|
let that = this
|
|
//获取事件详情
|
|
//获取事件详情
|
|
getEventDetail({ eventCode: eventCode }).then(res => {
|
|
getEventDetail({ eventCode: eventCode }).then(res => {
|
|
this.eventDialog = true
|
|
this.eventDialog = true
|
|
- this.eventlog=res.data.eventlog
|
|
|
|
|
|
+ this.eventlog = res.data.eventlog
|
|
console.log(this.eventlog)
|
|
console.log(this.eventlog)
|
|
- if(res.data.catalogue!=null&&res.data.catalogue.length>0){
|
|
|
|
|
|
+ if (res.data.catalogue != null && res.data.catalogue.length > 0) {
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
@@ -240,28 +241,30 @@ export default {
|
|
parameter: '',
|
|
parameter: '',
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: false,
|
|
isAggregation: false,
|
|
- radius:0
|
|
|
|
|
|
+ radius: 0
|
|
}
|
|
}
|
|
if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3') {
|
|
if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3') {
|
|
markersMap.icon = 'sj-icon-map-clz'
|
|
markersMap.icon = 'sj-icon-map-clz'
|
|
markersMap.isAggregation = false
|
|
markersMap.isAggregation = false
|
|
} else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_4') {
|
|
} else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_4') {
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
- }else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
|
|
|
|
|
|
+ } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
- }else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_6') {
|
|
|
|
|
|
+ } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_6') {
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
markersMap.icon = 'sj-icon-map-wcl'
|
|
} else {
|
|
} else {
|
|
markersMap.icon = 'sj-icon-map-ywc'
|
|
markersMap.icon = 'sj-icon-map-ywc'
|
|
}
|
|
}
|
|
markersMap.lng = res.data.catalogue[0].longitude
|
|
markersMap.lng = res.data.catalogue[0].longitude
|
|
markersMap.lat = res.data.catalogue[0].latitude
|
|
markersMap.lat = res.data.catalogue[0].latitude
|
|
- if(res.data.eventdetail!=null&&res.data.eventdetail.length>0&&res.data.eventdetail[0].fireRadius!=null&&res.data.eventdetail[0].fireRadius!=""&&res.data.eventdetail[0].fireRadius>0){
|
|
|
|
|
|
+ if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
|
+ that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口,防止截图位置改变
|
|
that.$refs.supermapDialog.clearM(false)
|
|
that.$refs.supermapDialog.clearM(false)
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
|
|
+ that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
|
|
}, 1000)
|
|
}, 1000)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -272,7 +275,9 @@ export default {
|
|
const canvas = document.createElement('canvas')
|
|
const canvas = document.createElement('canvas')
|
|
// 获取父标签,意思是这个标签内的 DOM 元素生成图片
|
|
// 获取父标签,意思是这个标签内的 DOM 元素生成图片
|
|
// imageTofile是给截图范围内的父级元素自定义的ref名称
|
|
// imageTofile是给截图范围内的父级元素自定义的ref名称
|
|
- let canvasBox = this.$refs.imageTofile
|
|
|
|
|
|
+ // let canvasBox = this.$refs.imageTofile
|
|
|
|
+ let canvasBox = document.getElementById('forestWarmSuperMap')
|
|
|
|
+ console.log(canvasBox)
|
|
// 获取父级的宽高
|
|
// 获取父级的宽高
|
|
const width = parseInt(window.getComputedStyle(canvasBox).width)
|
|
const width = parseInt(window.getComputedStyle(canvasBox).width)
|
|
const height = parseInt(window.getComputedStyle(canvasBox).height)
|
|
const height = parseInt(window.getComputedStyle(canvasBox).height)
|