修改无数据匹配工位

master
夜笙歌 3 months ago
parent 9b3f2c871f
commit 9777e837b5

@ -26,7 +26,8 @@
<el-form-item v-if="isStationId" prop="processId"> <el-form-item v-if="isStationId" prop="processId">
<el-select v-model="loginForm.processId" placeholder="请选择工序" style="width: 100%" @change="changeProcess"> <el-select v-model="loginForm.processId" placeholder="请选择工序" style="width: 100%" @change="changeProcess">
<el-option v-for="item in options" :key="item.processId" :label="item.processName" <el-option v-for="item in options" :key="item.processId" :label="item.processName"
:value="item.processId"></el-option> :value="item.processId"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工位编号" prop="processFloor" v-if="false"> <el-form-item label="工位编号" prop="processFloor" v-if="false">
@ -71,36 +72,36 @@
</template> </template>
<script> <script>
import {getCodeImg, getProcesses} from "@/api/login"; import { getCodeImg, getProcesses } from '@/api/login'
import Cookies from "js-cookie"; import Cookies from 'js-cookie'
import {encrypt, decrypt} from '@/utils/jsencrypt' import { encrypt, decrypt } from '@/utils/jsencrypt'
export default { export default {
name: "Login", name: 'Login',
data() { data() {
return { return {
codeUrl: "", codeUrl: '',
loginForm: { loginForm: {
username: "xin", username: 'xin',
password: "123456", password: '123456',
rememberMe: false, rememberMe: false,
processId: '', processId: '',
processFloor:'', processFloor: '',
processName:'', processName: '',
code: "", code: '',
uuid: "" uuid: ''
}, },
loginRules: { loginRules: {
username: [ username: [
{required: true, trigger: "blur", message: "请输入您的账号"} { required: true, trigger: 'blur', message: '请输入您的账号' }
], ],
password: [ password: [
{required: true, trigger: "blur", message: "请输入您的密码"} { required: true, trigger: 'blur', message: '请输入您的密码' }
], ],
processId: [ processId: [
{required: true, trigger: "blur", message: "请选择工序"} { required: true, trigger: 'blur', message: '请选择工序' }
], ],
code: [{required: true, trigger: "change", message: "请输入验证码"}] code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
}, },
loading: false, loading: false,
// //
@ -167,20 +168,20 @@ export default {
route: '/board/firstFloor?id=3'// route: '/board/firstFloor?id=3'//
} }
] ]
}; }
}, },
watch: { watch: {
$route: { $route: {
handler: function (route) { handler: function(route) {
this.redirect = route.query && route.query.redirect; this.redirect = route.query && route.query.redirect
}, },
immediate: true immediate: true
} }
}, },
created() { created() {
this.getCode(); this.getCode()
this.getCookie(); this.getCookie()
if (this.$route?.query?.isStationId === 'true') { if (this.$route?.query?.isStationId === 'true') {
this.isStationId = true this.isStationId = true
getProcesses().then(e => { getProcesses().then(e => {
@ -191,66 +192,69 @@ export default {
methods: { methods: {
getCode() { getCode() {
getCodeImg().then(res => { getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled; this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
if (this.captchaEnabled) { if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img; this.codeUrl = 'data:image/gif;base64,' + res.img
this.loginForm.uuid = res.uuid; this.loginForm.uuid = res.uuid
} }
}); })
}, },
getCookie() { getCookie() {
const username = Cookies.get("username"); const username = Cookies.get('username')
const password = Cookies.get("password"); const password = Cookies.get('password')
const rememberMe = Cookies.get('rememberMe') const rememberMe = Cookies.get('rememberMe')
this.loginForm = { this.loginForm = {
username: username === undefined ? this.loginForm.username : username, username: username === undefined ? this.loginForm.username : username,
password: password === undefined ? this.loginForm.password : decrypt(password), password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
}; }
}, },
handleLogin() { handleLogin() {
this.$refs.loginForm.validate(valid => { this.$refs.loginForm.validate(valid => {
if (valid) { if (valid) {
this.loading = true; this.loading = true
if (this.loginForm.rememberMe) { if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, {expires: 30}); Cookies.set('username', this.loginForm.username, { expires: 30 })
Cookies.set("password", encrypt(this.loginForm.password), {expires: 30}); Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30}); Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
} else { } else {
Cookies.remove("username"); Cookies.remove('username')
Cookies.remove("password"); Cookies.remove('password')
Cookies.remove('rememberMe'); Cookies.remove('rememberMe')
} }
this.$store.dispatch("Login", this.loginForm).then(() => { this.$store.dispatch('Login', this.loginForm).then(() => {
let data = this.options.find(v => v.processId === this.loginForm.processId) || {} let data = this.options.find(v => v.processId === this.loginForm.processId) || {}
let routeData = this.floorData.find(v => v.floor === data.processFloor && v.processId === data.processId) || {} let routeData = this.floorData.find(v => v.floor === data.processFloor && v.processId === data.processId) || {
let query = {processName:this.loginForm.processName} floor: 4,
processId: 44,
route: '/board/assemble'//
}
let query = { processName: this.loginForm.processName }
routeData.query = query routeData.query = query
if (routeData.route) { if (routeData.route) {
sessionStorage.setItem("FLOORDATA", JSON.stringify(routeData)) sessionStorage.setItem('FLOORDATA', JSON.stringify(routeData))
} }
// this.$router.push({path: this.redirect || "/"}).catch(() => { // this.$router.push({path: this.redirect || "/"}).catch(() => {
// }); // });
this.$router.push({path: routeData.route || this.redirect || "/"}).catch(() => { this.$router.push({ path: routeData.route || this.redirect || '/' }).catch(() => {
}); })
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false
if (this.captchaEnabled) { if (this.captchaEnabled) {
this.getCode(); this.getCode()
} }
}); })
} }
}); })
}, },
changeProcess(processId) { changeProcess(processId) {
let process = this.options.find(v => v.processId === processId) let process = this.options.find(v => v.processId === processId)
this.loginForm.processFloor = process.processFloor; this.loginForm.processFloor = process.processFloor
this.loginForm.processName = process.processName; this.loginForm.processName = process.processName
} }
} }
}; }
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">

Loading…
Cancel
Save