From 1707976c2f30199565c2ddbea0e2c33edd4688a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 九月 2023 09:11:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 51e4454..f5e40d6 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -75,7 +75,7 @@
import {mapGetters} from "vuex";
import {info} from "@/api/system/tenant";
import {getTopUrl} from "@/util/util";
-import {oaSsos, updatePassword} from "@/api/system/user.js"
+import { updatePassword} from "@/api/system/user.js"
import {removeToken} from "@/util/auth";
import md5 from "js-md5";
@@ -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,16 +300,13 @@
props: [],
methods: {
ChandleLogin() {
- this.$store.dispatch("LoginBySso").then((res) => {
- console.log('res', res)
- this.$router.push({path: this.tagWel.value});
- })
+ this.$router.push({ path: '/sso' });
},
closehandle() {
removeToken()
},
delok() {
- //鐐瑰嚮鍙栨秷鎴栬�厁 娓呴櫎token鍏抽棴寮圭獥 娓呴櫎token鍚庝細鑷姩閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅 杩欓噷娌℃湁閲嶆柊璋冪敤鏂规硶锛屽洜涓轰笅闈㈤�昏緫鏈夌偣缁曪紝鎬曢噸鏂版帀鏈塨ug鐩存帴娓呴櫎token閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅
+ //鐐瑰嚮鍙栨秷鎴栬�厁 娓呴櫎token鍏抽棴寮圭獥 娓呴櫎token鍚庝細鑷姩閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅
this.dialogFormVisible = false;
removeToken()
},
@@ -350,7 +345,6 @@
},
handleLogin: function () {
- debugger
this.userInfo = this.$store.state.upadatastatus
localStorage.setItem('username', this.loginForm.username)
this.$refs.loginForm.validate(valid => {
--
Gitblit v1.9.3