wangyifang
/
patrol-maintain-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡查-养护计划

Browse Source
master
lion 4 years ago
parent 4af3ed7c01 3910d951cf
commit b9ce865244
9 changed files with 371 additions and 266 deletions
Show Stats Download Patch File Download Diff File

6
src/api/system/user.js
Unescape View File

@ -8,10 +8,11 @@ export function save(data) {
}) })
} }
export function listuser() { export function listuser(params) {
return request({ return request({
url: '/api/admin/admin', url: '/api/admin/admin',
method: 'get' method: 'get',
params:params
}) })
} }
@ -30,4 +31,3 @@ export function setRoles(data) {
data data
}) })
} }

9
src/api/user.js
Unescape View File

@ -8,6 +8,15 @@ export function login(data) {
}) })
} }
export function loginOss(data) {
return request({
url: '/api/admin/auth/oss-login',
method: 'post',
data
})
}
export function getInfo(token) { export function getInfo(token) {
return request({ return request({
url: '/api/admin/auth/me', url: '/api/admin/auth/me',

1
src/layout/components/Sidebar/index.vue
Unescape View File

@ -9,7 +9,6 @@
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
<el-tag @click="logout()">退出</el-tag>
<hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
</div> </div>

2
src/settings.js
Unescape View File

@ -12,5 +12,5 @@ module.exports = {
* @type {boolean} true | false * @type {boolean} true | false
* @description Whether show the logo in sidebar * @description Whether show the logo in sidebar
*/ */
sidebarLogo: true sidebarLogo: false
} }

31
src/store/modules/user.js
Unescape View File

@ -1,7 +1,8 @@
import { import {
login, login,
logout, logout,
getInfo getInfo,
loginOss
} from '@/api/user' } from '@/api/user'
import { import {
getToken, getToken,
@ -42,6 +43,34 @@ const mutations = {
} }
const actions = { const actions = {
loginskip({
commit
}, userInfo) {
const {
token,
tp
} = userInfo
return new Promise((resolve, reject) => {
loginOss({
token: token,
tp: tp
}).then(response => {
//console.log(response)
const {
data
} = response;
console.log(response.access_token)
commit('SET_TOKEN', response.access_token)
setToken(response.access_token)
resolve()
}).catch(error => {
reject(error)
})
})
},
// user login // user login
login({ login({
commit commit

11
src/utils/auth.js
Unescape View File

@ -3,13 +3,22 @@ import Cookies from 'js-cookie'
const TokenKey = 'XunChaYanghu_token' const TokenKey = 'XunChaYanghu_token'
export function getToken() { export function getToken() {
return Cookies.get(TokenKey) //return Cookies.get(TokenKey)
if (Cookies.get(TokenKey)) {
return Cookies.get(TokenKey)
} else {
return sessionStorage.getItem(TokenKey);
}
} }
export function setToken(token) { export function setToken(token) {
sessionStorage.setItem(TokenKey, token);
return Cookies.set(TokenKey, token) return Cookies.set(TokenKey, token)
} }
export function removeToken() { export function removeToken() {
sessionStorage.clear();
return Cookies.remove(TokenKey) return Cookies.remove(TokenKey)
} }

359
src/views/login/index.vue
Unescape View File

@ -1,6 +1,7 @@
<template> <template>
<div class="login-container"> <div class="login-container">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
label-position="left">
<div class="title-container"> <div class="title-container">
<h3 class="title">巡查养护管理系统登录</h3> <h3 class="title">巡查养护管理系统登录</h3>
@ -10,224 +11,238 @@
<span class="svg-container"> <span class="svg-container">
<svg-icon icon-class="user" /> <svg-icon icon-class="user" />
</span> </span>
<el-input <el-input ref="username" v-model="loginForm.username" placeholder="请输入账号" name="username" type="text"
ref="username" tabindex="1" auto-complete="on" />
v-model="loginForm.username"
placeholder="请输入账号"
name="username"
type="text"
tabindex="1"
auto-complete="on"
/>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<span class="svg-container"> <span class="svg-container">
<svg-icon icon-class="password" /> <svg-icon icon-class="password" />
</span> </span>
<el-input <el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType"
:key="passwordType" placeholder="请输入密码" name="password" tabindex="2" auto-complete="on" @keyup.enter.native="handleLogin" />
ref="password" <!-- <span class="show-pwd" @click="showPwd">
v-model="loginForm.password"
:type="passwordType"
placeholder="请输入密码"
name="password"
tabindex="2"
auto-complete="on"
@keyup.enter.native="handleLogin"
/>
<span class="show-pwd" @click="showPwd">
<svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" /> <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
</span> </span> -->
</el-form-item> </el-form-item>
<el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button> <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
@click.native.prevent="handleLogin">登录</el-button>
</el-form> </el-form>
</div> </div>
</template> </template>
<script> <script>
import { validUsername } from '@/utils/validate' import {
validUsername
export default { } from '@/utils/validate'
name: 'Login',
data() { export default {
const validateUsername = (rule, value, callback) => { name: 'Login',
if (false) { data() {
callback(new Error('请正确输入登录名')) const validateUsername = (rule, value, callback) => {
} else { if (false) {
callback() callback(new Error('请正确输入登录名'))
} else {
callback()
}
} }
} const validatePassword = (rule, value, callback) => {
const validatePassword = (rule, value, callback) => { if (false) {
if (false) { callback(new Error('请正确输入密码'))
callback(new Error('请正确输入密码')) } else {
} else { callback()
callback() }
} }
} return {
return { loginForm: {
loginForm: { username: '',
username: '', password: ''
password: '' },
}, loginRules: {
loginRules: { username: [{
username: [{ required: true, trigger: 'blur', validator: validateUsername }], required: true,
password: [{ required: true, trigger: 'blur', validator: validatePassword }] trigger: 'blur',
}, validator: validateUsername
loading: false, }],
passwordType: 'password', password: [{
redirect: undefined required: true,
} trigger: 'blur',
}, validator: validatePassword
watch: { }]
$route: { },
handler: function(route) { loading: false,
this.redirect = route.query && route.query.redirect passwordType: 'password',
}, redirect: undefined
immediate: true
}
},
methods: {
showPwd() {
if (this.passwordType === 'password') {
this.passwordType = ''
} else {
this.passwordType = 'password'
} }
this.$nextTick(() => {
this.$refs.password.focus()
})
}, },
handleLogin() { watch: {
this.$refs.loginForm.validate(valid => { $route: {
if (valid) { handler: function(route) {
this.loading = true this.redirect = route.query && route.query.redirect
this.$store.dispatch('user/login', this.loginForm).then(() => { },
console.log(this.redirect) immediate: true
this.$router.push({ path: this.redirect || '/' }) }
this.loading = false },created() {
}).catch(() => { var query = this.$route.query;
this.loading = false if (query.token && query.userid && query.tp) {
this.loading = true
this.$store.dispatch('user/loginskip', {
token: query.token,
tp: query.tp
}).then(() => {
this.$router.push({
path: "/"
}) })
this.loading = false
}).catch((error) => {
console.log(error)
this.loading = false
})
}
},
methods: {
showPwd() {
if (this.passwordType === 'password') {
this.passwordType = ''
} else { } else {
console.log('error submit!!') this.passwordType = 'password'
return false
} }
}) this.$nextTick(() => {
this.$refs.password.focus()
})
},
handleLogin() {
this.$refs.loginForm.validate(valid => {
if (valid) {
this.loading = true
this.$store.dispatch('user/login', this.loginForm).then(() => {
console.log(this.redirect)
this.$router.push({
path: this.redirect || '/'
})
this.loading = false
}).catch(() => {
this.loading = false
})
} else {
console.log('error submit!!')
return false
}
})
}
} }
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
/* 修复input 背景不协调 和光标变色 */ /* 修复input 背景不协调 和光标变色 */
/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */ /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
$bg:#283443; $bg:#283443;
$light_gray:#fff; $light_gray:#fff;
$cursor: #fff; $cursor: #fff;
@supports (-webkit-mask: none) and (not (cater-color: $cursor)) { @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
.login-container .el-input input { .login-container .el-input input {
color: $cursor; color: $cursor;
}
} }
}
/* reset element-ui css */
.login-container {
.el-input {
display: inline-block;
height: 47px;
width: 85%;
input {
background: transparent;
border: 0px;
-webkit-appearance: none;
border-radius: 0px;
padding: 12px 5px 12px 15px;
color: $light_gray;
height: 47px;
caret-color: $cursor;
&:-webkit-autofill { /* reset element-ui css */
box-shadow: 0 0 0px 1000px $bg inset !important; .login-container {
-webkit-text-fill-color: $cursor !important; .el-input {
display: inline-block;
height: 47px;
width: 85%;
input {
background: transparent;
border: 0px;
-webkit-appearance: none;
border-radius: 0px;
padding: 12px 5px 12px 15px;
color: $light_gray;
height: 47px;
caret-color: $cursor;
&:-webkit-autofill {
box-shadow: 0 0 0px 1000px $bg inset !important;
-webkit-text-fill-color: $cursor !important;
}
} }
} }
}
.el-form-item { .el-form-item {
border: 1px solid rgba(255, 255, 255, 0.1); border: 1px solid rgba(255, 255, 255, 0.1);
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
border-radius: 5px; border-radius: 5px;
color: #454545; color: #454545;
}
} }
}
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
$bg:#2d3a4b; $bg:#2d3a4b;
$dark_gray:#889aa4; $dark_gray:#889aa4;
$light_gray:#eee; $light_gray:#eee;
.login-container { .login-container {
min-height: 100%; min-height: 100%;
width: 100%; width: 100%;
background-color: $bg; background-color: $bg;
overflow: hidden;
.login-form {
position: relative;
width: 520px;
max-width: 100%;
padding: 160px 35px 0;
margin: 0 auto;
overflow: hidden; overflow: hidden;
}
.tips { .login-form {
font-size: 14px; position: relative;
color: #fff; width: 520px;
margin-bottom: 10px; max-width: 100%;
padding: 160px 35px 0;
margin: 0 auto;
overflow: hidden;
}
.tips {
font-size: 14px;
color: #fff;
margin-bottom: 10px;
span { span {
&:first-of-type { &:first-of-type {
margin-right: 16px; margin-right: 16px;
}
} }
} }
}
.svg-container { .svg-container {
padding: 6px 5px 6px 15px; padding: 6px 5px 6px 15px;
color: $dark_gray; color: $dark_gray;
vertical-align: middle; vertical-align: middle;
width: 30px; width: 30px;
display: inline-block; display: inline-block;
} }
.title-container { .title-container {
position: relative; position: relative;
.title { .title {
font-size: 26px; font-size: 26px;
color: $light_gray; color: $light_gray;
margin: 0px auto 40px auto; margin: 0px auto 40px auto;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
}
} }
}
.show-pwd { .show-pwd {
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 7px; top: 7px;
font-size: 16px; font-size: 16px;
color: $dark_gray; color: $dark_gray;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
}
} }
}
</style> </style>

67
src/views/system/user.vue
Unescape View File

@ -7,7 +7,8 @@
<div slot="content"></div> <div slot="content"></div>
<slot> <slot>
<div> <div>
<Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.Name" placeholder="关键字搜索" /> <Input style="width: 200px; margin-right: 10px" v-model.number="searchFields.keyword"
placeholder="关键字搜索" />
<Button type="primary" @click="load" style="margin-left: 10px">查询</Button> <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
<Button type="primary" @click="edit()" style="margin-left: 10px">新增用户</Button> <Button type="primary" @click="edit()" style="margin-left: 10px">新增用户</Button>
</div> </div>
@ -47,6 +48,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination">
<el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
:page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
</el-pagination>
</div>
</div> </div>
<el-dialog title="用户编辑" :visible.sync="dialogFormVisible" width="30%"> <el-dialog title="用户编辑" :visible.sync="dialogFormVisible" width="30%">
<el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth"> <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
@ -61,6 +68,12 @@
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model="form.password" type="password" autocomplete="off"></el-input> <el-input v-model="form.password" type="password" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="department_id">
<el-select v-model="form.department_id" placeholder="请选择部门">
<el-option v-for="item in depts" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="resetForm('form')">取 消</el-button> <el-button @click="resetForm('form')">取 消</el-button>
@ -82,6 +95,9 @@
import { import {
list list
} from "../../api/system/role.js"; } from "../../api/system/role.js";
import {
listdept
} from "../../api/system/department.js";
export default { export default {
components: { components: {
LxHeader LxHeader
@ -97,6 +113,7 @@
data() { data() {
return { return {
depts: [],
roleList: [], roleList: [],
checkAll: false, checkAll: false,
isIndeterminate: true, isIndeterminate: true,
@ -106,7 +123,13 @@
form: { form: {
name: "", name: "",
username: "", username: "",
password: "" password: "",
department_id: ""
},
paginations: {
page: 1,
page_size: 15,
total: 0
}, },
rules: { rules: {
name: [{ name: [{
@ -116,8 +139,7 @@
}, },
{ {
min: 3, min: 3,
max: 5, message: '长度至少3位',
message: '长度在 3 到 5 个字符',
trigger: 'blur' trigger: 'blur'
} }
], ],
@ -128,22 +150,25 @@
}, },
{ {
min: 3, min: 3,
max: 5, message: '长度至少三位',
message: '长度在 3 到 5 个字符',
trigger: 'blur' trigger: 'blur'
} }
], ],
password: [{ password: [{
required: true, message: '请输入密码',
message: '请输入密码', trigger: 'blur'
trigger: 'blur', },
trigger: 'blur' {
}] min: 8,
message: '长度至少8位',
trigger: 'blur'
}
]
}, },
tableHeight: 0, tableHeight: 0,
//查询条件字段 //查询条件字段
searchFields: { searchFields: {
KeyWord: "" keyword: ""
}, },
tableData: [] tableData: []
} }
@ -157,6 +182,12 @@
var topHeight = 50; //页面 头部 var topHeight = 50; //页面 头部
let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
that.tableHeight = tableHeight; that.tableHeight = tableHeight;
listdept().then(res => {
that.depts = res;
}).catch(error => {
});
}, },
loadRole(callback) { loadRole(callback) {
list().then(response => { list().then(response => {
@ -166,14 +197,22 @@
//reject(error) //reject(error)
}) })
}, },
handleCurrentChange(page) {
this.paginations.page = page;
this.load();
},
load() { load() {
var that = this; var that = this;
listuser().then(response => { listuser({
page: that.paginations.page,
...this.searchFields
}).then(response => {
var data = response.data; var data = response.data;
this.paginations.total = response.total;
var _rolelist = []; var _rolelist = [];
for (var m of data) { for (var m of data) {
_rolelist = that.roleList; _rolelist = that.roleList;
m.rolelist =JSON.parse(JSON.stringify(_rolelist));//深拷贝 m.rolelist = JSON.parse(JSON.stringify(_rolelist)); //深拷贝
var roles = m.roles; var roles = m.roles;
var _u_rolelist = m.rolelist; var _u_rolelist = m.rolelist;

5
vue.config.js
Unescape View File

@ -46,7 +46,12 @@ module.exports = {
//before: require('./mock/mock-server.js') //before: require('./mock/mock-server.js')
proxy: { proxy: {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
<<<<<<< HEAD
target: 'http://patrol.115.langye.net/', target: 'http://patrol.115.langye.net/',
=======
target: 'http://192.168.60.100:9001/',
//target: 'http://patrol.115.langye.net/',
>>>>>>> 3910d951cf1c1c2d8475c69b7255c31704ab05b0
changeOrigin: true, //配置跨域 changeOrigin: true, //配置跨域
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save