fix: 修复s3参数设置错误、修复报告页面undefined bug

This commit is contained in:
chenjinsong
2022-07-19 16:24:12 +08:00
parent 7e23b260ee
commit 411edbe62d
2 changed files with 17 additions and 17 deletions

View File

@@ -78,9 +78,6 @@ export default {
if (!_.isEmpty(res.data.theme)) {
localStorage.setItem(storageKey.theme, res.data.theme)
}
if (!_.isEmpty(res.data.s3_upload)) {
localStorage.setItem(storageKey.s3Enable, res.data.s3_upload)
}
res.loginSuccessPath = this.$route.query.redirect
this.loginSuccess(res)
localStorage.setItem(storageKey.username, this.username)
@@ -116,6 +113,7 @@ export default {
if (_.isEmpty(localStorage.getItem(storageKey.theme))) {
localStorage.setItem(storageKey.theme, data.theme || 'light')
}
localStorage.setItem(storageKey.s3Enable, data.s3_enable)
localStorage.setItem(storageKey.sysTimezone, data.timezone)
window.$dayJs.tz.setDefault(data.timezone)
localStorage.setItem(storageKey.timezoneOffset, window.$dayJs.tz().utcOffset() / 60)

View File

@@ -128,20 +128,22 @@
>
<template #reference>
<span>
<template v-if="scope.row.config.schedulerConfig.type === 'day'">
{{$t('report.daily')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === 'week'">
{{$t('report.weekly')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === 'month'">
{{$t('report.monthly')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === ''">
{{$t('report.oneTime')}}
</template>
<template v-else>
-
<template v-if="scope.row.config.schedulerConfig">
<template v-if="scope.row.config.schedulerConfig.type === 'day'">
{{$t('report.daily')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === 'week'">
{{$t('report.weekly')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === 'month'">
{{$t('report.monthly')}}
</template>
<template v-else-if="scope.row.config.schedulerConfig.type === ''">
{{$t('report.oneTime')}}
</template>
<template v-else>
-
</template>
</template>
</span>
</template>