From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 51e4454..1311274 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -158,7 +158,6 @@
created() {
this.getTenant();
//杩欓噷鏄祻瑙堝櫒鐨勪竴涓猙ug锛岀獊鐒跺嚭鐜扮殑鐩墠鎵句笉鍒板師鍥狅紝鏂扮殑娴忚鍣ㄦ墦寮�姝ら」鐩�俵ocalStorage浼氬皯瀛樺偍涓�涓悕涓簊aber-permission鐨勬暟鎹紝灏戜簡杩欐潯鏁版嵁绉熸埛绠＄悊鐣岄潰浼氱己灏戝嚑涓寜閽拰鏍峰紡
- //杩樻湁涓�绉嶆儏鍐碉紝褰撴垜浠墜鍔ㄥ垹闄よ繖鏉℃暟鎹垨鑰呮竻绌簂ocalStorage鍚庯紝鍐嶅埛鏂拌繘鍏ラ〉闈㈠畠涔熶笉瀛樺偍杩欎釜鍙橀噺锛屾墍浠ユ垜灏卞湪杩欏啓姝讳簡瀛樺偍锛岀洰鍓嶆晥鏋滄病鏈夐棶棰�
localStorage.setItem("saber-permission", JSON.stringify({
"dataType": "object", "content": {
"flow_model_create": true,
@@ -268,7 +267,6 @@
}))
},
mounted() {
- //鍦╩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;
@@ -302,10 +300,11 @@
props: [],
methods: {
ChandleLogin() {
- this.$store.dispatch("LoginBySso").then((res) => {
- console.log('res', res)
- this.$router.push({path: this.tagWel.value});
- })
+ // this.$store.dispatch("LoginBySso").then((res) => {
+ // console.log('res', res)
+ // this.$router.push({path: this.tagWel.value});
+ // })
+ this.$router.push({path:'/sso'});
},
closehandle() {
removeToken()
--
Gitblit v1.9.3