Merge pull request '合并' (#2) from fzq into develop

Reviewed-on: #2
This commit is contained in:
朱文强 2021-12-22 10:07:47 +08:00
commit bb6925f3a2
6 changed files with 42 additions and 20 deletions

View File

@ -1,7 +1,7 @@
/* /*
* @Date: 2020-12-14 09:07:03 * @Date: 2020-12-14 09:07:03
* @LastEditors: guo * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-01-11 09:40:09 * @LastEditTime: 2021-12-06 15:14:46
* @FilePath: \basic-admin\src\api\user.js * @FilePath: \basic-admin\src\api\user.js
* @Description: 用户管理 & 登录用户的相关api接口定义 * @Description: 用户管理 & 登录用户的相关api接口定义
*/ */
@ -13,7 +13,8 @@ export function login(data) {
userType: 1 userType: 1
}) })
return request({ return request({
url: '/passport/login', url: '/api/passport/login',
// url: '/passport/login',
method: 'post', method: 'post',
data: dto data: dto
}) })
@ -26,13 +27,13 @@ export function logout() {
}) })
} }
// 获取当前登录的用户信息 // 获取当前登录的用户信息
export function getUserInfo(data) { // export function getUserInfo(data) {
return request({ // return request({
url: '/passport/getLoginUser', // url: '/passport/getLoginUser',
method: 'post', // method: 'post',
data // data
}) // })
} // }
// 修改当前用户密码 // 修改当前用户密码
export function editUserPW(data) { export function editUserPW(data) {

View File

@ -1,7 +1,7 @@
export default { export default {
title: { title: {
en: 'ARI MES', en: 'ARI WMS',
zh: '中建材自动化智能制造执行系统' zh: '中建材自动化智能仓库管理系统'
}, },
btn: { btn: {
start: { start: {

View File

@ -1,13 +1,13 @@
/* /*
* @Date: 2020-12-14 09:07:03 * @Date: 2020-12-14 09:07:03
* @LastEditors: gtz * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-03-08 11:52:17 * @LastEditTime: 2021-12-06 14:24:30
* @FilePath: \basic-admin\src\settings.js * @FilePath: \basic-admin\src\settings.js
* @Description: * @Description:
*/ */
module.exports = { module.exports = {
title: 'ARI MES', title: 'ARI WMS',
/** /**
* @type {boolean} true | false * @type {boolean} true | false

View File

@ -42,7 +42,7 @@ const actions = {
login({ commit }, userInfo) { login({ commit }, userInfo) {
const { username, password } = userInfo const { username, password } = userInfo
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login({ mobile: username.trim(), password: password }).then(res => { login({ mobile: String(username).trim(), password }).then(res => {
console.log(res) console.log(res)
if (res.code === 0) { if (res.code === 0) {
const { token, name } = res.data const { token, name } = res.data

View File

@ -102,8 +102,13 @@ export default {
} }
return { return {
loginForm: { loginForm: {
username: '13588441519', username: 13588441519,
password: '123abc.' password: 123456,
// password: '123abc.'
mobile: 13588441519,
oauthCode: 13588441519,
openId: 13588441519,
wechatAppId: 13588441519
}, },
loginRules: { loginRules: {
username: [{ required: true, trigger: 'blur', validator: validateUsername }], username: [{ required: true, trigger: 'blur', validator: validateUsername }],
@ -133,6 +138,7 @@ export default {
// window.addEventListener('storage', this.afterQRScan) // window.addEventListener('storage', this.afterQRScan)
}, },
mounted() { mounted() {
//
if (this.loginForm.username === '') { if (this.loginForm.username === '') {
this.$refs.username.focus() this.$refs.username.focus()
} else if (this.loginForm.password === '') { } else if (this.loginForm.password === '') {
@ -146,6 +152,7 @@ export default {
// window.removeEventListener('storage', this.afterQRScan) // window.removeEventListener('storage', this.afterQRScan)
}, },
methods: { methods: {
//
checkCapslock(e) { checkCapslock(e) {
const { key } = e const { key } = e
this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z') this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')
@ -162,12 +169,24 @@ export default {
}, },
handleLogin() { handleLogin() {
this.$refs.loginForm.validate(valid => { this.$refs.loginForm.validate(valid => {
// console.logtrue
console.log(valid) console.log(valid)
console.log(this.redirect, this.$route) console.log(this.redirect, this.$route)
if (valid) { if (valid) {
this.loading = true this.loading = true
// this.$store.dispatch('user/login', this.loginForm)
// .then(() => {
// console.log(this.redirect, this.otherQuery)
// this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
// this.loading = false
// })
// .catch(() => {
// this.loading = false
// })
this.$store.dispatch('user/login', this.loginForm) this.$store.dispatch('user/login', this.loginForm)
.then(() => { .then(res => {
console.log(res)
console.log(this.redirect, this.otherQuery) console.log(this.redirect, this.otherQuery)
this.$router.push({ path: this.redirect || '/', query: this.otherQuery }) this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
this.loading = false this.loading = false

View File

@ -46,7 +46,8 @@ module.exports = {
// 这里写入需要代理的api和对应的目标地址 // 这里写入需要代理的api和对应的目标地址
proxy: { proxy: {
'/api': { '/api': {
target: 'http://cigs.mes.picaiba.com', target: 'http://localhost:8080',
// target: 'http://192.168.0.198:8080',
// target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.127:8080',
// target: 'http://192.168.0.165:8080', // target: 'http://192.168.0.165:8080',
// target: 'http://192.168.43.105:8080', // target: 'http://192.168.43.105:8080',
@ -72,6 +73,7 @@ module.exports = {
// } // }
}, },
'/spc': { '/spc': {
// target: 'http://192.168.0.180:8080',
target: 'http://58.210.206.230:8000', target: 'http://58.210.206.230:8000',
// target: 'http://192.168.0.187:8080', // target: 'http://192.168.0.187:8080',
// target: 'http://192.168.43.105:8080', // target: 'http://192.168.43.105:8080',