diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 7c458d51d3..9dd307c471 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -153,7 +153,7 @@ public class ChartViewService { public String transMysqlSQL(String table, List xAxis, List yAxis) { // TODO 字段汇总 排序等 - String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(10,2))").toArray(String[]::new); + String[] field = yAxis.stream().map(y -> "CAST(" + y.getSummary() + "(" + y.getOriginName() + ") AS DECIMAL(20,2))").toArray(String[]::new); String[] group = xAxis.stream().map(ChartViewFieldDTO::getOriginName).toArray(String[]::new); return MessageFormat.format("SELECT {0},{1} FROM {2} GROUP BY {3}", StringUtils.join(group, ","), StringUtils.join(field, ","), table, StringUtils.join(group, ",")); } diff --git a/frontend/src/views/chart/components/DimensionItem.vue b/frontend/src/views/chart/components/DimensionItem.vue index 06abf94802..e9812f5c10 100644 --- a/frontend/src/views/chart/components/DimensionItem.vue +++ b/frontend/src/views/chart/components/DimensionItem.vue @@ -2,20 +2,17 @@ - + {{ item.name }} - - - - item1 - - - item2 - - - + + + + item1 + + + item2 + + @@ -43,13 +40,10 @@ export default { .item-axis { padding: 1px 6px; margin: 0 3px 2px 3px; - border: solid 1px #eee; - background-color: #f1f1f1; text-align: left; height: 24px; line-height: 22px; display: inline-block; - color: #1890ff; border-radius: 4px; box-sizing: border-box; white-space: nowrap; diff --git a/frontend/src/views/chart/components/QuotaItem.vue b/frontend/src/views/chart/components/QuotaItem.vue index 3e0c405781..dcf0f26220 100644 --- a/frontend/src/views/chart/components/QuotaItem.vue +++ b/frontend/src/views/chart/components/QuotaItem.vue @@ -2,32 +2,29 @@ - + {{ item.name }}{{ $t('chart.'+item.summary) }} - - - - - - {{ $t('chart.summary') }}({{ $t('chart.'+item.summary) }}) - - - {{ $t('chart.sum') }} - {{ $t('chart.avg') }} - {{ $t('chart.max') }} - {{ $t('chart.min') }} - {{ $t('chart.std') }} - {{ $t('chart.var_samp') }} - - - - - item4 - - - + + + + + + {{ $t('chart.summary') }}({{ $t('chart.'+item.summary) }}) + + + {{ $t('chart.sum') }} + {{ $t('chart.avg') }} + {{ $t('chart.max') }} + {{ $t('chart.min') }} + {{ $t('chart.std') }} + {{ $t('chart.var_samp') }} + + + + + item4 + + @@ -67,13 +64,10 @@ export default { .item-axis { padding: 1px 6px; margin: 0 3px 2px 3px; - border: solid 1px #eee; - background-color: #f1f1f1; text-align: left; height: 24px; line-height: 22px; display: inline-block; - color: #1890ff; border-radius: 4px; box-sizing: border-box; white-space: nowrap;