diff --git a/auth.json b/auth.json
index fc1a930..ddc8ab0 100644
--- a/auth.json
+++ b/auth.json
@@ -1,5 +1,5 @@
 {
-    "description": "德马泰克垛机视觉系统",
+    "description": "垛机视觉系统",
     "type": -1,
     "rights": "duojiSystem",
     "children": [{
diff --git a/public/index.html b/public/index.html
index cd219c8..625caa8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,12 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>德马泰克垛机视觉系统</title>
+    <title>垛机视觉系统</title>
 </head>
 
 <body>
     <noscript>
-        <strong>We're sorry but 德马泰克垛机视觉系统 doesn't work properly without JavaScript enabled. Please enable it to
+        <strong>We're sorry but 垛机视觉系统 doesn't work properly without JavaScript enabled. Please enable it to
             continue.</strong>
     </noscript>
     <div id="app"></div>
diff --git a/src/assets/user.json b/src/assets/user.json
index be9e3bc..2dbfdb2 100644
--- a/src/assets/user.json
+++ b/src/assets/user.json
@@ -820,7 +820,7 @@
             "parentId": 0,
             "grade": 1,
             "rights": "duojiSystem",
-            "description": "德马泰克垛机视觉系统",
+            "description": "垛机视觉系统",
             "reserved": "",
             "state": 0,
             "createTime": "2020-08-24T14:04:10",
diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue
index 540c4f6..8d2ac03 100644
--- a/src/layouts/AsideMenu.vue
+++ b/src/layouts/AsideMenu.vue
@@ -2,7 +2,7 @@
     <a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible>
         <div class="logo">
 <!--            <img src="@/assets/logo1.png" alt />-->
-            <span class="logo-title">德马泰克垛机视觉系统</span>
+            <span class="logo-title">垛机视觉系统</span>
         </div>
         <a-menu :selectedKeys="selectedKeys"
                 :openKeys.sync="openKeys"
diff --git a/src/router/index.js b/src/router/index.js
index 98f7364..bd4680b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -66,6 +66,15 @@ const routes = [{
             },
             component: () => import('@/views/alarmVideos/index')
         },
+        {
+            path: 'alarmLog',
+            name: 'alarmLog',
+            meta: {
+                icon: 'alert',
+                name: '告警日志'
+            },
+            component: () => import('@/views/alarmVideos/alarmLog')
+        },
         {
             path: 'checkManage',
             name: 'checkManage',
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 3200e62..33040d0 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -22,90 +22,165 @@
                     右货架
                 </a-select-option>
             </a-select>
-            <a-select default-value="c" style="width: 160px" v-if="!checkObj.shelveId">
-                <a-select-option value="c">
+            <a-select
+                @change="handleTypeChange2"
+                style="width: 160px"
+                :value="selectType2"
+                v-if="selectType2 !== 'none'"
+            >
+                <a-select-option value="out">
                     外
                 </a-select-option>
-                <a-select-option value="d">
+                <a-select-option value="inside">
                     内
                 </a-select-option>
             </a-select>
         </div>
-        <div v-for="(key,value) in checkList" :key="value">
 
-            <div v-if="checkObj.shelveId == value">
-                <!--{{value}}{{key}}-->
-                <div v-for="(columnItem,index) in key" :key="index">
-                    <div class="carousel-page"
-                         v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
-                        <p class="carousel-page-title">工单号：{{checkObj.orderNum}}</p>
-                        <div class="carousel-page-content">
-                            <div class="img-box">
-                                <img
-                                    src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1931813381,2486401072&fm=26&gp=0.jpg"
-                                    alt="">
-                                <p>操作前照片</p>
+        <div v-if="JSON.stringify(checkObj) !== '{}'">
+            <div v-for="(key,value) in checkList" :key="value">
+                <div v-if="checkObj.shelveId == value">
+                    <!--{{value}}{{key}}-->
+                    <div v-for="(columnItem,index) in key" :key="index">
+                        <div class="carousel-page"
+                             v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
+                            <p class="carousel-page-title">工单号：{{checkObj.orderNum}}</p>
+                            <div class="carousel-page-content">
+                                <div class="img-box">
+                                    <img
+                                        v-if="checkObj.preoperationPic"
+                                        :src="imgUrl+checkObj.preoperationPic"
+                                        alt="">
+                                    <div v-else
+                                         style="display: flex;align-items: center;justify-content: center;width:400px;height:400px;background:#bfbfbf">
+                                        暂无图片
+                                    </div>
+                                    <p>操作前照片</p>
+                                </div>
+                                <div class="img-box">
+                                    <img
+                                        v-if="checkObj.overoperationPic"
+                                        :src="imgUrl+checkObj.overoperationPic"
+                                        alt="">
+                                    <div v-else
+                                         style="display: flex;align-items: center;justify-content: center;width:400px;height:400px;background:#bfbfbf">
+                                        暂无图片
+                                    </div>
+                                    <p>操作后照片</p>
+                                </div>
                             </div>
-                            <div class="img-box">
-                                <img
-                                    src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3139679339,2066283298&fm=26&gp=0.jpg"
-                                    alt="">
-                                <p>操作后照片</p>
+                            <div class="carousel-page-footer">
+                                <div class="info-box">
+                                    <p>系统登记品规：{{checkObj.category}}</p>
+                                    <p>系统登记数量：{{checkObj.count}}</p>
+                                </div>
+                                <div class="status" v-if="checkObj.status == 0">
+                                    未核对
+                                </div>
+                                <div class="status" v-if="checkObj.status == 1">
+                                    已核对：<span style="color: #d81e06;">核对错误</span>
+                                </div>
+                                <div class="status" v-if="checkObj.status == 2">
+                                    已核对：<span style="color: #1afa29;">核对正确</span>
+                                </div>
+                                <div class="status-btn" v-if="checkObj.status == 0">
+                                    <a-button class="btn"
+                                              type="danger"
+                                              @click="showModel(checkObj,index)"
+                                    >人工复核
+                                    </a-button>
+                                    <a-button class="btn"
+                                              type="primary"
+                                              style="background:#29c12b;border-color:#29c12b;"
+                                              @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
+                                    >核对正确
+                                    </a-button>
+                                </div>
+                                <div class="status-btn" v-if="checkObj.status == 1 ||checkObj.status == 2">
+                                    <a-button class="btn"
+                                              type="danger"
+                                              @click="showModel(checkObj,index)"
+                                    >核对错误
+                                    </a-button>
+                                    <a-button class="btn"
+                                              type="primary"
+                                              style="background:#29c12b;border-color:#29c12b;"
+                                              @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
+                                    >核对正确
+                                    </a-button>
+                                </div>
                             </div>
                         </div>
-                        <div class="carousel-page-footer">
-                            <div class="info-box">
-                                <p>系统登记品规：{{checkObj.category}}</p>
-                                <p>系统登记数量：{{checkObj.count}}</p>
-                            </div>
-                            <div class="status" v-if="checkObj.status == 0">
-                                未核对
-                            </div>
-                            <div class="status" v-if="checkObj.status == 1">
-                                已核对：<span style="color: #d81e06;">核对错误</span>
-                            </div>
-                            <div class="status" v-if="checkObj.status == 2">
-                                已核对：<span style="color: #1afa29;">核对正确</span>
-                            </div>
-                            <div class="status-btn" v-if="checkObj.status == 0">
-                                <a-button class="btn"
-                                          type="danger"
-                                          @click="showModel(checkObj,index)"
-                                >人工复核
-                                </a-button>
-                                <a-button class="btn"
-                                          type="primary"
-                                          style="background:#29c12b;border-color:#29c12b;"
-                                          @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                                >核对正确
-                                </a-button>
-                            </div>
-                            <div class="status-btn" v-if="checkObj.status == 1 ||checkObj.status == 2">
-                                <a-button class="btn"
-                                          type="danger"
-                                          @click="showModel(checkObj,index)"
-                                >核对错误
-                                </a-button>
-                                <a-button class="btn"
-                                          type="primary"
-                                          style="background:#29c12b;border-color:#29c12b;"
-                                          @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                                >核对正确
-                                </a-button>
-                            </div>
-                        </div>
-                    </div>
 
-                    <div class="bottom-btn"
-                         v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
-                        <a-button class="btn" @click="prev(index > 0 ? index : 0)">＜上一个</a-button>
-                        <p>{{checkObj.row}}行{{checkObj.column}}列</p>
-                        <a-button class="btn" @click="next(index<=key.length ? index :index=key.length-1)">下一个＞
-                        </a-button>
+                        <div class="bottom-btn"
+                             v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
+                            <a-button class="btn" @click="prev(index > 0 ? index : 0)">＜上一个</a-button>
+                            <p>{{checkObj.row}}行{{checkObj.column}}列</p>
+                            <a-button class="btn" @click="next(index<=key.length ? index :index=key.length-1)">下一个＞
+                            </a-button>
+                        </div>
                     </div>
                 </div>
+
+                <!--<div v-if="shelveId == value && JSON.stringify(checkObj) == '{}'">-->
+                <!---->
+                <!--<div v-for="(columnItem,index) in key" :key="index">-->
+                <!--<div class="carousel-page"-->
+                <!--v-if="columnItem.row == row">-->
+                <!--<p class="carousel-page-title">工单号：</p>-->
+                <!--<div class="carousel-page-content">-->
+                <!--<div class="img-box">-->
+                <!--<img-->
+                <!--src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1931813381,2486401072&fm=26&gp=0.jpg"-->
+                <!--alt="">-->
+                <!--<p>操作前照片</p>-->
+                <!--</div>-->
+                <!--<div class="img-box">-->
+                <!--<img-->
+                <!--src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3139679339,2066283298&fm=26&gp=0.jpg"-->
+                <!--alt="">-->
+                <!--<p>操作后照片</p>-->
+                <!--</div>-->
+                <!--</div>-->
+                <!--<div class="carousel-page-footer">-->
+                <!--<div class="info-box">-->
+                <!--<p>系统登记品规：</p>-->
+                <!--<p>系统登记数量：</p>-->
+                <!--</div>-->
+                <!--<div class="status">-->
+                <!--未核对-->
+                <!--</div>-->
+                <!--<div class="status-btn" >-->
+                <!--<a-button class="btn"-->
+                <!--type="danger"-->
+                <!--@click="showModel(row,index)"-->
+                <!--&gt;人工复核-->
+                <!--</a-button>-->
+                <!--<a-button class="btn"-->
+                <!--type="primary"-->
+                <!--style="background:#29c12b;border-color:#29c12b;"-->
+                <!--@click="checkSure(row,column,shelveId,index)"-->
+                <!--&gt;核对正确-->
+                <!--</a-button>-->
+                <!--</div>-->
+                <!--</div>-->
+                <!--</div>-->
+
+                <!--<div class="bottom-btn"-->
+                <!--v-if="columnItem.row == row">-->
+                <!--<a-button class="btn" @click="prev1(index&#45;&#45; > 0 ? index&#45;&#45; : 0)">＜上一个</a-button>-->
+                <!--<p>{{row}}行{{column}}列</p>-->
+                <!--<a-button class="btn" @click="next1(index ++ <= key.length ? index++ :index =key.length-1)">下一个＞-->
+                <!--</a-button>-->
+                <!--</div>-->
+                <!--</div>-->
+                <!--</div>-->
             </div>
         </div>
+        <div v-else>
+            <p style="padding:25px;">该货位暂无相关记录</p>
+        </div>
+
         <Model
             :visible.sync="visible"
             :modelData.sync="modelData"
@@ -117,45 +192,67 @@
 </template>
 <script>
     import Model from "./model.vue"
+    import {imgUrl} from "@/api/importExcel";
 export default {
     data() {
         return {
             listData: [],
             checkObj: {},
             streetDetail: {},
-            checkList: [],
+            checkList: {},
             id: 0,
+            row: 1,
+            column: 1,
             selectName: '',
             shelveId: '',
             selectType: '',
+            selectType2: '',
             visible: false,
             category: '',
             count: 0,
             modelData: {},
-            index: 0
+            index: 0,
+            imgUrl: ''
         }
     },
     created() {
-        this.checkObj = this.$route.query.checkObj
-        this.streetDetail = this.$route.query.item
-        this.id = this.$route.query.item.id
-        this.selectName = this.$route.query.item.name
-        console.log(this.checkObj)
-        if (this.checkObj.shelveId == this.streetDetail.leftShelveId) {
-            this.selectType = 'left'
-        } else {
-            this.selectType = 'right'
+        this.imgUrl = imgUrl
+        console.log(this.$route.query.id)
+        if (this.$route.query.row && this.$route.query.column && this.$route.query.shelveId && this.$route.query.id && this.$route.query.name) {
+            this.id = this.$route.query.id
+            this.row = this.$route.query.row
+            this.column = this.$route.query.column
+            this.shelveId = this.$route.query.shelveId
+            this.selectName = this.$route.query.name
+            this.selectType = this.$route.query.type
+            this.selectType2 = this.$route.query.type2
+            console.log(this.shelveId)
+            console.log(this.row)
+            console.log(this.column)
+            this.getStockInfo(this.row, this.column, this.shelveId)
+        } else if (this.$route.query.checkObj && this.$route.query.item && this.$route.query.item.id && this.$route.query.item.name) {
+            this.checkObj = this.$route.query.checkObj
+            this.streetDetail = this.$route.query.item
+            this.id = this.$route.query.item.id
+            this.selectName = this.$route.query.item.name
         }
     },
     mounted() {
         this.getStreetList()
+        if (JSON.stringify(this.checkObj) !== '{}') {
+            if (this.checkObj.shelveId == this.streetDetail.leftShelveId) {
+                this.selectType = 'left'
+            } else {
+                this.selectType = 'right'
+            }
+        }
     },
     components: {
         Model
     },
     methods: {
         //获取巷道列表
-        getStreetList(id) {
+        getStreetList() {
             this.$api.httpApi.getStreetList({
                 data: {
                     pageNum: 1,
@@ -191,6 +288,7 @@ export default {
                 }
             }).then(res => {
                 this.checkList = res.data
+                console.log(this.checkList)
             }).catch(err => {
 
             });
@@ -204,8 +302,10 @@ export default {
                     shelveId: shelveId,
                 }
             }).then(res => {
-                this.checkObj = res.data
-                this.shelveId = res.data.shelveId
+                if (res.data) {
+                    this.checkObj = res.data
+                    this.shelveId = res.data.shelveId
+                }
             }).catch(err => {
 
             });
@@ -234,6 +334,21 @@ export default {
                 this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
             }
 
+        },
+        handleTypeChange2(value) {
+            console.log(this.streetDetail.leftShelveId)
+            console.log(value)
+            this.selectType2 = value
+            if (this.selectType == 'left' && value == 'inside') {
+                this.getStockInfo(1, 1, this.streetDetail.leftInsideShelveId)
+            } else if (this.selectType == 'left' && value == 'out') {
+                this.getStockInfo(1, 1, this.streetDetail.leftOutsideShelveId)
+            } else if (this.selectType == 'right' && value == 'inside') {
+                this.getStockInfo(1, 1, this.streetDetail.rightInsideShelveId)
+            } else if (this.selectType == 'right' && value == 'out') {
+                this.getStockInfo(1, 1, this.streetDetail.rightOutsideShelveId)
+            }
+
         },
         prev(index) {
             index--
@@ -259,6 +374,28 @@ export default {
                 }
             }
         },
+        prev1(index) {
+            console.log(index)
+            for (let x in this.checkList) {
+                if (this.shelveId == this.checkList[x][index].shelveId) {
+                    console.log(this.checkList[x][index].row)
+                    console.log(this.checkList[x][index].column)
+                    console.log(this.checkList[x][index].shelveId)
+                    this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
+                }
+            }
+        },
+        next1(index) {
+            console.log(index)
+            for (let x in this.checkList) {
+                if (this.shelveId == this.checkList[x][index].shelveId) {
+                    console.log(this.checkList[x][index].row)
+                    console.log(this.checkList[x][index].column)
+                    console.log(this.checkList[x][index].shelveId)
+                    this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
+                }
+            }
+        },
         checkSure(row, column, shelveId, index) {
             this.$api.httpApi.stockCheckCorrect({
                 data: {
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index ef9b93f..43d05dc 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -16,6 +16,7 @@
            </span>
         </div>
 
+        <!--左货架DOM-->
         <div class="check-content" v-for="item in data" :key="item.id">
             <div class="roadway-top" v-if="item.id == select ">
                 <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
@@ -23,9 +24,30 @@
                         <div class="line" v-for="(column,index) in item.leftColumn" :key="index">
                             <div v-for="(row,i) in item.leftRow" :key="i" class="el">
                                 <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
-                                <span class="default">
+                                <span
+                                    v-if="item.leftShelveId"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.leftShelveId,item.id,item.name,'left','none')"
+                                >
                                    {{row}}-{{column}}
-                               </span>
+                                </span>
+                                <span
+                                    v-if="item.leftInsideShelveId &&  size =='leftInsideShelveId'"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.leftInsideShelveId,item.id,item.name,'left','inside')"
+                                >
+                                   {{row}}-{{column}}
+                                </span>
+                                <span
+                                    v-if="item.leftOutsideShelveId && size== 'leftOutsideShelveId'"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.leftOutsideShelveId,item.id,item.name,'left','out')"
+                                >
+                                   {{row}}-{{column}}
+                                </span>
                                 <div v-for="(key,value) in checkList" :key="value">
                                     <div v-for="(columnItem,val) in key" :key="val">
                                         <div
@@ -55,6 +77,7 @@
             </div>
         </div>
 
+        <!--单伸类型右货架DOM-->
         <div class="center-box">
             <a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px"
                       @change="handleChange" class="select-roadway">
@@ -66,7 +89,7 @@
                 导出全部巷道
             </a-button>
         </div>
-        <div class="check-content" v-for="item in data" :key="item.id">
+        <div class="check-content" v-for="item in data" :key="item.name">
             <div class="roadway-buttom" v-if="item.id == select">
                 <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
                     <div class="roadway-box">
@@ -74,9 +97,28 @@
                             <div v-for="(row,index) in item.rightRow" :key="index" class="el">
 
                                 <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
-                                <span class="default">
+                                <span
+                                    v-if="item.rightShelveId"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.rightShelveId,item.id,item.name,'right','none')">
+                                   {{row}}-{{column}}
+                               </span>
+                                <span
+                                    v-if="item.rightInsideShelveId&& size2 == 'rightInsideShelveId'"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.rightShelveId,item.id,item.name,'right','inside')">
                                    {{row}}-{{column}}
                                </span>
+                                <span
+                                    v-if="item.rightOutsideShelveId && size2 == 'rightOutsideShelveId'"
+                                    class="default"
+                                    style="background:#bfbfbf;border-radius:4px"
+                                    @click="tocheck(row,column,item.rightOutsideShelveId,item.id,item.name,'right','out')">
+                                   {{row}}-{{column}}
+                               </span>
+
                                 <div v-for="(key,value) in checkList" :key="value">
                                     <div v-for="(columnItem,val) in key" :key="val">
                                         <div
@@ -110,8 +152,8 @@
 export default {
     data() {
         return {
-            size: 'small',
-            size2: 'small',
+            size: 'leftOutsideShelveId',
+            size2: 'rightOutsideShelveId',
             data: [],
             select: '',
             streetId: 0,
@@ -173,6 +215,14 @@ export default {
             console.log(item)
             this.$router.push({name: 'checkOperation', query: {checkObj: checkObj, item: item}})
         },
+        tocheck(row, column, shelveId, id, name, type, type2) {
+            console.log(type)
+            console.log(type2)
+            this.$router.push({
+                name: 'checkOperation',
+                query: {row: row, column: column, shelveId: shelveId, id: id, name, type: type, type2: type2}
+            })
+        },
         exportStock() {
             this.$api.httpApi.exportStock({
                 params: {
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index 73ef7a8..1a98dbb 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -187,6 +187,9 @@ export default {
                 //     item.pics = pic
                 // })
                 console.log(res.data)
+                const pagination = {...this.pagination};
+                pagination.total = res.data.total;
+                this.pagination = pagination;
                 this.data = res.data.list
             }).catch(err => {
 
diff --git a/src/views/login.vue b/src/views/login.vue
index f1ca021..d0f194c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -19,7 +19,7 @@
             <div class="login-cover-logo">
                 <img src="@/assets/logo.png" alt="logo" />
             </div>
-            <div class="login-cover-title">德马泰克垛机视觉系统</div>
+            <div class="login-cover-title">垛机视觉系统</div>
         </div>
         <!-- <div class="login-footer">Copyright © 2020 ZheHe technology CO., LTD.</div> -->
     </div>
diff --git a/src/views/repertoryManage/index.vue b/src/views/repertoryManage/index.vue
index 8aa7c59..c84616c 100644
--- a/src/views/repertoryManage/index.vue
+++ b/src/views/repertoryManage/index.vue
@@ -117,7 +117,7 @@ export default {
             }).then(res => {
                 const pagination = {...this.pagination};
                 pagination.total = res.data.total;
-                this.data = res.data;
+                this.data = res.data.list;
                 this.pagination = pagination;
                 res.data.list.forEach((value, index) => {
                     value.pageNumber = this.pagination.current
