From 82d09815c5efb03d448d6a5b74a5cbfe85063ebc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 16d3b52..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: '绠＄悊缁�',
@@ -155,7 +162,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 +192,6 @@
},
props: [],
methods: {
- // 杩欎釜鍏跺疄璺熶笅闈elok涓�涓晥鏋滐紝鎬曚笉瀹炵幇鍐欎簡涓ゆ,
closehandle(){
removeToken()
},
@@ -262,7 +268,6 @@
type: "warning",
message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
})
- // 1.5绉掑悗鎵ц 寮瑰嚭妗嗘樉绀�
setTimeout(()=>{
this.dialogFormVisible=true
},1500)
--
Gitblit v1.9.3