diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 2880d41..0907ed2 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -267,6 +267,12 @@ export default  {
         url: '/street/streetStockStatus',
         name: '巷道盘点状态',
         method: 'POST'
+    },
+    getoverview:{
+
+        url: '/stock/overview',
+        name: '盘点概况',
+        method: 'POST'
     }
 }
 
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 6eb30da..f0da8f5 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -86,7 +86,7 @@ export default {
             default: () => {
                 return {
                     row: 10,
-                    column: 30
+                    column: 25
                 }
             }
         },
@@ -240,8 +240,10 @@ export default {
             var color;
             if(status == -1){
                 color = '#f2ed48'
-            }else if(status == 2|| status == 3){
+            }else if(status == 2){
                 color = '#1afa29'
+            }else if( status == 3){
+                color = '#4c71d8'
             }else if(status == 1){
                 color = '#d81e06'
             }else if(status == 4){
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 4557ae8..2fd0079 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -44,11 +44,19 @@
                                             :key="value"
                                             :value="key"
                                         >
-                                            {{ value}}
+                                            {{ key}}
                                         </a-select-option>
                                     </a-select>
                                 </span>
                             </li>
+                            <li class="img-box-item">
+                                <span class="img-box-title">
+                                    上位品规:
+                                </span>
+                                <span class="img-box-value">
+                                    {{checkObj.wmsCategory}}{{checkObj.wmsCategoryName!="" && checkObj.wmsCategoryName!=null ?"-"+checkObj.wmsCategoryName:""}}
+                                </span>
+                            </li>
                             <!-- <li class="img-box-item">
                                 <span class="img-box-title">
                                     个数:
@@ -79,6 +87,7 @@
                             </li>
                         </ul>
                     </div>
+                    
                     <div
                         class="img-box"
                         style="width: 100%;"
@@ -90,11 +99,15 @@
                                 :key="ite"
                                 style="float:left;height:100%; width:100% ;display: flex; "
                             >
+
+                            <viewer  :images="checkPics">
                                 <img
                                     style="height:100%; width:100% ;"
                                     :src="ite"
                                 >
+                </viewer>
                             </div>
+                            
                         </div>
 
                         <p>盘点图</p>
@@ -129,6 +142,38 @@
                     3D点云信息
                 </a-button> -->
 
+                <a-button
+                    class="btn"
+                    type="primary"
+                    style="background:#29c12b;border-color:#29c12b;"
+                    @click="getOveroperationPic3d()"
+                >
+                    <a-modal
+                        v-drag
+                        width="600px"
+                        v-model="visible_pic3d"
+                        title="随行3d图像"
+                        style="top: 20px;"
+                        @ok="overoperationPicStop3d"
+                    >
+                    
+                    <template #footer>
+        <a-button key="footer" type="primary" :loading="loading" @click="overoperationPicStop3d">确定</a-button>
+      </template>
+                        <div
+                            style="height: 700px;"
+                            class="parent"
+                        >
+
+                            <img
+                                style="width:700px ;"
+                                :src="checkObj.overoperationPic"
+                            >
+                        </div>
+                    </a-modal>
+
+                    随行3d图像
+                </a-button>
                 <a-button
                     class="btn"
                     type="primary"
@@ -143,6 +188,9 @@
                         style="top: 20px;"
                         @ok="overoperationPicStop"
                     >
+                    <template #footer>
+        <a-button key="footer" type="primary" :loading="loading" @click="overoperationPicStop">确定</a-button>
+      </template>
                         <div
                             style="height: 700px;"
                             class="parent"
@@ -150,22 +198,21 @@
 
                             <img
                                 style="width:700px ;"
-                                :src="checkObj.overoperationPic"
+                                :src="checkObj.preoperationPic"
                             >
-
                         </div>
                     </a-modal>
 
                     随行图像
                 </a-button>
-                <a-button
+                <!-- <a-button
                     class="btn"
                     type="primary"
                     style="background:#29c12b;border-color:#29c12b;"
                     @click="nextOne(checkObj.id)"
                 >
                     下一个盘点
-                </a-button>
+                </a-button> -->
             </div>
 
         </div>
@@ -189,6 +236,7 @@ export default {
             column: 1,
             streetName: "",
             visible: false,
+            visible_pic3d: false,
             visible_pic: false,
             category: "",
             count: 0,
@@ -198,13 +246,13 @@ export default {
             categorys: {},
             params: [
                 {
-                    label: "上位个数",
+                    label: "个数",
                     key: "wmsCount",
                 },
-                {
-                    label: "上位品规",
-                    key: "wmsCategory",
-                },
+                // {
+                //     label: "上位品规",
+                //     key: "wmsCategory",
+                // },
                 //{
                 //    label: "上位品规名",
                 //    key: "wmsCategoryName",
@@ -279,6 +327,14 @@ export default {
         overoperationPicStop() {
             this.visible_pic = false;
         },
+
+        
+        getOveroperationPic3d() {
+            this.visible_pic3d = true;
+        },
+        overoperationPicStop3d() {
+            this.visible_pic3d = false;
+        },
         handleOk() {
             this.visible = false;
         },
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index b82be5c..b29fd40 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -15,6 +15,7 @@
                     盘点清空
                 </a-button>
             </a-popconfirm>
+
             <a-popconfirm
                 title="是否确定要全部盘点"
                 ok-text="是"
@@ -53,6 +54,7 @@
                 ></a-tag>
                 盘点错误
             </span>
+           
             <span class="info-text">
                 <a-tag
                     color="#1afa29"
@@ -67,7 +69,13 @@
                 ></a-tag>
                 未盘点
             </span>
-            
+            <span class="info-text">
+                <a-tag
+                    color="#4c71d8"
+                    style="width: 30px; height: 20px; margin-right: 6px"
+                ></a-tag>
+                人工核对
+            </span>
             <span class="info-text">
                 <a-tag
                     color="#bc55cf"
@@ -99,7 +107,7 @@
             </a-select>
         </div>
 
-        <a-col :span="24">
+        <a-col :span="19">
             <!--左货架DOM-->
             <div class="center-box">
                 <span class="shelf-number"> 左侧货架 </span>
@@ -160,6 +168,77 @@
                 </subsection>
             </div>
         </a-col>
+        <a-col :span="5">
+            <div
+                        class="img-box"
+                        style=""
+                    >
+                        <ul>
+                            <li class="img-box-item">
+                                <span class="img-box-title">
+                                    批次号:
+                                </span>
+                                <span class="img-box-value">
+                                    {{params.lotnum }}
+                                </span>
+                                   
+                            </li>
+                            <li class="img-box-item">
+                                <span class="img-box-title">
+                                    盘点个数:
+                                </span>
+                                <span class="img-box-value">
+                                   {{params.size}}
+                                </span>
+                            </li>
+                            <li class="img-box-item">
+                                <span class="img-box-title">
+                                    品规个数:
+                                </span>
+                                <span class="img-box-value">
+                                   
+{{params.sizeCategory }}
+                                </span>
+                            </li><li class="img-box-item">
+                                <span class="img-box-title">
+                                    其他货物数:
+                                </span>
+                                <span class="img-box-value">
+                                   
+{{params.type4        }}
+                                </span>
+                                
+
+                            </li><li class="img-box-item">
+                                <span class="img-box-title">
+                                    盘点正常:
+                                </span>
+                                <span class="img-box-value">
+                                    
+{{params.type2        }}
+                                </span>
+                                </li>
+                                <li class="img-box-item">
+                                <span class="img-box-title">
+                                    盘点异常:
+                                </span>
+                                <span class="img-box-value">
+                                   
+{{params.type1        }}
+                                </span>
+                            </li><li class="img-box-item">
+                                <span class="img-box-title">
+                                    人工盘点:
+                                </span>
+                                <span class="img-box-value">
+                                   
+{{params.type3        }}
+                                </span>
+                            </li>
+
+                        </ul>
+            </div>
+        </a-col>
         <!-- websocket推送信息 -->
         <!-- <a-col :span="6" style="height: 80vh; overflow-y: scroll">
             <a-timeline style="margin: 20px">
@@ -172,6 +251,7 @@
 <script>
 import Subsection from "./Subsection";
 import message from "ant-design-vue";
+import { notification } from 'ant-design-vue';
 
 export default {
     name: "checkManage",
@@ -181,6 +261,7 @@ export default {
             leftSide: 1,
             rightSide: 1,
             data: [],
+            params:[],
             wsData: [],
             select: "",
             streetId: 0,
@@ -206,13 +287,15 @@ export default {
     },
 
     created() {
-        this.initWebSocket();
+        //this.initWebSocket();
 
+
+        this.openNotification();
         this.timerRequestData = window.setInterval(this.requestData, 10000);
         //设置定时器,注意：只有在 created 生命周期中设置的定时器 才能在beforeDestroy 中销毁
-        this.timer = window.setInterval(() => {
-            setTimeout(this.pollingFunc(), 0);
-        }, 2000);
+        // this.timer = window.setInterval(() => {
+        //     setTimeout(this.pollingFunc(), 0);
+        // }, 2000);
     },
     beforeDestroy() {
         clearInterval(this.timerRequestData);
@@ -223,6 +306,8 @@ export default {
     methods: {
         //获取巷道列表
         requestData() {
+            
+            this.openNotification();
             this.$api.httpApi
                 .getAllStreet({})
                 .then((res) => {
@@ -254,6 +339,29 @@ export default {
                     //this.getStreetDetail(this.select);
                 })
                 .catch((err) => {});
+        },
+        openNotification(){
+            //概况
+            this.$api.httpApi
+                .getoverview({})
+                .then((res) => {
+                    console.log(res);
+                    console.log(res.data.lotnum);
+
+                    this.params = res.data;
+                    // notification.open({
+                    //     message: '盘点批次号：'+res.data.lotnum,
+                    //     description:
+                    //         '共盘点'+res.data.size+'个货位，'+res.data.sizeCategory+'个品规，'+res.data.type4+'个其他货物，其中'
+                    //         +res.data.type2+'个盘点成功，'+res.data.type1+'个盘点异常，'+res.data.type3+'个人工盘点',
+                    //     duration: 0,
+                    // });
+                })
+                .catch((err) => {
+
+                });
+
+            
         },
         //获取巷道列表
         request() {
@@ -469,6 +577,51 @@ export default {
     }
 }
 
+.img-box {
+                display: flex;
+                padding: 50px;
+                margin-right: 56px;
+                align-items: center;
+                justify-content: center;
+                flex-direction: column;
+                font-size: 17px;
+                height: 900px;
+                margin-right: 10px;
+                img {
+                    height: 100%;
+                }
+
+                p {
+                    height: 25px;
+                }
+                ul {
+                    width: 100%;
+                    height: 100%;
+                    margin-bottom: 0;
+                    padding-inline-start: 0;
+                    .img-box-item {
+                        background-color: #fed54d;
+                        margin: 10px 0;
+                        padding: 5px;
+                        font-size: 16px;
+                        font-weight: 600;
+                        color: #494e52;
+                        .img-box-title {
+                            width: 40%;
+                            display: inline-block;
+                        }
+                        .img-box-value {
+                            display: inline-block;
+                            width: calc(100% - 130px);
+                            overflow: hidden;
+                            width: 60%;
+                            position: relative;
+                            top: 5px;
+                        }
+                    }
+                }
+            }
+
 .button-box {
     position: absolute;
     top: 20px;