diff --git a/src/store/modules/profile.ts b/src/store/modules/profile.ts index 9209e395..6dc8301a 100644 --- a/src/store/modules/profile.ts +++ b/src/store/modules/profile.ts @@ -161,7 +161,13 @@ export const profileStore = defineStore({ this.analyzeTrees = []; return res.data; } - this.segmentSpans = segment.spans; + this.segmentSpans = segment.spans.map((d: SegmentSpan) => { + return { + ...d, + segmentId: this.currentSegment.segmentId, + traceId: this.currentSegment.traceIds[0], + }; + }); if (!(segment.spans && segment.spans.length)) { this.analyzeTrees = []; return res.data; diff --git a/src/views/dashboard/related/components/LogTable/LogService.vue b/src/views/dashboard/related/components/LogTable/LogService.vue index c91b1efe..4b40ff80 100644 --- a/src/views/dashboard/related/components/LogTable/LogService.vue +++ b/src/views/dashboard/related/components/LogTable/LogService.vue @@ -22,12 +22,12 @@ limitations under the License. --> {{ tags }} - {{ data[item.label] }} - + --> {{ data[item.label] }} diff --git a/src/views/dashboard/related/profile/components/TaskList.vue b/src/views/dashboard/related/profile/components/TaskList.vue index efcbb03f..ce18c162 100644 --- a/src/views/dashboard/related/profile/components/TaskList.vue +++ b/src/views/dashboard/related/profile/components/TaskList.vue @@ -124,12 +124,14 @@ limitations under the License. --> import { ref } from "vue"; import dayjs from "dayjs"; import { useI18n } from "vue-i18n"; +import { useSelectorStore } from "@/store/modules/selectors"; import { useProfileStore } from "@/store/modules/profile"; import { TaskLog, TaskListItem } from "@/types/profile"; import { ElMessage } from "element-plus"; const { t } = useI18n(); const profileStore = useProfileStore(); +const selectorStore = useSelectorStore(); const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") => dayjs(date).format(pattern); const viewDetail = ref(false); @@ -150,7 +152,7 @@ async function viewTask(e: Event, item: TaskListItem) { viewDetail.value = true; selectedTask.value = item; service.value = ( - profileStore.services.filter((s: any) => s.id === item.serviceId)[0] || {} + selectorStore.services.filter((s: any) => s.id === item.serviceId)[0] || {} ).label; const res = await profileStore.getTaskLogs({ taskID: item.id }); diff --git a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue index e6390ff7..a34db4e9 100644 --- a/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue +++ b/src/views/dashboard/related/trace/components/D3Graph/SpanDetail.vue @@ -40,7 +40,7 @@ limitations under the License. --> {{ currentSpan.peer || "No Peer" }}
- {{ t("error") }}: + {{ t("isError") }}: {{ currentSpan.isError }}
diff --git a/src/views/dashboard/related/trace/components/Table/TableItem.vue b/src/views/dashboard/related/trace/components/Table/TableItem.vue index 7f032fda..4becc9a1 100644 --- a/src/views/dashboard/related/trace/components/Table/TableItem.vue +++ b/src/views/dashboard/related/trace/components/Table/TableItem.vue @@ -105,8 +105,12 @@ limitations under the License. --> {{ data.serviceCode }}
-
- {{ t("view") }} +
+ {{ t("view") }}
+ d.className.includes("trace-item") + ); + emit("select", props.data); + viewSpanDetail(dom); + } - function selectedItem(data: any) { + function selectedItem(data: HTMLSpanElement) { emit("select", data); } - function viewSpanDetail(dom: any) { + function viewSpanDetail(dom: HTMLSpanElement) { showSelectSpan(dom); showDetail.value = true; } @@ -226,6 +237,7 @@ export default defineComponent({ showDetail, selectSpan, selectedItem, + viewSpan, t, }; },