mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '更新' (#17) from zwq into master

Browse Source 
Reviewed-on: #17
This commit is contained in:
朱文强 2022-07-07 13:33:56 +08:00
commit 2d812f07ad
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/router/index.js
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-15 08:20:28
* @LastEditors: zwq
* @LastEditTime: 2022-07-06 10:38:26
* @LastEditTime: 2022-07-07 09:48:49
* @Description:
*/
/**
@ -23,7 +23,8 @@ const _import = require('./import-' + process.env.NODE_ENV)
// 全局路由(无需嵌套上左右整体布局)
const globalRoutes = [
{ path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
{ path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }
{ path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
{ path: '/board', component: _import('common/board'), name: 'board', meta: { title: '车间生产看板', isTab: false } }
]
// 主入口路由(需嵌套上左右整体布局)
@ -39,7 +40,6 @@ const mainRoutes = {
// 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
// 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
{ path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
{ path: '/board', component: _import('common/board'), name: 'board', meta: { title: '车间生产看板', isTab: false } },
{ path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
{ path: '/orderAuto', component: _import('common/order-auto'), name: 'orderAuto', meta: { title: '自动任务', isTab: true } },
{ path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },

9
src/views/common/board.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-03-07 15:31:13
* @LastEditors: zwq
* @LastEditTime: 2022-07-06 16:08:05
* @LastEditTime: 2022-07-07 10:50:49
* @Description:
-->
<template>
@ -29,8 +29,7 @@ export default {
}
},
created () {
const baseurl = window.SITE_CONFIG.baseUrl
this.url = baseurl.substring(5, baseurl.length - 4)
this.url = window.SITE_CONFIG.wbUrl
this.initWebSocket()
},
destroyed () {
@ -42,7 +41,7 @@ export default {
methods: {
initWebSocket () {
// 初始化weosocket
const path = `ws:${this.url}/qj/websocket/2`
const path = `ws://${this.url}/qj/websocket/2`
this.websock = new WebSocket(path)
this.websock.onmessage = this.websocketonmessage
this.websock.onopen = this.websocketonopen
@ -76,7 +75,7 @@ export default {
<style lang="scss" scoped>
.main-body {
min-height: 88vh;
min-height: 100vh;
width: 100%;
background: url(~@/assets/img/board/1.png) center no-repeat;
background-size: cover;

11
src/views/common/order-process-add.vue
View File

@ -70,12 +70,14 @@
methods: {
init (row, idx) {
this.visible = true
this.row = null
this.editIndex = null
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (row) {
this.row = row
this.dataForm = row
this.editIndex = idx
this.row = JSON.parse(JSON.stringify(row))
this.dataForm = JSON.parse(JSON.stringify(row))
this.editIndex = JSON.parse(JSON.stringify(idx))
}
this.$refs['idenCardNum'].focus()
})
@ -90,7 +92,6 @@
'idenCardNum': this.dataForm.idenCardNum
})
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity
@ -110,7 +111,7 @@
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.editIndex) {
if (this.editIndex || this.editIndex === 0) {
const taskList = JSON.parse(sessionStorage.getItem('taskList'))
taskList.splice(this.editIndex, 1, this.dataForm)
sessionStorage.setItem('taskList', JSON.stringify(taskList))

2
src/views/common/order-process.vue
View File

@ -199,7 +199,7 @@
message: '请选择窑炉',
type: 'warning'
})
} else if (this.processType !== 0 || this.processType !== 1) {
} else if (this.processType !== 0 && this.processType !== 1) {
this.$message.warning('请选择加工类型')
} else {
this.$confirm(`确定提交任务?`, '提示', {

7
src/views/main.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-15 08:20:28
* @LastEditors: zwq
* @LastEditTime: 2022-07-06 16:28:27
* @LastEditTime: 2022-07-07 10:51:59
* @Description:
-->
<template>
@ -67,8 +67,7 @@
}
},
created () {
const baseurl = window.SITE_CONFIG.baseUrl
this.url = baseurl.substring(5, baseurl.length - 4)
this.url = window.SITE_CONFIG.wbUrl
this.getUserInfo()
this.initWebSocket()
},
@ -98,7 +97,7 @@
// })
},
initWebSocket () { // 初始化weosocket
const path = `ws:${this.url}/qj/websocket/1`
const path = `ws://${this.url}/qj/websocket/1`
this.websock = new WebSocket(path)
this.websock.onmessage = this.websocketonmessage
this.websock.onopen = this.websocketonopen

17
static/config/index-prod.js
View File

@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:08:41
* @LastEditors: zwq
* @LastEditTime: 2022-07-07 10:51:22
* @Description: file content
* @FilePath: \mt-qj-wms-ui\static\config\index-prod.js
*/
@ -10,13 +10,14 @@
* 生产环境
*/
;(function () {
window.SITE_CONFIG = {};
window.SITE_CONFIG = {}
// api接口请求地址
window.SITE_CONFIG['baseUrl'] = '/api';
window.SITE_CONFIG['baseUrl'] = '/api'
window.SITE_CONFIG['wbUrl'] = '192.168.1.18:8080'
// cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
})();
window.SITE_CONFIG['domain'] = './' // 域名
window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version
})()