diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index 2f5de0d..2d8b11b 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -776,7 +776,7 @@ function setSubmitShowDataByStartEnd(start, end) { async function submitConformance() { let dataToSave; - selectDurationTime.value = await { + selectDurationTime.value = { min: selectTimeRangeMin.value, max: selectTimeRangeMax.value }; diff --git a/src/components/Discover/Conformance/MoreModal.vue b/src/components/Discover/Conformance/MoreModal.vue index 4858962..c0ec3c4 100644 --- a/src/components/Discover/Conformance/MoreModal.vue +++ b/src/components/Discover/Conformance/MoreModal.vue @@ -275,8 +275,8 @@ async function fetchData() { infiniteFinish.value = false; startNum.value += 20 const result = await conformanceStore.getConformanceTraceDetail(props.listNo, showTraceId.value, startNum.value); - infiniteData.value = await [...infiniteData.value, ...result]; - infiniteFinish.value = await true; + infiniteData.value = [...infiniteData.value, ...result]; + infiniteFinish.value = true; } catch(error) { console.error('Failed to load data:', error); } diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/Trace.vue index 6887c1c..eb01536 100644 --- a/src/components/Discover/Map/Filter/Trace.vue +++ b/src/components/Discover/Map/Filter/Trace.vue @@ -358,9 +358,9 @@ async function fetchData() { infiniteFinish.value = false; baseInfiniteStart.value += 20; await allMapDataStore.getBaseTraceDetail(); - infiniteData.value = await [...infiniteData.value, ...baseCases.value]; - infiniteFinish.value = await true; - isLoading.value = await false; + infiniteData.value = [...infiniteData.value, ...baseCases.value]; + infiniteFinish.value = true; + isLoading.value = false; } catch(error) { console.error('Failed to load data:', error); } diff --git a/src/components/Discover/Map/SidebarTraces.vue b/src/components/Discover/Map/SidebarTraces.vue index ff3994a..c3fa103 100644 --- a/src/components/Discover/Map/SidebarTraces.vue +++ b/src/components/Discover/Map/SidebarTraces.vue @@ -249,10 +249,10 @@ function createCy(){ * create map */ async function show() { - isLoading.value = await true; // createCy 執行完關閉 + isLoading.value = true; // createCy 執行完關閉 // 因 trace api 連動,所以關閉側邊欄時讓數值歸 traces 第一筆 id - showTraceId.value = await traces.value[0]?.id; - infiniteStart.value = await 0; + showTraceId.value = traces.value[0]?.id; + infiniteStart.value = 0; setNodesData(); setEdgesData(); createCy(); @@ -281,9 +281,9 @@ async function fetchData() { infiniteFinish.value = false; infiniteStart.value += 20; await allMapDataStore.getTraceDetail(); - infiniteData.value = await [...infiniteData.value, ...props.cases]; - infiniteFinish.value = await true; - isLoading.value = await false; + infiniteData.value = [...infiniteData.value, ...props.cases]; + infiniteFinish.value = true; + isLoading.value = false; } catch(error) { console.error('Failed to load data:', error); } diff --git a/src/stores/files.ts b/src/stores/files.ts index 4f9798b..75e36fc 100644 --- a/src/stores/files.ts +++ b/src/stores/files.ts @@ -193,8 +193,8 @@ export const useFilesStore = defineStore('filesStore', { try { const response = await apiClient.post(api, data); - this.uploadLogId = await response.data.id; - await Swal.close(); // 關閉進度條 + this.uploadLogId = response.data.id; + Swal.close(); // 關閉進度條 await this.rename(); // 改檔名 await uploadSuccess(); this.$router.push({name: 'Files'}); diff --git a/src/views/Compare/Dashboard/Compare.vue b/src/views/Compare/Dashboard/Compare.vue index 794fd65..d4cc708 100644 --- a/src/views/Compare/Dashboard/Compare.vue +++ b/src/views/Compare/Dashboard/Compare.vue @@ -1260,11 +1260,11 @@ function getAvgProcessTimeHorizontalBarChart(chartData, content, isSingle, xUnit // 取得 Compare Data await compareStore.getCompare(queryParams); - avgProcessTimeByTaskHeight.value = await getHorizontalBarHeight(compareDashboardData.value.time.avg_process_time_by_task); + avgProcessTimeByTaskHeight.value = getHorizontalBarHeight(compareDashboardData.value.time.avg_process_time_by_task); if(compareDashboardData.value.time.avg_waiting_time_by_edge !== null) { - avgWaitingTimeByEdgeHeight.value = await getHorizontalBarHeight(compareDashboardData.value.time.avg_waiting_time_by_edge); + avgWaitingTimeByEdgeHeight.value = getHorizontalBarHeight(compareDashboardData.value.time.avg_waiting_time_by_edge); }; - casesByTaskHeight.value = await getHorizontalBarHeight(compareDashboardData.value.freq.cases_by_task); + casesByTaskHeight.value = getHorizontalBarHeight(compareDashboardData.value.freq.cases_by_task); // create chart [avgCycleTimeData.value, avgCycleTimeOptions.value] = getLineChart( compareDashboardData.value.time.avg_cycle_time, contentData.avgCycleTime, 'date'); diff --git a/src/views/Compare/MapCompare.vue b/src/views/Compare/MapCompare.vue index 7def5be..5b35020 100644 --- a/src/views/Compare/MapCompare.vue +++ b/src/views/Compare/MapCompare.vue @@ -495,29 +495,29 @@ function setActivityBgImage(mapData) { switch (routeParams.type) { case 'log': if (!isCheckPage) { - logId.value = await routeParams.fileId; - baseLogId.value = await routeParams.fileId; + logId.value = routeParams.fileId; + baseLogId.value = routeParams.fileId; } else { - logId.value = await file.parent.id; - baseLogId.value = await file.parent.id; + logId.value = file.parent.id; + baseLogId.value = file.parent.id; } break; case 'filter': if (!isCheckPage) { - createFilterId.value = await routeParams.fileId; + createFilterId.value = routeParams.fileId; } else { - createFilterId.value = await file.parent.id; + createFilterId.value = file.parent.id; } await allMapDataStore.fetchFunnel(createFilterId.value); - isRuleData.value = await Array.from(temporaryData.value); - ruleData.value = await isRuleData.value.map(e => sidebarFilterRefComp.value.setRule(e)); + isRuleData.value = Array.from(temporaryData.value); + ruleData.value = isRuleData.value.map(e => sidebarFilterRefComp.value.setRule(e)); break; } await allMapDataStore.getAllMapData(); await allMapDataStore.getAllTrace(); - traceId.value = await traces.value[0]?.id; - baseTraceId.value = await baseTraces.value[0]?.id; + traceId.value = traces.value[0]?.id; + baseTraceId.value = baseTraces.value[0]?.id; await createCy(mapType.value); await allMapDataStore.getFilterParams(); await allMapDataStore.getTraceDetail(); diff --git a/src/views/Discover/Map/Map.vue b/src/views/Discover/Map/Map.vue index 040819a..de5acae 100644 --- a/src/views/Discover/Map/Map.vue +++ b/src/views/Discover/Map/Map.vue @@ -478,29 +478,29 @@ function setActivityBgImage(mapData) { switch (routeParams.type) { case 'log': if(!isCheckPage) { - logId.value = await routeParams.fileId; - baseLogId.value = await routeParams.fileId; + logId.value = routeParams.fileId; + baseLogId.value = routeParams.fileId; } else { - logId.value = await file.parent.id; - baseLogId.value = await file.parent.id; + logId.value = file.parent.id; + baseLogId.value = file.parent.id; } break; case 'filter': if(!isCheckPage) { - createFilterId.value = await routeParams.fileId; + createFilterId.value = routeParams.fileId; } else { - createFilterId.value = await file.parent.id; + createFilterId.value = file.parent.id; } await allMapDataStore.fetchFunnel(createFilterId.value); - isRuleData.value = await Array.from(temporaryData.value); - ruleData.value = await isRuleData.value.map(e => sidebarFilterRefComp.value.setRule(e)); + isRuleData.value = Array.from(temporaryData.value); + ruleData.value = isRuleData.value.map(e => sidebarFilterRefComp.value.setRule(e)); break; } await allMapDataStore.getAllMapData(); await allMapDataStore.getAllTrace(); - traceId.value = await traces.value[0]?.id; - baseTraceId.value = await baseTraces.value[0]?.id; + traceId.value = traces.value[0]?.id; + baseTraceId.value = baseTraces.value[0]?.id; await createCy(mapType.value); await allMapDataStore.getFilterParams(); await allMapDataStore.getTraceDetail(); diff --git a/src/views/Discover/Performance/index.vue b/src/views/Discover/Performance/index.vue index 6449bbe..4079689 100644 --- a/src/views/Discover/Performance/index.vue +++ b/src/views/Discover/Performance/index.vue @@ -912,9 +912,9 @@ function getAvgWaitingTimeLineChart(chartData, content, yUnit) { let id; if(!isCheckPage) { - id = await routeParams.fileId; + id = routeParams.fileId; } else { - id = await file.parent.id; + id = file.parent.id; } // 取得 Performance Data @@ -923,11 +923,11 @@ function getAvgWaitingTimeLineChart(chartData, content, yUnit) { isLoading.value = false; return; } - avgProcessTimeByTaskHeight.value = await getHorizontalBarHeight(performanceData.value.time.avg_process_time_by_task); + avgProcessTimeByTaskHeight.value = getHorizontalBarHeight(performanceData.value.time.avg_process_time_by_task); if(performanceData.value.time.avg_waiting_time_by_edge !== null) { - avgWaitingTimeByEdgeHeight.value = await getHorizontalBarHeight(performanceData.value.time.avg_waiting_time_by_edge); + avgWaitingTimeByEdgeHeight.value = getHorizontalBarHeight(performanceData.value.time.avg_waiting_time_by_edge); } - casesByTaskHeight.value = await getHorizontalBarHeight(performanceData.value.freq.cases_by_task); + casesByTaskHeight.value = getHorizontalBarHeight(performanceData.value.freq.cases_by_task); // create chart [avgCycleTimeData.value, avgCycleTimeOptions.value] = getExplicitDeclaredLineChart(performanceData.value.time.avg_cycle_time, contentData.avgCycleTime, 'date'); diff --git a/src/views/Upload/index.vue b/src/views/Upload/index.vue index abc3671..cf0d2a2 100644 --- a/src/views/Upload/index.vue +++ b/src/views/Upload/index.vue @@ -332,7 +332,7 @@ onMounted(async () => { ); showEdit.value = true; if(uploadId.value) await filesStore.getUploadDetail(); - selectedColumns.value = await Array.from({ length: uploadDetail.value.columns.length }, () => columnType[columnType.length - 1]); // 預設選 Not Assigned + selectedColumns.value = Array.from({ length: uploadDetail.value.columns.length }, () => columnType[columnType.length - 1]); // 預設選 Not Assigned unwatch(); isLoading.value = false; });