src/main.js

@@ -130,8 +130,7 @@ Vue.prototype.$validatePassword = (rule, value, callback) => {
   /* eslint-disable */
   var reg1 = eval(process.env.VUE_APP_PASSWORD_FOR_PERMISSION) ? new RegExp(`${process.env.VUE_APP_PASSWORD_FOR_REGULAR}`) : /.*/g; //密码必须是8位以上、必须含有字母、数字、特殊符号
   if (!reg1.test(value)) {
-    callback(
+    callback(lang === 'zh' ? new Error("密码必须包含：1）8 – 32 个字符；2）至少1个数字；3) 至少1个大写字母；4）至少1个小写字母；5）至少1个特殊字符 (~!-@#$%^&*_+?)") : new Error('Passwords must have: 1) 8 - 32 characters; 2) At least 1 number; 3) At least 1 uppercase letter; 4) At least 1 lowercase letter; 5) At least 1 special character (~!-@#$%^&*_+?) '))
-      new Error(_vm.$t('env:regExp:formatPassword')))
   } else {
     callback();
   }
@@ -307,7 +306,7 @@ async function VueInit() {
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
         window.location.href = `/login`
         zzSessionStorage.removeItem('lastWorkbench')
-        _vm.$alert(_vm.$t("env:sso:tip"), {
+        _vm.$alert(lang === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', {
           type: 'warning',
         })
       }
@@ -368,7 +367,7 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
+      if(_vm.$msgbox){
         _vm.$msgbox.close();
       }
       isOpen = false
@@ -376,10 +375,7 @@ async function VueInit() {
       zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
-      // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
-      //   type: 'warning',
-      // })
-      _vm.$alert(_vm.$t("env:loginOut"), {
         type: 'warning',
       })
     })
@@ -403,17 +399,17 @@ async function VueInit() {
       isOpen = true
       zzSessionStorage.setItem('isLock', 'true')
       _vm.$msgbox({
-        title: _vm.$t("env:lock:msgBox:title"),
+        title: lang === 'zh' ? '已锁定' : 'Locked',
-        confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
+        confirmButtonText: lang === 'zh' ? '解锁' : 'Unlock',
         showClose: false,
         beforeClose: (action, instance, done) => {
           if (action === 'confirm') {
             if (!_vm.unlock.my_username) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:iupUser"))
+              _vm.$alert(lang === 'zh' ? '请输入您的用户名解锁' : 'Please enter your user name to unlock.')
               return
             }
             if (!_vm.unlock.my_password) {
-              _vm.$alert(_vm.$t("env:lock:msgBox:inpPassword"))
+              _vm.$alert(lang === 'zh' ? '请输入您的密码解锁' : 'Please enter the correct password to unlock.')
               return
             }
             var my_username = zzSessionStorage.getItem('my_username')
@@ -424,7 +420,7 @@ async function VueInit() {
               resetReadingRestTime().then(() => {
               })
               const closeLock = (_vm) => {
-                _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
+                _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
                 _vm.unlock = {
                   my_username: null,
                   my_password: null
@@ -459,7 +455,7 @@ async function VueInit() {
 
             } else {
               // console.log(111)
-              _vm.$message.error(_vm.$t('env:lock:msgBox:userFail'))
+              _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')
             }
           }
         },
@@ -468,7 +464,7 @@ async function VueInit() {
             props: { labelWidth: "80px" }
           }, [
             h('el-form-item', {
-              props: { label: _vm.$t("env:lock:msgBox:form:username") },
+              props: { label: lang === 'zh' ? '用户名' : 'Username' },
             }, [
               h('input', {
                 props: {
@@ -490,7 +486,7 @@ async function VueInit() {
               })
             ]),
             h('el-form-item', {
-              props: { label: _vm.$t("env:lock:msgBox:form:Password") },
+              props: { label: lang === 'zh' ? '密码' : 'Password' },
             }, [
               h('input', {
                 props: {

src/views/login/index.vue

@@ -183,7 +183,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.4.001</p>
+        <p style="margin-bottom: 20px">V1.5.3.001</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有