CN-606 时间计划列展示优化

This commit is contained in:
hyx
2022-06-18 16:37:16 +08:00
parent 5e4d1b2700
commit 105712fb89

View File

@@ -290,9 +290,9 @@ export default {
{ key: '', value: this.$t('report.oneTime') } { key: '', value: this.$t('report.oneTime') }
], ],
typeUnitMappings: [ typeUnitMappings: [
{ key: 'day', value: this.$t('report.day') }, { key: 'day', value: this.$t('report.days') },
{ key: 'week', value: this.$t('report.week') }, { key: 'week', value: this.$t('report.week') },
{ key: 'month', value: this.$t('report.month') } { key: 'month', value: this.$t('report.months') }
], ],
scheduleTypeList: report.scheduleTypeList, scheduleTypeList: report.scheduleTypeList,
weekdayList: report.weekdayList, weekdayList: report.weekdayList,
@@ -327,7 +327,7 @@ export default {
if (interval > 1) { if (interval > 1) {
const unit = this.typeUnitMappings.find(m => m.key === type) const unit = this.typeUnitMappings.find(m => m.key === type)
if (unit) { if (unit) {
str = this.$t('report.every') + interval + unit.value str = this.$t('report.every') + ' ' + interval + ' '+ unit.value
} else { } else {
str = '-' str = '-'
} }
@@ -368,10 +368,10 @@ export default {
const monthWeekDates = row.config.schedulerConfig.monthWeekDates// 哪几周 const monthWeekDates = row.config.schedulerConfig.monthWeekDates// 哪几周
const weekDates = row.config.schedulerConfig.weekDates// 周几 const weekDates = row.config.schedulerConfig.weekDates// 周几
if (!this.$_.isEmpty(monthDates)) { if (!this.$_.isEmpty(monthDates)) {
str = '日期-' + monthDates str = this.$t('report.date') + '-' + monthDates
} else { } else {
if (!this.$_.isEmpty(monthWeekDates)) { if (!this.$_.isEmpty(monthWeekDates)) {
str += '-' + this.handleConfigArray(monthWeekDates, this.weekOptions) str += this.$t('report.week') + '-' + this.handleConfigArray(monthWeekDates, this.weekOptions)
} }
if (!this.$_.isEmpty(weekDates)) { if (!this.$_.isEmpty(weekDates)) {
str += ' ' + this.handleConfigArray(weekDates, this.weekdayList) str += ' ' + this.handleConfigArray(weekDates, this.weekdayList)