@@ -63,24 +103,6 @@
@click="shiftDateRange(query.startTime, query.endTime, 1)"/>
-
-
- {{ querySortingTypeName }}
-
-
-
-
- {{ $t(sortingType.fullName) }}
-
-
-
-
@@ -255,7 +277,7 @@ import { useStatisticsStore } from '@/stores/statistics.js';
import datetimeConstants from '@/consts/datetime.js';
import statisticsConstants from '@/consts/statistics.js';
-import { getNameByKeyValue, limitText, formatPercent } from '@/lib/common.js'
+import { limitText, formatPercent } from '@/lib/common.js'
import {
getShiftedDateRangeAndDateType,
getDateRangeByDateType
@@ -287,7 +309,7 @@ export default {
const { mdAndUp } = useDisplay();
return {
- activeTab: 'statisticsPage',
+ activeTab: 'categoricalAnalysis',
initing: true,
loading: true,
alwaysShowNav: mdAndUp.value,
@@ -327,9 +349,21 @@ export default {
queryChartDataCategory() {
return this.statisticsStore.transactionStatisticsChartDataCategory;
},
- querySortingTypeName() {
- const querySortingTypeName = getNameByKeyValue(this.allSortingTypes, this.query.sortingType, 'type', 'fullName', 'System Default');
- return this.$t(querySortingTypeName);
+ queryChartType: {
+ get: function () {
+ return this.query.chartType;
+ },
+ set: function(value) {
+ this.setChartType(value);
+ }
+ },
+ querySortingType: {
+ get: function () {
+ return this.query.sortingType;
+ },
+ set: function(value) {
+ this.setSortingType(value);
+ }
},
queryStartTime() {
return this.$locale.formatUnixTimeToLongDateTime(this.userStore, this.query.startTime);
@@ -340,12 +374,27 @@ export default {
allChartTypes() {
return statisticsConstants.allChartTypes;
},
+ allChartTypesArray() {
+ return [
+ {
+ name: 'Pie Chart',
+ type: this.allChartTypes.Pie
+ },
+ {
+ name: 'Bar Chart',
+ type: this.allChartTypes.Bar
+ }
+ ];
+ },
allChartDataTypes() {
return statisticsConstants.allChartDataTypes;
},
allSortingTypes() {
return statisticsConstants.allSortingTypes;
},
+ allSortingTypesArray() {
+ return statisticsConstants.allSortingTypesArray;
+ },
allDateRanges() {
return datetimeConstants.allDateRanges;
},
diff --git a/src/views/mobile/statistics/TransactionPage.vue b/src/views/mobile/statistics/TransactionPage.vue
index cb6eb118..d485a56a 100644
--- a/src/views/mobile/statistics/TransactionPage.vue
+++ b/src/views/mobile/statistics/TransactionPage.vue
@@ -16,6 +16,7 @@