From 2bec0ab66e17ca6917fbc9ad36b177e2d07827a1 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, 24 Jul 2024 15:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=AF=94=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                      | 11 +-------
 src/views/checkManage/Subsection.vue     |  7 +++--
 src/views/checkManage/checkOperation.vue | 34 +++++++++++++-----------
 src/views/checkManage/index.vue          |  1 +
 src/views/historyCheck/index.vue         | 18 ++++++++++---
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index d319efd..e55bd5a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,19 +34,10 @@ const routes = [{
             name: 'videoWall1`',
             meta: {
                 icon: 'desktop',
-                name: '视频墙1'
+                name: '视频墙'
             },
             component: () => import('@/views/videoWall/index'),
         },
-        {
-            path: 'videoWall2',
-            name: 'videoWall2',
-            meta: {
-                icon: 'desktop',
-                name: '视频墙2'
-            },
-            component: () => import('@/views/videoWall2/index'),
-        },
         {
             path: 'realTimeMonitoring',
             name: 'realTimeMonitoring',
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 21521d9..7c27ca6 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="subsection">
         <a-layout style="width: 1500px">
-            <a-layout style="width: 100%;height: 310px">
+            <a-layout style="width: 100%;height: 380px">
                 <a-layout-sider width="110px">
                     <a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
                         <a-tab-pane 
@@ -16,7 +16,7 @@
                         </a-tab-pane>
                     </a-tabs>
                 </a-layout-sider>
-                <a-layout-content>
+                <a-layout-content style="height: 100%">
                     <!-- <slot :data="{select, nums, random}"></slot> -->
                     <div class="roadway-buttom">
                         <div class="roadway-box">
@@ -84,7 +84,7 @@ export default {
             type: Object,
             default: () => {
                 return {
-                    row: 10,
+                    row: 15,
                     column: 30
                 }
             }
@@ -297,7 +297,6 @@ export default {
 <style scoped lang="scss">
 .subsection /deep/{
     width: 100%;
-    height: 360px;
     overflow: hidden;
     .ant-tabs-nav .ant-tabs-tab {
         // padding: 0;
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 5468b6c..a5cc611 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -4,7 +4,7 @@
         <div>
             <div class="carousel-page">
                 <div class="carousel-page-content">
-                    <div class="img-box">
+                    <div class="img-box" style="width: 15%;">
                         <ul>
                             <li>
                                  <span class="img-box-title">
@@ -22,7 +22,7 @@
                                     {{ statusMap[checkObj.status] }}
                                 </span>
                             </li>
-                            <li v-for="item in params" :key="item.label">
+                            <li v-for="item in params" v-if="checkObj[item.key]!=null" :key="item.label">
                 
                                 <span class="img-box-title">
                                     {{ item.label }}:
@@ -33,7 +33,7 @@
                             </li>
                         </ul>
                     </div>
-                    <div class="img-box">
+                    <div class="img-box" style="width: 70%;">
                             <viewer v-if="checkObj.checkPic" style="height: 300px">
                                 <img :src="imgUrl+checkObj.checkPic"/>
                             </viewer>
@@ -42,18 +42,7 @@
                             style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
                             暂无图片
                         </div>
-                        <p>盘点图1</p>
-                    </div>
-                    <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
-                                <img :src="imgUrl+checkObj.checkPic2"/>
-                            </viewer>
-                        <div
-                            v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>盘点图2</p>
+                        <p>盘点图</p>
                     </div>
                     <!-- <div class="img-box">
                         <viewer v-if="checkObj.preoperationPic" style="height:300px;">
@@ -146,7 +135,20 @@ export default {
                     key: 'wmsCode'
                 },
                 {
-                    label:'托盘码描述',
+                    label:'盘点结果',
+                    key: 'trayCode'
+                },
+                
+                {
+                    label:'烟牌',
+                    key: 'wmsCategory'
+                },
+                {
+                    label:'数量',
+                    key: 'wmsCount'
+                },
+                {
+                    label:'视觉分辨结果',
                     key: 'wmsCategory'
                 },
                 {
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 7d640b5..10f392f 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -85,6 +85,7 @@
 
             <div class="check-content" v-for="item in data" :key="item.id">
                 <subsection
+                    style="height: 35vh;"
                     v-if="item.id == select"
                     :total="{ row: item.leftRow, column: item.leftColumn }"
                     :side="leftSide"
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index fead928..b2169fb 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -98,9 +98,13 @@
           <span slot="goodsLocation" slot-scope="text">
                {{ text.direction }}-{{ text.row}}-{{ text.column}}
           </span>
-          <span slot="status" slot-scope="text">
+          <span slot="trayCode" slot-scope="text">
                {{ text.trayCode}}
           </span>
+          
+          <span slot="status" slot-scope="text">
+               {{ statusMap[text.status]}}
+          </span>
           <span slot="pic" slot-scope="text" style="width:auto">
 
             <template>
@@ -164,13 +168,21 @@ export default {
                 },
                 
                 {
-                    title: "盘点状态",
+                    title:'托盘码',
+                    dataIndex: 'wmsCode'
+                },
+                {
+                    title: "扫码情况",
+                    scopedSlots: {customRender: 'trayCode'},
+                },
+                {
+                    title: "对比结果",
                     scopedSlots: {customRender: 'status'},
                 },
                 {
                     title: "照片",
                     scopedSlots: {customRender: 'pic'},
-                    width:320,
+                    width:150,
                 },
                 {
                     title: "更新时间",