diff --git a/src/components/Compare/SidebarStates.vue b/src/components/Compare/SidebarStates.vue new file mode 100644 index 0000000..2cce9a5 --- /dev/null +++ b/src/components/Compare/SidebarStates.vue @@ -0,0 +1,277 @@ + + + + diff --git a/src/components/Discover/Performance/ProformanceView.vue b/src/components/Discover/Performance/ProformanceView.vue deleted file mode 100644 index 8a0bbdc..0000000 --- a/src/components/Discover/Performance/ProformanceView.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/module/timeLabel.js b/src/module/timeLabel.js index bbc538e..d5d0fdd 100644 --- a/src/module/timeLabel.js +++ b/src/module/timeLabel.js @@ -2,29 +2,31 @@ import moment from 'moment'; /** * 將秒數轉換成帶有時間單位的格式 - * @param {number} Second + * @param {number} second + * @param {number} fixedNumber 小數點後幾位 * @returns {string} 轉換完的格式(ex: 1 day, 6.8 hrs) */ -export function getTimeLabel(Second) { - var day = 24 * 60 * 60 - var hour = 60 * 60 - var minutes = 60 - var dd = Math.floor(Second / day) - var hh = Math.floor((Second % day) / hour) - var mm = Math.floor((Second % hour) / minutes) +export function getTimeLabel(second, fixedNumber = 0) { + const day = 24 * 60 * 60; + const hour = 60 * 60; + const minutes = 60; + const dd = Math.floor(second / day); + const hh = Math.floor((second % day) / hour); + const mm = Math.floor((second % hour) / minutes); + if(dd > 0){ - return dd + " days" + return (second / day).toFixed(fixedNumber) + " days" } else if(hh > 0){ - return hh + " hrs" + return ((second % day) / hour).toFixed(fixedNumber) + " hrs" } else if(mm > 0){ - return mm + " mins" + return ((second % hour) / minutes).toFixed(fixedNumber) + " mins" } - if(Second == 0){ - return Second + " sec" + if(second == 0){ + return second + " sec" } - return Second + " secs" + return second + " sec" } /** * 將秒數轉換成帶有縮寫時間單位的格式 diff --git a/src/router/index.js b/src/router/index.js index 30d7333..f33d4ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,6 +87,11 @@ const routes = [ } ] }, + { + path: "/compare/dashboard", + name: "CompareDashboard", + component: CompareDashboard, + } ] }, { @@ -94,11 +99,11 @@ const routes = [ name: "NotFound404", component: NotFound404, }, - { - path: "/compare/dashboard", - name: "CompareDashboard", - component: CompareDashboard, - } + // { + // path: "/compare/dashboard", + // name: "CompareDashboard", + // component: CompareDashboard, + // } ]; const base_url = import.meta.env.BASE_URL; diff --git a/src/stores/allMapData.js b/src/stores/allMapData.js index 669e0da..cd3aa43 100644 --- a/src/stores/allMapData.js +++ b/src/stores/allMapData.js @@ -142,7 +142,8 @@ export default defineStore('allMapDataStore', { this.allStats = response.data.stats; this.allInsights = response.data.insights; } catch(error) { - apiError(error, 'Failed to load the Map.'); + console.dir(error) + // apiError(error, 'Failed to load the Map.'); }; }, /** diff --git a/src/views/Compare/Dashboard/index.vue b/src/views/Compare/Dashboard/index.vue index 440ebfe..a9b2c0c 100644 --- a/src/views/Compare/Dashboard/index.vue +++ b/src/views/Compare/Dashboard/index.vue @@ -23,11 +23,9 @@

scheduleTime Usage

-
-
-

movingFrequency

+

movingFrequency

- + + +
+ +
+ +