From ea2a176722026460028bee1643c2a723c7fa3371 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 九月 2025 09:57:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/TraceIdLogManage/components/ResourceLogsView.vue | 1 +
src/views/TraceIdLogManage/TraceIdLogManageList.vue | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/views/TraceIdLogManage/TraceIdLogManageList.vue b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
index c8c9390..7202d14 100644
--- a/src/views/TraceIdLogManage/TraceIdLogManageList.vue
+++ b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
@@ -8,7 +8,11 @@
v-model="state.traceId"
style="width: 260px"
placeholder="traceID"
+<<<<<<< HEAD
@on-click-search="refetch()"
+=======
+ @on-click-search="refetch"
+>>>>>>> 06c6ff19cf33a902ec66529629f6171d699776ce
>
</SearchInput>
</QueryFilterItem>
diff --git a/src/views/TraceIdLogManage/components/ResourceLogsView.vue b/src/views/TraceIdLogManage/components/ResourceLogsView.vue
index b2e24ff..1c2096b 100644
--- a/src/views/TraceIdLogManage/components/ResourceLogsView.vue
+++ b/src/views/TraceIdLogManage/components/ResourceLogsView.vue
@@ -185,6 +185,7 @@
let res = await logRecordsServices.resendResource({ id: id });
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
+ handleAdd({ json: JSON.parse(res) });
}
} catch (error) {}
}
--
Gitblit v1.9.1