From 7f6af6907202cb7c9395a7020d249bd62e17d50f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 05 一月 2024 17:59:17 +0800
Subject: [PATCH] 1、解决车间看板页面因浏览器兼容性问题导致的样式不适配问题（使用浏览器86版本与其他版本做对比） 2、优化车间看板页面代码，将看板拖拽区域设置高度后再设置限制拖拽以试图解决进入页面后有概率设备无法自由拖拽问题（猜想因父子组件渲染顺序导致，父组件还未渲染完成，子组件就已限制区域，此时区域高度可能0，未在现场调试，本地调试无问题） 3、优化设备利用率、开动率及班次利用率页面代码，解决因浏览器版本问题导致表格前3列文字无法垂直排列导致的布局问题以及调整右上角区间展示区域为响应式布局

---
 src/views/user/Login.vue |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 81546d3..22d89e3 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -49,6 +49,10 @@
         </a-button>
       </a-form-item>
 
+      <a-form-model-item style="color: red">
+        瀵嗙骇锛氬唴閮�&nbsp;&nbsp;&nbsp;&nbsp;璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭�
+      </a-form-model-item>
+
     </a-form-model>
 
     <!--<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>-->
@@ -57,6 +61,7 @@
       @success="loginSelectOk"
     ></login-select-tenant>
     <!--<third-login ref="thirdLogin"></third-login>-->
+    <user-password ref="userPassword"/>
   </div>
 </template>
 
@@ -73,9 +78,11 @@
 import LoginPhone from './LoginPhone'
 import store from '@/store'
 import { getAction } from '../../api/manage'
+import UserPassword from '../../components/tools/UserPassword'
 
 export default {
   components: {
+    UserPassword,
     LoginSelectTenant,
     TwoStepCaptcha,
     // ThirdLogin,
@@ -138,7 +145,10 @@
     },
     // 鐧诲綍鍚庡彴鎴愬姛
     requestSuccess(loginResult) {
-      this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
+      // this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
+      //   console.log('鐧诲綍璺宠浆棣栭〉鍑洪敊,杩欎釜閿欒浠庡摢閲屾潵鐨�')
+      // })
+      this.$router.push({ path: "/dashboard/analysis" }).catch(() => {
         console.log('鐧诲綍璺宠浆棣栭〉鍑洪敊,杩欎釜閿欒浠庡摢閲屾潵鐨�')
       })
       this.$notification.success({
@@ -162,17 +172,29 @@
       // this.$refs.loginSelect.show(loginResult)
     },
     //鐧诲綍鍚庡彴澶辫触
-    requestFailed(err) {
+    requestFailed(err,username) {
       let description = ((err.response || {}).data || {}).message || err.message || "璇锋眰鍑虹幇閿欒锛岃绋嶅悗鍐嶈瘯"
-      this.$notification['error']({
-        message: '鐧诲綍澶辫触',
-        description: description,
-        duration: 4,
-      });
-      //璐︽埛瀵嗙爜鐧诲綍閿欒鍚庢洿鏂伴獙璇佺爜
-      if (this.customActiveKey === 'tab1' && description.indexOf('瀵嗙爜閿欒') > 0) {
-        this.$refs.alogin.handleChangeCheckCode()
+      if(err.code!==5001&&err.code!==5002){
+        this.$notification['error']({
+          message: '鐧诲綍澶辫触',
+          description: description,
+          duration: 4,
+        });
+      }else{
+        this.$notification['warning']({
+          message: '鎻愮ず',
+          description: description,
+          duration:1,
+          onClose:()=>{
+            console.log('err',err)
+            this.$refs.userPassword.show(username)
+          }
+        });
       }
+      //璐︽埛瀵嗙爜鐧诲綍閿欒鍚庢洿鏂伴獙璇佺爜
+      // if (this.customActiveKey === 'tab1' && description.indexOf('瀵嗙爜閿欒') > 0) {
+      //   this.$refs.alogin.handleChangeCheckCode()
+      // }
       this.loginBtn = false;
     },
     loginSelectOk() {

--
Gitblit v1.9.3