From 2fe7eb79670f8d9a64a501596b18c4e098278c89 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/components/LogView.vue | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/views/projectProcess/components/LogView.vue b/src/views/projectProcess/components/LogView.vue
index e2ec6df..12b2472 100644
--- a/src/views/projectProcess/components/LogView.vue
+++ b/src/views/projectProcess/components/LogView.vue
@@ -73,7 +73,21 @@
锛�
<span class="tag jump">璺宠繃璇存槑</span>
锛�
- <span class="tag">{{log.eventDataJson.desc}}</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>
</div>
<div class="log" v-else-if="log.eventType === 'SUPERVISE'">
--
Gitblit v1.8.0