From 3f435173d4aa85d4cc1b2ce27aae81f3e5b042ea Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 21 Apr 2025 17:33:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/command-center-dashboard into feature_1.0.0

---
 src/components/DeviceJobDetails/JobRelatedEvents.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index 8c53a87..97e8f6e 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -8,9 +8,9 @@
 			:row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
 			:header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
 		>
-			<el-table-column prop="id" label="事件编号" />
+			<el-table-column prop="event_num" label="事件编号" />
 			<el-table-column show-overflow-tooltip prop="event_name" label="事件名称" />
-			<el-table-column show-overflow-tooltip prop="create_user" label="所属单位" />
+			<el-table-column show-overflow-tooltip prop="dept_name" label="所属单位" />
 			<el-table-column show-overflow-tooltip prop="remark" label="事件内容" />
 			<el-table-column show-overflow-tooltip prop="ai_types" label="关联算法" />
 			<el-table-column prop="status" label="工单状态">

--
Gitblit v1.9.3