diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index a548050..73d07e9 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -130,14 +130,7 @@ export default { label:'盘点任务号', key: 'checkNum' }, - { - label:'货物系统条码号', - key: 'wmsCode' - }, - { - label:'货物扫描条码号', - key: 'code' - }, + { label:'托盘系统条码号', key: 'wmsTrayCode' diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue index b8d3dbd..19b085c 100644 --- a/src/views/roadwayManage/index.vue +++ b/src/views/roadwayManage/index.vue @@ -2,10 +2,10 @@
- 打开光源 + 打开全部光源 - 关闭光源 + 关闭全部光源 新增巷道 @@ -55,6 +55,14 @@ + + 打开光源 + + + + 关闭光源 + + 编辑 @@ -240,13 +248,39 @@ export default { return new Promise((resolve, reject) => { that.closeLight(); setTimeout(resolve, 1000); + this.$message.success('已关闭光源'); }).catch(() => console.log('Oops errors!')); }, cancelText: '取消', }); } }, - + openOneLight(streetId){ + console.log("openOneLight"+streetId) + this.$axios.get('/street/lightSource/open/' + streetId, { + + }).then(res => { + if(res.code==200){ + this.$message.success('已打开光源'); + } + + }).catch(err => { + + }) + }, + closeOneLight(streetId){ + console.log("closeOneLight"+streetId) + this.$axios.get('/street/lightSource/close/' + streetId, { + + }).then(res => { + if(res.code==200){ + this.$message.success('已关闭光源'); + } + + }).catch(err => { + + }) + }, openLight(){ console.log("openLight") this.$api.httpApi.openLight().then(res => { diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index 849ef7f..24b667c 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -107,12 +107,12 @@
- + - + @@ -174,12 +174,12 @@
- + - +