From 140f927763a2ba1938abcd5d09919d8cb33dddb8 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 27 Oct 2022 15:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/dept-todo-view.vue   |  4 +-
 .../src/views/modules/workBench/workBench.vue | 72 +++++++++++--------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index 4a018261..15a3fbce 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -9,7 +9,7 @@
     >
       <div class="content">
         <img class="img" :src="dataInfo.imgSrc" />
-        <div class="title">{{ title }}</div>
+        <div class="title">{{ '我的'+title }}</div>
         <div class="flex-row-bottom">
           <span class="num" :style="{ color: dataInfo.textColor }">{{
             formatNum(dataInfo.num)
@@ -90,7 +90,7 @@
       </div>
       <div class="more" @click="goPage(dataInfo.url)">查看更多 ></div>
     </div>
-    <div class="list-box flex-row-center no-data" v-else>暂无数据</div>
+    <div class="list-box flex-row-center no-data" v-else>暂无{{title}}任务</div>
   </div>
 </template>
 <script>
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index d01b97c6..5830b6eb 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -3,8 +3,8 @@
         <!-- 上 -->
         <div class="flex-row-start top">
             <div class="flex-row-start dept-left">
-                <dept-todo-view title="部门待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
-                <dept-todo-view title="部门已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
+                <dept-todo-view title="待办" v-loading="loadingToDo" :dataInfo="toToData"></dept-todo-view>
+                <dept-todo-view title="已办" v-loading="loadingHasToDo" :dataInfo="hasToDodoData"
                     style="margin-left: 0"></dept-todo-view>
             </div>
             <div class="flex-row-start dept-chart-box">
@@ -56,7 +56,7 @@ export default {
         list: [],
         type: 'todo',
         // url: 'activiti-my-todo-task',
-        url: 'myAgent-CompetencyApplication',
+        url: 'myAgent-CompetencyApplication'
       },
       // 部门已办
       hasToDodoData: {
@@ -69,7 +69,7 @@ export default {
         num: 0,
         list: [],
         // url: 'activiti-my-join-task',
-        url: 'hasToDoTasks-CompetencyApplication',
+        url: 'hasToDoTasks-CompetencyApplication'
       },
       // 部门申请
       resourceData: [],
@@ -103,43 +103,53 @@ export default {
     // 待办
     getToDo () {
       this.loadingToDo = true
-      const data = {
-        limit: 5,
-        page: 1
-      }
-      Apis.getToDoTask(data, res => {
+      // const data = {
+      //   limit: 5,
+      //   page: 1
+      // }
+      this.$http.get('/act/task/myToDoTaskPage?page=1&limit=5').then(res => {
         this.loadingToDo = false
-        if (res.data.code !== 0) {
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----待办-------->', res.data)
-        this.toToData.list = res.data.data.records || []
+        this.toToData.list = res.data.data.list || []
         this.toToData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingToDo = false
       })
+      // Apis.getToDoTask(data, res => {
+      //   this.loadingToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----待办-------->', res.data)
+      //   this.toToData.list = res.data.data.records || []
+      //   this.toToData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingToDo = false
+      // })
     },
     // 已办
     getHasToDo () {
-      const data = {
-        limit: 5,
-        page: 1
-      }
+      // const data = {
+      //   limit: 5,
+      //   page: 1
+      // }
       this.loadingHasToDo = true
-      Apis.getHasToDoTask(data, res => {
+      this.$http.get('/act/his/getMyHandledInstancePage?page=1&limit=5').then(res => {
         this.loadingHasToDo = false
-        if (res.data.code !== 0) {
-          return this.$message.error(res.data.msg)
-        }
-        console.log('res----已办-------->', res.data)
-        this.hasToDodoData.list = res.data.data.records || []
+        this.hasToDodoData.list = res.data.data.list || []
         this.hasToDodoData.num = res.data.data.total || 0
-      }, err => {
-        this.$message.error(err)
-        this.loadingHasToDo = false
-        console.log('err-----已办------->', err)
       })
+      // Apis.getHasToDoTask(data, res => {
+      //   this.loadingHasToDo = false
+      //   if (res.data.code !== 0) {
+      //     return this.$message.error(res.data.msg)
+      //   }
+      //   console.log('res----已办-------->', res.data)
+      //   this.hasToDodoData.list = res.data.data.records || []
+      //   this.hasToDodoData.num = res.data.data.total || 0
+      // }, err => {
+      //   this.$message.error(err)
+      //   this.loadingHasToDo = false
+      //   console.log('err-----已办------->', err)
+      // })
     },
     // 部门上架
     getShelvesTotal () {