mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-13 06:05:12 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
607eec6c44 | ||
|
|
28daf41fb5 | ||
|
|
e45720af1b |
@@ -77,8 +77,11 @@ export function toSafeLocalDateStr(d) {
|
|||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
const date = safeDate(d)
|
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
|
return date_s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -151,11 +151,11 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: this.$t('applications.appName'),
|
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'),
|
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'),
|
key: this.$t('common.dateStart'),
|
||||||
|
|||||||
@@ -144,15 +144,15 @@ export default {
|
|||||||
// },
|
// },
|
||||||
{
|
{
|
||||||
key: this.$t('tickets.IP'),
|
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'),
|
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'),
|
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'),
|
key: this.$t('common.dateStart'),
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'user_display',
|
prop: 'applicant_display',
|
||||||
label: this.$t('tickets.user'),
|
label: this.$t('tickets.user'),
|
||||||
sortable: 'custom'
|
sortable: 'custom'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -50,9 +50,6 @@ export default {
|
|||||||
return this.$route.meta.action !== 'update' || formValue.source !== 'local'
|
return this.$route.meta.action !== 'update' || formValue.source !== 'local'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
source: {
|
|
||||||
hidden: () => { return true }
|
|
||||||
},
|
|
||||||
password: {
|
password: {
|
||||||
component: UserPassword,
|
component: UserPassword,
|
||||||
hidden: (formValue) => {
|
hidden: (formValue) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user