diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..ad995ad 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -40,7 +40,7 @@ html {--antd-wave-shadow-color: @primary-color;}
 .ant-alert-success .ant-alert-icon {color: #52c41a;}
 .ant-alert-info {background-color: #e6f7ff;border: 1px solid #91d5ff;}
 .ant-alert-info .ant-alert-icon {color: #1890ff;}
-.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;}
+.ant-alert-warning {background-color: color(~`colorPalette("@{heading-color}", 1)`);border: 1px solid #ffe58f;}
 .ant-alert-warning .ant-alert-icon {color: #faad14;}
 .ant-alert-error {background-color: #fff1f0;border: 1px solid #ffa39e;}
 .ant-alert-error .ant-alert-icon {color: #f5222d;}
@@ -1385,7 +1385,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;}
 .ant-tag-yellow {color: #fadb14;background: #feffe6;border-color: #fffb8f;}
 .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;}
-.ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;}
+.ant-tag-gold {color: #faad14;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffe58f;}
 .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;}
 .ant-tag-cyan {color: #13c2c2;background: #e6fffb;border-color: #87e8de;}
 .ant-tag-cyan-inverse {color: #fff;background: #13c2c2;border-color: #13c2c2;}
diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 7e9b573..7dcc2aa 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -183,6 +183,11 @@ export default  {
         name: '复核页面的核对信息',
         method: 'POST'
     },
+    getCategoryList: {
+        url: '/stock/getCategoryList',
+        name: '品规信息',
+        method: 'POST'
+    },
     getStockPage: {
         url: '/stockLog',
         name: '获取随性历史',
@@ -215,7 +220,7 @@ export default  {
     },
     stockCheckCorrect: {
         url: '/stock/checkCorrect',
-        name: '人工复核正确',
+        name: '人工复核',
         method: 'POST'
     },
     stockCheckByMan: {
diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js
index 3101ca6..19abe70 100644
--- a/src/store/modules/styles.js
+++ b/src/store/modules/styles.js
@@ -11,7 +11,7 @@ const store =  {
                 "primary-color":"rgba(184, 68, 13, 1)"
             },
             "title":{
-                "text":"北起库智能视觉系统",
+                "text":"北起院智能视觉系统",
                 "style":{
                     "color":"rgba(255, 255, 255, 1)",
                     "background-color":"rgba(163, 60, 12, 1)",
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 7932ac4..1d3c12c 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -232,11 +232,14 @@ export default {
         },
         
         getStatusBg(row,column,status) {
+            
             var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column);
             var color;
             if(status == -1){
                 color = '#f2ed48'
             }else if(status == 2|| status == 3){
+                console.log(111);
+                console.log(dom);
                 color = '#1afa29'
             }else if(status == 1){
                 color = '#d81e06'
@@ -244,6 +247,7 @@ export default {
                 color = '#bfbfbf'
             }
             dom.style.background = color
+        
         },
         getStatus(){
             
@@ -275,7 +279,7 @@ export default {
                 if(res.code == 200){
                     if(res.data.stocks){
                         for(let a of res.data.stocks){
-                            this.getStatusBg(a.row,a.column,a.viewStatus)
+                            this.getStatusBg(a.row,a.column,a.status)
                         }
                     }
                 
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 5468b6c..c1ce140 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -7,7 +7,7 @@
                     <div class="img-box">
                         <ul>
                             <li>
-                                 <span class="img-box-title">
+                                <span class="img-box-title">
                                     位置:
                                 </span>
                                 <span class="img-box-value">
@@ -22,8 +22,46 @@
                                     {{ statusMap[checkObj.status] }}
                                 </span>
                             </li>
-                            <li v-for="item in params" :key="item.label">
-                
+                            <li>
+                                <span class="img-box-title">
+                                    品规:
+                                </span>
+                                <span class="img-box-value">
+
+                                    <a-select
+                                        ref="select"
+                                        style="width: 100%"
+                                        :defaultValue="checkObj.category"
+                                        placeholder="请选择"
+                                        @change="handleChangeVlue"
+
+                                    >
+                                    <a-select-option v-for="i in categorys" :key="i">
+        {{ i}}
+      </a-select-option>
+                                    </a-select>
+                                </span>
+                            </li>
+                            <li>
+                                <span class="img-box-title">
+                                    个数:
+                                </span>
+                                <span class="img-box-value">
+                                    <a-input-number
+                                        id="inputNumber"
+                                        style="width: 100%"
+                                        v-model="checkObj.count"
+                                        :min="0"
+                                        :max="50"
+                                    />
+
+                                </span>
+                            </li>
+                            <li
+                                v-for="item in params"
+                                :key="item.label"
+                            >
+
                                 <span class="img-box-title">
                                     {{ item.label }}:
                                 </span>
@@ -34,75 +72,43 @@
                         </ul>
                     </div>
                     <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
-                                <img :src="imgUrl+checkObj.checkPic"/>
-                            </viewer>
+                        <viewer
+                            v-if="checkObj.checkPic"
+                            style="height: 300px"
+                        >
+                            <img :src="imgUrl+checkObj.checkPic" />
+                        </viewer>
                         <div
                             v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
+                            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>
-                    </div>
-                    <!-- <div class="img-box">
-                        <viewer v-if="checkObj.preoperationPic" style="height:300px;">
-                            <img  :src="imgUrl+checkObj.preoperationPic"/>
-                        </viewer>
-                        
-                        <div v-else  style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>操作前照片</p>
-                    </div>
-                    <div class="img-box">
-                        <viewer v-if="checkObj.overoperationPic" style="width:100%;height:300px;">
-                            
-                            <img  :src="imgUrl+checkObj.overoperationPic"/>
-                        </viewer>
-                        
-                        <div
-                            v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>操作后照片</p>
-                    </div> -->
+
                 </div>
             </div>
-            <div class="bottom-btn" >
-                <a-button class="btn"
-                        type="primary"
-                        style="background:#29c12b;border-color:#29c12b;"
-                        @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                >核对正确
-                </a-button>
-                <a-button class="btn"
-                        type="primary"
-                        style="background:#ff0000;border-color:#ff0000;"
-                        @click="checkfalse(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                >核对错误
+            <div class="bottom-btn">
+                <a-button
+                    class="btn"
+                    type="primary"
+                    style="background:#29c12b;border-color:#29c12b;"
+                    @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
+                >核对品规
                 </a-button>
-		<a-button class="btn"
-                        type="primary"
-                        style="background:#29c12b;border-color:#29c12b;"
-                        @click="nextOne(checkObj.id)">
-                        下一个盘点
+
+                <a-button
+                    class="btn"
+                    type="primary"
+                    style="background:#29c12b;border-color:#29c12b;"
+                    @click="nextOne(checkObj.id)"
+                >
+                    下一个盘点
                 </a-button>
             </div>
-            
+
         </div>
-       
 
         <Model
             :visible.sync="visible"
@@ -114,325 +120,352 @@
     </div>
 </template>
 <script>
-import Model from "./model.vue"
-import {imgUrl} from "@/api/importExcel";
-import { message } from 'ant-design-vue';
+import Model from "./model.vue";
+import { imgUrl } from "@/api/importExcel";
+import { message } from "ant-design-vue";
 export default {
     data() {
         return {
-           
             checkObj: {},
             row: 1,
             column: 1,
-            streetName: '',
+            streetName: "",
             visible: false,
-            category: '',
-            count: 0,
+            category: "",
             modelData: {},
             index: 0,
-            imgUrl: '',
-            params:[
+            imgUrl: "",
+            categorys: ["2"],
+            params: [
                 // {
                 //     label:'盘点批次号',
                 //     key: 'lotnum'
                 // },
-                
-                {
-                    label:'盘点任务号',
-                    key: 'checkNum'
-                },
+
                 {
-                    label:'托盘码',
-                    key: 'wmsCode'
+                    label: "托盘码",
+                    key: "wmsCode",
                 },
                 {
-                    label:'托盘码描述',
-                    key: 'wmsCategory'
+                    label: "盘点任务号",
+                    key: "checkNum",
                 },
                 {
-                    label:'盘点时间',
-                    key: 'exportTime'
+                    label: "盘点时间",
+                    key: "exportTime",
                 },
-                
             ],
-            statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"}
-            
-        }
+            statusMap: {
+                0: "未盘点",
+                1: "盘点异常",
+                2: "核对正确",
+                3: "人工核对正确",
+            },
+        };
     },
-    beforeRouteLeave(to ,form, next) {
+    beforeRouteLeave(to, form, next) {
         // 修复第二次进入界面不执行created
         this.$destroy();
-        if (to.name == 'checkManage') {
-            to.meta.isUseCache = true;    
-        }else{
+        if (to.name == "checkManage") {
+            to.meta.isUseCache = true;
+        } else {
             to.meta.isUseCache = false;
-        }   
+        }
         next();
     },
     created() {
-        this.imgUrl = imgUrl
-        
+        this.imgUrl = imgUrl;
+
         //this.getStreetList();
-        if (this.$route.query.row && this.$route.query.column && this.$route.query.direction && this.$route.query.side && this.$route.query.streetId) {
-            this.id = this.$route.query.id
-            this.row = this.$route.query.row
-            this.column = this.$route.query.column
-            this.direction = this.$route.query.direction
-            this.side = this.$route.query.side
-            this.streetId = this.$route.query.streetId
-            this.streetName = this.$route.query.name
-            
+        if (
+            this.$route.query.row &&
+            this.$route.query.column &&
+            this.$route.query.direction &&
+            this.$route.query.side &&
+            this.$route.query.streetId
+        ) {
+            this.id = this.$route.query.id;
+            this.row = this.$route.query.row;
+            this.column = this.$route.query.column;
+            this.direction = this.$route.query.direction;
+            this.side = this.$route.query.side;
+            this.streetId = this.$route.query.streetId;
+            this.streetName = this.$route.query.name;
+
             this.getStockInfo(this.row, this.column);
+            this.getCategoryList();
         }
     },
-    mounted() {
-        
-    },
-    destroyed () {
-        
-    },
+    mounted() {},
+    destroyed() {},
     components: {
-        Model
+        Model,
     },
     methods: {
-       
+        handleChangeVlue(value){
+            this.checkObj.category = value
+        },
         //获取复核页面的核对信息
         getStockInfo(row, column) {
-            this.$api.httpApi.getStockInfo({
-                data: {
-                    row: Number(row),
-                    column: Number(column),
-                    direction: this.direction,
-                    side: this.side,
-                    streetId: this.streetId,
-                }
-            }).then(res => {
-                if (res.data) {
-                    this.checkObj = res.data;
-                    this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg"
-                    //this.shelveId = res.data.shelveId;
-                    //this.getScanAndCheck();
-                }
-            }).catch(err => {
-                console.log(err)
-            });
+            this.$api.httpApi
+                .getStockInfo({
+                    data: {
+                        row: Number(row),
+                        column: Number(column),
+                        direction: this.direction,
+                        side: this.side,
+                        streetId: this.streetId,
+                    },
+                })
+                .then((res) => {
+                    if (res.data) {
+                        this.checkObj = res.data;
+                        this.checkObj.checkPic2 =
+                            this.checkObj.checkPic + ".jpg";
+                        //this.shelveId = res.data.shelveId;
+                        //this.getScanAndCheck();
+                    }
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
+        //获取复核页面的核对信息
+        getCategoryList() {
+            this.$api.httpApi
+                .getCategoryList({
+                    data: {},
+                })
+                .then((res) => {
+                    if (res.data) {
+                        this.categorys = res.data;
+                        console.log(this.categorys);
+                        //this.shelveId = res.data.shelveId;
+                        //this.getScanAndCheck();
+                    }
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
         },
         handleChange(value) {
-            
-            this.select = value
-            this.id = value
-            this.row = 1
-            this.column = 1
-            this.getStockInfo(1, 1)
+            this.select = value;
+            this.id = value;
+            this.row = 1;
+            this.column = 1;
+            this.getStockInfo(1, 1);
         },
-        
-        checkSure(row, column, shelveId, index) {
-            this.$api.httpApi.stockCheckCorrect({
-                data: {
-                    row: Number(row),
-                    column: Number(column),
-                    side: Number(this.side),
-                    streetId: Number(this.streetId),
-                    direction: Number(this.direction),
-                    ok: 1
-                }
-            }).then(res => {
-                if (res.code == 200) {
-                    this.$message.success('操作成功');
-                    this.getStockInfo(this.row,this.column)
-                }
 
-            }).catch(err => {
+        checkSure(row, column, shelveId, index) {
+            this.$api.httpApi
+                .stockCheckCorrect({
+                    data: {
+                        row: Number(row),
+                        column: Number(column),
+                        side: Number(this.side),
+                        streetId: Number(this.streetId),
+                        direction: Number(this.direction),
+                        conut: this.checkObj.count,
+                        category: this.checkObj.category,
 
-            });
+                        ok: 1,
+                    },
+                })
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.$message.success("操作成功");
+                        this.getStockInfo(this.row, this.column);
+                    }
+                })
+                .catch((err) => {});
         },
         checkfalse(row, column, shelveId, index) {
-            this.$api.httpApi.stockCheckCorrect({
-                data: {
-                    row: Number(row),
-                    column: Number(column),
-                    side: Number(this.side),
-                    streetId: Number(this.streetId),
-                    direction: Number(this.direction),
-                    ok: 0
-                }
-            }).then(res => {
-                if (res.code == 200) {
-                    this.$message.success('操作成功');
-                    this.getStockInfo(this.row,this.column)
-                }
-
-            }).catch(err => {
-
-            });
+            this.$api.httpApi
+                .stockCheckCorrect({
+                    data: {
+                        row: Number(row),
+                        column: Number(column),
+                        side: Number(this.side),
+                        streetId: Number(this.streetId),
+                        direction: Number(this.direction),
+                        ok: 0,
+                    },
+                })
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.$message.success("操作成功");
+                        this.getStockInfo(this.row, this.column);
+                    }
+                })
+                .catch((err) => {});
         },
         showModel(checkObj, index) {
-            this.visible = true
-            this.modelData = checkObj
+            this.visible = true;
+            this.modelData = checkObj;
             this.index = index;
         },
         submit(visible, index) {
-            
-            this.visible = visible
-            console.log(index)
+            this.visible = visible;
+            console.log(index);
             // this.next(index);
             this.checkObj.status = 1;
         },
         closeModel(visible, data) {
-            this.visible = visible
-            this.modelData = data
+            this.visible = visible;
+            this.modelData = data;
         },
-        nextOne(id){
-            this.$api.httpApi.nextOne({
-                data: {
-                    id:Number(id)
-                }
-            }).then(res => {
-                if (res.data && res.data != null) {
-                    console.log(res.data)
-                    this.checkObj = res.data;
-                    this.id = res.data.id
-                    this.row = res.data.row
-                    this.column = res.data.column
-                    this.direction = res.data.direction
-                    this.side = res.data.side
-                    this.streetId = res.data.streetId
-                    this.streetName = res.data.streetName
-                    this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg"
-            
-                }else{
-                    message.info('全部盘点已完成')
-                }
-            }).catch(err => {
-                console.log(err)
-            });
-        }
-       
-    }
-}
+        nextOne(id) {
+            this.$api.httpApi
+                .nextOne({
+                    data: {
+                        id: Number(id),
+                    },
+                })
+                .then((res) => {
+                    if (res.data && res.data != null) {
+                        console.log(res.data);
+                        this.checkObj = res.data;
+                        this.id = res.data.id;
+                        this.row = res.data.row;
+                        this.column = res.data.column;
+                        this.direction = res.data.direction;
+                        this.side = res.data.side;
+                        this.streetId = res.data.streetId;
+                        this.streetName = res.data.streetName;
+                        this.checkObj.checkPic2 =
+                            this.checkObj.checkPic + ".jpg";
+                    } else {
+                        message.info("全部盘点已完成");
+                    }
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
+    },
+};
 </script>
 <style lang="scss">
-    .ant-carousel .slick-slide {
-        color: #000000;
-    }
+.ant-carousel .slick-slide {
+    color: #000000;
+}
 
-    .checkOperation {
-            .carousel-page {
-                width: 100%;
-                /*border: solid 1px blue;*/
-                &-title {
-                    color: #009FE3;
-                    font-size: 16px;
-                    margin: 0;
-                    padding: 15px 0 10px 25px;
-                }
+.checkOperation {
+    .carousel-page {
+        width: 100%;
+        /*border: solid 1px blue;*/
+        &-title {
+            color: #009fe3;
+            font-size: 16px;
+            margin: 0;
+            padding: 15px 0 10px 25px;
+        }
 
-                &-content {
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    padding-left: 25px;
+        &-content {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding-left: 25px;
 
-                    .img-box {
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                        flex-direction: column;
-                        font-size: 17px;
-                        height: 400px;
-                        margin-right: 10px;
-                        img {
-                            height: 100%
-                        }
+            .img-box {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                flex-direction: column;
+                font-size: 17px;
+                height: 400px;
+                margin-right: 10px;
+                img {
+                    height: 100%;
+                }
 
-                        p {
-                            height: 25px;
+                p {
+                    height: 25px;
+                }
+                ul {
+                    width: 100% / 4;
+                    height: 100%;
+                    margin-bottom: 0;
+                    padding-inline-start: 0;
+                    li {
+                        background-color: #ffaf11;
+                        margin: 10px 0;
+                        padding: 5px;
+                        font-size: 16px;
+                        font-weight: 600;
+                        color: #494e52;
+                        .img-box-title {
+                            width: 130px;
+                            display: inline-block;
                         }
-                        ul {
-                            width: 100% / 4;
-                            height: 100%;
-                            margin-bottom: 0;
-                            padding-inline-start: 0;
-                            li {
-                                background-color: #ffaf11;
-                                margin: 10px 0;
-                                padding: 5px;
-                                font-size: 16px;
-                                font-weight: 600;
-                                color: #494e52;
-                                .img-box-title {
-                                    width: 130px;
-                                    display: inline-block;
-                                }
-                                .img-box-value {
-                                    display: inline-block;
-                                    width: calc(100% - 130px);
-                                    overflow: hidden;
-                                    position: relative;
-                                    top: 5px;
-                                }
-                            }
+                        .img-box-value {
+                            display: inline-block;
+                            width: calc(100% - 130px);
+                            overflow: hidden;
+                            position: relative;
+                            top: 5px;
                         }
                     }
                 }
+            }
+        }
 
-                &-footer {
-                    width: calc(100% - 380px);
-                    .info-box {
-                        color: #000000;
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
+        &-footer {
+            width: calc(100% - 380px);
+            .info-box {
+                color: #000000;
+                display: flex;
+                align-items: center;
+                justify-content: center;
 
-                        p {
-                            padding: 0 20px;
-                            font-size: 18px;
-                        }
-                    }
+                p {
+                    padding: 0 20px;
+                    font-size: 18px;
+                }
+            }
 
-                    .status {
-                        text-align: center;
-                        font-size: 21px;
-                    }
+            .status {
+                text-align: center;
+                font-size: 21px;
+            }
 
-                    .status-btn {
-                        display: flex;
-                        align-items: flex-start;
-                        justify-content: flex-start;
+            .status-btn {
+                display: flex;
+                align-items: flex-start;
+                justify-content: flex-start;
 
-                        .btn {
-                            padding: 50px;
-                            font-size: 20px;
-                            display: flex;
-                            align-items: center;
-                            justify-content: center;
-                            line-height: 0;
-                            margin: 15px 45px;
-                        }
-                    }
+                .btn {
+                    padding: 50px;
+                    font-size: 20px;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    line-height: 0;
+                    margin: 15px 45px;
                 }
             }
+        }
+    }
 
-        .bottom-btn {
-            width: 100%;
-            display: flex;
-            align-items: right;
-            justify-content: center;
+    .bottom-btn {
+        width: 100%;
+        display: flex;
+        align-items: right;
+        justify-content: center;
 
-            p {
-                font-size: 18px;
-                padding: 0;
-                margin: 0;
-            }
+        p {
+            font-size: 18px;
+            padding: 0;
+            margin: 0;
+        }
 
-            .btn {
-                margin: 25px;
-            }
+        .btn {
+            margin: 25px;
         }
     }
-    .historyImg {
-        width: 180px;
-        height:auto;
-    }
-
+}
+.historyImg {
+    width: 180px;
+    height: auto;
+}
 </style>
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 5b6b275..39cfa91 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -108,7 +108,6 @@
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
                         <viewer>
                             <img class="historyImg" :src="imgUrl+text.pic"/> 
-                            <img class="historyImg" :src="imgUrl+text.pic+'.jpg'"/>
                         </viewer>
                     </happy-scroll>
                 </span>