From 682ebd99bb3bd3813a6559a6bc789fe8ec18e803 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 8 Aug 2024 00:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/list/components/showLogs.vue |  8 +++++++-
 src/views/task/list/unit.vue                | 16 +++++++++++++---
 vue.config.js                               |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/task/list/components/showLogs.vue b/src/views/task/list/components/showLogs.vue
index aae5650..2a40a3b 100644
--- a/src/views/task/list/components/showLogs.vue
+++ b/src/views/task/list/components/showLogs.vue
@@ -22,8 +22,14 @@
           </template>
         </xy-table>
       </template>
+      <template v-slot:footerContent>
+        <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow = false">关闭</Button>
+
+      </template>
+    </xy-dialog>
+
+
 
-    </xy-dialog>
 
   </div>
 </template>
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 4e807de..d8d1804 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -621,16 +621,26 @@
                 }
               }
             })
-          let my_arr = [] // 接收我的任务中我已完成的
+          let my_arr = [] // 接收我的任务中我已完成的  还要去除 参与人已经完成掉的
           let my_no_arr = [] // 接收我的任务中未完成的
             if(this.path_type == 5){
               const newArr = res.data.filter((_, index) => !spliceIndex.includes(index));
               newArr.map(item=>{
-                if(item.audit_status==5 || item.audit_status==3){
+                // 已归档 或已完成
+                if(item.audit_status==5 || item.audit_status==3 ){
                   console.log("item.mission_finished",item.id,item.mission_finished)
                   my_arr.push(item)
                 }else{
-                  my_no_arr.push(item)
+                  // 参与对象中 我提交已审核的 keep_status = 2
+                  // item.mission_distribute.map(md=>{
+                  //   if(md.accept_admin_id===this.stateObj.login_id && md.keep_status ==2){
+                  //     my_arr.push(item)
+                  //   }else{
+                  //     my_no_arr.push(item)
+                  //   }
+                  // })
+                   my_no_arr.push(item)
+
                 }
               })
               _arr = this.buildTree(my_no_arr)
diff --git a/vue.config.js b/vue.config.js
index 8b49cd5..c1b0b04 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,