diff --git a/src/store/modules/log.ts b/src/store/modules/log.ts index ef1e97bc..27c74534 100644 --- a/src/store/modules/log.ts +++ b/src/store/modules/log.ts @@ -65,10 +65,7 @@ export const logStore = defineStore({ if (res.data.errors) { return res.data; } - this.services = [ - { value: "0", label: "All" }, - ...res.data.data.services, - ] || [{ value: "0", label: "All" }]; + this.services = res.data.data.services; return res.data; }, async getInstances() { diff --git a/src/store/modules/profile.ts b/src/store/modules/profile.ts index ccca3d56..10f9e308 100644 --- a/src/store/modules/profile.ts +++ b/src/store/modules/profile.ts @@ -82,10 +82,7 @@ export const profileStore = defineStore({ if (res.data.errors) { return res.data; } - this.services = [ - { value: "0", label: "All" }, - ...res.data.data.services, - ] || [{ value: "0", label: "All" }]; + this.services = res.data.data.services; return res.data; }, async getTaskList() { diff --git a/src/store/modules/trace.ts b/src/store/modules/trace.ts index 8fe7aafe..79d8a8f2 100644 --- a/src/store/modules/trace.ts +++ b/src/store/modules/trace.ts @@ -80,10 +80,7 @@ export const traceStore = defineStore({ if (res.data.errors) { return res.data; } - this.services = [ - { value: "0", label: "All" }, - ...res.data.data.services, - ] || [{ value: "0", label: "All" }]; + this.services = res.data.data.services; return res.data; }, async getInstances() { diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index 71d6d922..f20f7773 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -143,7 +143,7 @@ const isBrowser = ref(dashboardStore.layerId === "BROWSER"); const state = reactive({ instance: { value: "0", label: "All" }, endpoint: { value: "0", label: "All" }, - service: { value: "0", label: "All" }, + service: { value: "", label: "" }, }); init(); @@ -154,11 +154,10 @@ async function init() { ElMessage.error(resp.errors); return; } + await fetchSelectors(); + await searchLogs(); state.instance = { value: "0", label: "All" }; state.endpoint = { value: "0", label: "All" }; - state.service = { value: "0", label: "All" }; - searchLogs(); - fetchSelectors(); } function fetchSelectors() { diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue index 251b7e6c..85f416f7 100644 --- a/src/views/dashboard/related/trace/Filter.vue +++ b/src/views/dashboard/related/trace/Filter.vue @@ -113,7 +113,7 @@ const state = reactive({ status: { label: "All", value: "ALL" }, instance: { value: "0", label: "All" }, endpoint: { value: "0", label: "All" }, - service: { value: "0", label: "All" }, + service: { value: "", label: "" }, }); // const dateTime = computed(() => [ @@ -121,24 +121,21 @@ const state = reactive({ // appStore.durationRow.end, // ]); init(); -function init() { - searchTraces(); +async function init() { if (dashboardStore.entity === EntityType[1].value) { - getServices(); - return; + await getServices(); } if (dashboardStore.entity === EntityType[2].value) { - getInstances(); - return; + await getInstances(); } if (dashboardStore.entity === EntityType[3].value) { - getEndpoints(); - return; + await getEndpoints(); } if (dashboardStore.entity === EntityType[0].value) { - getInstances(); - getEndpoints(); + await getInstances(); + await getEndpoints(); } + await searchTraces(); } async function getServices() {