From 5ad4dd02b16cabb6859a327d659bdff21caf70cf Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 25 Sep 2024 16:20:39 +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/api/task/unit.js                          |  11 +-
 src/views/dashboard/article.vue               |  19 +-
 src/views/task/list/components/addUnit.vue    |  69 ++--
 src/views/task/list/components/checkUnit.vue  |  94 ++++-
 src/views/task/list/components/sendNotice.vue |   6 +-
 src/views/task/list/unit.vue                  | 375 ++----------------
 vue.config.js                                 |   2 +-
 7 files changed, 176 insertions(+), 400 deletions(-)

diff --git a/src/api/task/unit.js b/src/api/task/unit.js
index 8cbcf6b..ad4bab0 100644
--- a/src/api/task/unit.js
+++ b/src/api/task/unit.js
@@ -21,7 +21,16 @@ export function save(data) {
     method: 'post',
     data
   })
-}
+}
+
+export function updateDistribute(data) {
+  return request({
+    url: '/api/admin/mission/batch-update-mission-distribute',
+    method: 'post',
+    data
+  })
+}
+
 
 export function del(id) {
   return request({
diff --git a/src/views/dashboard/article.vue b/src/views/dashboard/article.vue
index c82f1ac..b69dbe0 100644
--- a/src/views/dashboard/article.vue
+++ b/src/views/dashboard/article.vue
@@ -17,6 +17,8 @@
       <template v-slot:btns>
         <el-table-column align='center' label="操作" width="200" header-align="center">
           <template slot-scope="scope">
+            <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
+              @click="showArticle(scope.row.id)">查看</Button>
             <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
               @click="editArticle('editor',scope.row.id)">编辑</Button>
             <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
@@ -27,7 +29,7 @@
       </template>
     </xy-table>
     <addArticle ref="addArticle" @refresh="getList"></addArticle>
-
+    <showDashboardArticle ref="showDashboardArticle"></showDashboardArticle>
   </div>
 </template>
 
@@ -36,10 +38,13 @@
     index,
     destroy
   } from '@/api/task/newplan.js'
-  import addArticle from "@/views/dashboard/components/addArticle.vue"
+  import addArticle from "@/views/dashboard/components/addArticle.vue"
+  import showDashboardArticle from '@/views/dashboard/components/showDashboardArticle.vue'
+
   export default {
     components: {
-      addArticle
+      addArticle,
+      showDashboardArticle
     },
     data() {
       return {
@@ -47,8 +52,8 @@
           keyword: "",
           page: 1,
           page_size: 15,
-          table_name: 'articles',
-          with_relations:['image']
+          table_name: 'articles',
+          with_relations: ['image']
         },
         list: [],
         table: [{
@@ -80,6 +85,10 @@
         })
         this.list = res.data
         this.total = res.total
+      },
+      showArticle(id){
+        this.$refs.showDashboardArticle.id = id
+        this.$refs.showDashboardArticle.isShow = true
       },
       editArticle(type, id) {
         if (id) {
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index e395537..97674a3 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -399,7 +399,8 @@
     save,
     get,
     del,
-    updatemission
+    updatemission,
+    updateDistribute
   } from "@/api/task/unit.js";
   import {
     save as saveLog
@@ -443,6 +444,7 @@
         type: 'add',
         stateObj:{},
         typeName:'新增任务',
+        now_do_admin_ids:[], //每次转办记录选择的人员id
         plan_unit:'', // 年度计划发布任务不用选参与对象
         subtitle:'',
         is_what_unitType: '',
@@ -797,11 +799,18 @@
           value.map(item => {
             _arr.push(item.id)
           })
-          if (this.type === 'send') {
-            this.form.do_admin_ids = _arr
+          if (this.type === 'send') {
+            this.now_do_admin_ids = _arr
+            console.log("this.now_do_admin_ids",this.now_do_admin_ids)
+            if(this.form.do_admin_ids && this.form.do_admin_ids.length>0){
+              _arr.map(item=>{
+                if(!this.form.do_admin_ids.includes(item)){
+                  this.form.do_admin_ids.push(item)
+                }
+              })
+            }
           } else {
             this.form.accept_admin_ids = _arr
-
           }
         } else {
           if (this.type === 'send') {
@@ -968,14 +977,16 @@
         }
         // 有do_admin_ids 放入到人员选择器初始数据
         if (this.type == "send" && res.do_admin_ids && res.do_admin_ids.length > 0) {
-          this.userdatabefore.map(item => {
-            res.do_admin_ids.map(item1 => {
-              if (item.id == item1) {
-                this.valueMultiple.push(item)
-              }
-            })
-          })
-          this.valueArr = res.do_admin_ids
+          // this.userdatabefore.map(item => {
+          //   res.do_admin_ids.map(item1 => {
+          //     if (item.id == item1) {
+          //       this.valueMultiple.push(item)
+          //     }
+          //   })
+          // })
+          this.valueMultiple = []
+          this.valueArr = []
+          // this.valueArr = res.do_admin_ids
           // res.accept_department_ids = []
         }
         // 责任部门 责任人 分解任务 需要重新制定责任人
@@ -1125,13 +1136,7 @@
           this.form.mission_groups = arr
 
         }
-        if (this.is_what_unitType == '答题' && this.form.ask.length == 0) {
-          Message({
-            type: 'warning',
-            message: `请增加题库题目`
-          })
-          return
-        }
+
         if(!(this.form.audit_status==3||this.form.audit_status==5)){
           console.log("this.betweenSe",this.form.start_date, this.form.end_date)
           this.betweenSe(this.form.start_date, this.form.end_date)
@@ -1162,6 +1167,7 @@
                 if(res.mission_distribute && res.mission_distribute.length>0){
                   this.sendNotice({
                     id:res.model.id,
+                    name:res.model.name,
                     mission_distribute:res.mission_distribute
                   })
                 }
@@ -1171,10 +1177,6 @@
               this.$emit('refresh')
               this.$emit('toUnit', this.form.type)
             })
-
-            // this.isShow = false
-            // this.$emit('refresh')
-            // this.$emit("uploadOa")
           })
           return
         }
@@ -1186,7 +1188,7 @@
           }).then(res => {
             Message({
               type: 'success',
-              message: '编辑任务成功'
+              message: this.type=== 'send'?'任务转办成功':'编辑任务成功'
             })
             saveLog({
               table_name:"missions_logs",
@@ -1198,8 +1200,27 @@
               console.log("this.type",this.type)
               if(this.type==="send"){
                 if(res.mission_distribute && res.mission_distribute.length>0){
+                  //  form_user_id 插入到这一个的 承办人中去
+
+                  // 本次由我转办的人的记录id
+                  let this_doAdmins = []
+                  res.mission_distribute.map(item=>{
+                    if(this.now_do_admin_ids.includes(item.accept_admin_id)){
+                      this_doAdmins.push(item.id)
+                    }
+                  })
+                  // 批量更新 这次转办记录中的 from_user_id
+                  if(this_doAdmins.length>0){
+                    updateDistribute({
+                      id:this_doAdmins,
+                      from_user_id:this.stateObj.login_id
+                    })
+                  }
+
+
                   this.sendNotice({
                     id:res.model.id,
+                    name:res.model.name,
                     mission_distribute:res.mission_distribute
                   })
                 }
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index cc492bf..27a890d 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -74,13 +74,39 @@
                 <template slot="label">
                   任务分解
                 </template>
-                <span v-for="item in showform.mission_distribute">
-                  <!-- 责任人 -->
+                <span v-if="showform.pid>0" v-for="item in showform.mission_distribute">
+                  <!-- 非责任人 -->
                   <template v-if="item.admin_type===3">
                     {{item.accept_admin.name}},
                   </template>
                 </span>
-              </el-descriptions-item>
+              </el-descriptions-item>
+              <!-- 我的任务中的 转办 -->
+              <el-descriptions-item span='4' v-if="url_type==5&&showform.mission_distribute&&showform.mission_distribute.length>0">
+                <template slot="label">
+                  任务承办人
+                </template>
+                <span v-for="item in showform.mission_distribute">
+                  <!-- 非责任人 -->
+                  <template v-if="item.admin_type===2 && item.from_user_id===stateObj.login_id">
+                    {{item.accept_admin.name}},
+                  </template>
+                </span>
+              </el-descriptions-item>
+              <!-- 任务追踪中的 转办 -->
+              <el-descriptions-item span='4' v-if="url_type!=5&&showform.mission_distribute&&showform.mission_distribute.length>0">
+                <template slot="label">
+                  任务承办人
+                </template>
+                <span v-for="item in showform.mission_distribute">
+                  <!-- 非责任人 -->
+                  <template v-if="item.admin_type===2">
+                    {{item.accept_admin.name}},
+                  </template>
+                </span>
+              </el-descriptions-item>
+
+
 
               <el-descriptions-item span='4' v-if="is_what_unitType==='答题'">
                 <template slot="label">
@@ -130,7 +156,25 @@
             <el-divider>执行情况</el-divider>
             <!-- 所有人的执行情况 -->
             <div v-if="url_type!=5">
-              <xy-table :list="showform.mission_distribute" stripe :table-item="distributeTable" :isPage='false'>
+              <xy-table :list="showform.mission_distribute" stripe :table-item="distributeTable" :isPage='false'>
+                <template v-slot:accept_admin_name>
+                  <el-table-column align='left' label="执行人" width="140" header-align="center">
+                    <template slot-scope="scope">
+                      <!-- 有组别的 -->
+                      <div v-if="scope.row.mission_group_id">
+                        {{scope.row.mission_group?(scope.row.mission_group.name?scope.row.mission_group.name:''):''}}
+                        {{scope.row.mission_group?(scope.row.mission_group.type==1?'组长'+':':':'):''}}
+                        {{scope.row.accept_admin?scope.row.accept_admin.name:''}}
+                      </div>
+                      <div v-else>
+                        <div v-if="scope.row.from_user">转办来源:{{scope.row.from_user?scope.row.from_user.name:''}}</div>
+                        {{scope.row.admin_type==1?'责任人:':''}}
+                        {{scope.row.admin_type==2?'承办人:':''}}
+                        {{scope.row.accept_admin?scope.row.accept_admin.name:''}}
+                      </div>
+                    </template>
+                  </el-table-column>
+                </template>
                 <template v-slot:carry_type>
                   <el-table-column align='center' label="执行方式" width="120" header-align="center">
                     <template slot-scope="scope">
@@ -195,7 +239,26 @@
             </div>
             <!-- 我的代办里的 -->
             <div v-else>
-              <xy-table :list="my_mission_distribute" stripe :table-item="distributeTable" :isPage='false'>
+              <xy-table :list="my_mission_distribute" stripe :table-item="distributeTable" :isPage='false'>
+
+                <template v-slot:accept_admin_name>
+                  <el-table-column align='left' label="执行人" width="140" header-align="center">
+                    <template slot-scope="scope">
+                      <!-- 有组别的 -->
+                      <div v-if="scope.row.mission_group_id">
+                        {{scope.row.mission_group?(scope.row.mission_group.name?scope.row.mission_group.name:''):''}}
+                        {{scope.row.mission_group?(scope.row.mission_group.type==1?'组长'+':':':'):''}}
+                        {{scope.row.accept_admin?scope.row.accept_admin.name:''}}
+                      </div>
+                      <div v-else>
+                        <div v-if="scope.row.from_user">转办来源:{{scope.row.from_user?scope.row.from_user.name:''}}</div>
+                        {{scope.row.admin_type==1?'责任人:':''}}
+                        {{scope.row.admin_type==2?'承办人:':''}}
+                        {{scope.row.accept_admin?scope.row.accept_admin.name:''}}
+                      </div>
+                    </template>
+                  </el-table-column>
+                </template>
                 <template v-slot:carry_type>
                   <el-table-column align='center' label="执行方式" width="80" header-align="center">
                     <template slot-scope="scope">
@@ -260,10 +323,8 @@
                         <Button style="margin-bottom: 5px;"
                           v-if="scope.row.carry_type===1 && !(scope.row.carry_status==2)"
                           @click="carryTypeWhat('carry_type1')" type="primary" size="small">任务分解</Button>
-                        <!-- <Button style="margin-bottom: 5px;" v-if="scope.row.carry_type===2 && scope.row.admin_type==1" @click="editorUnit('send')" type="primary" size="small"
+                       <!-- <Button style="margin-bottom: 5px;" v-if="scope.row.carry_type===2" @click="editorUnit('send')" type="primary" size="small"
                          >任务转办</Button> -->
-
-
                         <Button style="margin-bottom: 5px;" v-if="scope.row.keep_status===-1"
                           @click="startLoad(scope.row,'editor')" type="primary" size="small">提交进展</Button>
                         <Button style="margin-bottom: 5px;"
@@ -423,8 +484,9 @@
         my_mission_distribute: [],
         distributeTable: [{
           label: '执行人',
-          prop: 'accept_admin.name',
-          width: 80
+          prop: 'accept_admin_name',
+          width: 140,
+          align:'left'
         }, {
           label: '执行状态',
           prop: 'carry_status',
@@ -445,16 +507,19 @@
           width: 80
         }, {
           label: '当前进展概述',
-          prop: 'ing_introduce',
+          prop: 'ing_introduce',
+          align:'left'
         }, {
           label: '完成概述',
-          prop: 'end_introduce',
+          prop: 'end_introduce',
+          align:'left'
         }, {
           label: '成果资料',
           prop: 'file_ids',
         }, {
           label: '审核意见',
-          prop: 'check_contents',
+          prop: 'check_contents',
+          align:'left'
         }],
 
       }
@@ -554,7 +619,8 @@
           accept_department_ids: res?.accept_department_ids,
           mission_groups: res?.groups,
 
-        }
+        }
+        // 我的执行
         let md = []
         res.mission_distribute.map(item => {
           if (item.accept_admin_id === this.stateObj.login_id) {
diff --git a/src/views/task/list/components/sendNotice.vue b/src/views/task/list/components/sendNotice.vue
index 5a585b9..d57e508 100644
--- a/src/views/task/list/components/sendNotice.vue
+++ b/src/views/task/list/components/sendNotice.vue
@@ -87,12 +87,12 @@
           this.form.title = `"${e.name}"任务请及时处理（安全生产管理平台）`
           this.form.mission_id = e.id
           e.mission_distribute.map(item=>{
-            // if(item.admin_type>1){
+            if(item.admin_type>1){
               arr.push(item.accept_admin_id)
               Arr.push(item)
-            // }
+            }
           })
-          this.checkList = arr
+          // this.checkList = arr
           this.checkArr = Arr
         }
       },
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index f25619c..a5bfe74 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -3,9 +3,7 @@
     <div ref="lxHeader">
       <lx-header icon="md-apps" :text="type_name" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
-          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <!-- <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
-              type="year" @on-change="changeYear"></DatePicker> -->
+          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <el-date-picker
                   class='height32'
                   type="month"
@@ -25,11 +23,7 @@
               v-model="select.audit_status" placeholder="任务状态">
               <el-option v-for="item in selectAuditStatusList" :key="item.id" :label="item.value" :value="item.id">
               </el-option>
-            </el-select>
-            <!-- <el-date-picker v-if="showSelectMonth" @change="changeDate" v-model="select.dateRange" type="daterange"
-              :picker-options="pickerOptions" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
-              end-placeholder="结束日期" align="right">
-            </el-date-picker> -->
+            </el-select>
             <el-select class='height32' style="width: 150px;margin-right: 10px;" filterable clearable
               v-model="select.main_department_id" placeholder="责任人(科室)">
               <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
@@ -49,7 +43,7 @@
     </div>
 
     <div class="tablewrap">
-      <div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
+      <div class="tablecontent">
         <div class="topwrap">
           <div>
             共有<span style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>项任务，
@@ -74,14 +68,7 @@
                   <div v-if="!(scope.row.audit_status==3||scope.row.audit_status==5) && (scope.row.admin_id==stateObj.login_id )">
                     <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
                       @click="editorUnit(scope.row.id,'editor')">编辑任务</Button>
-                  </div>
-
-                  <!-- <div v-if="scope.row.admin_id==stateObj.login_id || stateObj.is_chuzhang || stateObj.is_guiji)">
-                      <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small"
-                        @click="editorUnit(scope.row.id,'editor')">编辑任务</Button>
-                    <Button style='margin-right:5px;margin-bottom:5px;' size="small"
-                      @click="backPlan(scope.row)">归档</Button>
-                  </div> -->
+                  </div>
                 </template>
                 <!-- 我的任务 -->
                 <template v-else>
@@ -111,10 +98,7 @@
     <addUnit ref='addUnit' @refresh='getList'></addUnit>
     <addBackPlan ref="addBackPlan" @refresh="getList"></addBackPlan>
 
-    <showPatrol ref='showPatrol'></showPatrol>
-    <addPatrol ref='addPatrol' @refresh='getList'></addPatrol>
     <checkUnit ref='checkUnit' @refresh='getList'></checkUnit>
-    <answerQuestion @refresh='getList' ref='answerQuestion'></answerQuestion>
     <sendNotice ref="sendNotice" @refresh='getList'></sendNotice>
   </div>
 </template>
@@ -122,16 +106,13 @@
 <script>
   import addUnit from '../list/components/addUnit.vue'
   import addBackPlan from '../list/components/addBackPlan.vue'
-  import showPatrol from '../list/components/showPatrol.vue'
-  import addPatrol from '../list/components/addPatrol.vue'
   import checkUnit from '../list/components/checkUnit.vue'
-  import answerQuestion from '../list/components/answerQuestion.vue'
   import sendNotice from '../list/components/sendNotice.vue'
   import {
     listunit,
     del,
     unDoTotal,
-          isRead
+    isRead
   } from '@/api/task/unit.js'
   import {
     listdept
@@ -151,10 +132,7 @@
     components: {
       addUnit,
       addBackPlan,
-      showPatrol,
-      addPatrol,
-      checkUnit,
-      answerQuestion,
+      checkUnit,
       sendNotice
     },
     data() {
@@ -164,19 +142,8 @@
         dialogVisible: false,
         stateObj: {},
         deptOptions:[],
-        treeProps:{children: 'mychildren', hasChildren: 'hasChildren'},
-        typeName: [{
-          type: 1,
-          name: '任务追踪'
-        }, {
-          type: 4,
-          name: '专项专题任务'
-        }, {
-          type: 5,
-          name: '我的待办任务'
-        }],
-        myMonth:'',
-        isMyPage:true,
+        treeProps:{children: 'mychildren', hasChildren: 'hasChildren'},
+        myMonth:'',
         select: {
           keyword: '',
           page: 1,
@@ -197,33 +164,6 @@
           main_department_id:''
         },
         total: 0,
-        pickerOptions: {
-          shortcuts: [{
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近一个月',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近三个月',
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit('pick', [start, end]);
-            }
-          }]
-        },
         selectAuditStatusList: [{
           id: 4,
           value: '待办',
@@ -259,61 +199,14 @@
           type: 'danger'
         }],
         unitTypeList: [],
-        askList: [],
-        myListFinishStatus:true,
         list: [],
-        myListFinish:[],
-        sectionList: [],
-        currentTableList: [],
         auditStatus1: 0, // 办理中
         auditStatus4: 0, // 待办
         auditStatus5: 0, //已完成
-        isIndeterminate: true,
-        checkAll: false,
-        showSelectMonth:false,
-        selectMonth: [],
-        allMonths: [{
-          id: "01",
-          value: '一月'
-        }, {
-          id: "02",
-          value: '二月'
-        }, {
-          id: "03",
-          value: '三月'
-        }, {
-          id: "04",
-          value: '四月'
-        }, {
-          id: "05",
-          value: '五月'
-        }, {
-          id: "06",
-          value: '六月'
-        }, {
-          id: "07",
-          value: '七月'
-        }, {
-          id: "08",
-          value: '八月'
-        }, {
-          id: "09",
-          value: '九月'
-        }, {
-          id: "10",
-          value: '十月'
-        }, {
-          id: "11",
-          value: '十一月'
-        }, {
-          id: "12",
-          value: '十二月'
-        }],
         table: [
           {
           label: "",
           prop: 'pindex',
-          // fixed:'left',
           width:80
         },
         {
@@ -333,12 +226,6 @@
           width: 120,
           align: 'center'
         },
-          // {
-          //   label: "开始日期",
-          //   prop: 'start_date',
-          //   width: 120,
-          //   align: 'center'
-          // },
         {
           label: "要求完成日期",
           prop: 'end_date',
@@ -357,11 +244,11 @@
        //  :
             this.auditStatusList.map(item => {
                 if (item.id == row.audit_status) {
-                  return ( <el-tag type = {
+                  return (<el-tag type = {
                       item.type
                     }> {
                       item.value
-                    } </el-tag>)
+                    }</el-tag>)
                   }
                 })
             } </div>)
@@ -375,64 +262,26 @@
       }
     },
         computed: {
-        },
-        mounted(){
-          // var query = this.$route;
-          // var rediret = this.$route.path?this.$route.path:'/'
-          // console.log("query",query)
-          // if (query.token && query.userid) {
-          //   this.loading = true
-          //   this.$store.dispatch('user/loginskip', {
-          //     token: query.token,
-          //     tp: query.tp,
-          //   }).then(() => {
-          //     this.$router.push({
-          //       path: rediret
-          //     })
-          //     this.loading = false
-          //   }).catch((error) => {
-          //     console.log(error)
-          //     this.loading = false
-          //   })
-          // }
         },
-        created() {
-          this.getLeads()
+        created() {
           this.loadDeptOptions()
-          this.stateObj = state.state
-          let currentMonth = (new Date()).getMonth() + 1 < 10 ? "0" + ((new Date()).getMonth() + 1) : (new Date())
-            .getMonth() + 1
-          // this.selectMonth.push(currentMonth)
-          // this.selectMonth.push(currentMonth)
-          // this.select.month = currentMonth
+          this.stateObj = state.state
           // 是否从 平台跳转来的
           if (this.$route.path) {
             let path = this.$route.path.split("_")
             this.select.type = path[1]
             this.path_type = path[1]
-            if (path[1] == 5) {
-              this.showSelectMonth = false
+            if (path[1] == 5) {
               this.select.type = ''
               this.select.myself = 1
-              // this.select.pid = 0
-              // if(!this.stateObj.is_manger){
-              this.isMyPage = false
               this.select.page_size = 999
-              this.select.pid = ''
-              // this.treeProps = {children: 'mychildren', hasChildren: 'hasChildren' }
-              // }
+              this.select.pid = ''
               this.type_name = '我的待办任务'
               this.path_type = path[1]
               this.select.month = ''
               this.table.splice(this.table.length-1,1)
-
             }
-            if (path[1] == 4) {
-              this.selectMonth = []
-              // this.allMonths.map(item=>{
-              //   this.selectMonth.push(item.id)
-              // })
-              // this.select.month = this.selectMonth.join(',')
+            if (path[1] == 4) {
               this.select.type = 4
               this.type_name = '专项专题任务'
               this.path_type = path[1]
@@ -441,29 +290,17 @@
                 prop: 'mission_type',
                 width: 120,
                 align: 'center'
-              })
-              // this.table.unshift({
-              //   label: "任务类别",
-              //   prop: 'mission_type',
-              //   width: 120,
-              //   align: 'left'
-              // })
+              })
             }
-            if (path[1] == 1) {
-              this.showSelectMonth = false
-              this.select.type = ''
-              // this.select.pid = ''
-              // this.treeProps = {children: 'nochildren', hasChildren: 'hasChildren' }
+            if (path[1] == 1) {
+              this.select.type = ''
               this.type_name = '任务跟踪'
               this.path_type = path[1]
             }
           }
-          this.getUnitTypeList()
-          this.getUnDoTotal()
+          this.getUnitTypeList()
           this.getList()
           console.log("this.$route.query123",this.$route.query)
-
-
           // 从大平台跳转过来的
 
           let that = this
@@ -474,13 +311,13 @@
              }
              setTimeout(()=>{
                that.checkUnits(that.$route.query.missionId,'show')
-             },5000)
+             },3000)
           }
           // 从首页
           if (this.$route.query.dashboardId){
              setTimeout(()=>{
                that.checkUnits(that.$route.query.dashboardId,'show')
-             },5000)
+             },3000)
           }
 
 
@@ -502,23 +339,14 @@
               console.log(error)
               reject(error)
             })
-          },
-          changeYear(e) {
-            if (e) {
-              this.select.year = e
-            }
           },
           changeMyMonth(e){
             console.log(e)
             if(e){
               this.select.month = e
-              // this.select.month = e.join(",")
             }else{
               this.select.month = ''
             }
-          },
-          async getLeads() {
-            // await this.$store.dispatch("user/getLeads")
           },
           sendNotice(row){
             this.$refs.sendNotice.setForm(row)
@@ -535,70 +363,6 @@
             const res = await getparameteritem('unitTypeList')
             this.unitTypeList = res.detail
           },
-          // 我的任务中的操作
-          openMyMission(remark, e) {
-            switch (remark) {
-              case '检查':
-                this.addPatrol(e)
-                break;
-              case '学习':
-                this.openStudy(e)
-                break;
-              case '答题':
-                this.openAnswers(e)
-                break;
-              case '培训':
-                this.openTrain(e)
-                break;
-              case '资料收集':
-              case '方案':
-              case '会议':
-                this.openUploads(e)
-                break;
-              // case '方案':
-              //   this.openCases(e)
-              //   break;
-
-            }
-          },
-
-          addPatrol(scope) {
-            this.$refs['addPatrol'].login_id = this.stateObj.login_id
-            this.$refs['addPatrol'].department_id = this.stateObj.department_id
-            this.$refs['addPatrol'].mission_id = scope.id
-            this.$refs['addPatrol'].isShow = true
-            this.$refs['addPatrol'].type = 'add'
-          },
-          openAnswers(scope) {
-            this.$refs['answerQuestion'].mission_id = scope.id
-            this.$refs['answerQuestion'].askList = scope.ask
-            this.$refs['answerQuestion'].isShow = true
-          },
-          showPatrol(id, type) {
-            this.$refs.showPatrol.id = id
-            this.$refs.showPatrol.type = type
-            this.$refs.showPatrol.isShow = true
-          },
-          openTrain(e) {
-            this.$refs.checkUnit.id = e.id
-            this.$refs.checkUnit.type = 'train'
-            this.$refs.checkUnit.isShow = true
-          },
-          openUploads(e) {
-            this.$refs.checkUnit.id = e.id
-            this.$refs.checkUnit.type = 'uploads'
-            this.$refs.checkUnit.isShow = true
-          },
-          openCases(e) {
-            this.$refs.checkUnit.id = e.id
-            this.$refs.checkUnit.type = 'cases'
-            this.$refs.checkUnit.isShow = true
-          },
-          openStudy(e) {
-            this.$refs.checkUnit.id = e.id
-            this.$refs.checkUnit.type = 'study'
-            this.$refs.checkUnit.isShow = true
-          },
           editorUnit(id, type , formtype) {
             if (id) {
               this.$refs.addUnit.id = id
@@ -625,25 +389,8 @@
             this.$refs.checkUnit.type = type
             this.$refs.checkUnit.url_type = this.path_type
             this.$refs.checkUnit.isShow = true
-          },
-          changeDate(e) {
-            if (e) {
-              this.select.start_date = e[0];
-              this.select.end_date = e[1];
-            } else {
-              this.select.start_date = "";
-              this.select.end_date = "";
-            }
           },
-          // 获取未完成的任务数量
-          getUnDoTotal(){
-            unDoTotal({
-              ...this.select,
-              audit_status:1
-            }).then(res=>{
-              // this.auditStatus1 = res.total
-            })
-          },
+
           async getList() {
             let res = await listunit({
               ...this.select
@@ -708,21 +455,13 @@
               r.pindex = index+1
             })
             this.list = _arr
-            this.myListFinish = my_arr
             let auditStatus1 = this.list.filter(item=>item.audit_status===1)
             let auditStatus4 = this.list.filter(item=>item.audit_status===4)
             let auditStatus5 = this.list.filter(item=>item.audit_status===5)
-            // this.list.map(item=>{
-            //   if(item.audit_status===1){
-            //     auditStatus1++
-            //   }
-            // })
             this.auditStatus1 = auditStatus1.length
             this.auditStatus4 = auditStatus4.length
             this.auditStatus5 = auditStatus5.length
-            console.log("spliceIndex",this.list)
-
-
+            console.log("spliceIndex",this.list)
             this.total = res.total
 
           },
@@ -746,52 +485,12 @@
 
             return tree;
           },
-          handleCheckAllChange(val) {
-            if (val) {
-              let _sm = []
-              this.allMonths.map(item => {
-                _sm.push(item.id)
-              })
-              this.selectMonth = _sm
-              this.select.month = this.selectMonth.join(',')
-              this.getUnDoTotal()
-              this.getList()
-
-            } else {
-              this.selectMonth = []
-              this.select.month = ''
-            }
-            this.isIndeterminate = false;
-          },
-          changeMonth(e) {
-            let checkedCount = e.length;
-            this.checkAll = checkedCount === this.allMonths.length;
-            this.isIndeterminate = checkedCount > 0 && checkedCount < this.allMonths.length;
-            console.log("this.selectMonth", this.selectMonth)
-            this.select.month = this.selectMonth.join(",")
-            this.getUnDoTotal()
-            this.getList()
-          },
 
         },
       }
 </script>
 
 <style scoped>
-  .tablewrap {
-    display: flex;
-  }
-
-  .tablemonth {
-    width: 10%;
-    background: #fff;
-    padding: 20px;
-    margin-right: 1%
-  }
-
-  .tablecontent {
-    width: 89%
-  }
 
   ::v-deep .el-table .cell.el-tooltip {
     white-space: normal !important;
@@ -863,33 +562,5 @@
 	  align-items: center;
 	  justify-content: space-between;
   }
-  .myListFinish {
-    display: flex;
-    align-items: center;
-	margin:15px 0;
-  }
-
-  .myListFinish>div {
-    padding: 10px 20px;
-    font-size: 16px;
-    background-color: #fff;
-    color: #333;
-	cursor: pointer;
-  }
-
-  .myListFinish>div:first-child {
-    border-radius: 10px 0 0 10px;
-
-  }
-
-  .myListFinish>div:last-child {
-    border-radius: 0 10px 10px 0;
-
-  }
-
-  .myListFinish>div.tabcur {
-    background: #0077CC;
-    color: #fff
-  }
 
 </style>
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,