交通云图 接口调整

src/api/forest.js

@@ -77,7 +77,7 @@ export function getEventByReportorOrder(param) {
 // 日志文件上传
 export function eventLogUpload(param) {
   return request({
-    url: '/center-event/eventcatalogue/upload',
+    url: '/center-event/centereventtfirelog',
     method: 'post',
     data: param
   })
@@ -86,7 +86,7 @@ export function eventLogUpload(param) {
 // 日志发送
 export function sendEventLog(param) {
   return request({
-    url: '/center-event/eventcatalogue/uploadConext',
+    url: '/center-event/centereventtfirelog',
     method: 'post',
     data: param
   })
@@ -104,7 +104,8 @@ export function uploadBase64(param) {
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
-    url: '/center-traffic/traffic/updateCentereventTEventcatalogueStatus',
+    // url: '/center-traffic/traffic/updateCentereventTEventcatalogueStatus',
+    url: '/center-fire/VisuForestCloudMapController/updateCentereventTEventcatalogueStatus',
     method: 'post',
     data: param
   })
@@ -134,67 +135,10 @@ export function listYuAn() {
   })
 }
 
-
-
-
-
-
-
-
-
-// 事件处理流程-联动
-export function sendTask(param) {
+// 事件短信联系人
+export function userFeginlist() {
   return request({
-    url: '/center-agriculture/fire/sendTask',
-    method: 'post',
-    data:param
-  })
-}
-// 任务接口
-export function selectTaskBO() {
-  return request({
-    url: '/center-agriculture/fire/selectTaskBO',
-    method: 'post',
-  })
-}
-// 搜索物资
-export function listResourceByWz(param) {
-  return request({
-    url: '/center-agriculture/fire/listResourceByWz',
-    method: 'post',
-    data:param
-  })
-}
-// 任务领取部门列表
-export function selectTaskDtpts(param) {
-  return request({
-    url: '/center-agriculture/fire/selectTaskDtpts',
-    method: 'post',
-    data:param
-  })
-}
-// 任务领取
-export function receiveTask(param) {
-  return request({
-    url: '/center-agriculture/fire/receiveTask',
-    method: 'post',
-    data:param
-  })
-}
-// 任务拒绝
-export function refusedTask(param) {
-  return request({
-    url: '/center-agriculture/fire/refusedTask',
-    method: 'post',
-    data:param
-  })
-}
-// 事件调整关联预案
-export function updateYjYuAn(param) {
-  return request({
-    url: '/center-agriculture/fire/updateYjYuAn',
-    method: 'post',
-    data:param
+    url: '/center-fire/VisuForestCloudMapController/userFeginlist',
+    method: 'post'
   })
 }
-

src/views/eventLogUpload.vue

@@ -125,11 +125,11 @@ export default {
       let fileUrl=[]
       if(this.fileList!=null&&this.fileList.length>0){
         for (let i = 0; i < this.fileList.length; i++) {
-          let file={url:this.fileList[i].url,webname:this.fileList[i].webName}
+          let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx: "bus_indx_forest",busSource: "PC"}
           fileUrl.push(file)
         }
       }
-      let param={ eventCode:this.eventCode,fileUrl: fileUrl }
+      let param={ eventCode:this.eventCode,operation:"bus_oper_type_2",operationType:"log_oper_type_1",fileList:fileUrl}
       //日志文件上传
       eventLogUpload(param).then(res => {
         if(res.code==200){

src/views/eventdetailsdialog.vue

@@ -109,12 +109,12 @@
                                 <!--                                </el-button>-->
                                 <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传
                                 </el-button>
-                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传
-                                </el-button>
+<!--                                <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
+<!--                                </el-button>-->
                               </div>
                               <div class="z-info-btm-grp-right">
-                                <el-button size="small" icon="el-icon-mic">会议
-                                </el-button>
+<!--                                <el-button size="small" icon="el-icon-mic">会议-->
+<!--                                </el-button>-->
                               </div>
                             </div>
                             <div class="z-info-btm-input">
@@ -160,7 +160,7 @@
                                     <!--联动-->
                                   <!--</el-button>-->
                                   <el-button size="small"
-                                             icon="el-icon-success" style="text-align:left"
+                                             icon="el-icon-success" style="text-align:left" v-if="dataStatus=='1'"
                                              @click="updateCentereventTEventcatalogueStatus('bj',true)">
                                     办结
                                   </el-button>
@@ -170,7 +170,7 @@
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_5'">
                                 <el-button size="small"
-                                           icon="el-icon-success" style="text-align:left"
+                                           icon="el-icon-success" style="text-align:left" v-if="dataStatus=='1'"
                                            @click="updateCentereventTEventcatalogueStatus('gd',true)">
                                   归档
                                 </el-button>
@@ -272,6 +272,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>
@@ -314,9 +323,7 @@ import {
   listYuAn,
   selectByeventCode,
   updateCentereventTEventcatalogueStatus,
-  sendTask,
-  listResourceByWz,
-  updateYjYuAn,
+  userFeginlist,
   uploadBase64
 } from '@/api/forest'
 import {
@@ -349,7 +356,10 @@ export default {
       },
       filterText: '',//树搜索
       /** *****************事件流程***************************/
+      dataStatus: null, // 数据状态：当值为1时，显示办结、归档按钮，否则隐藏
       deptNameitem: '签收部门',
+      sendUserFegin: [],//联系人
+      userFeginList: [],//联系人列表
       sendDeptId: null,//签收部门/发起部门
       sendDeptName: null,//签收部门/发起部门
       sendEventType: null,//事件类型
@@ -702,6 +712,8 @@ export default {
     },
     cancelEventConfirm() {
       //关闭事件签收弹窗
+      this.sendUserFegin = []//联系人
+      this.userFeginList = []//联系人列表
       this.sendDeptId = null
       this.sendDeptName = null
       this.sendEventType = null
@@ -723,6 +735,8 @@ export default {
     },
     cancelEventConfirm_send() {
       //清空表单数据
+      this.sendUserFegin = []//联系人
+      this.userFeginList = []//联系人列表
       this.sendDeptId = null
       this.sendDeptName = null
       this.sendEventType = null
@@ -848,8 +862,6 @@ export default {
       this.sendEventType = this.eventTypeXl
       if (!isSend) {//事件弹窗
         if (eventStatus == 'qs') {//签收
-          // console.log(this.eventType);
-          // console.log(this.eventTypeXl);
           this.eventConfirmTitle = '事件签收'
           let param = { parentId: this.eventType }
           await listSJfl(param).then(res => {
@@ -858,12 +870,6 @@ export default {
               this.eventTypeList = res.data
             }
           })
-          await listYuAn().then(res => {
-            //关联预案
-            if (res.code == 200) {
-              this.guanLianYuAnList = res.data
-            }
-          })
           await selectByeventCode(this.eventCode).then(res => {
             //签收部门
             if (res.code == 200) {
@@ -871,6 +877,12 @@ export default {
               this.deptNameitem = '签收部门'
             }
           })
+          await userFeginlist().then(res => {
+            //联系人列表
+            if (res.code == 200) {
+              this.userFeginList = res.data
+            }
+          })
           this.showEventConfirm = true
         } else if (eventStatus == 'wb') {//误报
           this.eventConfirmTitle = '事件误报'
@@ -961,11 +973,16 @@ export default {
         } else if (eventStatus == 'gd') {
           //事件处理流程--归档
           let param = {
+            phones:this.sendUserFegin,
             eventCode: this.eventCode,
+            deptId: this.deptId,
+            deptName: this.sendDeptName,
             eventStatus: eventStatus,
+            eventType: this.sendEventType,
             id: this.eventId,
-            eventType: this.eventTypeXl,
-            czlx: ''
+            czlx: '',
+            fireRadius: this.sendHuoZaiBanJing,
+            reserve: this.sendGuanLianYuAn
           }
           updateCentereventTEventcatalogueStatus(param).then(res => {
             if (res.code == 200) {
@@ -983,14 +1000,17 @@ export default {
               this.$message.error(`请选择部门!`)
               return
             }
+          }else {
+            this.sendDeptId = this.deptId
           }
           //事件处理流程
           let param = {
+            phones:this.sendUserFegin,
             eventCode: this.eventCode,
-            deptId: this.sendDeptId,
+            deptId: this.deptId,
             deptName: this.sendDeptName,
             eventStatus: eventStatus,
-            eventType: this.eventTypeXl,
+            eventType: this.sendEventType,
             id: this.eventId,
             czlx: '',
             fireRadius: this.sendHuoZaiBanJing,
@@ -1016,7 +1036,7 @@ export default {
     },
     sendEventLog() {
       //日志发送
-      let param = { eventCode: this.eventCode, conext: this.eventLog }
+      let param = { eventCode: this.eventCode, logContent: this.eventLog,operation:"bus_oper_type_2",operationType:"log_oper_type_1"}
       sendEventLog(param).then(res => {
         if (res.code == 200) {
           this.$message.success(`发送成功!`)
@@ -1037,7 +1057,9 @@ export default {
       let that = this
       //获取事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
+        this.dataStatus = res.data.catalogue.dataStatus;
         this.eventDialog = true
+        this.deptId = res.data.catalogue.deptId
         this.eventLogList = res.data.eventlog//日志列表
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
         if (res.data.catalogue != null) {