From 138874f99b26e1379db6320ba1a841ac49411ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Fri, 22 Nov 2024 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/views/auditPages/taskManagement/index.vue | 13 +++++++++-
 src/views/auditPages/taskManagement/info.vue  | 17 +++++++-----
 src/views/system/user/danweiList.vue          |  1 +
 src/views/unitPages/myTask/info.vue           | 26 ++++++++++++-------
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/.env.development b/.env.development
index cb6c485..bc5430f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.107:9015'
+VUE_APP_BASE_API = 'http://192.168.0.108:9015'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue
index c6b76df..c38873c 100644
--- a/src/views/auditPages/taskManagement/index.vue
+++ b/src/views/auditPages/taskManagement/index.vue
@@ -123,7 +123,7 @@
             </el-form-item>
             <el-form-item label="核查单位" prop="dwmc" class="select-box">
               <el-col >
-                <el-select v-model="ruleForm.dwmc" placeholder="请选择活动区域" multiple collapse-tags>
+                <el-select v-model="ruleForm.dwmc" placeholder="请选择核查单位" multiple collapse-tags>
                 </el-select>
               </el-col>
               <el-col class="btn-box">
@@ -275,6 +275,10 @@ export default {
     //打开列表
     addliebiao() {
       this.$refs.liebiaoDialog.open()
+      setTimeout(() => {
+      this.$refs.danweiList.getList()
+        
+      }, 100);
       if (this.tabclicklist) {
         setTimeout(() => {
           this.$refs.danweiList.dakai(this.tabclicklist)
@@ -283,6 +287,13 @@ export default {
 
     },
     liebiaoClose() {
+      this.$refs.danweiList.queryParams = {
+        current: 1,
+        size: 10,
+        userName: undefined,
+        nickName: undefined,
+        dwlx: undefined,
+      },
       this.$refs.liebiaoDialog.close()
 
     },
diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue
index ef72ef2..adf45ff 100644
--- a/src/views/auditPages/taskManagement/info.vue
+++ b/src/views/auditPages/taskManagement/info.vue
@@ -102,8 +102,11 @@
             <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" />
             <el-table-column label="系统名称" key="xtmc" prop="xtmc" align="center" />
             <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx" />
+              <template slot-scope="scope" >
+                <div v-if='scope.row.xtlx'>
+                  <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx" />
+
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="核查单位" key="zcdwmc" prop="zcdwmc" align="center" />
@@ -200,7 +203,7 @@ export default {
     return {
       index: 1,
       formInline: {
-
+        xtlx:""
       },
       formInlineTwo: {
         dwmc: "",
@@ -271,7 +274,10 @@ export default {
     },
     //获取流程
     assetLcpageList(){
-      assetLcpage(this.$route.query.id || this.$route.meta.id).then(res=>{
+      let obj = {
+        taskId:this.$route.query.id || this.$route.meta.id
+      }
+      assetLcpage(obj).then(res=>{
         this.timeLineData = res.data
       })
     },
@@ -329,7 +335,7 @@ export default {
       }
       if (this.index == 1) {
         this.formInline = {
-
+            xtlx:""
         }
         this.getList();
       } else if (this.index == 2) {
@@ -386,7 +392,6 @@ export default {
     },
     getListTwo() { 
       this.loading = true
-
       this.pagination.taskId = this.$route.query.id || this.$route.meta.id
       assetTaskdwHc(this.pagination).then(res=>{
         this.tableDataTwo = res.data.records
diff --git a/src/views/system/user/danweiList.vue b/src/views/system/user/danweiList.vue
index 44365ec..17a42b7 100644
--- a/src/views/system/user/danweiList.vue
+++ b/src/views/system/user/danweiList.vue
@@ -227,6 +227,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
+      this.queryParams.isSearch = 1
       listUnitdw(this.queryParams).then(response => {
         this.userList = response.data.records;
         this.total = response.data.total;
diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue
index 1b954ec..c38943d 100644
--- a/src/views/unitPages/myTask/info.vue
+++ b/src/views/unitPages/myTask/info.vue
@@ -158,18 +158,16 @@
       <div class="timeline">
         <div class="timeline-items" v-for="(item,index) in timeLineData">
           <div class="left-box">
-            <img class="main-img" v-if="item.status == 1" src="@/assets/images/rwxf.png" alt="">
-            <img class="main-img" v-if="item.status == 2" src="@/assets/images/wctj.png" alt="">
-            <img class="main-img" v-if="item.status == 3" src="@/assets/images/shbh.png" alt="">
-            <img class="main-img" v-if="item.status == 4" src="@/assets/images/shtg.png" alt="">
+            <img class="main-img"  :src="returnidimg(item.assetName)" alt="">
+            <!-- <img class="main-img" v-if="item.status == 2" src="" alt="">
+            <img class="main-img" v-if="item.status == 3" src="" alt="">
+            <img class="main-img" v-if="item.status == 4" src="" alt=""> -->
             <img class="icon-jt" v-if="(index + 1) != timeLineData.length" src="@/assets/images/icon-jt@2x.png" alt="">
           </div>
           <div class="right-box">
-            <span class="span-title" v-if="item.status == 1">管理员任务下发:</span>
-            <span class="span-title" v-if="item.status == 2">单位核查完成提交:</span>
-            <span class="span-title" v-if="item.status == 3">管理员审核驳回:</span>
-            <span class="span-title" v-if="item.status == 4">管理员审核通过:</span>
-            <span class="span-time">{{ item.timestamp }}</span>
+           
+            <span class="span-title" >{{item.assetName}}:</span>
+            <span class="span-time">{{ item.xfTime }}</span>
           </div>
         </div>
       </div>
@@ -248,12 +246,22 @@ export default {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     this.titleInfo()
+    this.assetLcpageList()
+
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
 
   methods: {
+    assetLcpageList(){
+      let obj = {
+        taskId:this.$route.query.id || this.$route.meta.id
+      }
+      assetLcpage(obj).then(res=>{
+        this.timeLineData = res.data
+      })
+    },
     goInfo(type, row) {
       // 查看
       if (type == 1) {