diff --git a/src/api/system/user.js b/src/api/system/user.js index 095d17d..7cba815 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -8,10 +8,11 @@ export function save(data) { }) } -export function listuser() { +export function listuser(params) { return request({ url: '/api/admin/admin', - method: 'get' + method: 'get', + params:params }) } @@ -30,4 +31,3 @@ export function setRoles(data) { data }) } - diff --git a/src/api/user.js b/src/api/user.js index e12d073..ba40eb1 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -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) { return request({ url: '/api/admin/auth/me', diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 2695834..59b28da 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -9,7 +9,6 @@ - 退出 diff --git a/src/settings.js b/src/settings.js index bcea8ab..0c82169 100644 --- a/src/settings.js +++ b/src/settings.js @@ -12,5 +12,5 @@ module.exports = { * @type {boolean} true | false * @description Whether show the logo in sidebar */ - sidebarLogo: true + sidebarLogo: false } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c288974..383c7d7 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,7 +1,8 @@ import { login, logout, - getInfo + getInfo, + loginOss } from '@/api/user' import { getToken, @@ -42,6 +43,34 @@ const mutations = { } 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 login({ commit diff --git a/src/utils/auth.js b/src/utils/auth.js index 21900ef..4c4f315 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,15 +1,24 @@ import Cookies from 'js-cookie' const TokenKey = 'XunChaYanghu_token' - -export function getToken() { - return Cookies.get(TokenKey) -} - -export function setToken(token) { - return Cookies.set(TokenKey, token) -} - -export function removeToken() { - return Cookies.remove(TokenKey) -} + +export function getToken() { + //return Cookies.get(TokenKey) + + if (Cookies.get(TokenKey)) { + return Cookies.get(TokenKey) + } else { + return sessionStorage.getItem(TokenKey); + } +} + +export function setToken(token) { + sessionStorage.setItem(TokenKey, token); + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + sessionStorage.clear(); + return Cookies.remove(TokenKey) + +} \ No newline at end of file diff --git a/src/views/login/index.vue b/src/views/login/index.vue index baea980..3f37148 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,233 +1,248 @@ - - - - - - - + + diff --git a/src/views/system/user.vue b/src/views/system/user.vue index c19fd26..09be8df 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -7,7 +7,8 @@
- +
@@ -47,6 +48,12 @@ + + @@ -61,6 +68,12 @@ + + + + + +
取 消 @@ -82,6 +95,9 @@ import { list } from "../../api/system/role.js"; + import { + listdept + } from "../../api/system/department.js"; export default { components: { LxHeader @@ -97,6 +113,7 @@ data() { return { + depts: [], roleList: [], checkAll: false, isIndeterminate: true, @@ -106,7 +123,13 @@ form: { name: "", username: "", - password: "" + password: "", + department_id: "" + }, + paginations: { + page: 1, + page_size: 15, + total: 0 }, rules: { name: [{ @@ -116,8 +139,7 @@ }, { min: 3, - max: 5, - message: '长度在 3 到 5 个字符', + message: '长度至少3位', trigger: 'blur' } ], @@ -128,22 +150,25 @@ }, { min: 3, - max: 5, - message: '长度在 3 到 5 个字符', + message: '长度至少三位', trigger: 'blur' } ], password: [{ - required: true, - message: '请输入密码', - trigger: 'blur', - trigger: 'blur' - }] + message: '请输入密码', + trigger: 'blur' + }, + { + min: 8, + message: '长度至少8位', + trigger: 'blur' + } + ] }, tableHeight: 0, //查询条件字段 searchFields: { - KeyWord: "" + keyword: "" }, tableData: [] } @@ -157,6 +182,12 @@ var topHeight = 50; //页面 头部 let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20; that.tableHeight = tableHeight; + + listdept().then(res => { + that.depts = res; + }).catch(error => { + + }); }, loadRole(callback) { list().then(response => { @@ -166,14 +197,22 @@ //reject(error) }) }, + handleCurrentChange(page) { + this.paginations.page = page; + this.load(); + }, load() { var that = this; - listuser().then(response => { + listuser({ + page: that.paginations.page, + ...this.searchFields + }).then(response => { var data = response.data; + this.paginations.total = response.total; var _rolelist = []; for (var m of data) { _rolelist = that.roleList; - m.rolelist =JSON.parse(JSON.stringify(_rolelist));//深拷贝 + m.rolelist = JSON.parse(JSON.stringify(_rolelist)); //深拷贝 var roles = m.roles; var _u_rolelist = m.rolelist; @@ -184,8 +223,8 @@ } else { mod.checked = false; } - } - console.log(_u_rolelist) + } + console.log(_u_rolelist) //break; m.rolelist = _u_rolelist; } diff --git a/vue.config.js b/vue.config.js index 9672647..4d401bb 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,7 +46,12 @@ module.exports = { //before: require('./mock/mock-server.js') proxy: { [process.env.VUE_APP_BASE_API]: { +<<<<<<< HEAD target: 'http://patrol.115.langye.net/', +======= + target: 'http://192.168.60.100:9001/', + //target: 'http://patrol.115.langye.net/', +>>>>>>> 3910d951cf1c1c2d8475c69b7255c31704ab05b0 changeOrigin: true, //配置跨域 pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''