diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 72ccaf8ee1..f08a57cb8e 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -973,7 +973,26 @@ export default { next: 'Next', select_dataset: 'Select Dataset', select_chart_type: 'Select Chart Type', - recover: 'Reset' + recover: 'Reset', + yoy_label: 'YOY/MOM', + yoy_setting: 'Setting', + pls_select_field: 'Select Field', + compare_date: 'Compare Date', + compare_type: 'Compare Type', + compare_data: 'Data Setting', + year_yoy: 'Year yoy', + month_yoy: 'Month yoy', + quarter_yoy: 'Quarter yoy', + week_yoy: 'Week yoy', + day_yoy: 'Day yoy', + year_mom: 'Year mom', + month_mom: 'Month mom', + quarter_mom: 'Quarter mom', + week_mom: 'Week mom', + day_mom: 'Day mom', + data_sub: 'Sub', + data_percent: 'Percent', + compare_calc_expression: 'Expression' }, dataset: { sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index a7b55f367a..5a46fc610f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -973,8 +973,26 @@ export default { preview: '上一步', next: '下一步', select_dataset: '選擇數據集', - select_chart_type: '選擇圖表類型', - recover: '重置' + recover: '重置', + yoy_label: '同比/環比', + yoy_setting: '同環比設置', + pls_select_field: '請選擇字段', + compare_date: '對比日期', + compare_type: '對比類型', + compare_data: '數據設置', + year_yoy: '年同比', + month_yoy: '月同比', + quarter_yoy: '季同比', + week_yoy: '周同比', + day_yoy: '日同比', + year_mom: '年環比', + month_mom: '月環比', + quarter_mom: '季環比', + week_mom: '周環比', + day_mom: '日環比', + data_sub: '對比差值', + data_percent: '差值百分比', + compare_calc_expression: '計算公式' }, dataset: { sheet_warn: '有多個 Sheet 頁,默認抽取第一個', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 140013faff..845fce3a65 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -976,7 +976,26 @@ export default { next: '下一步', select_dataset: '选择数据集', select_chart_type: '选择图表类型', - recover: '重置' + recover: '重置', + yoy_label: '同比/环比', + yoy_setting: '同环比设置', + pls_select_field: '请选择字段', + compare_date: '对比日期', + compare_type: '对比类型', + compare_data: '数据设置', + year_yoy: '年同比', + month_yoy: '月同比', + quarter_yoy: '季同比', + week_yoy: '周同比', + day_yoy: '日同比', + year_mom: '年环比', + month_mom: '月环比', + quarter_mom: '季环比', + week_mom: '周环比', + day_mom: '日环比', + data_sub: '对比差值', + data_percent: '差值百分比', + compare_calc_expression: '计算公式' }, dataset: { sheet_warn: '有多个 Sheet 页,默认抽取第一个', diff --git a/frontend/src/views/chart/chart/compare.js b/frontend/src/views/chart/chart/compare.js new file mode 100644 index 0000000000..b06a104a10 --- /dev/null +++ b/frontend/src/views/chart/chart/compare.js @@ -0,0 +1,29 @@ +export const compareItem = { + type: 'none', // year-yoy/month-yoy等 + resultData: 'percent', // 对比差sub,百分比percent等 + field: '', + custom: { + field: '', + calcType: '0', // 0-增长值,1-增长率 + timeType: '0', // 0-固定日期,1-日期区间 + currentTime: '', + compareTime: '', + currentTimeRange: [], + compareTimeRange: [] + } +} + +export const compareYearList = [ + { name: 'year_mom', value: 'year_mom' } +] + +export const compareMonthList = [ + { name: 'month_mom', value: 'month_mom' }, + { name: 'year_yoy', value: 'year_yoy' } +] + +export const compareDayList = [ + { name: 'day_mom', value: 'day_mom' }, + { name: 'month_yoy', value: 'month_yoy' }, + { name: 'year_yoy', value: 'year_yoy' } +] diff --git a/frontend/src/views/chart/components/compare/CompareEdit.vue b/frontend/src/views/chart/components/compare/CompareEdit.vue new file mode 100644 index 0000000000..988b372323 --- /dev/null +++ b/frontend/src/views/chart/components/compare/CompareEdit.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue index acbc047608..073edc2b01 100644 --- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue +++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue @@ -61,7 +61,7 @@ {{ $t('chart.y') }} {{ $t('chart.y_M') }} {{ $t('chart.y_M_d') }} - {{ $t('chart.H_m_s') }} + {{ $t('chart.H_m_s') }} {{ $t('chart.y_M_d_H_m') }} {{ $t('chart.y_M_d_H_m_s') }} diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue index 2ec9104734..7684e24757 100644 --- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue +++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue @@ -13,7 +13,9 @@ {{ item.name }} - {{ $t('chart.'+item.summary) }} + + {{ $t('chart.' + item.summary) }}-{{ $t('chart.' + item.compareCalc.type) }} + @@ -30,7 +32,9 @@ {{ item.name }} - {{ $t('chart.'+item.summary) }} + + {{ $t('chart.' + item.summary) }}-{{ $t('chart.' + item.compareCalc.type) }} + @@ -87,6 +91,25 @@ + + + + + + + + {{ $t('chart.yoy_label') }} + ({{ !item.compareCalc ? $t('chart.none') : $t('chart.' + item.compareCalc.type) }}) + + + + + {{ $t('chart.none') }} + {{ $t('commons.setting') }}... + + + + @@ -120,6 +143,8 @@