qinhouyu 1 年之前
父节点
当前提交
5a0a30d489
共有 3 个文件被更改,包括 52 次插入7 次删除
  1. 38 0
      src/api/forest.js
  2. 8 1
      src/api/vBottomMenu.js
  3. 6 6
      src/components/vBottomMenu.vue

+ 38 - 0
src/api/forest.js

@@ -439,6 +439,20 @@ export function selectMessageById(messageId) {
     method: 'get'
   })
 }
+export function sendTask_direct(param) {
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/sendTask',
+    method: 'post',
+    data:param
+  })
+}
+export function selectTaskBO_direct(data) {
+  return request({
+    url: '/center-task/centerTaskFeign/selectUnclaimedTaskBO',
+    method: 'post',
+    data:data
+  })
+}
 // 事件处置
 export function eventHandling(id,eventCode) {
   return request({
@@ -491,3 +505,27 @@ export function eventExamine(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
+  })
+}

+ 8 - 1
src/api/vBottomMenu.js

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

+ 6 - 6
src/components/vBottomMenu.vue

@@ -183,7 +183,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>
@@ -590,7 +590,7 @@ import {
   selectByeventCode,
   sendTask,
   eventExamine,
-  eventHandling, sendEventLog
+  eventHandling, sendEventLog, receiveTask_direct, refusedTask_direct, selectTaskDtpts_direct, selectTaskBO_direct
 } from '@/api/forest'
 import {
   selectFarmByDeptId, linBanTreeselect, selectBanBylinBanTreesId, userDeptSelect
@@ -1057,7 +1057,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      receiveTask(param).then(res => {
+      receiveTask_direct(param).then(res => {
         //任务领取
         if (res.code == 200) {
           this.$message.success(`任务领取成功!`)
@@ -1076,7 +1076,7 @@ export default {
         eventCode: eventCode,
         // centerTaskTaskDepts: this.centerTaskTaskDepts
       }
-      refusedTask(param).then(res => {
+      refusedTask_direct(param).then(res => {
         //任务拒绝
         if (res.code == 200) {
           this.$message.success(`任务拒绝成功!`)
@@ -1092,7 +1092,7 @@ export default {
     selectTaskDtpts(taskId, eventCode, state) {
       this.taskId = taskId
       this.eventCode = eventCode
-      selectTaskDtpts({
+      selectTaskDtpts_direct({
         taskId: taskId
       }).then(res => {
         //任务领取部门列表
@@ -1532,7 +1532,7 @@ export default {
     },
     selectTaskList: async function () {
       //获取任务列表
-      selectTaskBO().then(res => {
+      selectTaskBO_direct({depts:[{deptId:Cookies.get("deptId")}]}).then(res => {
         this.taskList = res.data
         this.taskCount = res.data.length
       })