From ea2e0a63ef8a43ee554cd940c08172fe9522bc87 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/page/login/userlogin.vue |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index af14bc8..b08bc18 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -8,7 +8,7 @@
              status-icon
     >
       <el-form-item prop="selectInput">
-        <el-select v-model="loginForm.value" placeholder="璇烽�夋嫨缁勭粐" style="width: 326px" @change="selectchange">
+        <el-select v-model="loginForm.tenantId" placeholder="璇烽�夋嫨绉熸埛" style="width: 100%" @change="selectchange">
           <i slot="prefix" class="el-icon-s-operation"/>
           <el-option
             v-for="(item,index) in loginForm.region"
@@ -67,7 +67,6 @@
     </el-dialog>
   </div>
 
-
 </template>
 
 <script>
@@ -89,6 +88,14 @@
         newPassword: '',
         newPassword1: '',
       },
+      loginRules:{
+        username:[
+          { required: true, message: '璇疯緭鍏ヨ处鍙�', trigger: 'blur' }
+        ],
+        password: [
+          { required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' }
+        ],
+      },
       rules: {
         oldPassword: [
           { required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur' }
@@ -102,15 +109,15 @@
       },
       loginForm: {
         //绉熸埛ID
-        tenantId: "000000",
+        tenantId: "",
         //閮ㄩ棬ID
         deptId: "",
         //瑙掕壊ID
         roleId: "",
         //鐢ㄦ埛鍚�
-        username: "admin",
+        username: "",
         //瀵嗙爜
-        password: "admin",
+        password: "",
         selectInput: '',
         //涓嬫媺input鏁版嵁
         value: '绠＄悊缁�',
@@ -126,7 +133,7 @@
       },
       value: {
         selectInput: [
-          {required: true, message: "璇烽�夋嫨缁勭粐", trigger: "blur"}
+          {required: true, message: "璇烽�夋嫨绉熸埛", trigger: "blur"}
         ],
         username: [
           {required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur"}
@@ -155,6 +162,7 @@
     //鍦╩ounted鑾峰彇棣栭〉涓嬫媺鑿滃崟鏁版嵁
     this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
       if (res.data.code == 200) {
+        this.loginForm.tenantId = res.data.data[0].TENANT_ID;
         this.loginForm.region = res.data.data
       }
     })
@@ -184,7 +192,6 @@
   },
   props: [],
   methods: {
-    // 杩欎釜鍏跺疄璺熶笅闈elok涓�涓晥鏋滐紝鎬曚笉瀹炵幇鍐欎簡涓ゆ,
     closehandle(){
       removeToken()
     },
@@ -229,7 +236,7 @@
     },
     handleLogin: function () {
       this.userInfo = this.$store.state.upadatastatus
-      console.log(this.userInfo)
+      localStorage.setItem('username',this.loginForm.username)
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           const loading = this.$loading({
@@ -261,7 +268,6 @@
                   type: "warning",
                   message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
                 })
-                // 1.5绉掑悗鎵ц 寮瑰嚭妗嗘樉绀�
                 setTimeout(()=>{
                   this.dialogFormVisible=true
                 },1500)
@@ -271,6 +277,7 @@
             //鎶婂垽鏂瘑鐮佺瓥鐣ヤ慨鏀圭殑鍊煎瓨杩涙湰鍦帮紝鐒跺悗鍐嶈矾鐢辨潈闄恓s鏂囦欢閲岄潰鑾峰彇鍐嶅仛鍒ゆ柇锛屼笉鐒跺埛鏂颁細杩涘叆棣栭〉锛堝洜涓哄湪鏈塱d鍜宼oken鐨勬儏鍐典笅锛屽埛鏂伴〉闈㈡垨鑰呰繘鍏ョ櫥褰曢〉浼氳嚜鍔ㄨ繘鍏ラ椤碉級
             //index椤甸潰涔熷彲浠ョ敤鍒拌繖涓�兼潵鍒ゆ柇鏄惁鏄秴绠¤韩浠界櫥褰曟潵鍒ゆ柇鏄惁鎻愰啋杩囨湡鏃堕棿绛�
             localStorage.setItem("updataid",JSON.stringify(this.userInfo))
+            localStorage.setItem("userId",this.userInfo.user_id)
             loading.close();
           }).catch(() => {
             loading.close();

--
Gitblit v1.10.0