From c0c455c55c7be14cd718705427bd7b3c7b27a149 Mon Sep 17 00:00:00 2001 From: Cindy Chang Date: Thu, 6 Jun 2024 15:16:43 +0800 Subject: [PATCH] refine performance code layout --- src/stores/conformanceData.js | 14 ++++ src/views/Discover/Performance/index.vue | 86 ++++++++++++++++++------ 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/src/stores/conformanceData.js b/src/stores/conformanceData.js index 2907dd2..a2a2b28 100644 --- a/src/stores/conformanceData.js +++ b/src/stores/conformanceData.js @@ -21,5 +21,19 @@ export default defineStore('conformanceDataStore', { setConformanceData(userInputObj){ this.dataToSave = {...userInputObj}; }, + /** + * Set the starting time of time range to be saved later + * @param {string} startStr + */ + setConformanceDataStart(startStr){ + this.dataToSave.start = startStr; + }, + /** + * Set the ending time of time range to be saved later + * @param {string} startStr + */ + setConformanceDataEnd(endStr){ + this.dataToSave.end = endStr; + }, }, }) \ No newline at end of file diff --git a/src/views/Discover/Performance/index.vue b/src/views/Discover/Performance/index.vue index baa4208..625cec4 100644 --- a/src/views/Discover/Performance/index.vue +++ b/src/views/Discover/Performance/index.vue @@ -8,13 +8,21 @@

Time Usage

Frequency

@@ -22,7 +30,11 @@
-

scheduleTime Usage

+

+ schedule + + Time Usage +

    @@ -30,11 +42,16 @@ Cycle Time & Efficiency
    • - {{ contentData.avgCycleTime.title }} + + {{ contentData.avgCycleTime.title }} +
    • - {{ contentData.avgCycleEfficiency.title }}info + + {{ contentData.avgCycleEfficiency.title }} + info
    @@ -43,12 +60,17 @@ Processing Time
    • - {{ contentData.avgProcessTime.title }} + + {{ contentData.avgProcessTime.title }} +
    • - {{ contentData.avgProcessTimeByTask.title }} - + + {{ contentData.avgProcessTimeByTask.title }} + +
    @@ -56,13 +78,25 @@ Waiting Time
    • - {{ contentData.avgWaitingTime.title }}info + + {{ contentData.avgWaitingTime.title }} + + info +
    • - {{ contentData.avgWaitingTimeByEdge.title }}info + {{ contentData.avgWaitingTimeByEdge.title }} + + info + +
      - +

      No waiting time.

      @@ -73,7 +107,11 @@
-

movingFrequency

+

+ moving + + Frequency +

  • Number of Cases @@ -232,7 +270,8 @@ export default { switch (yUnit) { case 'date': - datasets = setLineChartData(chartData.data, chartData.x_axis.max, chartData.x_axis.min, false, chartData.y_axis.max, chartData.y_axis.min); + datasets = setLineChartData(chartData.data, chartData.x_axis.max, chartData.x_axis.min, false, chartData.y_axis.max, + chartData.y_axis.min); xData = this.xLabelsData(chartData.x_axis); break; case 'count': // 次數 10 個點 @@ -632,18 +671,25 @@ export default { } this.casesByTaskHeight = await this.getHorizontalBarHeight(this.performanceData.freq.cases_by_task); // create chart - [this.avgCycleTimeData, this.avgCycleTimeOptions] = this.getLineChart(this.performanceData.time.avg_cycle_time, this.contentData.avgCycleTime, 'date'); - [this.avgCycleEfficiencyData, this.avgCycleEfficiencyOptions] = this.getBarChart(this.performanceData.time.avg_cycle_efficiency, this.contentData.avgCycleEfficiency); - [this.avgProcessTimeData, this.avgProcessTimeOptions] = this.getLineChart(this.performanceData.time.avg_process_time, this.contentData.avgProcessTime, 'date'); - [this.avgProcessTimeByTaskData, this.avgProcessTimeByTaskOptions] = this.getHorizontalBarChart(this.performanceData.time.avg_process_time_by_task, this.contentData.avgProcessTimeByTask, true, 'date'); - [this.avgWaitingTimeData, this.avgWaitingTimeOptions] = this.getLineChart(this.performanceData.time.avg_waiting_time, this.contentData.avgWaitingTime, 'date'); + [this.avgCycleTimeData, this.avgCycleTimeOptions] = this.getLineChart(this.performanceData.time.avg_cycle_time, + this.contentData.avgCycleTime, 'date'); + [this.avgCycleEfficiencyData, this.avgCycleEfficiencyOptions] = this.getBarChart( + this.performanceData.time.avg_cycle_efficiency, this.contentData.avgCycleEfficiency); + [this.avgProcessTimeData, this.avgProcessTimeOptions] = this.getLineChart(this.performanceData.time.avg_process_time, + this.contentData.avgProcessTime, 'date'); + [this.avgProcessTimeByTaskData, this.avgProcessTimeByTaskOptions] = this.getHorizontalBarChart( + this.performanceData.time.avg_process_time_by_task, this.contentData.avgProcessTimeByTask, true, 'date'); + [this.avgWaitingTimeData, this.avgWaitingTimeOptions] = this.getLineChart( + this.performanceData.time.avg_waiting_time, this.contentData.avgWaitingTime, 'date'); if(this.performanceData.time.avg_waiting_time_by_edge !== null) { - [this.avgWaitingTimeByEdgeData, this.avgWaitingTimeByEdgeOptions] = this.getHorizontalBarChart(this.performanceData.time.avg_waiting_time_by_edge, this.contentData.avgWaitingTimeByEdge, false, 'date'); + [this.avgWaitingTimeByEdgeData, this.avgWaitingTimeByEdgeOptions] = this.getHorizontalBarChart( + this.performanceData.time.avg_waiting_time_by_edge, this.contentData.avgWaitingTimeByEdge, false, 'date'); } else { [this.avgWaitingTimeByEdgeData, this.avgWaitingTimeByEdgeOptions] = [null, null] } [this.freqData, this.freqOptions] = this.getLineChart(this.performanceData.freq.cases, this.contentData.freq, 'count'); - [this.casesByTaskData, this.casesByTaskOptions] = this.getHorizontalBarChart(this.performanceData.freq.cases_by_task, this.contentData.casesByTask, true, 'count'); + [this.casesByTaskData, this.casesByTaskOptions] = this.getHorizontalBarChart(this.performanceData.freq.cases_by_task, + this.contentData.casesByTask, true, 'count'); // 停止 loading this.isLoading = false; },