From 738882cd08af39435dc35ef2c4010dd4bae64ee1 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Tue, 12 Jul 2022 13:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=B7=B7=E9=81=93=E7=9A=84?=
 =?UTF-8?q?=E5=85=89=E6=BA=90=E5=8D=95=E7=8B=AC=E5=8F=AF=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/checkOperation.vue |  9 +-----
 src/views/roadwayManage/index.vue        | 40 ++++++++++++++++++++++--
 src/views/roadwayManage/model.vue        |  8 ++---
 3 files changed, 42 insertions(+), 15 deletions(-)

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 @@
     <div>
         <div class="button-box">
             <a-button type="primary" class="open" @click="confirmLight('open')">
-                打开光源
+                打开全部光源
             </a-button>
             <a-button type="primary" class="close" @click="confirmLight('close')">
-                关闭光源
+                关闭全部光源
             </a-button>
             <a-button type="primary" @click="showModel('add','')">
                 新增巷道
@@ -55,6 +55,14 @@
             </template>
           </span>
           <span slot="action" slot-scope="text, record">
+              <a @click="openOneLight(record.id)">
+            打开光源
+          </a>
+          <a-divider type="vertical"/>
+          <a @click="closeOneLight(record.id)">
+            关闭光源
+          </a>
+          <a-divider type="vertical"/>
           <a @click="showModel('edit',record)">
             编辑
           </a>
@@ -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 @@
                         </a-form-item>
                     </div>
                     <div class="across-layout" v-if="leftType =='1'">
-                        <a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['leftInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
                             />
                         </a-form-item>
-                        <a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['leftOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
                             />
@@ -174,12 +174,12 @@
                         </a-form-item>
                     </div>
                     <div class="across-layout" v-if="rightType =='1'">
-                        <a-form-item label="内货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="浅货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['rightInsideShelveId', { rules: [{ required: true, message: '请输入内货架号!' }] }]"
                             />
                         </a-form-item>
-                        <a-form-item label="外货架号" :label-col="formItemAcrossLayout.labelCol">
+                        <a-form-item label="深货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
                                 v-decorator="['rightOutsideShelveId', { rules: [{ required: true, message: '请输入外货架号!' }] }]"
                             />