Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
0c52bde525
|
@ -205,17 +205,21 @@
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<h1
|
<h1
|
||||||
style="text-align: center; margin-bottom: 20px"
|
style="text-align: center; margin-bottom: 30px"
|
||||||
v-if="NODE_ENV === 'usa'"
|
v-if="NODE_ENV === 'usa'"
|
||||||
>
|
>
|
||||||
About
|
About
|
||||||
</h1>
|
</h1>
|
||||||
<h1 style="text-align: center; margin-bottom: 20px" v-else>关于</h1>
|
<h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
|
||||||
<p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
|
<p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
|
||||||
{{ $t('login:title:system_title_about') }}
|
<!-- {{ $t('login:title:system_title_about') }} -->
|
||||||
|
<svg-icon
|
||||||
|
icon-class="login-logo"
|
||||||
|
style="width: 250px; height: 71px"
|
||||||
|
/>
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
|
<p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
|
||||||
<p style="margin-bottom: 20px">
|
<p style="margin-bottom: 20px; margin-top: 0">
|
||||||
V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
|
V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
|
||||||
</p>
|
</p>
|
||||||
<p style="margin-bottom: 20px" v-if="language === 'zh'">
|
<p style="margin-bottom: 20px" v-if="language === 'zh'">
|
||||||
|
@ -313,7 +317,8 @@ export default {
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(['asyncRoutes', 'routes', 'language']),
|
...mapGetters(['asyncRoutes', 'routes', 'language']),
|
||||||
host() {
|
host() {
|
||||||
return window.location.host
|
// return window.location.host
|
||||||
|
return 'elevateimaging.ai '
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -328,6 +333,7 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
let lang = zzSessionStorage.getItem('lang') || 'zh'
|
||||||
zzSessionStorage.clear()
|
zzSessionStorage.clear()
|
||||||
this.loginType = this.$route.query.loginType
|
this.loginType = this.$route.query.loginType
|
||||||
this.location = this.$route.query.location
|
this.location = this.$route.query.location
|
||||||
|
@ -343,8 +349,8 @@ export default {
|
||||||
this.setLanguage('en')
|
this.setLanguage('en')
|
||||||
this.$updateDictionary()
|
this.$updateDictionary()
|
||||||
} else {
|
} else {
|
||||||
this.$i18n.locale = 'zh'
|
this.$i18n.locale = lang
|
||||||
this.setLanguage('zh')
|
this.setLanguage(lang)
|
||||||
this.$updateDictionary()
|
this.$updateDictionary()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -388,8 +394,8 @@ export default {
|
||||||
.dispatch('user/login', this.loginForm)
|
.dispatch('user/login', this.loginForm)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.BasicInfo.LoginState === 2) {
|
if (res.BasicInfo.LoginState === 2) {
|
||||||
this.$message.warning(this.$t('login:message:login4'))
|
this.$message.warning(this.$t('login:message:login4'))
|
||||||
}
|
}
|
||||||
if (res.BasicInfo.IsFirstAdd) {
|
if (res.BasicInfo.IsFirstAdd) {
|
||||||
// 当前用户为首次登录,请先修改密码之后再次登录
|
// 当前用户为首次登录,请先修改密码之后再次登录
|
||||||
this.$message.success(this.$t('login:message:login1'))
|
this.$message.success(this.$t('login:message:login1'))
|
||||||
|
@ -431,6 +437,8 @@ export default {
|
||||||
// // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
|
// // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
|
||||||
// this.$message.warning(this.$t('login:message:login4'))
|
// this.$message.warning(this.$t('login:message:login4'))
|
||||||
// }
|
// }
|
||||||
|
zzSessionStorage.removeItem('userId')
|
||||||
|
zzSessionStorage.removeItem('identityUserId')
|
||||||
this.changeRoleLogin()
|
this.changeRoleLogin()
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<template v-if="DATA.FirstName && DATA.LastName">
|
<template v-if="DATA.FirstName && DATA.LastName">
|
||||||
<div class="userInfo">
|
<div class="userInfo">
|
||||||
<span>{{
|
<span>{{
|
||||||
isEN ? DATA.FirstName + DATA.LastName : DATA.ChineseName
|
isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
|
||||||
}}</span>
|
}}</span>
|
||||||
<span>{{ $fd('Sex', DATA.Sex) }}</span>
|
<span>{{ $fd('Sex', DATA.Sex) }}</span>
|
||||||
<span v-if="isEN">
|
<span v-if="isEN">
|
||||||
|
@ -269,16 +269,10 @@
|
||||||
:label="$t('curriculumVitae:info:form:City')"
|
:label="$t('curriculumVitae:info:form:City')"
|
||||||
v-if="isEN"
|
v-if="isEN"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input v-model="form.City" size="small" />
|
||||||
v-model="form.City"
|
|
||||||
size="small"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="$t('curriculumVitae:info:form:City')" v-else>
|
<el-form-item :label="$t('curriculumVitae:info:form:City')" v-else>
|
||||||
<el-input
|
<el-input v-model="form.CityCN" size="small" />
|
||||||
v-model="form.CityCN"
|
|
||||||
size="small"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="$t('curriculumVitae:info:form:department')"
|
:label="$t('curriculumVitae:info:form:department')"
|
||||||
|
|
|
@ -7,8 +7,9 @@
|
||||||
<span v-if="isAll">
|
<span v-if="isAll">
|
||||||
{{
|
{{
|
||||||
isEN
|
isEN
|
||||||
? reviewerData.BasicInfoView.FirstName +
|
? reviewerData.BasicInfoView.LastName +
|
||||||
reviewerData.BasicInfoView.LastName
|
' / ' +
|
||||||
|
reviewerData.BasicInfoView.FirstName
|
||||||
: reviewerData.BasicInfoView.ChineseName
|
: reviewerData.BasicInfoView.ChineseName
|
||||||
}}
|
}}
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in New Issue