From 2cc91fc1881e25c2f3ed94dd50235d9ca1b2669a Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 26 Apr 2021 17:54:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/chart.js | 6 +++--- frontend/src/views/chart/components/table/TableNormal.vue | 2 +- frontend/src/views/chart/group/Group.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 803721d686..629f4303a8 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -2,9 +2,9 @@ export const DEFAULT_COLOR_CASE = { value: 'default', colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'], alpha: 100, - tableHeaderBgColor: '#e8eaec', - tableItemBgColor: '#ffffff', - tableFontColor: '#606266', + tableHeaderBgColor: '#4e81bb', + tableItemBgColor: '#c6d9f0', + tableFontColor: '#000000', tableStripe: true } export const DEFAULT_SIZE = { diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index 0b5013002e..e8d542fec3 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -192,7 +192,7 @@ export default { return prev } }, 0) - means[columnIndex] = means[columnIndex].toFixed(2) + means[columnIndex] = (means[columnIndex] + '').includes('.') ? means[columnIndex].toFixed(2) : means[columnIndex] } else { means[columnIndex] = '' } diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue index 97c62da98d..23a4649298 100644 --- a/frontend/src/views/chart/group/Group.vue +++ b/frontend/src/views/chart/group/Group.vue @@ -565,8 +565,8 @@ export default { this.$store.dispatch('chart/setTableId', null) this.$store.dispatch('chart/setTableId', this.table.id) // this.$router.push('/chart/chart-edit') - this.$emit('switchComponent', { name: 'ChartEdit' }) - this.$store.dispatch('chart/setViewId', response.data.id) + this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': response.data.id }}) + // this.$store.dispatch('chart/setViewId', response.data.id) this.chartTree() }) },