diff --git a/src/views/dashboard/related/event/Content.vue b/src/views/dashboard/related/event/Content.vue index 29ce5686..28c8455a 100644 --- a/src/views/dashboard/related/event/Content.vue +++ b/src/views/dashboard/related/event/Content.vue @@ -28,6 +28,8 @@ import { useDashboardStore } from "@/store/modules/dashboard"; import getDashboard from "@/hooks/useDashboardsSession"; import { useAppStoreWithOut } from "@/store/modules/app"; import dateFormatStep, { dateFormatTime } from "@/utils/dateFormat"; +import getLocalTime from "@/utils/localtime"; +import { enumDeclaration } from "@babel/types"; const eventStore = useEventStore(); /*global defineProps, Nullable */ @@ -134,8 +136,8 @@ function associateTraceLog( filters: { sourceId: props.data.id || "", duration: { - startTime: null, - endTime: null, + start: null, + end: null, step: appStore.duration.step, }, }, @@ -148,8 +150,16 @@ function associateTraceLog( filters: { sourceId: props.data.id || "", duration: { - startTime: dateFormatStep(start, appStore.duration.step, true), - endTime: dateFormatStep(end, appStore.duration.step, true), + start: dateFormatStep( + getLocalTime(appStore.utc, start), + appStore.duration.step, + true + ), + end: dateFormatStep( + getLocalTime(appStore.utc, end), + appStore.duration.step, + true + ), step: appStore.duration.step, }, }, diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index 7b16c4d6..4f8e2a03 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -160,6 +160,9 @@ const logStore = useLogStore(); const traceId = ref( (props.data.filters && props.data.filters.traceId) || "" ); +const duration = ref( + (props.data.filters && props.data.filters.duration) || appStore.durationTime +); const keywordsOfContent = ref([]); const excludingKeywordsOfContent = ref([]); const tagsList = ref([]); @@ -252,7 +255,7 @@ function searchLogs() { pagePathId: endpoint || state.endpoint.id || undefined, serviceVersionId: instance || state.instance.id || undefined, paging: { pageNum: 1, pageSize: 15 }, - queryDuration: appStore.durationTime, + queryDuration: duration, category: state.category.value, }); } else { @@ -346,6 +349,7 @@ onUnmounted(() => { }; dashboardStore.setWidget(item); traceId.value = ""; + duration.value = appStore.durationTime; }); watch( () => selectorStore.currentService, @@ -381,6 +385,7 @@ watch( return; } traceId.value = props.data.filters.traceId || ""; + duration.value = props.data.filters.duration || appStore.durationTime; init(); } } diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue index 77753b4a..7f6fa665 100644 --- a/src/views/dashboard/related/trace/Filter.vue +++ b/src/views/dashboard/related/trace/Filter.vue @@ -105,6 +105,7 @@ import ConditionTags from "@/views/components/ConditionTags.vue"; import { ElMessage } from "element-plus"; import { EntityType } from "../../data"; import { LayoutConfig } from "@/types/dashboard"; +// import { Duration, DurationTime } from "@/types/app"; /*global defineProps, Recordable */ const props = defineProps({ @@ -122,6 +123,9 @@ const appStore = useAppStoreWithOut(); const selectorStore = useSelectorStore(); const dashboardStore = useDashboardStore(); const traceStore = useTraceStore(); +const duration = ref( + (props.data.filters && props.data.filters.duration) || appStore.durationTime +); const minTraceDuration = ref(); const maxTraceDuration = ref(); const tagsList = ref([]); @@ -198,7 +202,7 @@ function searchTraces() { endpointId: endpoint || state.endpoint.id || undefined, serviceInstanceId: instance || state.instance.id || undefined, traceState: state.status.value || "ALL", - queryDuration: appStore.durationTime, + queryDuration: duration.value, minTraceDuration: Number(minTraceDuration.value), maxTraceDuration: Number(maxTraceDuration.value), queryOrder: "BY_DURATION", @@ -238,6 +242,7 @@ onUnmounted(() => { }; dashboardStore.setWidget(item); traceId.value = ""; + duration.value = appStore.durationTime; }); watch( () => [selectorStore.currentPod], @@ -273,6 +278,7 @@ watch( return; } traceId.value = props.data.filters.traceId || ""; + duration.value = props.data.filters.duration || appStore.durationTime; init(); } }