Merge remote-tracking branch 'origin/visu_environment' into visu_environment

src/api/forest.js

@@ -290,10 +290,10 @@ export function selectMessageById(messageId) {
 }
 
 // 事件处置
-export function putEventcatalogue(id) {
+export function eventHandling(id,eventCode) {
   return request({
-    url: '/center-environment/VisuForestEventCenterController/putEventcatalogue',
+    url: '/center-environment/VisuForestEventCenterController/eventHandling',
     method: 'post',
-    data: {id:id,dataStatus:"1"}
+    data: {id:id,eventCode:eventCode,dataStatus:"1"}
   })
 }

src/views/eventdetailsdialog.vue

@@ -156,6 +156,9 @@
                                 </el-button>
                                 <el-button size="small" icon="el-icon-download" @click="showResponsibility()">责任制
                                 </el-button>
+                                <el-button v-if="eventStatusValue=='forest_event_status_2' && statusFlag=='1' && dataStatus=='0'"
+                                  size="small" icon="el-icon-download" @click="updateCentereventTEventcatalogueStatus('cz',true)">处置
+                                </el-button>
                               </div>
                               <div class="z-info-btm-grp-right">
                                 <el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
@@ -230,11 +233,6 @@
                                              @click="updateCentereventTEventcatalogueStatus('bj',true)">
                                     办结
                                   </el-button>
-                                  <el-button size="small" v-if="statusFlag=='1'"
-                                             icon="el-icon-success" style="text-align:left"
-                                             @click="updateCentereventTEventcatalogueStatus('cz',true)">
-                                    处置
-                                  </el-button>
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
@@ -1010,7 +1008,7 @@ import {
   dutysystemAdd,
   dutysystemRemove,
   userFeginlist,
-  putEventcatalogue
+  eventHandling
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1182,6 +1180,7 @@ export default {
       eventType: null,//事件类型-大类
       eventTypeXl: null,//事件类型-小类
       statusFlag: null,//事件流程按钮
+      dataStatus: null,//事件处置按钮
       deptId: null,//事件流程部门
       eventCode: null,
       eventName: null,
@@ -1822,7 +1821,7 @@ export default {
             }
           })
         } else if(eventStatus == 'cz'){
-          putEventcatalogue(that.eventId).then(res => {
+          eventHandling(that.eventId,that.eventCode).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
@@ -1906,6 +1905,7 @@ export default {
       let that = this
       //获取事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
+        debugger
         that.eventDialog = true
         that.eventLogList = res.data.eventlog//日志列表
         that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
@@ -1913,6 +1913,7 @@ export default {
         that.eventStatusValue = res.data.catalogue.eventStatusValue
         that.eventType = res.data.catalogue.eventType
         that.statusFlag = res.data.catalogue.statusFlag
+        that.dataStatus = res.data.catalogue.dataStatus
         that.deptId = res.data.catalogue.deptId
         that.eventId = res.data.catalogue.id
         that.longitude = res.data.catalogue.longitude