From dc89353e4afafbb835e4b7ddb53e9c88052cb359 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sun, 9 Oct 2022 16:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=8E=B0=E5=9C=BA=E4=BF=AE=E6=94=B9=202022-1?=
 =?UTF-8?q?0-09=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/taskmanage/alltasklist.vue |  1 +
 src/views/modules/taskmanage/taskReport.vue  | 21 ++++++++++----------
 src/views/modules/taskmanage/tasklist.vue    |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/taskmanage/alltasklist.vue b/src/views/modules/taskmanage/alltasklist.vue
index aac320b..868923d 100644
--- a/src/views/modules/taskmanage/alltasklist.vue
+++ b/src/views/modules/taskmanage/alltasklist.vue
@@ -102,6 +102,7 @@
             width="130"
             label="操作">
             <template slot-scope="scope">
+              <el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通记录 |</el-link>
               <el-link type="text" size="small" @click="annex(scope.row.id)">沟通附件 |</el-link>
               <el-link type="text" size="small" @click="annex(scope.row.taskId)">任务附件 </el-link>
 <!--              <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
diff --git a/src/views/modules/taskmanage/taskReport.vue b/src/views/modules/taskmanage/taskReport.vue
index 3311352..8a6f5ee 100644
--- a/src/views/modules/taskmanage/taskReport.vue
+++ b/src/views/modules/taskmanage/taskReport.vue
@@ -4,7 +4,6 @@
       <el-col :span="24" style="display:flex">
 
         <div style=" margin: auto; width: 300px;height: 50px;display:flex">
-          <img src="src/assets/img/avatar.png" height="55">
           <h2>赫艾内部MES沟通系统</h2>
         </div>
 
@@ -55,7 +54,7 @@
       return {
         height: 200,
         dataForm: {
-          site: this.$store.state.user.site?this.$store.state.user.site:1,
+          site: this.$store.state.user.site ? this.$store.state.user.site : 1,
           customer: '',
           taskHeader: '',
           project: '',
@@ -247,21 +246,21 @@
         })
       },
       tableRowClassName({row, rowIndex}) {
+        if (row.status == '未受理' && this.dayjs(this.dayjs()).diff( row.createdDate,'minutes')/60>=12) {
+          return 'finish'
+        }
         if (row.status == '未受理') {
           return 'not-processing'
         }
         if (row.status == '已受理') {
           return 'processing'
         }
-        if (row.status == '已结束') {
-          return 'finish'
-        }
-       // return ''
+        // return ''
       },
       // 鼠标进入
       mouseEnter(time) {
         // 鼠标进入停止滚动和切换的定时任务
-         this.autoRoll(true)
+        this.autoRoll(true)
       },
       // 鼠标离开
       mouseLeave() {
@@ -306,15 +305,15 @@
   }
 </script>
 <style>
-  .mod-config  .not-processing {
+  .mod-config .not-processing {
     background-color: #ffff00;
   }
 
   .mod-config .processing {
-    background-color: #ffffff;
+   // background-color: #5f0e3f;
   }
 
-  .mod-config .finish{
-    background-color: #1bb61b;
+  .mod-config .finish {
+    background-color:orangered;
   }
 </style>
diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue
index 63c7cb4..5ad36db 100644
--- a/src/views/modules/taskmanage/tasklist.vue
+++ b/src/views/modules/taskmanage/tasklist.vue
@@ -109,12 +109,12 @@
             fixed="right"
             header-align="center"
             align="center"
-            width="80"
+            width="150"
             label="操作">
             <template slot-scope="scope">
 <!--              <el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改 |</el-link>-->
 <!--              <el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>-->
-<!--              <el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通 |</el-link>-->
+              <el-link type="text" size="small" @click="chatHistoryDialog(scope.row.id)">沟通记录 |</el-link>
               <el-link type="text" size="small" @click="annex(scope.row.id)">附件</el-link>
 <!--              <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->
 <!--                       @click="deleteHandle(scope.row.id)">删除-->