|
@@ -285,7 +285,7 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
|
|
|
|
|
|
+ <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型!" clearable>
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型!" clearable>
|
|
<el-option
|
|
<el-option
|
|
v-for="item in eventTypeList"
|
|
v-for="item in eventTypeList"
|
|
@@ -1186,6 +1186,7 @@ export default {
|
|
eventName: null,
|
|
eventName: null,
|
|
longitude: null,
|
|
longitude: null,
|
|
latitude: null,
|
|
latitude: null,
|
|
|
|
+ eventTypeXl:null,
|
|
eventLog: null,
|
|
eventLog: null,
|
|
eventLogList: [],
|
|
eventLogList: [],
|
|
visuForestCloudYuAnBo: null,
|
|
visuForestCloudYuAnBo: null,
|
|
@@ -1662,12 +1663,16 @@ export default {
|
|
if (eventStatus == 'qs') {//签收
|
|
if (eventStatus == 'qs') {//签收
|
|
that.eventConfirmTitle = '事件签收'
|
|
that.eventConfirmTitle = '事件签收'
|
|
let param = { parentId: that.eventType }
|
|
let param = { parentId: that.eventType }
|
|
- await listSJfl(param).then(res => {
|
|
|
|
- //事件类型
|
|
|
|
- if (res.code == 200) {
|
|
|
|
- that.eventTypeList = res.data
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ if(that.eventTypeXl != null){
|
|
|
|
+ that.sendEventType = that.eventTypeXl;
|
|
|
|
+ }else{
|
|
|
|
+ await listSJfl(param).then(res => {
|
|
|
|
+ //事件类型
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ that.eventTypeList = res.data
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
await listYuAn().then(res => {
|
|
await listYuAn().then(res => {
|
|
//关联预案
|
|
//关联预案
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
@@ -1893,6 +1898,7 @@ export default {
|
|
let that = this
|
|
let that = this
|
|
//获取事件详情
|
|
//获取事件详情
|
|
getEventDetail({ eventCode: eventCode }).then(res => {
|
|
getEventDetail({ eventCode: eventCode }).then(res => {
|
|
|
|
+
|
|
that.eventDialog = true
|
|
that.eventDialog = true
|
|
that.eventLogList = res.data.eventlog//日志列表
|
|
that.eventLogList = res.data.eventlog//日志列表
|
|
that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
|
|
that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
|
|
@@ -1905,6 +1911,7 @@ export default {
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.eventName = res.data.catalogue.eventName
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
|
+ that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
@@ -1989,6 +1996,7 @@ export default {
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.eventName = res.data.catalogue.eventName
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
|
+ that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
@@ -2020,7 +2028,7 @@ export default {
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
markersMap.radius = res.data.eventdetail[0].fireRadius
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- that.$refs.supermapDialog.clearM(false)
|
|
|
|
|
|
+ that.$refs.supermapDialog.clearM(true)
|
|
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) {
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
that.$refs.supermapDialog.setMarkersRadius([markersMap])
|
|
} else {
|
|
} else {
|