From 904897d888962511eb58b0dec9168983ecc1a439 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 16:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/page/login/userlogin.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 16d3b52..a8877c8 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"
@@ -40,6 +40,7 @@
       </el-form-item>
 
       <el-form-item>
+        <el-button @click="ChandleLogin">娴嬭瘯鍗曠偣鐧诲綍</el-button>
         <el-button class="login-submit"
                    size="small"
                    type="primary"
@@ -62,11 +63,10 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="delok">鍙� 娑�</el-button>
-        <el-button type="primary" @click="addok">纭� 瀹�</el-button>
+        <el-button type="primary" @click="addHandler">纭� 瀹�</el-button>
       </div>
     </el-dialog>
   </div>
-
 
 </template>
 
@@ -89,6 +89,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 +110,15 @@
       },
       loginForm: {
         //绉熸埛ID
-        tenantId: "000000",
+        tenantId: "",
         //閮ㄩ棬ID
         deptId: "",
         //瑙掕壊ID
         roleId: "",
         //鐢ㄦ埛鍚�
-        username: "admin",
+        username: "",
         //瀵嗙爜
-        password: "admin",
+        password: "",
         selectInput: '',
         //涓嬫媺input鏁版嵁
         value: '绠＄悊缁�',
@@ -155,7 +163,7 @@
     //鍦╩ounted鑾峰彇棣栭〉涓嬫媺鑿滃崟鏁版嵁
     this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
       if (res.data.code == 200) {
-        console.log(res.data.data);
+        this.loginForm.tenantId = res.data.data[0].TENANT_ID;
         this.loginForm.region = res.data.data
       }
     })
@@ -185,7 +193,9 @@
   },
   props: [],
   methods: {
-    // 杩欎釜鍏跺疄璺熶笅闈elok涓�涓晥鏋滐紝鎬曚笉瀹炵幇鍐欎簡涓ゆ,
+    ChandleLogin(){
+
+    },
     closehandle(){
       removeToken()
     },
@@ -195,7 +205,7 @@
       removeToken()
     },
     // 鐐瑰嚮纭畾淇敼瀵嗙爜
-    addok(){
+    addHandler(){
       this.dialogFormVisible = false
       updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res=>{
         console.log(res)
@@ -209,7 +219,7 @@
       })
     },
     // 缁戝畾涓嬫媺鑿滃崟鍔ㄦ�両D
-    selectchange(value) {
+    selectChange(value) {
       this.loginForm.tenantId = value
     },
     showPassword() {
@@ -262,7 +272,6 @@
                   type: "warning",
                   message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
                 })
-                // 1.5绉掑悗鎵ц 寮瑰嚭妗嗘樉绀�
                 setTimeout(()=>{
                   this.dialogFormVisible=true
                 },1500)

--
Gitblit v1.9.3