From 5506a429c6b62c6d92999ee804efbff3fe9b4ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 8 May 2024 10:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=8F=B7?=
 =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/checkOperation.vue |  8 +++++
 src/views/historyCheck/index.vue         |  8 ++---
 src/views/historyMonitoring/index.vue    | 45 ++++++++++++++++++------
 src/views/videoWall/index.vue            |  5 +--
 src/views/videoWall2/index.vue           |  6 ++--
 src/views/videoWall3/index.vue           |  5 +--
 6 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 88d029e..3b5bc50 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -141,6 +141,10 @@ export default {
                     label:'盘点任务号',
                     key: 'checkNum'
                 },
+                {
+                    label:'wms任务号',
+                    key: 'taskWMSId'
+                },
                 {
                     label:'托盘码',
                     key: 'wmsCode'
@@ -149,6 +153,10 @@ export default {
                     label:'托盘码描述',
                     key: 'wmsTrayCode'
                 },
+                {
+                    label:'子托盘信息',
+                    key: 'subtag'
+                },
                 {
                     label:'盘点时间',
                     key: 'exportTime'
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 5b6b275..0c17497 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -58,8 +58,8 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="4" style="text-align: left">
-                        <a-form-item label="盘点号">
-                            <a-input v-model="queryParam.lotnum" placeholder="请输入" />
+                        <a-form-item label="wms任务号">
+                            <a-input v-model="queryParam.taskId" placeholder="请输入" />
                         </a-form-item>
                     </a-col>
                     <a-col :span="4">
@@ -151,8 +151,8 @@ export default {
             imgUrl: imgUrl,
             columns: [
                 {
-                    title: "盘点批次号",
-                    dataIndex: "lotnum",
+                    title: "wms任务号",
+                    dataIndex: "taskId",
                 },
                 {
                     title: "巷道名称",
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index 1e3d5b3..3a4725d 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -3,7 +3,7 @@
         <div class="ant-advanced-search-form">
             <a-form layout="inline" :form="queryParam">
                 <a-row :gutter="24">
-                    <a-col :span="4" style="text-align: left">
+                    <a-col :span="5" style="text-align: left">
                         <a-form-item label="巷道">
                             <a-select  @change="handleChange" :value="select" style="width:100px">
                             <a-select-option :value="0">
@@ -16,17 +16,32 @@
                         </a-form-item>
                         
                     </a-col>
-                    <a-col :span="6" >
+                    <a-col :span="8" >
                         <a-form-item label="工单号">
                             <a-input v-model="queryParam.orderNum" placeholder="请输入" style="width:270px;"/>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="6" >
+                    <a-col :span="8" >
                         <a-form-item label="wms任务号">
-                            <a-input v-model="queryParam.taskId" placeholder="请输入" style="width:270px;"/>
+                            <a-input v-model="queryParam.taskId" placeholder="请输入" style="width:250px;"/>
+                        </a-form-item>
+                    </a-col>
+                    
+                    
+                </a-row>
+                
+                <a-row :gutter="24">
+                    <a-col :span="7" >
+                        <a-form-item label="托盘码">
+                            <a-input v-model="queryParam.trayCode" placeholder="请输入" style="width:390px;"/>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="8">
+                    <a-col :span="6" >
+                        <a-form-item label="子托盘标签">
+                            <a-input v-model="queryParam.subtag" placeholder="请输入" style="width:250px;"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="7">
                         <a-form-item class="ageInput" label="时间">
                             <a-range-picker
                                 @change="onTimeChange"
@@ -41,7 +56,8 @@
                             </a-range-picker>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="6" style="text-align: right">
+                    
+                    <a-col :span="4" style="text-align: right">
                         <a-button type="primary" @click="handleSearch">搜索</a-button>
                         <a-button style="margin-left: 15px" @click="reset">重置</a-button>
                     </a-col>
@@ -161,10 +177,16 @@ export default {
                     width:320,
                 },
                 {
-                    title: "视频状态",
-                    // dataIndex: "status",
-                    scopedSlots: {customRender: 'status'},
-                    width: 90
+                    title: "托盘码",
+                    dataIndex: "wmsCode",
+                    //scopedSlots: {customRender: 'wmsCode'},
+                    width: 120
+                },
+                {
+                    title: "子标签信息",
+                    dataIndex: "subtag",
+                    //scopedSlots: {customRender: "subtag"},
+                    width: 120
                 },
                 {
                     title: "工单时长",
@@ -173,7 +195,8 @@ export default {
                 {
                     title: "视频录像",
                     // dataIndex: "videoPath1",
-                    scopedSlots: {customRender: 'videoPath1'}
+                    scopedSlots: {customRender: 'videoPath1'},
+                    width: 90
                 }
                 
             ],
diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue
index dfd81b8..6f8c862 100644
--- a/src/views/videoWall/index.vue
+++ b/src/views/videoWall/index.vue
@@ -83,8 +83,9 @@ export default {
                 data: {}
             }).then(res => {
                 if(res.code == 200) {
-                    this.row = res.data[0];
-                    this.column = res.data[1];
+                    //焦作蜜雪冰城第一页8个球机2，3页四个
+                    this.row = 2;
+                    this.column = 4;
                     this.getClientHeight();
                     sessionStorage.setItem('originHeight', this.clientHeight)
                 }
diff --git a/src/views/videoWall2/index.vue b/src/views/videoWall2/index.vue
index f463c1e..2dcbf5c 100644
--- a/src/views/videoWall2/index.vue
+++ b/src/views/videoWall2/index.vue
@@ -83,8 +83,10 @@ export default {
                 data: {}
             }).then(res => {
                 if(res.code == 200) {
-                    this.row = res.data[0];
-                    this.column = res.data[1];
+                   
+                    //焦作蜜雪冰城第一页8个球机2，3页四个
+                    this.row = 2;
+                    this.column = 2;
                     this.getClientHeight();
                     sessionStorage.setItem('originHeight', this.clientHeight)
                 }
diff --git a/src/views/videoWall3/index.vue b/src/views/videoWall3/index.vue
index 56e1443..d1d9f6c 100644
--- a/src/views/videoWall3/index.vue
+++ b/src/views/videoWall3/index.vue
@@ -83,8 +83,9 @@ export default {
                 data: {}
             }).then(res => {
                 if(res.code == 200) {
-                    this.row = res.data[0];
-                    this.column = res.data[1];
+                    //焦作蜜雪冰城第一页8个球机2，3页四个
+                    this.row = 2;
+                    this.column = 2;
                     this.getClientHeight();
                     sessionStorage.setItem('originHeight', this.clientHeight)
                 }