农业可视化事件详情问题修改

src/api/forest.js

@@ -51,13 +51,24 @@ export function getExposureStage(param) {
 }
 
 // 获取事件详情
+// export function getEventDetail(param) {
+//   return request({
+//     url: '/center-agriculture/fire/getEventDetail',
+//     method: 'post',
+//     data: param
+//   })
+// }
+
+
+// 获取事件详情
 export function getEventDetail(param) {
   return request({
-    url: '/center-agriculture/fire/getEventDetail',
+    url: '/center-fire/VisuForestCloudMapController/getEventDetail',
     method: 'post',
     data: param
   })
 }
+
 // 获取日历颜色状态
 export function getEventByCalendar(param) {
   return request({
@@ -94,14 +105,15 @@ export function eventLogUpload(param) {
 export function sendEventLog(param) {
   return request({
     url: '/center-event/eventcatalogue/uploadConext',
-    method: 'post',
+    method: 'get',
     data: param
   })
 }
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-agriculture/fire/updateCentereventTEventcatalogueStatus',
+    // url: '/center-agriculture/fire/updateCentereventTEventcatalogueStatus',
+    url: '/center-fire/VisuForestCloudMapController/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
@@ -109,7 +121,8 @@ export function updateCentereventTEventcatalogueStatus(param) {
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
-    url: '/center-agriculture/fire/listSJfl',
+    // url: '/center-agriculture/fire/listSJfl',
+    url: '/center-fire/VisuForestCloudMapController/listSJfl',
     method: 'post',
     data: param
   })
@@ -117,14 +130,16 @@ export function listSJfl(param) {
 // 事件处理流程-关联预案
 export function listYuAn() {
   return request({
-    url: '/center-agriculture/fire/listYuAn',
+    // url: '/center-agriculture/fire/listYuAn',
+    url: '/center-fire/VisuForestCloudMapController/listYuAn',
     method: 'post'
   })
 }
 // 事件处理流程-签收部门
 export function selectByeventCode(eventCode) {
   return request({
-    url: '/center-agriculture/fire/selectByeventCode/'+eventCode,
+    // url: '/center-agriculture/fire/selectByeventCode/'+eventCode,
+    url: '/center-fire/VisuForestCloudMapController/selectByeventCode/'+eventCode,
     method: 'post'
   })
 }
@@ -191,3 +206,10 @@ export function uploadBase64(param) {
     data:param
   })
 }
+// 事件短信联系人
+export function userFeginlist(param) {
+  return request({
+    url: '/center-fire/VisuForestCloudMapController/userFeginlist',
+    method: 'post'
+  })
+}

src/components/v-fastmenu.vue

@@ -65,6 +65,11 @@ import { getUserProfile } from "@/api/system/user";
 
 			}
 		},
+    provide(){
+      return{
+        closePage:this.closePage
+      }
+    },
     created() {
       this.getUser()
     },
@@ -112,7 +117,12 @@ import { getUserProfile } from "@/api/system/user";
             location.href = '/index';
           })
         }).catch(() => {});
+      },
+
+      closePage(){
+        this.isResetPwd = false;
       }
+
 		},
 		computed: {},
 

src/components/vBottomMenu.vue

@@ -703,12 +703,12 @@ export default {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-        if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-          this.address = res.data.catalogue[0].address
-          this.eventType = res.data.catalogue[0].eventType
-          this.eventId = res.data.catalogue[0].id
-          this.longitude = res.data.catalogue[0].longitude
-          this.latitude = res.data.catalogue[0].latitude
+        if (res.data.catalogue != null) {
+          this.address = res.data.catalogue.address
+          this.eventType = res.data.catalogue.eventType
+          this.eventId = res.data.catalogue.id
+          this.longitude = res.data.catalogue.longitude
+          this.latitude = res.data.catalogue.latitude
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -721,20 +721,20 @@ export default {
             radius: 0
           }
 
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
           }
-          markersMap.lng = res.data.catalogue[0].longitude
-          markersMap.lat = res.data.catalogue[0].latitude
+          markersMap.lng = res.data.catalogue.longitude
+          markersMap.lat = res.data.catalogue.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) {
             markersMap.radius = res.data.eventdetail[0].fireRadius
           }
@@ -742,7 +742,7 @@ export default {
             // that.$refs.supermapTaskDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
             that.$refs.supermapTaskDialog.clearM(false)
             that.$refs.supermapTaskDialog.setMarkersRadius([markersMap])
-            that.$refs.supermapTaskDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
+            that.$refs.supermapTaskDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
           }, 1000)
         }
       })

src/views/bigdata/bigdata.vue

@@ -5,7 +5,7 @@
 		<div class="header">
 			<!-- title -->
 			<router-link class="header-left"  to="/integrated/index"  exact><img class="logo" src="@/assets/images/integrated/logo-small.png" />
-				<h3 class="title">数字四平态势感知监管平台</h3></router-link>
+				<h3 class="title">通榆县乡村振兴监管平台</h3></router-link>
 			<div class="bignav">
 				<img src="@/assets/images/integrated/bigdata-header-nav-left.png" />
 				<router-link v-for="(navbar,index) in navbar " :key="index" :to="navbar.path" class="bignav-list" exact>

src/views/eventdetailsdialog.vue

@@ -202,7 +202,7 @@
                                              <!--@click="updateCentereventTEventcatalogueStatus('ld',false)">-->
                                     <!--联动-->
                                   <!--</el-button>-->
-                                  <el-button size="small"
+                                  <el-button size="small" v-if="dataStatus=='1'"
                                              icon="el-icon-success" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('bj',true)">
                                     办结
@@ -319,6 +319,15 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="联系人" v-if="eventStatusButton=='qs'">
+          <el-select multiple collapse-tags v-model='sendUserFegin' placeholder='请选择联系人！' clearable>
+            <el-option
+              v-for="item in userFeginList"
+              :label="item.nickName"
+              :value="item.phonenumber"
+            />
+          </el-select>
+        </el-form-item>
         <el-button size="mini" type="primary" v-if="eventStatusButton=='qs'"
                    @click="updateCentereventTEventcatalogueStatus('qs',true)">签收
         </el-button>
@@ -876,7 +885,8 @@ import {
   sendTask,
   listResourceByWz,
   updateYjYuAn,
-  uploadBase64
+  uploadBase64,
+  userFeginlist
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -914,12 +924,14 @@ export default {
       sendEventType: null,//事件类型
       sendHuoZaiBanJing: null,//火灾报告
       sendGuanLianYuAn: null,//关联预案
+      sendUserFegin: [],
       sendTaskSource: null,//任务来源
       sendTaskTitle: null,//联动标题
       sendTaskContent: null,//联动内容
       sendLianDongDept: [],//联动部门
       eventTypeList: [],//事件类型列表
       guanLianYuAnList: [],//关联预案列表
+      userFeginList: [],//联系人列表
       deptOptions: [],//签收部门
       deptOptionsLiandong: [],//联动部门
       eventStatusButton: null,//流程按钮标识
@@ -1262,6 +1274,7 @@ export default {
       //关闭事件签收弹窗
       this.sendDeptId = null
       this.sendDeptName = null
+      this.sendUserFegin = []
       this.sendEventType = null
       this.sendHuoZaiBanJing = null
       this.sendGuanLianYuAn = null
@@ -1283,6 +1296,7 @@ export default {
       //清空表单数据
       this.sendDeptId = null
       this.sendDeptName = null
+      this.sendUserFegin = []
       this.sendEventType = null
       this.sendHuoZaiBanJing = null
       this.sendGuanLianYuAn = null
@@ -1403,165 +1417,175 @@ export default {
      * */
     async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
       this.eventStatusButton = eventStatus
-
+      let that=this
       if (!isSend) {//事件弹窗
         if (eventStatus == 'qs') {//签收
-          this.eventConfirmTitle = '事件签收'
-          let param = { parentId: this.eventType }
+          that.eventConfirmTitle = '事件签收'
+          let param = { parentId: that.eventType }
           await listSJfl(param).then(res => {
             //事件类型
             if (res.code == 200) {
-              this.eventTypeList = res.data
+              that.eventTypeList = res.data
             }
           })
           await listYuAn().then(res => {
             //关联预案
             if (res.code == 200) {
-              this.guanLianYuAnList = res.data
+              that.guanLianYuAnList = res.data
             }
           })
-          await selectByeventCode(this.eventCode).then(res => {
+          await userFeginlist().then(res => {
+            //联系人列表
+            if (res.code == 200) {
+              that.userFeginList = res.data
+            }
+          })
+          await selectByeventCode(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
-              this.deptOptions = res.data
-              this.deptNameitem = '签收部门'
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
             }
           })
-          this.showEventConfirm = true
+          that.showEventConfirm = true
         } else if (eventStatus == 'wb') {//误报
-          this.eventConfirmTitle = '事件误报'
-          await selectByeventCode(this.eventCode).then(res => {
+          that.eventConfirmTitle = '事件误报'
+          await selectByeventCode(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
-              this.deptOptions = res.data
-              this.deptNameitem = '签收部门'
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
             }
           })
-          this.showEventConfirm = true
+          that.showEventConfirm = true
         } else if (eventStatus == 'cf') {//重复
-          this.eventConfirmTitle = '事件重复'
-          await selectByeventCode(this.eventCode).then(res => {
+          that.eventConfirmTitle = '事件重复'
+          await selectByeventCode(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
-              this.deptOptions = res.data
-              this.deptNameitem = '签收部门'
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
             }
           })
-          this.showEventConfirm = true
+          that.showEventConfirm = true
         } else if (eventStatus == 'ld') {//联动
-          await selectByeventCode(this.eventCode).then(res => {
+          await selectByeventCode(that.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
-              this.deptOptions = res.data
-              this.deptNameitem = '发起部门'
+              that.deptOptions = res.data
+              that.deptNameitem = '发起部门'
             }
           })
-          this.eventConfirmTitle = '事件联动'
+          that.eventConfirmTitle = '事件联动'
           /** 查询部门树结构 */
           await deptTreeselect().then(response => {
-            this.deptOptionsLiandong = response.data
+            that.deptOptionsLiandong = response.data
           })
-          this.showEventConfirm = true
+          that.showEventConfirm = true
         } else if (eventStatus == 'gd') {//归档填报
-          this.showEventConfirm_gd = true
+          that.showEventConfirm_gd = true
         }
       } else {//事件提交后台
         if (eventStatus == 'ld') {
           //事件处理流程--联动
-          let array = this.$refs.LiandongDept.getCheckedNodes()
+          let array = that.$refs.LiandongDept.getCheckedNodes()
           if (array != null && array.length > 0) {
             for (let i = 0; i < array.length; i++) {
-              this.sendLianDongDept.push({ 'taskDeptId': array[i].id, 'taskDeptName': array[i].label })
+              that.sendLianDongDept.push({ 'taskDeptId': array[i].id, 'taskDeptName': array[i].label })
             }
           }
-          if (this.sendTaskSource == '' || this.sendTaskSource == null) {
-            this.$message.error(`请选择任务来源!`)
+          if (that.sendTaskSource == '' || that.sendTaskSource == null) {
+            that.$message.error(`请选择任务来源!`)
             return
           }
-          if (this.sendTaskContent == '' || this.sendTaskContent == null) {
-            this.$message.error(`请输入任务内容!`)
+          if (that.sendTaskContent == '' || that.sendTaskContent == null) {
+            that.$message.error(`请输入任务内容!`)
             return
           }
-          if (this.sendTaskTitle == '' || this.sendTaskTitle == null) {
-            this.$message.error(`请输入任务标题!`)
+          if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
+            that.$message.error(`请输入任务标题!`)
             return
           }
-          if (this.sendLianDongDept == '' || this.sendLianDongDept == null) {
-            this.$message.error(`请选择任务联动部门!`)
+          if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
+            that.$message.error(`请选择任务联动部门!`)
             return
           }
-          if (this.sendDeptId == '' || this.sendDeptId == null || this.sendDeptName == '' || this.sendDeptName == null) {
-            this.$message.error(`请选择任务发起部门!`)
+          if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+            that.$message.error(`请选择任务发起部门!`)
             return
           }
           let param = {
-            sendDeptId: this.sendDeptId,
-            sendDept: this.sendDeptName,
-            eventCode: this.eventCode,
-            longitude: this.longitude,
-            latitude: this.latitude,
-            taskTitle: this.sendTaskTitle,
-            taskSource: this.sendTaskSource,
-            taskContent: this.sendTaskContent,
-            taskDept: this.sendLianDongDept
+            sendDeptId: that.sendDeptId,
+            sendDept: that.sendDeptName,
+            eventCode: that.eventCode,
+            longitude: that.longitude,
+            latitude: that.latitude,
+            taskTitle: that.sendTaskTitle,
+            taskSource: that.sendTaskSource,
+            taskContent: that.sendTaskContent,
+            taskDept: that.sendLianDongDept
           }
           sendTask(param).then(res => {
             if (res.code == 200) {
-              this.$message.success(`联动发起成功!`)
-              this.refreshEventDialog(this.eventCode)
-              this.cancelEventConfirm_send()
-              this.showEventConfirm = false
+              that.$message.success(`联动发起成功!`)
+              that.refreshEventDialog(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
             }
           })
 
         } else if (eventStatus == 'gd') {
           //事件处理流程--归档
           let param = {
-            eventCode: this.eventCode,
+            deptId: that.deptId,
+            eventCode: that.eventCode,
             eventStatus: eventStatus,
-            id: this.eventId,
+            id: that.eventId,
             czlx: '',
-            forestFireLoss: { eventId: this.eventCode, table1: this.table1 },
-            fireInformation: { eventId: this.eventCode, table2: this.table2 },
-            array: this.regionalFlagObj.array
+            forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
+            fireInformation: { eventId: that.eventCode, table2: that.table2 },
+            array: that.regionalFlagObj.array
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
-              this.$message.success(`处理成功!`)
-              this.refreshEvent(this.eventCode)
-              this.cancelEventConfirm_send()
-              this.showEventConfirm_gd = false
-              this.$emit('getEventList', this.calendarDay)
-              this.$emit('getTodayEvents', this.calendarDay)
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm_gd = false
+              that.$emit('getEventList', that.calendarDay)
             }
           })
         } else {
           if (eventStatus == 'qs' || eventStatus == 'wb' || eventStatus == 'cf') {
-            if (this.sendDeptId == '' || this.sendDeptId == null || this.sendDeptName == '' || this.sendDeptName == null) {
-              this.$message.error(`请选择部门!`)
+            if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+              that.$message.error(`请选择部门!`)
               return
             }
+          } else {
+            that.sendDeptId = that.deptId
           }
           //事件处理流程
           let param = {
-            eventCode: this.eventCode,
-            deptId: this.sendDeptId,
-            deptName: this.sendDeptName,
+            phones:that.sendUserFegin,
+            eventCode: that.eventCode,
+            deptId: that.sendDeptId,
+            deptName: that.sendDeptName,
             eventStatus: eventStatus,
-            eventType: this.sendEventType,
-            id: this.eventId,
+            eventType: that.sendEventType,
+            id: that.eventId,
             czlx: '',
-            fireRadius: this.sendHuoZaiBanJing,
-            reserve: this.sendGuanLianYuAn
+            fireRadius: that.sendHuoZaiBanJing,
+            reserve: that.sendGuanLianYuAn
           }
+          console.log(param);
           updateCentereventTEventcatalogueStatus(param).then(res => {
+            console.log(param);
             if (res.code == 200) {
-              this.$message.success(`处理成功!`)
-              this.refreshEvent(this.eventCode)
-              this.cancelEventConfirm_send()
-              this.showEventConfirm = false
-              this.$emit('getEventList', this.calendarDay)
-              this.$emit('getTodayEvents', this.calendarDay)
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
+              that.$emit('getEventList', that.calendarDay)
             }
           })
         }
@@ -1574,14 +1598,19 @@ export default {
     },
     sendEventLog() {
       //日志发送
-      let param = { eventCode: this.eventCode, conext: this.eventLog }
-      sendEventLog(param).then(res => {
-        if (res.code == 200) {
-          this.$message.success(`发送成功!`)
-          this.eventLog = null
-          this.refreshEventDialog(this.eventCode)
-        }
-      })
+      if(this.eventLog != null && this.eventLog != ''){
+        let param = { eventCode: this.eventCode, conext: this.eventLog }
+        sendEventLog(param).then(res => {
+          if (res.code == 200) {
+            this.$message.success(`发送成功!`)
+            this.eventLog = null
+            this.refreshEventDialog(this.eventCode)
+          }
+        })
+      }else{
+        this.$message.error('请填写反馈内容！');
+      }
+
     },
     showEventLogUpload() {
       this.$refs.eventLogUpload.eventLogUpload(this.eventCode)
@@ -1595,16 +1624,17 @@ export default {
       let that = this
       //获取事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
-        this.eventDialog = true
-        this.eventLogList = res.data.eventlog//日志列表
-        this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-        if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-          this.address = res.data.catalogue[0].address
-          this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-          this.eventType = res.data.catalogue[0].eventType
-          this.eventId = res.data.catalogue[0].id
-          this.longitude = res.data.catalogue[0].longitude
-          this.latitude = res.data.catalogue[0].latitude
+        that.eventDialog = true
+        that.eventLogList = res.data.eventlog//日志列表
+        that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
+        that.address = res.data.catalogue.address
+        that.eventStatusValue = res.data.catalogue.eventStatusValue
+        that.eventType = res.data.catalogue.eventType
+        that.dataStatus = res.data.catalogue.dataStatus
+        that.deptId = res.data.catalogue.deptId
+        that.eventId = res.data.catalogue.id
+        that.longitude = res.data.catalogue.longitude
+        that.latitude = res.data.catalogue.latitude
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1616,20 +1646,20 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
           }
-          markersMap.lng = res.data.catalogue[0].longitude
-          markersMap.lat = res.data.catalogue[0].latitude
+          markersMap.lng = res.data.catalogue.longitude
+          markersMap.lat = res.data.catalogue.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) {
             markersMap.radius = res.data.eventdetail[0].fireRadius
           }
@@ -1637,9 +1667,8 @@ export default {
             that.$refs.supermapDialog.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
             that.$refs.supermapDialog.clearM(false)
             that.$refs.supermapDialog.setMarkersRadius([markersMap])
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
+            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
           }, 2000)
-        }
         if (res.data.centermonitorTCamera != null) {
           let markersMap = {
             lng: 124.59,
@@ -1675,16 +1704,18 @@ export default {
       let that = this
       //刷新--事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
-        this.eventDialog = true
-        this.eventLogList = res.data.eventlog
-        this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
-        if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-          this.address = res.data.catalogue[0].address
-          this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-          this.eventType = res.data.catalogue[0].eventType
-          this.eventId = res.data.catalogue[0].id
-          this.latitude = res.data.catalogue[0].latitude
-          this.longitude = res.data.catalogue[0].longitude
+        if (res.data.catalogue != null ) {
+          that.eventDialog = true
+          that.eventLogList = res.data.eventlog
+          that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
+          that.address = res.data.catalogue.address
+          that.eventStatusValue = res.data.catalogue.eventStatusValue
+          that.eventType = res.data.catalogue.eventType
+          that.dataStatus = res.data.catalogue.dataStatus
+          that.deptId = res.data.catalogue.deptId
+          that.eventId = res.data.catalogue.id
+          that.latitude = res.data.catalogue.latitude
+          that.longitude = res.data.catalogue.longitude
           let markersMap = {
             lng: 124.59,
             lat: 43.02,
@@ -1696,20 +1727,20 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
+          if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+          } else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
           }
-          markersMap.lng = res.data.catalogue[0].longitude
-          markersMap.lat = res.data.catalogue[0].latitude
+          markersMap.lng = res.data.catalogue.longitude
+          markersMap.lat = res.data.catalogue.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) {
             markersMap.radius = res.data.eventdetail[0].fireRadius
           }
@@ -1720,7 +1751,7 @@ export default {
             } else {
               that.$refs.supermapDialog.setMarkers([markersMap])
             }
-            that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data.catalogue[0].longitude)
+            that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data.catalogue.longitude)
           }, 2000)
         }
       })

src/views/forest.vue

@@ -904,7 +904,9 @@ export default {
       this.eventListAll = []
       //右侧获取事件列表
       getEventList({ day: day }).then(res => {
-        this.eventList = res.data
+        this.eventList = res.data;
+
+        console.log(res.data);
         this.eventListAll = res.data
         that.markersList = []
         if (this.eventList != null && this.eventList.length > 0) {
@@ -966,11 +968,11 @@ export default {
               '                </div>' +
               '                </div>' +
               '                </span>'
-            if (this.eventList[i].picturePath != null && this.eventList[i].picturePath != '' && this.isAssetTypeAnImage(this.eventList[i].picturePath)) {
+            if (this.eventList[i].pictureType=='image'&&this.eventList[i].picturePath != null && this.eventList[i].picturePath != '') {
               markersMap.bindPopupHtml += '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '<img src="' + this.eventList[i].picturePath + '" style="width: 150px;height: 100px"/>' +
+                '<img src="/' + this.eventList[i].picturePath + '" style="width: 150px;height: 100px"/>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>'

src/views/system/user/profile/resetPwd.vue

@@ -50,6 +50,7 @@ export default {
       }
     };
   },
+  inject:['closePage'],
   methods: {
     submit() {
       this.$refs["form"].validate(valid => {
@@ -61,7 +62,7 @@ export default {
       });
     },
     close() {
-      this.$tab.closePage();
+      this.closePage();
     }
   }
 };