From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/login.vue | 105 +++++++++++++++++++++++++---------------------------
1 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 107f37f..47f42aa 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -8,49 +8,29 @@
<div class="title_small">LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<el-form-item prop="username">
- <el-input
- v-model="loginForm.username"
- type="text"
- auto-complete="off"
- placeholder="璐﹀彿"
- >
+ <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="password">
- <el-input
- v-model="loginForm.password"
- type="password"
- auto-complete="off"
- placeholder="瀵嗙爜"
- @keyup.enter.native="handleLogin"
- >
+ <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="瀵嗙爜"
+ @keyup.enter.native="handleLogin" show-password>
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
- <el-input
- v-model="loginForm.code"
- auto-complete="off"
- placeholder="楠岃瘉鐮�"
- style="width: 63%"
- @keyup.enter.native="handleLogin"
- >
- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
- </el-input>
- <div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img"/>
- </div>
- </el-form-item>
+<!-- <el-form-item prop="code" v-if="captchaEnabled">-->
+<!-- <el-input v-model="loginForm.code" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%"-->
+<!-- @keyup.enter.native="handleLogin">-->
+<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
+<!-- </el-input>-->
+<!-- <div class="login-code">-->
+<!-- <img :src="codeUrl" @click="getCode" class="login-code-img" />-->
+<!-- </div>-->
+<!-- </el-form-item>-->
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
<el-form-item style="width:100%;">
- <el-button
- :loading="loading"
- size="medium"
- type="primary"
- style="width:100%;"
- @click.native.prevent="handleLogin"
- >
+ <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+ @click.native.prevent="handleLogin">
<span v-if="!loading">鐧� 褰�</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
@@ -58,17 +38,18 @@
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
+ <el-button v-if="true" type="primary" plain @click="goLogin">闆嗗洟闆嗘垚鐧诲綍</el-button>
</el-form>
</div>
<!-- 搴曢儴 -->
-<!-- <div class="el-login-footer">-->
-<!-- <span>Copyright 漏 2018-2025 ruoyi.vip All Rights Reserved.</span>-->
-<!-- </div>-->
+ <!-- <div class="el-login-footer">-->
+ <!-- <span>Copyright 漏 2018-2025 ruoyi.vip All Rights Reserved.</span>-->
+ <!-- </div>-->
</div>
</template>
<script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg, getSsoAuthUrl } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
@@ -78,8 +59,8 @@
return {
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "ZT-",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
@@ -103,17 +84,22 @@
},
watch: {
$route: {
- handler: function(route) {
+ handler: function (route) {
this.redirect = route.query && route.query.redirect;
},
immediate: true
}
},
created() {
- this.getCode();
+ // this.getCode();
this.getCookie();
},
methods: {
+ async goLogin() {
+ await getSsoAuthUrl().then(res => {
+ window.location.href = res.data
+ })
+ },
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
@@ -147,12 +133,12 @@
Cookies.remove('rememberMe');
}
this.$store.dispatch("Login", this.loginForm).then(() => {
- this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+ this.$router.push({ path: "/" }).catch(() => { });
}).catch(() => {
this.loading = false;
- if (this.captchaEnabled) {
- this.getCode();
- }
+ // if (this.captchaEnabled) {
+ // this.getCode();
+ // }
});
}
});
@@ -162,24 +148,26 @@
</script>
<style rel="stylesheet/scss" lang="scss">
-//.login {
-// display: flex;
-// justify-content: center;
-// align-items: center;
-// height: 100%;
-// background-image: url("../assets/images/login-background.jpg");
-// background-size: cover;
-//}
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ background-image: url("../assets/images/login-background.jpg");
+ background-size: cover;
+}
.login {
width: 100vw;
height: 100vh;
display: flex;
background-image: url("~@/assets/images/login.png");
background-size: 100% 100%;
+
.leftImg {
width: calc(100% - 500px);
height: 100%;
overflow: hidden;
+
img {
width: 100%;
min-height: 100%;
@@ -193,6 +181,7 @@
align-items: center;
flex-direction: column;
justify-content: center;
+
.title_big {
color: #004EA2;
font-size: 40px;
@@ -203,30 +192,37 @@
color: #004EA2;
font-size: 24px;
}
+
.login-form {
border-radius: 6px;
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
+
.el-input {
height: 38px;
+
input {
height: 38px;
}
}
+
.input-icon {
height: 39px;
width: 14px;
margin-left: 2px;
}
+
.login-code {
width: 33%;
height: 38px;
float: right;
+
img {
cursor: pointer;
vertical-align: middle;
}
+
.login-code-img {
height: 38px;
}
@@ -234,6 +230,7 @@
}
}
}
+
.el-login-footer {
height: 40px;
line-height: 40px;
--
Gitblit v1.9.3