gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Login.vue
View File

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

30
src/components/table/report/reportTestTable.vue
View File

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