ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update login page

Browse Source
木子李·De 3 years ago
parent 15b8360a88
commit 081c2a9d9a
4 changed files with 117 additions and 118 deletions
Show Stats Download Patch File Download Diff File

13
report-ui/src/api/login.js
Unescape Escape View File

@ -1,9 +1,8 @@
import request from './axios'
export function login (data) {
console.log(data)
return request({
url: '/login',
url: 'accessUser/login',
method: 'post',
data
})
@ -11,7 +10,7 @@ export function login (data) {
export function logout () {
return request({
url: '/accessUser/logout',
url: 'accessUser/logout',
method: 'post'
})
}
@ -22,11 +21,3 @@ export const reqUpdatePassword = data => request({
method: 'post',
data: data
})
export function queryForCodeSelect (params = {}) {
return request({
url: '/auth-service/dict/queryForCodeSelect',
method: 'post',
data: params
})
}

46
report-ui/src/mixins/access.js
Unescape Escape View File

@ -6,9 +6,9 @@ export default {
}
},
computed: {
username: function(){
var username = getItem('username')
return username
operator: function () {
var operator = getItem('loginName')
return operator
},
getUser: function () {
// var user = getItem('user');
@ -19,21 +19,6 @@ export default {
return {};
}
},
isAdmin() {
if (this.getUser == null) {
return false
}
return this.getUser.userId === 1
},
opLoginName() {
return this.getUser == null ? '' : this.getUser.userName
},
opNikeName() {
return this.getUser == null ? '' : this.getUser.nikeName
},
opUserType() {
return this.getUser == null ? '' : this.getUser.userType
},
opAuthorities () {
return this.getUser == null ? [] : this.getUser.authorityWithOrgIds
}
@ -50,9 +35,6 @@ export default {
if (this.opAuthorities == null) {
return false
}
if(this.isAdmin){
return true;
}
if (permissionStr && permissionStr.indexOf('|') !== -1) {
let flag = false
let arr = permissionStr.split('|')
@ -92,27 +74,5 @@ export default {
return result
}
},
//从所有字典中，取某个字典的列表
getDict(dictname){
var basecode = JSON.parse(localStorage.getItem('queryForCodeSelect'));
var dictList = basecode[dictname]
return dictList;
},
//从某个字典的列表，获取某个字典对象
getDictCode(dictname, codeValue , value='value'){
//如果 codeValue传过来的是字符串 all 则字典数组返回
var dictList = this.getDict(dictname);
for (var i = 0; i < dictList.length; i++) {
var codeItem = dictList[i]
if(codeItem[value] == codeValue){
return codeItem;
}
if(codeValue =='all'){
return dictList
}
}
return {};
},
}
}

18
report-ui/src/views/layout/components/Navbar.vue
Unescape Escape View File

@ -1,17 +1,23 @@
<template>
<div>
<el-menu class="navbar" mode="horizontal">
<hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container" />
<el-menu class="navbar"
mode="horizontal">
<hamburger :toggle-click="toggleSideBar"
:is-active="sidebar.opened"
class="hamburger-container" />
<breadcrumb />
<el-dropdown class="avatar-container" trigger="click">
<el-dropdown class="avatar-container"
trigger="click">
<div class="avatar-wrapper">
<i class="icon iconfont iconyonghu user" />
<span class="user-name">{{ username }}</span>
<span class="user-name">{{ operator }}</span>
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-menu slot="dropdown"
class="user-dropdown">
<el-dropdown-item divided>
<span style="display:block;" @click="logout">注销登录</span>
<span style="display:block;"
@click="logout">注销登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>

84
report-ui/src/views/login.vue
Unescape Escape View File

@ -8,11 +8,20 @@
<div class="login_container">
<!-- 顶部logo -->
<div class="login_title">
<img src="@/assets/images/home-logo.png" alt="logo" />
<img src="@/assets/images/home-logo.png"
alt="logo" />
</div>
<div class="login_contant">
<img src="@/assets/images/login.png" alt="image" class="login_img" />
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login_form" autocomplete="on" label-position="left" @keyup.enter.native="handleLogin">
<img src="@/assets/images/login.png"
alt="image"
class="login_img" />
<el-form ref="loginForm"
:model="loginForm"
:rules="loginRules"
class="login_form"
autocomplete="on"
label-position="left"
@keyup.enter.native="handleLogin">
<div class="title_container">
<h3 class="title">
HELLO,
@ -27,17 +36,42 @@
<b />
<div>
<p>用户名</p>
<el-form-item prop="username">
<el-input ref="username" v-model="loginForm.username" placeholder="用户名" name="username" type="text" tabindex="1" autocomplete="on" @focus="setTop('0')" @change="getPsw" />
<el-form-item prop="loginName">
<el-input ref="loginName"
v-model="loginForm.loginName"
placeholder="用户名"
name="loginName"
type="text"
tabindex="1"
autocomplete="on"
@focus="setTop('0')"
@change="getPsw" />
</el-form-item>
</div>
<div>
<p>密码</p>
<input name="password" type="password" autocomplete="off" class="take" />
<el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
<input name="password"
type="password"
autocomplete="off"
class="take" />
<el-tooltip v-model="capsTooltip"
content="Caps lock is On"
placement="right"
manual>
<el-form-item prop="password">
<el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType" placeholder="用户密码" name="password" tabindex="2" autocomplete="on" @blur="capsTooltip = false" @focus="setTop('50')" @keyup.native="checkCapslock" />
<span class="show_pwd" @click="showPwd">
<el-input :key="passwordType"
ref="password"
v-model="loginForm.password"
:type="passwordType"
placeholder="用户密码"
name="password"
tabindex="2"
autocomplete="on"
@blur="capsTooltip = false"
@focus="setTop('50')"
@keyup.native="checkCapslock" />
<span class="show_pwd"
@click="showPwd">
<i class="el-icon-view" />
</span>
</el-form-item>
@ -46,15 +80,23 @@
</div>
<div class="control">
<div class="remember">
<input v-model="rememberPsw" type="checkbox" />
<input v-model="rememberPsw"
type="checkbox" />
<p>记住密码</p>
</div>
</div>
<el-button :loading="loading" type="primary" class="login_btn" @click.native.prevent="handleLogin">登录</el-button>
<el-button :loading="loading"
type="primary"
class="login_btn"
@click.native.prevent="handleLogin">登录</el-button>
</el-form>
</div>
<!-- 验证码 -->
<Verify v-if="needCaptcha" ref="verify" :captcha-type="'blockPuzzle'" :img-size="{ width: '400px', height: '200px' }" @success="verifylogin" />
<Verify v-if="needCaptcha"
ref="verify"
:captcha-type="'blockPuzzle'"
:img-size="{ width: '400px', height: '200px' }"
@success="verifylogin" />
</div>
</template>
@ -75,12 +117,12 @@ export default {
activeTop: '-50%', // 色条滑块控制
rememberPsw: false, // 记住密码选择框
loginForm: {
username: 'admin',
loginName: 'admin',
password: '123456',
verifyCode: '',
}, // 登录表单
loginRules: {
username: [{ required: true, message: '用户名必填', trigger: 'blur' }],
loginName: [{ required: true, message: '用户名必填', trigger: 'blur' }],
password: [
{ required: true, message: '用户密码必填', trigger: 'blur' },
],
@ -108,8 +150,8 @@ export default {
},
mounted () {
// 获取焦点
if (this.loginForm.username === '') {
this.$refs.username.focus()
if (this.loginForm.loginName === '') {
this.$refs.loginName.focus()
} else if (this.loginForm.password === '') {
this.$refs.password.focus()
}
@ -117,7 +159,7 @@ export default {
methods: {
// 获取存储的密码并解密
getPsw () {
const cookVal = cookies.get(`u_${this.loginForm.username}`)
const cookVal = cookies.get(`u_${this.loginForm.loginName}`)
this.loginForm.password = cookVal && Decrypt(cookVal)
},
// 滑动条块的top控制
@ -175,7 +217,7 @@ export default {
},
async loginApi () {
let obj = {
username: this.loginForm.username,
loginName: this.loginForm.loginName,
password: transPsw(this.loginForm.password),
verifyCode: '',
}
@ -184,11 +226,11 @@ export default {
this.loading = false
if (code != '200') return
setItem('token', data.token)
setItem('username', data.username)
setItem('loginName', data.loginName)
// 选中记住密码时 把密码存到cookie里,时效15天
this.rememberPsw &&
cookies.set(
`u_${this.loginForm.username}`,
`u_${this.loginForm.loginName}`,
Encrypt(this.loginForm.password),
{ expires: 15 }
)
@ -381,7 +423,7 @@ export default {
height: 14px;
}
& > input:checked::before {
content: '\2713';
content: "\2713";
background-color: #f5ab1b;
position: absolute;
top: 0;

Write Preview
Loading…
Cancel
Save