diff --git a/dist.zip b/dist.zip
index 9a2896b..52de43d 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/router/index.js b/src/router/index.js
index 7f295d2..1117c24 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,44 +29,44 @@ const routes = [{
     },
     component: () => import('@/views/index'),
     children: [
-        // {
-        //     path: 'videoWall1`',
-        //     name: 'videoWall1`',
-        //     meta: {
-        //         icon: 'desktop',
-        //         name: '视频墙1'
-        //     },
-        //     component: () => import('@/views/videoWall/index'),
-        // },
-        // {
-        //     path: 'videoWall2',
-        //     name: 'videoWall2',
-        //     meta: {
-        //         icon: 'desktop',
-        //         name: '视频墙2'
-        //     },
-        //     component: () => import('@/views/videoWall2/index'),
-        // },
-        // {
-        //     path: 'realTimeMonitoring',
-        //     name: 'realTimeMonitoring',
-        //     meta: {
-        //         icon: 'video-camera',
-        //         name: '实时视频流'
-        //     },
-        //     component: () => import('@/views/realTimeMonitoring/index'),
+        {
+            path: 'videoWall1`',
+            name: 'videoWall1`',
+            meta: {
+                icon: 'desktop',
+                name: '视频墙1'
+            },
+            component: () => import('@/views/videoWall/index'),
+        },
+        {
+            path: 'videoWall2',
+            name: 'videoWall2',
+            meta: {
+                icon: 'desktop',
+                name: '视频墙2'
+            },
+            component: () => import('@/views/videoWall2/index'),
+        },
+        {
+            path: 'realTimeMonitoring',
+            name: 'realTimeMonitoring',
+            meta: {
+                icon: 'video-camera',
+                name: '实时视频流'
+            },
+            component: () => import('@/views/realTimeMonitoring/index'),
 
-        // },
+        },
        
-        // {
-        //     path: 'historyMonitoring',
-        //     name: 'historyMonitoring',
-        //     meta: {
-        //         icon: 'book',
-        //         name: '历史数据'
-        //     },
-        //     component: () => import('@/views/historyMonitoring/index')
-        // },
+        {
+            path: 'historyMonitoring',
+            name: 'historyMonitoring',
+            meta: {
+                icon: 'book',
+                name: '历史数据'
+            },
+            component: () => import('@/views/historyMonitoring/index')
+        },
         // {
         //     path: 'alarmLog',
         //     name: 'alarmLog',
@@ -128,15 +128,15 @@ const routes = [{
             },
             component: () => import('@/views/roadwayManage/index')
         },
-        // {
-        //     path: 'cameraManage',
-        //     name: 'cameraManage',
-        //     meta: {
-        //         icon: 'camera',
-        //         name: '球机管理'
-        //     },
-        //     component: () => import('@/views/cameraManage/index')
-        // },
+        {
+            path: 'cameraManage',
+            name: 'cameraManage',
+            meta: {
+                icon: 'camera',
+                name: '球机管理'
+            },
+            component: () => import('@/views/cameraManage/index')
+        },
         // {
         //     path: 'cameraManage/model',
         //     name: 'cameraManageModel',
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 106076f..b55c718 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -246,11 +246,11 @@ export default {
             var color;
             if(status == -1){
                 color = '#f2ed48'
-            }else if(status ==1){
+            }else if(status ==2){
                 color = '#1afa29'
-            }else if( status == 2){
+            }else if( status == 3){
                 color = '#4c71d8'
-            }else if(status == 2 ||status == 5 || status == 6 ){
+            }else if(status == 1 ||status == 5 || status == 6 ){
                 color = '#d81e06'
             }else if(status == 4){
                 color = '#bc55cf'
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index ff880c0..8792af1 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -276,8 +276,8 @@ export default {
             ],
             statusMap: {
                 0: "未盘点",
-                1: "无货",
-                2: "有货",
+                2: "盘点正确",
+                1: "盘点异常",
                 3: "人工核对正确",
                 4: "空托盘",
                 5: "品规失败",
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 2584f40..5c0f7cd 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -60,15 +60,15 @@
                     color="#1afa29"
                     style="width: 30px; height: 20px; margin-right: 6px"
                 ></a-tag>
-                有货
+                盘点正常
             </span>
-            <span class="info-text">
+            <!-- <span class="info-text">
                 <a-tag
                     color="#bfbfbf"
                     style="width: 30px; height: 20px; margin-right: 6px"
                 ></a-tag>
-                无货
-            </span>
+                盘点异常
+            </span> -->
             <span class="info-text">
                 <a-tag
                     color="#4c71d8"
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index df64b7f..7911157 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -111,10 +111,10 @@
                                     未盘点
                                 </a-select-option> -->
                                 <a-select-option :value=1>
-                                    有货
+                                    盘点正常
                                 </a-select-option>
                                 <a-select-option :value=2>
-                                    无货
+                                    盘点异常
                                 </a-select-option>
                                 <!-- <a-select-option :value=3>
                                     人工核对正确
@@ -178,7 +178,13 @@
                 slot="goodsLocation"
                 slot-scope="text"
             >
-                {{ text.direction }}-{{ text.row}}-{{ text.column}}
+                {{ text.direction==1?"左侧":"右侧" }}-{{ text.side==1?"浅":"深" }}-{{ text.row +"行"}}-{{ text.column +"列"}}
+            </span>
+            <span
+                slot="trayCode"
+                slot-scope="text"
+            >
+                {{  text.wmsTrayCode==='0'?"无货":"有货" }}
             </span>
             <span
                 slot="status"
@@ -235,8 +241,8 @@ export default {
         return {
             statusMap: {
                 0: "未盘点",
-                1: "有货",
-                2: "无货",
+                1: "盘点异常",
+                2: "盘点正常",
                 3: "人工核对正确",
                 4: "空托盘",
                 5: "品规失败",
@@ -279,15 +285,19 @@ export default {
                     width: 200,
                 },
 
+                {
+                    title: "上位有无货物",
+                    scopedSlots: { customRender: "trayCode" },
+                },
                 {
                     title: "盘点状态",
                     scopedSlots: { customRender: "status" },
                 },
-                // {
-                //     title: "照片",
-                //     scopedSlots: { customRender: "pic" },
-                //     width: 320,
-                // },
+                {
+                    title: "照片",
+                    scopedSlots: { customRender: "pic" },
+                    width: 320,
+                },
                 {
                     title: "更新时间",
                     dataIndex: "createTime",