From ba916a942bbccda6b520fef1fc7ba7b579d916fa Mon Sep 17 00:00:00 2001 From: Fine Date: Wed, 23 Nov 2022 17:46:05 +0800 Subject: [PATCH] update --- src/store/modules/trace.ts | 15 --------------- .../trace/components/D3Graph/SpanDetail.vue | 5 +++-- .../related/trace/components/Table/TableItem.vue | 12 ++++++++++++ .../related/trace/components/Table/data.ts | 4 ++++ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 4d698ed6..640d10ad 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -176,21 +176,6 @@ export const traceStore = defineStore({ return res.data; } const data = res.data.data.trace.spans; - data[4].attachedEvents = [ - { - startTime: { - seconds: 1669102205296, - nanos: 1669102205296, - }, - event: "event", - endTime: { - seconds: 1669102212791, - nanos: 1669102212791, - }, - tags: [{ key: "test", value: "test" }], - summary: [{ key: "test", value: 123 }], - }, - ]; this.setTraceSpans(data || []); return res.data; }, diff --git a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue index dcac04de..e735d3ec 100644 --- a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue +++ b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue @@ -81,14 +81,14 @@ limitations under the License. -->
{{ t("events") }}.
{{ t("relatedTraceLogs") }} @@ -190,6 +190,7 @@ const total = computed(() => ? pageSize * pageNum.value + 1 : pageSize * pageNum.value ); +console.log(props.currentSpan); const visDate = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") => dayjs(date).format(pattern); diff --git a/src/views/dashboard/related/trace/components/Table/TableItem.vue b/src/views/dashboard/related/trace/components/Table/TableItem.vue index a60598ee..38af3b43 100644 --- a/src/views/dashboard/related/trace/components/Table/TableItem.vue +++ b/src/views/dashboard/related/trace/components/Table/TableItem.vue @@ -112,6 +112,9 @@ limitations under the License. --> > {{ t("view") }} +
+ {{ data.attachedEvents && data.attachedEvents.length }} +
@import "./table.scss"; +.event-tag { + width: 12px; + height: 12px; + border-radius: 12px; + border: 1px solid #e66; + color: #e66; + display: inline-block; +} + .trace-item.level0 { color: #448dfe; diff --git a/src/views/dashboard/related/trace/components/Table/data.ts b/src/views/dashboard/related/trace/components/Table/data.ts index 6c7c0411..cc486536 100644 --- a/src/views/dashboard/related/trace/components/Table/data.ts +++ b/src/views/dashboard/related/trace/components/Table/data.ts @@ -79,6 +79,10 @@ export const TraceConstant = [ label: "application", value: "Service", }, + { + label: "application", + value: "Attached Events", + }, ]; export const StatisticsConstant = [