qinhouyu 1 年之前
父节点
当前提交
7da5a0b113
共有 3 个文件被更改,包括 59 次插入11 次删除
  1. 36 0
      src/api/forest.js
  2. 8 1
      src/api/vBottomMenu.js
  3. 15 10
      src/components/vBottomMenu.vue

+ 36 - 0
src/api/forest.js

@@ -210,6 +210,28 @@ export function sendEventLog(param) {
     data: param
   })
 }
+export function selectTaskDtpts_direct(param) {
+  return request({
+    url: '/center-task/centerTaskFeign/selectTaskDtpts',
+    method: 'post',
+    data:param
+  })
+}
+export function receiveTask_direct(param) {
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/receiveTask',
+    method: 'post',
+    data:param
+  })
+}
+export function refusedTask_direct(param) {
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/refusedTask',
+    method: 'post',
+    data:param
+  })
+}
+
 // 事件处理流程
 export function updateCentereventTEventcatalogueStatus(param) {
   return request({
@@ -267,6 +289,13 @@ export function sendTask(param) {
     data:param
   })
 }
+export function sendTask_direct(param) {
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/sendTask',
+    method: 'post',
+    data:param
+  })
+}
 // 任务接口
 export function selectTaskBO() {
   return request({
@@ -274,6 +303,13 @@ export function selectTaskBO() {
     method: 'post',
   })
 }
+export function selectTaskBO_direct(data) {
+  return request({
+    url: '/center-task/centerTaskFeign/selectUnclaimedTaskBO',
+    method: 'post',
+    data:data
+  })
+}
 // 搜索物资
 export function listResourceByWz(param) {
   return request({

+ 8 - 1
src/api/vBottomMenu.js

@@ -2,9 +2,16 @@ import request from '@/utils/request'
 
 
 // 获取林场列表
+// export function selectFarmByDeptId(param) {
+//   return request({
+//     url: '/center-environment/VisuForestCloudMapController/selectFarmByDeptId',
+//     method: 'post',
+//     data: param
+//   })
+// }
 export function selectFarmByDeptId(param) {
   return request({
-    url: '/center-environment/VisuForestCloudMapController/selectFarmByDeptId',
+    url: '/center-task/feign/selectFarmByDeptId',
     method: 'post',
     data: param
   })

+ 15 - 10
src/components/vBottomMenu.vue

@@ -187,7 +187,7 @@
               </div>
               <div class="btm-r-pop-info-list">
                 <div class="btm-r-pop-info-list-name">标题</div>
-                <div class="btm-r-pop-info-list-text">{{ item.title }}</div>
+                <div class="btm-r-pop-info-list-text" style="width:85%:">{{ item.title }}</div>
               </div>
               <div class="btm-r-pop-info-list">
                 <div class="btm-r-pop-info-list-name">消息类型</div>
@@ -582,10 +582,14 @@
 <script>
 import {
   selectTaskBO,
+  selectTaskBO_direct,
   getEventDetail,
   selectTaskDtpts,
+  selectTaskDtpts_direct,
   receiveTask,
+  receiveTask_direct,
   refusedTask,
+  refusedTask_direct,
   selectMessageCount,
   selectMessageList,
   selectMessageById,
@@ -593,8 +597,9 @@ import {
   listYuAn,
   selectByeventCode,
   sendTask,
+  sendTask_direct,
   eventExamine,
-  eventHandling, sendEventLog
+  eventHandling, sendEventLog, getEventDetail_direct
 } from '@/api/forest'
 import {
   selectFarmByDeptId, linBanTreeselect, selectBanBylinBanTreesId, userDeptSelect
@@ -1062,7 +1067,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      receiveTask(param).then(res => {
+      receiveTask_direct(param).then(res => {
         //任务领取
         if (res.code == 200) {
           this.$message.success(`任务领取成功!`)
@@ -1081,7 +1086,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      refusedTask(param).then(res => {
+      refusedTask_direct(param).then(res => {
         //任务拒绝
         if (res.code == 200) {
           this.$message.success(`任务拒绝成功!`)
@@ -1097,7 +1102,7 @@ export default {
     selectTaskDtpts(taskId, eventCode, state) {
       this.taskId = taskId
       this.eventCode = eventCode
-      selectTaskDtpts({
+      selectTaskDtpts_direct({
         taskId: taskId
       }).then(res => {
         //任务领取部门列表
@@ -1162,7 +1167,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         this.eventDialog = true
@@ -1218,7 +1223,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //获取事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -1434,7 +1439,7 @@ export default {
       this.eventCode = eventCode
       let that = this
       //刷新--事件详情
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         let markersMapList = [];
@@ -1528,7 +1533,7 @@ export default {
     },
     refreshEventDialog(eventCode) {
       //刷新--事件日志12
-      getEventDetail({
+      getEventDetail_direct({
         eventCode: eventCode
       }).then(res => {
         this.eventLogList = res.data.eventlog
@@ -1537,7 +1542,7 @@ export default {
     },
     selectTaskList: async function () {
       //获取任务列表
-      selectTaskBO().then(res => {
+      selectTaskBO({depts:[{deptId:Cookies.get("deptId")}]}).then(res => {
         this.taskList = res.data
         this.taskCount = res.data.length
       })