巡查-养护计划

master
lion 4 years ago
commit b9ce865244

@ -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
}) })
} }

@ -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',

@ -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>

@ -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
} }

@ -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

@ -1,15 +1,24 @@
import Cookies from 'js-cookie' 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)) {
export function setToken(token) { return Cookies.get(TokenKey)
return Cookies.set(TokenKey, token) } else {
} return sessionStorage.getItem(TokenKey);
}
export function removeToken() { }
return Cookies.remove(TokenKey)
} export function setToken(token) {
sessionStorage.setItem(TokenKey, token);
return Cookies.set(TokenKey, token)
}
export function removeToken() {
sessionStorage.clear();
return Cookies.remove(TokenKey)
}

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

@ -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;
@ -184,8 +223,8 @@
} else { } else {
mod.checked = false; mod.checked = false;
} }
} }
console.log(_u_rolelist) console.log(_u_rolelist)
//break; //break;
m.rolelist = _u_rolelist; m.rolelist = _u_rolelist;
} }

@ -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]: ''

Loading…
Cancel
Save