From 35a0c77a631df4e843a1e80ed98fe14fb2a02884 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 三月 2025 11:48:28 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/projectProcess/components/LogView.vue | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/views/projectProcess/components/LogView.vue b/src/views/projectProcess/components/LogView.vue
index 588b93c..12b2472 100644
--- a/src/views/projectProcess/components/LogView.vue
+++ b/src/views/projectProcess/components/LogView.vue
@@ -26,6 +26,30 @@
<span class="tag">{{log.eventDataObj.reason}}</span>
</div>
</div>
+ <div class="log" v-else-if="log.eventType === 'HANGUP'">
+ <div>
+ <span class="tag name">{{log.nickName}}</span>
+ 浜�
+ <span class="tag time">{{log.gmtCreate}}</span>
+ <span class="tag reject">鎸傝捣</span>
+ 浜嗕换鍔�
+ <span class="tag taskName">{{log.taskName}}</span>
+ 锛�
+ <span class="tag reject">鎸傝捣鍘熷洜</span>
+ 锛�
+ <span class="tag">{{log.eventDataObj.reason}}</span>
+ </div>
+ </div>
+ <div class="log" v-else-if="log.eventType === 'CANCEL_HANGUP'">
+ <div>
+ <span class="tag name">{{log.nickName}}</span>
+ 浜�
+ <span class="tag time">{{log.gmtCreate}}</span>
+ <span class="tag reject">鍙栨秷鎸傝捣</span>
+ 浜嗕换鍔�
+ <span class="tag taskName">{{log.taskName}}</span>
+ </div>
+ </div>
<div class="log" v-else-if="log.eventType === 'DELEGATE'">
<div>
<span class="tag name">{{log.nickName}}</span>
@@ -48,6 +72,20 @@
<span class="tag taskName">{{log.taskName}}</span>
锛�
<span class="tag jump">璺宠繃璇存槑</span>
+ 锛�
+ <span class="tag">{{log.eventDataObj.desc}}</span>
+ </div>
+ </div>
+ <div class="log" v-else-if="log.eventType === 'WAIT'">
+ <div>
+ <span class="tag name">{{log.nickName}}</span>
+ 浜�
+ <span class="tag time">{{log.gmtCreate}}</span>
+ <span class="tag jump">瀹圭己</span>
+ 浜嗕换鍔�
+ <span class="tag taskName">{{log.taskName}}</span>
+ 锛�
+ <span class="tag jump">瀹圭己璇存槑</span>
锛�
<span class="tag">{{log.eventDataObj.desc}}</span>
</div>
@@ -103,14 +141,14 @@
<style scoped>
.log-warp {
- font-size: 18px;
+ font-size: 16px;
}
.log {
width: 100%;
margin-bottom: 15px;
overflow-wrap: break-word;
background-color: #E4E7ED;
- padding: 5px 0px;
+ padding: 5px 5px;
}
.tag {
margin: 0 5px;
--
Gitblit v1.8.0