diff --git a/src/api/login.js b/src/api/login.js index 587c44d..255d79b 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -28,6 +28,23 @@ export function phoneLogin(parameter) { }) } +// 管理员账号密码登录 +export function companyAdminLogin(parameter) { + return axios({ + url: '/companyManager/login', + method: 'post', + data: parameter + }) +} +// 管理员手机号登录 +export function companyAdminPhoneLogin(parameter) { + return axios({ + url: '/companyManager/smsLogin', + method: 'post', + data: parameter + }) +} + export function getSmsCaptcha(parameter) { return axios({ url: api.SendSms, diff --git a/src/config/router.config.js b/src/config/router.config.js index 1061392..ca77bba 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -382,6 +382,7 @@ export const routerData = [ id: '8' }, + // { // redirect: null, // path: '/dataDownload/DataDownload', @@ -502,4 +503,19 @@ export const routerData = [ name: 'problem-collection-detail-list', id: '15' }, + + { + redirect: null, + path: '/companyUserList/CompanyUserList', + component: 'companyUserList/CompanyUserList', + route: '1', + meta: { + icon: 'team', // 菜单前图标 + componentName: 'CompanyUserList', + keepAlive: false, + title: '人员信息' // 菜单名称 + }, + name: 'company-user-list', + id: '16' + }, ] diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 512c845..a9f96bc 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import { login, logout, phoneLogin, thirdLogin } from '@/api/login' +import { login, logout, phoneLogin, thirdLogin,companyAdminLogin,companyAdminPhoneLogin } from '@/api/login' import { ACCESS_TOKEN, USER_NAME, @@ -127,6 +127,64 @@ const user = { }) }) }, + // 管理员账号密码登录 + CompanyAdminLogin({ commit }, userInfo){ + return new Promise((resolve, reject) => { + companyAdminLogin(userInfo).then(response => { + if (response.code == '200') { + // 初次登录需要跳转至修改密码，不存用户信息 + if (response.message === 'updatePassword') { + resolve(response) + } else { + const result = response.result + const userInfo = result.userInfo + Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) + commit('SET_TOKEN', result.token) + commit('SET_INFO', userInfo) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) + commit('SET_AVATAR', userInfo.avatar) + resolve(response) + } + } else { + reject(response) + } + }).catch(error => { + reject(error) + }) + }) + }, + // 管理员手机验证码登录 + CompanyAdminPhoneLogin({ commit }, userInfo) { + return new Promise((resolve, reject) => { + companyAdminPhoneLogin(userInfo).then(response => { + if (response.code == '200') { + // 初次登录需要跳转至修改密码，不存用户信息 + if (response.message === 'updatePassword') { + resolve(response) + } else { + const result = response.result + const userInfo = result.userInfo + Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) + commit('SET_TOKEN', result.token) + commit('SET_INFO', userInfo) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) + commit('SET_AVATAR', userInfo.avatar) + resolve(response) + } + } else { + reject(response) + } + }).catch(error => { + reject(error) + }) + }) + }, /** * 初次手机号登录，修改密码后再存用户信息 * @param commit diff --git a/src/views/companyUserList/CompanyUserList.vue b/src/views/companyUserList/CompanyUserList.vue new file mode 100644 index 0000000..b1ef1b6 --- /dev/null +++ b/src/views/companyUserList/CompanyUserList.vue @@ -0,0 +1,122 @@ + + + \ No newline at end of file diff --git a/src/views/companyUserList/modules/CompanyUserModal.vue b/src/views/companyUserList/modules/CompanyUserModal.vue new file mode 100644 index 0000000..c9e4c10 --- /dev/null +++ b/src/views/companyUserList/modules/CompanyUserModal.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 2ebf989..6923384 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -126,8 +126,9 @@ + - +
注册
 @@ -139,33 +140,45 @@ - + 忘记密码 + + + +
+ +
+ +