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