From efcf450e8e7e375ef4ffe9f421ec0d34c5378180 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:02:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/login/index.vue | 255 ++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 121 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9dee500..3076e66 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,113 +1,113 @@
<style scoped>
- .enter {
- width: 100vw;
- height: 100vh;
- display: flex;
- background-image: url("../../assets/404_images/login-form-bg.png");
- background-size: 100% 100%;
- }
-
- .left {
- width: calc(100% - 500px);
- height: 100%;
- overflow: hidden;
- }
-
- .left img {
- width: 100%;
- min-height: 100%;
- }
-
- .right {
- width: 600px;
- overflow-y: auto;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .title_big {
- color: #004EA2;
- font-size: 40px;
- margin-bottom: 8px;
- }
-
- .title_small {
- color: #004EA2;
- font-size: 24px;
- }
-
- .elform {
- margin-top: 50px;
- }
-
- .sao {
- font-size: 14px;
- color: #004EA2;
- width: 100%;
- text-align: right;
- }
+.enter {
+ width: 100vw;
+ height: 100vh;
+ display: flex;
+ background-image: url("../../assets/404_images/login-form-bg.png");
+ background-size: 100% 100%;
+}
+
+.left {
+ width: calc(100% - 500px);
+ height: 100%;
+ overflow: hidden;
+}
+
+.left img {
+ width: 100%;
+ min-height: 100%;
+}
+
+.right {
+ width: 600px;
+ overflow-y: auto;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.title_big {
+ color: #004EA2;
+ font-size: 40px;
+ margin-bottom: 8px;
+}
+
+.title_small {
+ color: #004EA2;
+ font-size: 24px;
+}
+
+.elform {
+ margin-top: 50px;
+}
+
+.sao {
+ font-size: 14px;
+ color: #004EA2;
+ width: 100%;
+ text-align: right;
+}
</style>
-
+
<style>
- .enter .el-form-item__label {
- font-size: 20px;
- color: #333;
- line-height: 48px;
- }
-
- .enter .el-form-item {
- margin-bottom: 30px;
- }
-
- .enter .el-input__inner {
- height: 48px;
- }
-
- .enter .el-button {
- background-color: #1763EB;
- color: #fff;
- border: 0;
- border-radius: 16px;
- width: 100%;
- height: 48px;
- }
-
- .enter input::-webkit-input-placeholder,
- .enter textarea::-webkit-input-placeholder {
- font-size: 14px;
- }
-
- .enter input::-moz-placeholder,
- .enter textarea::-moz-placeholder {
- font-size: 10px;
- }
-
- .enter input:-ms-input-placeholder,
- .enter textarea:-ms-input-placeholder {
- font-size: 10px;
- }
-
- .enter input:-moz-placeholder,
- .enter textarea:-moz-placeholder {
- font-size: 10px;
- }
- .copyright{
- width: 100%;
- position: relative;
- top: 140px;
- }
- .copyright p{
- padding: 2px 0px;
- font-size: 5px;
- text-align: center;
- color: lightgray;
- }
- .copyright >p:nth-child(3){
- text-decoration: underline;
- }
+.enter .el-form-item__label {
+ font-size: 20px;
+ color: #333;
+ line-height: 48px;
+}
+
+.enter .el-form-item {
+ margin-bottom: 30px;
+}
+
+.enter .el-input__inner {
+ height: 48px;
+}
+
+.enter .el-button {
+ background-color: #1763EB;
+ color: #fff;
+ border: 0;
+ border-radius: 16px;
+ width: 100%;
+ height: 48px;
+}
+
+.enter input::-webkit-input-placeholder,
+.enter textarea::-webkit-input-placeholder {
+ font-size: 14px;
+}
+
+.enter input::-moz-placeholder,
+.enter textarea::-moz-placeholder {
+ font-size: 10px;
+}
+
+.enter input:-ms-input-placeholder,
+.enter textarea:-ms-input-placeholder {
+ font-size: 10px;
+}
+
+.enter input:-moz-placeholder,
+.enter textarea:-moz-placeholder {
+ font-size: 10px;
+}
+.copyright{
+ width: 100%;
+ position: relative;
+ top: 140px;
+}
+.copyright p{
+ padding: 2px 0px;
+ font-size: 5px;
+ text-align: center;
+ color: lightgray;
+}
+.copyright >p:nth-child(3){
+ text-decoration: underline;
+}
</style>
-
+
<template>
<div class="enter">
<div class="left">
@@ -118,7 +118,7 @@
<div class="title_big">娆㈣繋鎮ㄧ櫥褰曪紒</div>
<div class="title_small">瑁呭鐢电紗LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="elform" :hide-required-asterisk="true">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username">
+ <el-form-item label="璐﹀彿" prop="username">
<el-input v-model="ruleForm.username" placeholder="璇疯緭鍏ヨ处鍙�" clearable></el-input>
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
@@ -127,7 +127,7 @@
<el-form-item style="margin-bottom: 8px;">
<el-col :span="12"><el-checkbox v-model="ruleForm.remumberme">璁颁綇瀵嗙爜</el-checkbox></el-col>
<el-col :span="12" style="text-align: right;"><el-checkbox
- v-model="ruleForm.autoenter">鑷姩鐧诲綍</el-checkbox></el-col>
+ v-model="ruleForm.autoenter">鑷姩鐧诲綍</el-checkbox></el-col>
</el-form-item>
<el-form-item style="margin-bottom: 15px;">
<el-button type="primary" @click="submitForm('ruleForm')" :loading="btnload">绔嬪嵆鐧诲綍</el-button>
@@ -135,15 +135,15 @@
</el-form>
<div class="sao">寰俊鎵爜鐧诲綍</div>
<div class="copyright">
- <p>姹熶笢閲戝叿璁惧鏈夐檺鍏徃</p>
- <p>鐗堟潈鎵�鏈塁opyright 漏锔� 2012-2021 ZTT.All Rights Reserved.</p>
- <p>[鑻廔CP澶�10047815鍙�-1]</p>
+ <!-- <p>鏈夐檺鍏徃</p>
+ <p>鐗堟潈鎵�鏈塁opyright 漏锔� </p>
+ <p>[鑻廔CP澶�10047815鍙�-1]</p> -->
</div>
</div>
</div>
</div>
</template>
-
+
<script>
import { get } from "@/api/util/requestUtil.js"
export default {
@@ -177,11 +177,11 @@
var user = JSON.parse(localStorage.getItem('user'))
if (user != null && user != undefined) {
if (this.ruleForm.remumberme==true) {
- this.ruleForm.username = user.username
- this.ruleForm.password = user.password
+ this.ruleForm.username = user.username;
+ this.ruleForm.password = user.password;
}
if (this.ruleForm.autoenter==true) {
- this.submitForm('ruleForm')
+ this.submitForm('ruleForm');
}
}
},
@@ -198,24 +198,37 @@
this.btnload = true
this.$refs[formName].validate((valid) => {
if (valid) {
- this.$store.dispatch('user/login', this.ruleForm).then(async () => {
+ this.$store.dispatch('user/login', this.ruleForm).then(async (res) => {
+ let name = "";
await get(this.$url.info).then(res => {
this.user = res.data;
+ name = res.data.name;
sessionStorage.setItem("user", JSON.stringify(res.data));
sessionStorage.setItem("flushPage",0);
})
+ localStorage.setItem('rememberme', this.ruleForm.remumberme);
+ localStorage.setItem('autoenter', this.ruleForm.autoenter);
+ if (this.ruleForm.remumberme==true||this.ruleForm.autoenter==true) {
+ localStorage.setItem("user", JSON.stringify({
+ username: this.ruleForm.username,
+ password: this.ruleForm.password,
+ name: name,
+ }));
+ }
+ this.$message.success("鐧诲綍鎴愬姛")
+ this.btnload = false
this.$router.push({ path: this.redirect || '/' })
- this.loading = false
- }).catch(() => {
- this.loading = false
+ }).catch((error) => {
+ this.$message.error(error.message)
+ this.btnload = false
})
} else {
this.btnload = false
- this.$message.error('鐧诲綍澶辫触锛�')
+ this.$message.error('璐﹀彿鎴栧瘑鐮佹湭杈撳叆锛�')
return false;
}
})
},
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3