mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-07 18:08:50 +00:00
Compare commits
3 Commits
pr@v3@fixe
...
v2.7.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
607eec6c44 | ||
|
|
28daf41fb5 | ||
|
|
e45720af1b |
@@ -77,8 +77,11 @@ export function toSafeLocalDateStr(d) {
|
||||
return ''
|
||||
}
|
||||
const date = safeDate(d)
|
||||
// let date_s = date.toLocaleString(getUserLang(), {hour12: false});
|
||||
const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' })
|
||||
// const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' })
|
||||
const date_s =
|
||||
date.toLocaleDateString(getUserLang(), { hourCycle: 'h23' }) +
|
||||
' ' +
|
||||
date.toLocaleTimeString(getUserLang(), { hourCycle: 'h23' })
|
||||
return date_s
|
||||
}
|
||||
|
||||
|
||||
@@ -151,11 +151,11 @@ export default {
|
||||
},
|
||||
{
|
||||
key: this.$t('applications.appName'),
|
||||
value: this.object.meta.apply_application_group
|
||||
value: this.object.meta.apply_application_group.toString()
|
||||
},
|
||||
{
|
||||
key: this.$t('tickets.SystemUser'),
|
||||
value: this.object.meta.apply_system_user_group
|
||||
value: this.object.meta.apply_system_user_group.toString()
|
||||
},
|
||||
{
|
||||
key: this.$t('common.dateStart'),
|
||||
|
||||
@@ -144,15 +144,15 @@ export default {
|
||||
// },
|
||||
{
|
||||
key: this.$t('tickets.IP'),
|
||||
value: this.object.meta.apply_ip_group
|
||||
value: this.object.meta.apply_ip_group.toString()
|
||||
},
|
||||
{
|
||||
key: this.$t('tickets.Hostname'),
|
||||
value: this.object.meta.apply_hostname_group
|
||||
value: this.object.meta.apply_hostname_group.toString()
|
||||
},
|
||||
{
|
||||
key: this.$t('tickets.SystemUser'),
|
||||
value: this.object.meta.apply_system_user_group
|
||||
value: this.object.meta.apply_system_user_group.toString()
|
||||
},
|
||||
{
|
||||
key: this.$t('common.dateStart'),
|
||||
|
||||
@@ -43,7 +43,7 @@ export default {
|
||||
}
|
||||
},
|
||||
{
|
||||
prop: 'user_display',
|
||||
prop: 'applicant_display',
|
||||
label: this.$t('tickets.user'),
|
||||
sortable: 'custom'
|
||||
},
|
||||
|
||||
@@ -50,9 +50,6 @@ export default {
|
||||
return this.$route.meta.action !== 'update' || formValue.source !== 'local'
|
||||
}
|
||||
},
|
||||
source: {
|
||||
hidden: () => { return true }
|
||||
},
|
||||
password: {
|
||||
component: UserPassword,
|
||||
hidden: (formValue) => {
|
||||
|
||||
Reference in New Issue
Block a user