mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 03:22:56 +08:00
refactor(图表): 同环比计算公式提示优化
This commit is contained in:
ulleo
dataeaseShu
parent
32f9f542f4
commit
96e96e10d3
@ -1551,6 +1551,17 @@ export default {
|
||||
data_sub: 'Comparison difference',
|
||||
data_percent: 'Difference percentage',
|
||||
compare_calc_expression: 'Calculation formula',
|
||||
compare_calc_day_pre: 'Previous Day Data',
|
||||
compare_calc_day_sub: "Today's Data - Previous Day Data",
|
||||
compare_calc_day_percent: "(Today's Data / Previous Day Data - 1) * 100%",
|
||||
compare_calc_month_pre: 'Same Day Last Month Data',
|
||||
compare_calc_month_sub: "Today's Data - Same Day Last Month Data",
|
||||
compare_calc_month_percent: "(Today's Data / Same Day Last Month Data - 1) * 100%",
|
||||
compare_calc_year_pre: 'Same Day Last Year Data',
|
||||
compare_calc_year_sub: "Today's Data - Same Day Last Year Data",
|
||||
compare_calc_year_percent: "(Today's Data / Same Day Last Year Data - 1) * 100%",
|
||||
compare_calc_tip:
|
||||
'When filtering is required for comparison dates, please use the filter component to apply the filter; using chart filters, dashboard drilling, and linking functions may lead to inconsistent results.',
|
||||
and: 'And',
|
||||
or: 'Or',
|
||||
logic_exp: 'Logical condition',
|
||||
|
||||
@ -1586,6 +1586,17 @@ export default {
|
||||
data_sub: 'Comparison difference',
|
||||
data_percent: 'Difference percentage',
|
||||
compare_calc_expression: 'Calculation formula',
|
||||
compare_calc_day_pre: 'Previous Day Data',
|
||||
compare_calc_day_sub: "Today's Data - Previous Day Data",
|
||||
compare_calc_day_percent: "(Today's Data / Previous Day Data - 1) * 100%",
|
||||
compare_calc_month_pre: 'Same Day Last Month Data',
|
||||
compare_calc_month_sub: "Today's Data - Same Day Last Month Data",
|
||||
compare_calc_month_percent: "(Today's Data / Same Day Last Month Data - 1) * 100%",
|
||||
compare_calc_year_pre: 'Same Day Last Year Data',
|
||||
compare_calc_year_sub: "Today's Data - Same Day Last Year Data",
|
||||
compare_calc_year_percent: "(Today's Data / Same Day Last Year Data - 1) * 100%",
|
||||
compare_calc_tip:
|
||||
'When filtering is required for comparison dates, please use the filter component to apply the filter; using chart filters, dashboard drilling, and linking functions may lead to inconsistent results.',
|
||||
and: 'And',
|
||||
or: 'Or',
|
||||
logic_exp: 'Logical condition',
|
||||
|
||||
@ -1556,6 +1556,17 @@ export default {
|
||||
data_sub: '對比差值',
|
||||
data_percent: '差值百分比',
|
||||
compare_calc_expression: '計算公式',
|
||||
compare_calc_day_pre: '昨日數據',
|
||||
compare_calc_day_sub: '當天數據 - 昨日數據',
|
||||
compare_calc_day_percent: '（當天數據 / 昨日數據 - 1）* 100%',
|
||||
compare_calc_month_pre: '上月同日數據',
|
||||
compare_calc_month_sub: '當天數據 - 上月同日數據',
|
||||
compare_calc_month_percent: '（當天數據 / 上月同日數據 - 1）* 100%',
|
||||
compare_calc_year_pre: '去年同月同日數據',
|
||||
compare_calc_year_sub: '當天數據 - 去年同月同日數據',
|
||||
compare_calc_year_percent: '（當天數據 / 去年同月同日數據 - 1）* 100%',
|
||||
compare_calc_tip:
|
||||
'當對比日期需要過濾時，請使用過濾組件實現過濾；使用圖表過濾器，儀表板下鑽和聯動等功能，會導致結果不一致',
|
||||
and: '與',
|
||||
or: '或',
|
||||
logic_exp: '邏輯條件',
|
||||
|
||||
@ -1558,6 +1558,17 @@ export default {
|
||||
data_sub: '对比差值',
|
||||
data_percent: '差值百分比',
|
||||
compare_calc_expression: '计算公式',
|
||||
compare_calc_day_pre: '昨日数据',
|
||||
compare_calc_day_sub: '当天数据 - 昨日数据',
|
||||
compare_calc_day_percent: '（当天数据 / 昨日数据 - 1）* 100%',
|
||||
compare_calc_month_pre: '上月同日数据',
|
||||
compare_calc_month_sub: '当天数据 - 上月同日数据',
|
||||
compare_calc_month_percent: '（当天数据 / 上月同日数据 - 1）* 100%',
|
||||
compare_calc_year_pre: '去年同月同日数据',
|
||||
compare_calc_year_sub: '当天数据 - 去年同月同日数据',
|
||||
compare_calc_year_percent: '（当天数据 / 去年同月同日数据 - 1）* 100%',
|
||||
compare_calc_tip:
|
||||
'当对比日期需要过滤时，请使用过滤组件实现过滤；使用图表过滤器，仪表板下钻和联动等功能，会导致结果不一致',
|
||||
and: '与',
|
||||
or: '或',
|
||||
logic_exp: '逻辑条件',
|
||||
|
||||
@ -37,9 +37,9 @@ const state = reactive({
|
||||
})
|
||||
|
||||
const dateFormatterList = [
|
||||
{ name: '年', value: 'y' },
|
||||
{ name: '年月', value: 'y_M' },
|
||||
{ name: '年月日', value: 'y_M_d' }
|
||||
{ name: t('chart.y'), value: 'y' },
|
||||
{ name: t('chart.y_M'), value: 'y_M' },
|
||||
{ name: t('chart.y_M_d'), value: 'y_M_d' }
|
||||
]
|
||||
|
||||
const changeDateFormatter = () => {
|
||||
@ -208,18 +208,54 @@ initDateFormatter()
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="t('chart.compare_calc_expression')">
|
||||
<span v-if="compareItem.compareCalc.resultData === 'pre'" class="exp-style">上期数据</span>
|
||||
<span v-if="compareItem.compareCalc.resultData === 'sub'" class="exp-style"
|
||||
>本期数据 - 上期数据</span
|
||||
<template v-if="compareItem.compareCalc.type === 'day_mom'">
|
||||
<span v-if="compareItem.compareCalc.resultData === 'pre'" class="exp-style">
|
||||
{{ t('chart.compare_calc_day_pre') }}
|
||||
</span>
|
||||
<span v-if="compareItem.compareCalc.resultData === 'sub'" class="exp-style">
|
||||
{{ t('chart.compare_calc_day_sub') }}
|
||||
</span>
|
||||
<span v-else-if="compareItem.compareCalc.resultData === 'percent'" class="exp-style">
|
||||
{{ t('chart.compare_calc_day_percent') }}
|
||||
</span>
|
||||
</template>
|
||||
<template
|
||||
v-if="
|
||||
compareItem.compareCalc.type === 'month_yoy' ||
|
||||
compareItem.compareCalc.type === 'month_mom'
|
||||
"
|
||||
>
|
||||
<span v-else-if="compareItem.compareCalc.resultData === 'percent'" class="exp-style"
|
||||
>(本期数据 / |上期数据| - 1) * 100%</span
|
||||
<span v-if="compareItem.compareCalc.resultData === 'pre'" class="exp-style">
|
||||
{{ t('chart.compare_calc_month_pre') }}
|
||||
</span>
|
||||
<span v-if="compareItem.compareCalc.resultData === 'sub'" class="exp-style">
|
||||
{{ t('chart.compare_calc_month_sub') }}
|
||||
</span>
|
||||
<span v-else-if="compareItem.compareCalc.resultData === 'percent'" class="exp-style">
|
||||
{{ t('chart.compare_calc_month_percent') }}
|
||||
</span>
|
||||
</template>
|
||||
<template
|
||||
v-if="
|
||||
compareItem.compareCalc.type === 'year_yoy' ||
|
||||
compareItem.compareCalc.type === 'year_mom'
|
||||
"
|
||||
>
|
||||
<span v-if="compareItem.compareCalc.resultData === 'pre'" class="exp-style">
|
||||
{{ t('chart.compare_calc_year_pre') }}
|
||||
</span>
|
||||
<span v-if="compareItem.compareCalc.resultData === 'sub'" class="exp-style">
|
||||
{{ t('chart.compare_calc_year_sub') }}
|
||||
</span>
|
||||
<span v-else-if="compareItem.compareCalc.resultData === 'percent'" class="exp-style">
|
||||
{{ t('chart.compare_calc_year_percent') }}
|
||||
</span>
|
||||
</template>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="t('chart.tip')">
|
||||
<span class="exp-style" style="padding-top: 2px">
|
||||
当对比日期需要过滤时，请使用过滤组件实现过滤；使用图表过滤器，仪表板下钻和联动等功能，会导致结果不一致
|
||||
{{ t('chart.compare_calc_tip') }}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user