From 547b38d7be526bd3ca32c4bf755fe09f444deceb Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 9 Nov 2023 09:09:35 +0800
Subject: [PATCH] bug 78311

---
 .env                                       | 3 ++-
 .env.development                           | 3 ++-
 .env.production                            | 3 ++-
 .env.test                                  | 3 ++-
 src/views/system/UserList.vue              | 4 ++++
 src/views/system/modules/PasswordModal.vue | 8 +++++---
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index e4126439..618b96bd 100644
--- a/.env
+++ b/.env
@@ -2,4 +2,5 @@ NODE_ENV=production
 VUE_APP_PLATFORM_NAME=JeroBoot 企业级快速开发平台
 VUE_APP_SSO=false
 VUE_TAG_FLAG=0
-VUE_APP_LOGIN_PAGE='/user/login'
\ No newline at end of file
+VUE_APP_LOGIN_PAGE='/user/login'
+VUE_APP_CURRENT_SYSTEM='inner'
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 1b4245b4..8f73c839 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,4 @@
 NODE_ENV=development
 VUE_APP_TAG_FLAG=0
-VUE_APP_LOGIN_PAGE='/user/login'
\ No newline at end of file
+VUE_APP_LOGIN_PAGE='/user/login'
+VUE_APP_CURRENT_SYSTEM='inner'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index edbc4077..924469b6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,4 @@
 NODE_ENV=production
 VUE_APP_TAG_FLAG=1
-VUE_APP_LOGIN_PAGE='https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?redirect_uri=http://laws-test.sinotruk.com/dashboard/analysis&state=123&client_id=SRMS&response_type=code'
\ No newline at end of file
+VUE_APP_LOGIN_PAGE='https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?redirect_uri=http://laws-test.sinotruk.com/dashboard/analysis&state=123&client_id=SRMS&response_type=code'
+VUE_APP_CURRENT_SYSTEM='IAM'
\ No newline at end of file
diff --git a/.env.test b/.env.test
index ebe3cdc3..a4f3781b 100644
--- a/.env.test
+++ b/.env.test
@@ -3,4 +3,5 @@ VUE_APP_API_BASE_URL=http://boot.jero.com:8080/laws-sinotruk
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview
 VUE_APP_TAG_FLAG=1
-VUE_APP_LOGIN_PAGE='/user/login'
\ No newline at end of file
+VUE_APP_LOGIN_PAGE='/user/login'
+VUE_APP_CURRENT_SYSTEM='inner'
\ No newline at end of file
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 59f4a2d3..e1343402 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -406,6 +406,10 @@ export default {
       })
     },
     handleChangePassword (username) {
+      if (process.env.VUE_APP_CURRENT_SYSTEM === 'IAM') {
+        this.$message.warn('请前往IAM修改密码')
+        return
+      }
       this.$refs.passwordmodal.show(username)
     },
     passwordModalOk () {
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index d7ca2a9a..b14be454 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -22,7 +22,7 @@
         </a-form-item>
 
         <a-form-item :label="$t('user.confirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol" :hasFeedback="true" >
-          <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('user.reenterLoginPassword')" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
 
       </a-form>
@@ -48,14 +48,16 @@ export default {
             message: this.$t('user.passwordConsists')
           }, {
             validator: this.validateToNextPassword
-          }]
+          }],
+          validateTrigger: 'blur'
         },
         confirmpassword: {
           rules: [{
             required: true, message: this.$t('user.reenterLoginPassword')
           }, {
             validator: this.compareToFirstPassword
-          }]
+          }],
+          validateTrigger: 'blur'
         }
       },