gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix： 修改保存全局变量为 1或0 ，修改 userBox creatTime传‘-’的问题

Browse Source
This commit is contained in:
zhangyu
2021-08-16 11:33:42 +08:00
parent d1ca46aed6
commit e159467b54
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/rightBox/administration/userBox.vue
View File

@@ -78,7 +78,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="editUser.id" :label="$t('config.user.createTime')"> <el-form-item v-if="editUser.id" :label="$t('config.user.createTime')">
<div class="right-box-form-content-txt">{{editUser.createAt}}</div> <div class="right-box-form-content-txt">{{utcTimeToTimezoneStr(editUser.createAt)}}</div>
</el-form-item> </el-form-item>
</el-form> </el-form>

2
nezha-fronted/src/components/common/table/settings/userTable.vue
View File

@@ -38,7 +38,7 @@
<div> <div>
<div class="flex-align-center"> <div class="flex-align-center">
<span class="user-name-top">{{scope.row[item.prop]}}</span> <span class="user-name-top">{{scope.row[item.prop]}}</span>
<el-tag size="mini" v-if="mfaEnable!='0' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag> <el-tag size="mini" v-if="mfaEnable == '1' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
</div> </div>
<div class="user-name-bottom"> <div class="user-name-bottom">
@{{scope.row.username}} @{{scope.row.username}}

1
nezha-fronted/src/components/page/config/user.vue
View File

@@ -112,7 +112,6 @@ export default {
this.object = { this.object = {
...user, ...user,
status: user.status + '', status: user.status + '',
createAt: this.utcTimeToTimezoneStr(user.createAt),
roleIds: Number(user.roles.map(item => item.id).join(',')), roleIds: Number(user.roles.map(item => item.id).join(',')),
pin: '', pin: '',
pinChange: '' pinChange: ''

1
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -468,6 +468,7 @@ export default {
{ key: 'Logs', value: 'logs', name: 'Logs' } { key: 'Logs', value: 'logs', name: 'Logs' }
] ]
this.titleSearchList.state.show = true this.titleSearchList.state.show = true
this.titleSearchList.type.show = true
}, },
batchModify () { batchModify () {
if (!this.batchDeleteObjs.length) { if (!this.batchDeleteObjs.length) {

2
nezha-fronted/src/store/user.js
View File

@@ -50,7 +50,7 @@ const user = {
localStorage.setItem('nz-sys-max-terminal-num', res.data.maxTerminalNum) localStorage.setItem('nz-sys-max-terminal-num', res.data.maxTerminalNum)
localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch) localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch)
localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange) localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange)
localStorage.setItem('nz-mfa-enable', res.data.mfaAuthEnable) localStorage.setItem('nz-mfa-enable', res.data.mfaAuthEnable ? 1 : 0)
post('/sys/user/permissions', { token: res.data.token }).then(res => { post('/sys/user/permissions', { token: res.data.token }).then(res => {
const menuList = sortByOrderNum(res.data.menus) const menuList = sortByOrderNum(res.data.menus)
store.commit('setMenuList', menuList) store.commit('setMenuList', menuList)