diff --git a/src/components/Discover/Conformance/ConformanceResults.vue b/src/components/Discover/Conformance/ConformanceResults.vue index 927aa5c..01d043e 100644 --- a/src/components/Discover/Conformance/ConformanceResults.vue +++ b/src/components/Discover/Conformance/ConformanceResults.vue @@ -286,7 +286,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? (val * 100) : (val * 100).toFixed(1); + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * Convert seconds to days diff --git a/src/components/Discover/Conformance/MoreModal.vue b/src/components/Discover/Conformance/MoreModal.vue index db73627..1bb9686 100644 --- a/src/components/Discover/Conformance/MoreModal.vue +++ b/src/components/Discover/Conformance/MoreModal.vue @@ -160,7 +160,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? val * 100 : (val * 100).toFixed(1); + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * set progress bar width diff --git a/src/components/Discover/Conformance/StatusBar.vue b/src/components/Discover/Conformance/StatusBar.vue index bc58d49..96572ef 100644 --- a/src/components/Discover/Conformance/StatusBar.vue +++ b/src/components/Discover/Conformance/StatusBar.vue @@ -108,7 +108,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? (val * 100) : (val * 100).toFixed(1); + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * setting stats data diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/Trace.vue index 1ee93de..b390658 100644 --- a/src/components/Discover/Map/Filter/Trace.vue +++ b/src/components/Discover/Map/Filter/Trace.vue @@ -203,7 +203,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? val * 100 : (val * 100).toFixed(1); + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * set progress bar width diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue index a2fdefe..791ce63 100644 --- a/src/components/Discover/Map/SidebarFilter.vue +++ b/src/components/Discover/Map/SidebarFilter.vue @@ -261,7 +261,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? `${val * 100}%` : `${(val * 100).toFixed(1)}%`; + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * set progress bar width diff --git a/src/components/Discover/Map/SidebarState.vue b/src/components/Discover/Map/SidebarState.vue index 711fe66..203d324 100644 --- a/src/components/Discover/Map/SidebarState.vue +++ b/src/components/Discover/Map/SidebarState.vue @@ -217,8 +217,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - if(val * 100 >= 100) return `${val * 100}%`; - return `${(val * 100).toFixed(1)}%`; + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * Behavior when show diff --git a/src/components/Discover/Map/SidebarTraces.vue b/src/components/Discover/Map/SidebarTraces.vue index 2caebdc..0d4ec57 100644 --- a/src/components/Discover/Map/SidebarTraces.vue +++ b/src/components/Discover/Map/SidebarTraces.vue @@ -118,7 +118,8 @@ export default { * @returns {string} 轉換完成的百分比字串 */ getPercentLabel(val){ - return (val * 100 === 100) ? `${val * 100}%` : `${(val * 100).toFixed(1)}%`; + if((val * 100).toFixed(1) >= 100) return `100%`; + else return `${(val * 100).toFixed(1)}%`; }, /** * set progress bar width