From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 1311274..441ce6d 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -40,7 +40,6 @@
</el-form-item>
<el-form-item>
- <el-button @click="ChandleLogin">娴嬭瘯鍗曠偣鐧诲綍</el-button>
<el-button class="login-submit"
size="small"
type="primary"
@@ -75,7 +74,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";
@@ -299,18 +298,15 @@
},
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'});
+ this.$router.push({ path: '/sso' });
},
closehandle() {
removeToken()
},
delok() {
- //鐐瑰嚮鍙栨秷鎴栬�厁 娓呴櫎token鍏抽棴寮圭獥 娓呴櫎token鍚庝細鑷姩閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅 杩欓噷娌℃湁閲嶆柊璋冪敤鏂规硶锛屽洜涓轰笅闈㈤�昏緫鏈夌偣缁曪紝鎬曢噸鏂版帀鏈塨ug鐩存帴娓呴櫎token閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅
+ //鐐瑰嚮鍙栨秷鎴栬�厁 娓呴櫎token鍏抽棴寮圭獥 娓呴櫎token鍚庝細鑷姩閲嶆柊鑾峰彇鐢ㄦ埛淇℃伅
this.dialogFormVisible = false;
removeToken()
},
@@ -349,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