From 433c86a379189fc5b4e59993645513781f926e27 Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Wed, 22 Dec 2021 10:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=981=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user.js | 21 +++++++++++---------- src/lang/i18n.js | 4 ++-- src/settings.js | 6 +++--- src/store/modules/user.js | 2 +- src/views/login/index.vue | 25 ++++++++++++++++++++++--- vue.config.js | 4 +++- 6 files changed, 42 insertions(+), 20 deletions(-) diff --git a/src/api/user.js b/src/api/user.js index 0521416..8252318 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,7 +1,7 @@ /* * @Date: 2020-12-14 09:07:03 - * @LastEditors: guo - * @LastEditTime: 2021-01-11 09:40:09 + * @LastEditors: Please set LastEditors + * @LastEditTime: 2021-12-06 15:14:46 * @FilePath: \basic-admin\src\api\user.js * @Description: 用户管理 & 登录用户的相关api接口定义 */ @@ -13,7 +13,8 @@ export function login(data) { userType: 1 }) return request({ - url: '/passport/login', + url: '/api/passport/login', + // url: '/passport/login', method: 'post', data: dto }) @@ -26,13 +27,13 @@ export function logout() { }) } // 获取当前登录的用户信息 -export function getUserInfo(data) { - return request({ - url: '/passport/getLoginUser', - method: 'post', - data - }) -} +// export function getUserInfo(data) { +// return request({ +// url: '/passport/getLoginUser', +// method: 'post', +// data +// }) +// } // 修改当前用户密码 export function editUserPW(data) { diff --git a/src/lang/i18n.js b/src/lang/i18n.js index 3c42cd6..ce160e8 100644 --- a/src/lang/i18n.js +++ b/src/lang/i18n.js @@ -1,7 +1,7 @@ export default { title: { - en: 'ARI MES', - zh: '中建材自动化智能制造执行系统' + en: 'ARI WMS', + zh: '中建材自动化智能仓库管理系统' }, btn: { start: { diff --git a/src/settings.js b/src/settings.js index ca06c49..0fa3fd1 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,13 +1,13 @@ /* * @Date: 2020-12-14 09:07:03 - * @LastEditors: gtz - * @LastEditTime: 2021-03-08 11:52:17 + * @LastEditors: Please set LastEditors + * @LastEditTime: 2021-12-06 14:24:30 * @FilePath: \basic-admin\src\settings.js * @Description: */ module.exports = { - title: 'ARI MES', + title: 'ARI WMS', /** * @type {boolean} true | false diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 98ab5e1..6bdfb03 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -42,7 +42,7 @@ const actions = { login({ commit }, userInfo) { const { username, password } = userInfo return new Promise((resolve, reject) => { - login({ mobile: username.trim(), password: password }).then(res => { + login({ mobile: String(username).trim(), password }).then(res => { console.log(res) if (res.code === 0) { const { token, name } = res.data diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 85c7327..eec4c6a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -102,8 +102,13 @@ export default { } return { loginForm: { - username: '13588441519', - password: '123abc.' + username: 13588441519, + password: 123456, + // password: '123abc.' + mobile: 13588441519, + oauthCode: 13588441519, + openId: 13588441519, + wechatAppId: 13588441519 }, loginRules: { username: [{ required: true, trigger: 'blur', validator: validateUsername }], @@ -133,6 +138,7 @@ export default { // window.addEventListener('storage', this.afterQRScan) }, mounted() { + // 自动获取焦点 if (this.loginForm.username === '') { this.$refs.username.focus() } else if (this.loginForm.password === '') { @@ -146,6 +152,7 @@ export default { // window.removeEventListener('storage', this.afterQRScan) }, methods: { + // 监听用户键盘输入 checkCapslock(e) { const { key } = e this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z') @@ -162,12 +169,24 @@ export default { }, handleLogin() { this.$refs.loginForm.validate(valid => { + // 自定义登陆验证，如符合验证console.log输出true console.log(valid) console.log(this.redirect, this.$route) if (valid) { 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) - .then(() => { + .then(res => { + console.log(res) console.log(this.redirect, this.otherQuery) this.$router.push({ path: this.redirect || '/', query: this.otherQuery }) this.loading = false diff --git a/vue.config.js b/vue.config.js index adf54d5..d760c0c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,7 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/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.165:8080', // target: 'http://192.168.43.105:8080', @@ -72,6 +73,7 @@ module.exports = { // } }, '/spc': { + // target: 'http://192.168.0.180:8080', target: 'http://58.210.206.230:8000', // target: 'http://192.168.0.187:8080', // target: 'http://192.168.43.105:8080',