From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分
---
src/views/login/index.vue | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ceeb1f2..25d5aa0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,24 +1,43 @@
<template>
<div class="login-container">
-
<div class="login-container-center">
-
<el-carousel
- :autoplay="false"
+ :autoplay="true"
indicator-position="outside"
height="580px"
:interval="3000"
style="width: 500px;margin-left: 20px"
>
- <el-carousel-item v-for="item in carouselArr" :key="item.title">
- <!-- <h3>{{ item }}</h3>-->
-
- <div :style="{ width:'200px',height:'300px' ,backgroundColor:item.color,margin:'95px 0px 35px 155px'}" />
+ <el-carousel-item>
+ <img src="@/assets/images/img1.png" style="margin-top: -30px">
<div class="itemLabel">
- <div class="title">{{ item.title }}</div>
- <div class="content">{{ item.content }}</div>
+ <p class="title">鏅烘収鐗╄仈</p>
+ <p class="content">鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆� 浼犻�掋�佸缁村害鍙鍖栧憟鐜�</p>
</div>
</el-carousel-item>
+ <el-carousel-item>
+ <img src="@/assets/images/img2.png" style="margin-top: -30px">
+ <div class="itemLabel">
+ <p class="title">绮剧泭鎬濈淮</p>
+ <p class="content">杩愮敤绮剧泭鎬濇兂鍜孖T绯荤粺鎶� 鏈墦閫犲伐鍘傚埗閫犲崗鍚屽钩鍙�</p>
+ </div>
+ </el-carousel-item>
+ <el-carousel-item>
+ <img src="@/assets/images/img3.png" style="margin-top: -30px">
+ <div class="itemLabel">
+ <p class="title">琛屼笟缁勪欢</p>
+ <p class="content">鍩轰簬鍒堕�犳ā鍨嬪揩閫熺伒娲诲湴 閰嶇疆瀹㈡埛涓撳睘鐨勫簲鐢ㄥ満鏅�</p>
+ </div>
+ </el-carousel-item>
+ <!-- <el-carousel-item v-for="item in carouselArr" :key="item.title">-->
+ <!-- <div :style="{ width:'200px',height:'300px' ,margin:'95px 0px 35px 155px'}">-->
+ <!-- <img :src="item.url" alt="" style="width: 200px;height: 300px">-->
+ <!-- </div>-->
+ <!-- <div class="itemLabel">-->
+ <!-- <div class="title">{{ item.title }}</div>-->
+ <!-- <div class="content">{{ item.content }}</div>-->
+ <!-- </div>-->
+ <!-- </el-carousel-item>-->
</el-carousel>
<el-form
@@ -32,7 +51,7 @@
<div class="title-container">
<div class="title_img" />
- <h3 class="title">鏂板嚡杩埗閫犱簯骞冲彴</h3>
+ <!-- <h3 class="title">鏂板嚡杩埗閫犱簯骞冲彴</h3>-->
</div>
<el-form-item prop="username">
@@ -84,7 +103,7 @@
<el-button
:loading="loading"
type="primary"
- style="width:100%;margin-bottom:30px;"
+ style="width:100%;margin-top:20px;"
@click.native.prevent="handleLogin"
>鐧诲綍
</el-button>
@@ -112,39 +131,40 @@
// } else {
// callback()
// }
- const mPattern = /^\w+$/ // 姝ｅ垯 绛変环浜嶽A-Za-z0-9_]
- if (value.length < 5) {
- callback(new Error('璐﹀彿闀垮害涓嶅皯浜庝簲浣嶏紒'))
- } else if (!mPattern.test(value)) {
- callback(new Error('璐﹀彿涓嶇鍚堣鍒欙紝鍙緭鍏ュ瓧姣嶃�佹暟瀛楀強涓嬪垝绾�'))
+ // const mPattern = /^\w+$/ // 姝ｅ垯 绛変环浜嶽A-Za-z0-9_]
+
+ if (value.length < 1) {
+ callback(new Error('璐﹀彿涓嶈兘涓虹┖锛�'))
} else {
callback()
}
+ // if (value.length < 1) {
+ // callback(new Error('璐﹀彿涓嶈兘涓虹┖锛�'))
+ // } else if (!mPattern.test(value)) {
+ // callback(new Error('璐﹀彿涓嶇鍚堣鍒欙紝鍙緭鍏ュ瓧姣嶃�佹暟瀛楀強涓嬪垝绾�'))
+ // } else {
+ // callback()
+ // }
}
const validatePassword = (rule, value, callback) => {
- if (value.length < 6) {
- callback(new Error('瀵嗙爜闀垮害涓嶅皯浜庡叚浣嶏紒'))
+ if (value.length < 1) {
+ callback(new Error('瀵嗙爜闀垮害涓嶈兘涓虹┖锛�'))
} else {
callback()
}
}
return {
loginForm: {
- username: 'Admin',
- password: '123456'
+ username: 'Admin', // Admin
+ password: '123456'// 123456
},
loginRules: {
- username: [{ required: true, trigger: 'blur', validator: validateUsername }],
- password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+ username: [{ required: true, trigger: ['blur', 'change'], validator: validateUsername }],
+ password: [{ required: true, trigger: ['blur', 'change'], validator: validatePassword }]
},
loading: false,
passwordType: 'password',
redirect: undefined,
- carouselArr: [
- { color: 'red', title: '鏅烘収鐗╄仈', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�' },
- { color: 'yellow', title: '鏅烘収鐗╄仈2', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�2' },
- { color: 'blue', title: '鏅烘収鐗╄仈3', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�3' }
- ],
focus1: false,
focus2: false
}
@@ -240,19 +260,16 @@
$bg: #2d3a4b;
$dark_gray: #889aa4;
$light_gray: #eee;
-$main_color:#42b983;
+$main_color: #42b983;
.login-container {
min-height: 100%;
width: 100%;
- background-color: $bg;
+ //background-color: $bg;
overflow: hidden;
- background: url("../../assets/images/login_bg2.jpg") no-repeat;
+ background: url("../../assets/images/login_bg.png") no-repeat;
background-size: 100% 100%;
- opacity: 0.8;
- // ::v-deep input {
- // color: #000;
- //}
+ opacity: 1;
.login-container-center {
width: 1000px;
@@ -319,10 +336,11 @@
align-items: center;
.title_img {
- background: url("../../assets/images/xkd_logo.png");
- width: 200px;
- height: 100px;
+ background: url("../../assets/images/xkd_newlogo.png") no-repeat;
+ width: 300px;
+ height: 200px;
margin: -50px 0 20px;
+ background-size: 100% 100%;
}
.title {
--
Gitblit v1.9.3