master
lion 2 years ago
parent e5cd70fd9f
commit 49b99a9baf

@ -2,15 +2,15 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = http://192.168.60.99:9004/ #VUE_APP_BASE_API = http://192.168.60.99:9004/
VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file #VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
VUE_APP_OA_URL = http://192.168.60.18:2021 #VUE_APP_OA_URL = http://192.168.60.18:2021
VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' #VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'

@ -8,6 +8,15 @@ export function login(data) {
}) })
} }
export function loginOss(data) {
return request({
url: '/api/admin/auth/oss-login',
method: 'post',
data,
noloading:true
})
}
export function getInfo(token) { export function getInfo(token) {
return request({ return request({
url: '/api/admin/auth/me', url: '/api/admin/auth/me',

@ -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,36 @@ const mutations = {
} }
const actions = { const actions = {
loginskip({
commit
}, userInfo) {
const {
token,
tp,
loginId
} = userInfo
return new Promise((resolve, reject) => {
loginOss({
token: token,
tp: tp,
loginId: loginId
}).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
@ -104,7 +135,8 @@ const actions = {
commit, commit,
state state
}) { }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log("logout",state.token)
logout(state.token).then(() => { logout(state.token).then(() => {
removeToken() // must remove token first removeToken() // must remove token first
resetRouter() resetRouter()

@ -46,87 +46,111 @@
const defaultSettings = require('../../../src/settings.js') const defaultSettings = require('../../../src/settings.js')
export default { export default {
name: 'Login', name: 'Login',
data() { data() {
const validateUsername = (rule, value, callback) => { const validateUsername = (rule, value, callback) => {
if (!validUsername(value)) { if (false) {
callback(new Error('请正确输入登录名')) callback(new Error('请正确输入登录名'))
} else { } else {
callback() callback()
} }
} }
const validatePassword = (rule, value, callback) => { const validatePassword = (rule, value, callback) => {
if (value.length < 6) { if (false) {
callback(new Error('密码输入错误')) callback(new Error('请正确输入密码'))
} else { } else {
callback() callback()
} }
} }
return { return {
title: "", showLogin: false,
loginForm: { loginForm: {
username: '', username: '',
password: '' password: ''
}, },
loginRules: { loginRules: {
username: [{ username: [{
required: true, required: true,
trigger: 'blur', trigger: 'blur',
validator: validateUsername validator: validateUsername
}], }],
password: [{ password: [{
required: true, required: true,
trigger: 'blur', trigger: 'blur',
validator: validatePassword validator: validatePassword
}] }]
}, },
loading: false, loading: false,
passwordType: 'password', passwordType: 'password',
redirect: undefined redirect: undefined
} }
}, },
watch: { beforeCreate() {
$route: {
handler: function(route) { },
this.redirect = route.query && route.query.redirect created() {
}, this.title = defaultSettings.title;
immediate: true var query = this.$route.query;
} if (query.tp) {
}, this.showLogin = false;
created() { } else {
this.title = defaultSettings.title; this.showLogin = true;
}, }
methods: { if (query.token && query.userid && query.tp) {
showPwd() { this.loading = true
if (this.passwordType === 'password') { this.$store.dispatch('user/loginskip', {
this.passwordType = '' token: query.token,
} else { tp: query.tp,
this.passwordType = 'password' loginId: query.loginId
} }).then(() => {
this.$nextTick(() => { this.$router.push({
this.$refs.password.focus() path: "/"
}) })
this.loading = false
}).catch((error) => {
console.log(error)
this.loading = false
})
}
},
watch: {
$route: {
handler: function(route) {
this.redirect = route.query && route.query.redirect
},
immediate: true
}
},
methods: {
showPwd() {
if (this.passwordType === 'password') {
this.passwordType = ''
} else {
this.passwordType = 'password'
}
this.$nextTick(() => {
this.$refs.password.focus()
})
}, },
// handleLogin() {
handleLogin() { this.$refs.loginForm.validate(valid => {
this.$refs.loginForm.validate(valid => { if (valid) {
if (valid) { this.loading = true
this.loading = true this.$store.dispatch('user/login', this.loginForm).then(() => {
this.$store.dispatch('user/login', this.loginForm).then(() => { console.log(this.redirect)
this.$router.push({
this.$router.push({ path: this.redirect || '/'
path: this.redirect || '/' })
}) this.loading = false
this.loading = false }).catch(() => {
}).catch(() => { this.loading = false
this.loading = false })
}) } else {
} else { console.log('error submit!!')
console.log('error submit!!') return false
return false }
} })
}) }
}
} }
} }
</script> </script>

@ -114,7 +114,7 @@
</div> </div>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="isShowMingxi=true"></Button> <Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="isShowMingxi=true"></Button>
<Button type="primary" icon="md-add" style="margin-bottom: 10px" @click="importsRuku"></Button> <Button type="primary" icon="md-add" style="margin-bottom: 10px;margin-left: 10px" @click="importsRuku"></Button>
<xy-table style="width: 60%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable"> <xy-table style="width: 60%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
<template v-slot:btns> <template v-slot:btns>
<el-table-column label="操作" width="90" header-align="center" align="center"> <el-table-column label="操作" width="90" header-align="center" align="center">

@ -76,7 +76,7 @@
return:'回库', return:'回库',
check:'盘点', check:'盘点',
data:"数据校对", data:"数据校对",
testcheck:'模拟盘点' mock:'模拟盘点'
}, },
customForm: { customForm: {
customFormId: "", customFormId: "",

Loading…
Cancel
Save