diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index d754317..28ab594 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -491,7 +491,8 @@ export default {
break;
};
- return this.isMainBtnDisabled = disabledBool;
+ this.isMainBtnDisabled = disabledBool;
+ return this.isMainBtnDisabled;
},
...mapState(ConformanceInputStore, ['activityRadioData']),
diff --git a/src/views/Compare/Dashboard/Compare.vue b/src/views/Compare/Dashboard/Compare.vue
index b8f766c..b1b2c84 100644
--- a/src/views/Compare/Dashboard/Compare.vue
+++ b/src/views/Compare/Dashboard/Compare.vue
@@ -117,7 +117,6 @@
-
{{ contentData.freq.title }}
-
@@ -159,7 +158,7 @@ import LoadingStore from '@/stores/loading.js';
import CompareStore from '@/stores/compare.js';
import SidebarStates from '@/components/Compare/SidebarStates.vue';
import { setLineChartData } from '@/module/setChartData.js';
-import { simpleTimeLabel, followTimeLabel, getDateLabelByMinMaxDate,
+import { simpleTimeLabel, followTimeLabel,
setTimeStringFormatBaseOnTimeDifference,
mapTimestampToAxisTicksByFormat,
getStepSizeOfYTicks,
@@ -757,7 +756,7 @@ console.log("TODO:", datasetsPrimary, )
* @param { string } yUnit y 軸單位 'date' | 'count',可傳入以上任一。
* @returns { [primeVueSetData, primeVueSetOption] } 這兩者為符合 primeVue 圖表格式的數據資料
*/
- getLineChart(chartData, content, yUnit) {
+ getLineChart0(chartData, content, yUnit) {
let datasetsPrimary;
let datasetsSecondary;
let minX = chartData.x_axis.min;
@@ -771,7 +770,6 @@ console.log("TODO:", datasetsPrimary, )
return this.$moment(time).format('YYYY/M/D hh:mm:ss')
};
const getSimpleTimeLabel = simpleTimeLabel;
- const getFollowTimeLabel = followTimeLabel;
// fabricate x label according to y unit
switch (yUnit) {