diff --git a/src/api/area/index.js b/src/api/area/index.js
index b5ab1c5..ec502b4 100644
--- a/src/api/area/index.js
+++ b/src/api/area/index.js
@@ -64,4 +64,21 @@ export function FetchLibraryRegionDetails(params) {
   })
 }
 
-export default { add, edit, del, sort, saveLibraryRegionSignPoint, FetchInitLibraryRegionList, FetchRegionAllByFloor, FetchLibraryRegionDetails }
+// 区域id关联图书分类
+export function FetchbookClassRegionIdRelated(parameter) {
+  return request({
+    url: 'api/libraryRegion/bookClassRegionIdRelated',
+    method: 'post',
+    data: parameter
+  })
+}
+
+// 根据区域id获取关联图书分类
+export function FetchBookClassByRegionId(params) {
+  return request({
+    url: 'api/libraryRegion/getBookClassByRegionId' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, sort, saveLibraryRegionSignPoint, FetchInitLibraryRegionList, FetchRegionAllByFloor, FetchLibraryRegionDetails, FetchbookClassRegionIdRelated, FetchBookClassByRegionId }
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 14218d5..ebf068c 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -57,4 +57,13 @@ export function FetchDictionaryTreeByCategoryId(params) {
   })
 }
 
-export default { add, edit, del, FetchDictsList, FetchDictionaryTree, FetchSonDictionaryList, FetchDictionaryTreeByCategoryId }
+// 根据父code查询子集
+export function FetchSonDictionaryListByCode(params) {
+  return request({
+    url: '/api/dictionary/getSonDictionaryListByCode',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, FetchDictsList, FetchDictionaryTree, FetchSonDictionaryList, FetchDictionaryTreeByCategoryId, FetchSonDictionaryListByCode }
diff --git a/src/views/deviceManage/area/areaClassifyRelated.vue b/src/views/deviceManage/area/areaClassifyRelated.vue
index fafe8fb..913db27 100644
--- a/src/views/deviceManage/area/areaClassifyRelated.vue
+++ b/src/views/deviceManage/area/areaClassifyRelated.vue
@@ -17,13 +17,16 @@
           </div>
         </div>
         <div>
+          <!--
+            @selection-change="crud.selectionChangeHandler" -->
           <el-table
             ref="table"
             v-loading="crud.loading"
             :data="crud.data"
             style="width: 100%;"
+            highlight-current-row
             height="506"
-            @selection-change="crud.selectionChangeHandler"
+            row-key="id"
             @row-click="clickRowHandler"
           >
             <!-- <el-table-column type="selection" align="center" width="55" /> -->
@@ -46,34 +49,49 @@
             <li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">关联列表<i /></li>
             <!-- 最右侧装饰img -->
             <span class="tab-right-img" />
-            <el-button size="mini" class="venue-mark">
+            <!-- :disabled="crud.selections.length !== 1"  -->
+            <el-button size="mini" class="venue-mark" @click="handleSetRelated">
               <i class="iconfont icon-bendiguajie" />
               关联设置
             </el-button>
           </ul>
-          <div v-if="activeIndex == 0" class="venue-preview">
-            111
+          <div v-if="activeIndex == 0" class="venue-preview" style="overflow-y: scroll;">
+            <div v-if="relatedList.length !== 0">
+              <div v-for="item in relatedList" :key="item.id" class="related-item">
+                {{ item.dictionaryCode +'  '+ item.dictionaryName }}
+              </div>
+            </div>
+            <el-empty v-else description="还未关联图书分类" />
           </div>
         </div>
       </div>
     </div>
 
     <!-- form -->
-    <el-dialog :close-on-click-modal="false" :append-to-body="true" title="关联图书分类" :visible.sync="relatedVisible">
+    <el-dialog :close-on-click-modal="false" :append-to-body="true" :title="relatedTitle" :visible.sync="relatedVisible" :before-close="handleCloseDialog">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <el-table :data="relatedTableData" class="file-sort" style="width: 100%;max-height: 70vh;" row-key="id">
+        <el-table
+          ref="relatedTable"
+          :data="relatedTableData"
+          style="width: 100%;"
+          height="602px"
+          row-key="id"
+          @selection-change="selectionRelatedChangeHandler"
+          @row-click="clickRowRelatedHandler"
+        >
+          <el-table-column type="selection" align="center" width="55" />
           <el-table-column type="index" label="序号" width="100" align="center" />
           <el-table-column prop="regionName" label="图书分类">
             <template slot-scope="scope">
-              <span>{{ scope.row.regionName +' [ '+ scope.row.floorName+' ] ' }}</span>
+              <span>{{ scope.row.dictionaryCode +'  '+ scope.row.dictionaryName }}</span>
             </template>
           </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="handleCloseDialog">取消</el-button>
-          <el-button type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button type="primary" @click="handleSaveRelated">保存</el-button>
         </div>
       </div>
     </el-dialog>
@@ -82,7 +100,8 @@
 
 <script>
 import { FetchLibraryFloorListAll } from '@/api/floor/index'
-import crudRegion from '@/api/area/index'
+import { FetchSonDictionaryListByCode } from '@/api/system/dict'
+import crudRegion, { FetchbookClassRegionIdRelated, FetchBookClassByRegionId } from '@/api/area/index'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
@@ -112,9 +131,12 @@ export default {
         del: ['admin', 'floor:del']
       },
       activeIndex: 0,
+      relatedTitle: '关联图书分类',
       relatedTableData: [], // 排序data
       relatedVisible: false, // 排序dialog
-      currentData: null
+      relatedSelections: [],
+      currentData: null,
+      relatedList: []
     }
   },
   computed: {
@@ -128,7 +150,11 @@ export default {
   beforeDestroy() {
     window.removeEventListener('beforeunload', this.clearLocalStorage)
   },
+  mounted() {
+    this.getSonDictionaryListByCode()
+  },
   methods: {
+
     clearLocalStorage() {
       const key = 'formFloor'
       if (localStorage.getItem(key)) {
@@ -145,11 +171,21 @@ export default {
       }
     },
     [CRUD.HOOK.afterRefresh](crud) {
-      console.log('crud.data', crud.data)
       if (crud.data.length !== 0) {
-        this.clickRowHandler(crud.data[0])
-        this.activeIndex = 0
+        this.$nextTick(() => {
+          let targetIndex = 0
+          if (this.currentData) {
+            targetIndex = crud.data.findIndex(item => item.id === this.currentData.id)
+            if (targetIndex === -1) targetIndex = 0
+          }
+          this.$refs.table.setCurrentRow(crud.data[targetIndex])
+          this.clickRowHandler(crud.data[targetIndex])
+        })
+      } else {
+        this.currentData = null
+        this.relatedList = []
       }
+      this.activeIndex = 0
     },
 
     // 提交前的验证
@@ -168,50 +204,107 @@ export default {
       if (this.$route.query.formFloor) {
         localStorage.removeItem('formFloor')
       }
-
+      this.currentData = null
+      this.relatedList = []
       this.crud.query.floorId = value
       this.crud.toQuery()
-      console.log('value', value)
     },
     clickRowHandler(row) {
-      this.$refs.table.clearSelection()
-      this.$refs.table.toggleRowSelection(row)
+      if (!this.$refs.table) return
       this.currentData = row
+
+      this.$nextTick(() => {
+        this.$refs.table.doLayout()
+        this.$refs.table.setCurrentRow(row)
+      })
+
       if (this.activeIndex === 0) {
-        console.log('列表数据', row)
+        FetchBookClassByRegionId({ 'id': row.id }).then(res => {
+          if (res.code !== 500) {
+            this.relatedList = res
+          } else {
+            this.relatedList = []
+          }
+        }).catch(() => {
+        })
       }
     },
-    changeActiveTab(data) {
-      this.activeIndex = data
+    getSonDictionaryListByCode() {
+      const params = {
+        'code': 'BookClass'
+      }
+      FetchSonDictionaryListByCode(params).then(res => {
+        if (res.length > 0) {
+          this.relatedTableData = res
+        } else {
+          this.relatedTableData = []
+        }
+      }).catch(() => {
+      })
     },
-    toDelete(datas) {
-      this.$confirm('此操作将删除当前所选区域<span>你是否还要继续？</span>', '提示', {
-        confirmButtonText: '继续',
-        cancelButtonText: '取消',
-        type: 'warning',
-        dangerouslyUseHTMLString: true
-      }).then(() => {
-        this.crud.delAllLoading = true
-        const ids = []
-        datas.forEach(val => {
-          ids.push(val.id)
+    handleSetRelated() {
+      this.relatedVisible = true
+      this.relatedTitle = '关联图书分类 - ' + ' [ ' + this.currentData.floorName + ' - ' + this.currentData.regionName + ' ]'
+
+      if (this.relatedList.length > 0) {
+        this.$nextTick(() => {
+          if (this.$refs.relatedTable) {
+            this.relatedList.forEach(relatedItem => {
+              const row = this.relatedTableData.find(tableRow => tableRow.id === relatedItem.dictionary_id)
+              if (row) {
+                this.$refs.relatedTable.toggleRowSelection(row, true)
+              }
+            })
+          }
         })
-        console.log(ids)
-        crudRegion.del(ids).then(res => {
-          console.log(res)
-          this.$message({ message: res, type: 'success', offset: 8 })
-          this.crud.delAllLoading = false
-          this.crud.refresh()
-        }).catch(err => {
-          this.crud.delAllLoading = false
-          console.log(err)
+      } else {
+        this.$nextTick(() => {
+          if (this.$refs.relatedTable) {
+            this.$refs.relatedTable.clearSelection()
+          }
         })
+      }
+    },
+    selectionRelatedChangeHandler(val) {
+      this.relatedSelections = val
+    },
+    clickRowRelatedHandler(row) {
+      // this.$refs.relatedTable.clearSelection()
+      this.$refs.relatedTable.toggleRowSelection(row)
+    },
+    handleSaveRelated() {
+      // if (this.relatedSelections.length === 0) {
+      //   this.$message({ message: '请选择需要关联的图书分类', type: 'error', offset: 8 })
+      //   return
+      // }
+      const dictionaryIds = []
+      this.relatedSelections.forEach(item => {
+        dictionaryIds.push(item.id)
+      })
+      const params = {
+        'regionId': this.currentData.id,
+        'dictionaryIds': dictionaryIds
+      }
+      console.log('params', params)
+      FetchbookClassRegionIdRelated(params).then(res => {
+        if (res.code !== 500) {
+          this.$message({ message: '操作成功', type: 'success', offset: 8 })
+          this.crud.refresh()
+        } else {
+          this.$message({ message: '操作失败', type: 'error', offset: 8 })
+        }
+        this.handleCloseDialog()
       }).catch(() => {
-        this.crud.delAllLoading = false
       })
     },
+    changeActiveTab(data) {
+      this.activeIndex = data
+    },
     handleCloseDialog() {
       this.relatedVisible = false
+      if (this.$refs.relatedTable) {
+        this.$refs.relatedTable.clearSelection()
+      }
     }
   }
 }
@@ -221,4 +314,14 @@ export default {
 .tab-content{
   min-height: calc(100vh - 232px) !important;
 }
+.related-item{
+  padding: 0 10px;
+  height: 40px;
+  line-height: 40px;
+  font-size: 14px;
+  color: #0c0e1e;
+  background-color: #e8f2ff;
+  border-radius: 3px;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/views/deviceManage/area/index.vue b/src/views/deviceManage/area/index.vue
index 6a558c1..759eb0e 100644
--- a/src/views/deviceManage/area/index.vue
+++ b/src/views/deviceManage/area/index.vue
@@ -132,7 +132,7 @@
             <el-input v-model="form.regionDescription" placeholder="请输入" type="textarea" rows="3" style="width: 580px;" />
           </el-form-item>
           <el-form-item label="地图类型" prop="mapType">
-            <el-radio-group v-model="form.mapType" :disabled="true">
+            <el-radio-group v-model="form.mapType" v-removeAriaHidden :disabled="true">
               <el-radio :label="1">2D</el-radio>
               <el-radio :label="2">3D</el-radio>
             </el-radio-group>
diff --git a/src/views/deviceManage/bookshelf/index.vue b/src/views/deviceManage/bookshelf/index.vue
index 1965dda..7ced480 100644
--- a/src/views/deviceManage/bookshelf/index.vue
+++ b/src/views/deviceManage/bookshelf/index.vue
@@ -41,7 +41,7 @@
           >
             <el-table-column type="selection" align="center" width="55" />
             <!-- <el-table-column type="index" label="排序" /> -->
-            <el-table-column prop="shelfName" label="书架名称" />
+            <el-table-column prop="shelfName" label="书架名称" min-width="90" />
             <el-table-column prop="shelfShelf" label="书架规格">
               <template slot-scope="scope">
                 <span>{{ scope.row.shelfFloor + ' X ' + scope.row.shelfShelf }}</span>
@@ -53,8 +53,20 @@
               </template>
             </el-table-column>
             <el-table-column prop="floorName" label="所属楼层" />
-            <el-table-column prop="regionName" label="所属区域" min-width="100" />
-            <el-table-column prop="signPoint" label="标注">
+            <el-table-column prop="regionName" label="所属区域" min-width="130" />
+            <el-table-column prop="regionName" label="视觉盘点" width="80">
+              <template slot-scope="scope">
+                <span :class="['row-state', scope.row.signPoint ? 'end-state' : 'cancel-state' ]">{{ scope.row.signPoint ? '参与': '不参与' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="regionName" label="3D定位" width="80" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini" @click="handleShelf3D(scope.row)">
+                  操作
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="signPoint" label="2D标注">
               <template slot-scope="scope">
                 <span :class="['row-state', scope.row.signPoint ? 'end-state' : 'cancel-state' ]">{{ scope.row.signPoint ? '已标注': '未标注' }}</span>
               </template>
@@ -173,6 +185,12 @@
               <el-radio :label="1">书架</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="视觉盘点" prop="shelfErrorJudge">
+            <el-radio-group v-model="form.shelfErrorJudge" v-removeAriaHidden size="mini">
+              <el-radio :label="2">不参与</el-radio>
+              <el-radio :label="1">参与</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -559,11 +577,15 @@ export default {
     },
     onRowDblclick(row) {
       crudShelf.FetchBookShelfDetails({ 'shelfId': row.shelfId }).then(res => {
-        this.$router.push({ path: '/bookshelf/bookshelfPosition', query: { 'floorName': row.floorName, 'regionName': row.regionName }})
+        this.$router.push({ path: '/deviceManage/shelfManage/bookshelfPosition', query: { 'floorName': row.floorName, 'regionName': row.regionName }})
         localStorage.setItem('bookShelfDetails', JSON.stringify(res))
       }).catch(() => {
       })
     },
+    handleShelf3D(row) {
+      console.log('row', row)
+      this.$router.push({ path: '/deviceManage/shelfManage/shelf3dPosition', query: { 'floorName': row.floorName, 'regionName': row.regionName }})
+    },
     toDelete(datas) {
       this.$confirm('此操作将删除当前所选书架<span>你是否还要继续？</span>', '提示', {
         confirmButtonText: '继续',
diff --git a/src/views/deviceManage/floor/index.vue b/src/views/deviceManage/floor/index.vue
index 40c7c5e..f851003 100644
--- a/src/views/deviceManage/floor/index.vue
+++ b/src/views/deviceManage/floor/index.vue
@@ -103,7 +103,7 @@
             <el-input v-model="form.floorDescription" placeholder="请输入" type="textarea" rows="3" style="width: 580px;" />
           </el-form-item>
           <el-form-item label="地图类型" prop="mapType">
-            <el-radio-group v-model="form.mapType">
+            <el-radio-group v-model="form.mapType" v-removeAriaHidden>
               <el-radio :label="1">2D</el-radio>
               <el-radio :label="2">3D</el-radio>
             </el-radio-group>
diff --git a/src/views/deviceManage/map3d/index.vue b/src/views/deviceManage/map3d/index.vue
index 79579e1..4e3fb08 100644
--- a/src/views/deviceManage/map3d/index.vue
+++ b/src/views/deviceManage/map3d/index.vue
@@ -62,7 +62,7 @@
             <el-input v-model="form.mapKey" style="width: 486px;" placeholder="请输入，注意：输入错误将无法正常解析" />
           </el-form-item>
           <el-form-item label="访问方式" prop="isOnline">
-            <el-radio-group v-model="form.isOnline">
+            <el-radio-group v-model="form.isOnline" v-removeAriaHidden>
               <el-radio :label="1">在线</el-radio>
               <el-radio :label="0">离线</el-radio>
             </el-radio-group>
diff --git a/src/views/deviceManage/map3d/map.vue b/src/views/deviceManage/map3d/map.vue
index d4c49ef..5bffeb3 100644
--- a/src/views/deviceManage/map3d/map.vue
+++ b/src/views/deviceManage/map3d/map.vue
@@ -148,8 +148,10 @@ export default {
           const target = e.targets[0]
           this.marker && this.marker.remove()
           this.marker = null
-          this.areaFid = null
-          this.areaModel.resetColor()
+          if (this.areaFid) {
+            this.areaFid = null
+            this.areaModel.resetColor()
+          }
 
           console.log('event:', e)
           console.log('拾取模型对象:', target)
diff --git a/src/views/deviceManage/shelfManage/shelf.vue b/src/views/deviceManage/shelfManage/shelf.vue
index 67247d0..55c17c6 100644
--- a/src/views/deviceManage/shelfManage/shelf.vue
+++ b/src/views/deviceManage/shelfManage/shelf.vue
@@ -55,7 +55,7 @@
                 <el-input v-model="form.phone" placeholder="请输入" />
               </el-form-item>
               <el-form-item label="性别" prop="personSex">
-                <el-radio-group v-model="form.personSex">
+                <el-radio-group v-model="form.personSex" v-removeAriaHidden>
                   <el-radio :label="1">男</el-radio>
                   <el-radio :label="0">女</el-radio>
                 </el-radio-group>
diff --git a/src/views/deviceManage/shelfManage/shelf3dPosition.vue b/src/views/deviceManage/shelfManage/shelf3dPosition.vue
new file mode 100644
index 0000000..8a19d20
--- /dev/null
+++ b/src/views/deviceManage/shelfManage/shelf3dPosition.vue
@@ -0,0 +1,24 @@
+<template>
+  <div class="app-container row-container">
+    架位3D地图定位
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Shelf3dPosition',
+  data() {
+    return {
+    }
+  },
+  watch: {
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/deviceManage/shelfManage/shelfAllSearch.vue b/src/views/deviceManage/shelfManage/shelfAllSearch.vue
new file mode 100644
index 0000000..3cb7389
--- /dev/null
+++ b/src/views/deviceManage/shelfManage/shelfAllSearch.vue
@@ -0,0 +1,240 @@
+<template>
+  <div class="app-container  row-container">
+    <div class="head-container">
+      <div class="head-search">
+        <!-- 搜索 -->
+        <el-select v-model="selectFloorVal" size="small" placeholder="楼层" class="filter-item" style="width: 80px" value-key="id" @change="changeBeforeFloor">
+          <el-option v-for="(item,index) in floorOptions" :key="index" :label="item.floorName" :value="item" />
+        </el-select>
+        <el-select v-model="selectRegionVal" size="small" placeholder="区域" class="filter-item" style="width: 140px" value-key="id" @change="changeBeforeRegion">
+          <el-option v-for="(item,index) in regionOptions" :key="index" :label="item.regionName" :value="item" />
+        </el-select>
+        <el-input v-model="query.search" clearable size="small" placeholder="输入检索条件检索" prefix-icon="el-icon-search" style="width: 220px;" class="filter-item" @clear="crud.toQuery" @keyup.enter.native="crud.toQuery" />
+        <rrOperation>
+          <template v-slot:right>
+            <el-button class="filter-item  filter-refresh" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery()">重置</el-button>
+          </template>
+        </rrOperation>
+      </div>
+      <crudOperation :permission="permission">
+        <template v-slot:right>
+          <el-button :loading="crud.downloadLoading" size="mini" @click="doExport(crud.selections)">
+            <i class="iconfont icon-daochu" />
+            导出
+          </el-button>
+        </template>
+      </crudOperation>
+    </div>
+    <div class="container-wrap">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        class="archives-table"
+        :data="crud.data"
+        style="width: 100%;"
+        height="calc(100vh - 329px)"
+        @selection-change="crud.selectionChangeHandler"
+        @row-click="clickRowHandler"
+      >
+        <el-table-column type="selection" align="center" width="55" />
+        <el-table-column prop="gridName" label="层位名称">
+          <template slot-scope="scope">
+            {{ scope.row.gridName | removeQUPrefix }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="gridCode" label="层位编码" />
+        <el-table-column prop="floorName" label="所属机构" />
+        <el-table-column prop="floorName" label="所属楼层" />
+        <el-table-column prop="regionName" label="所属区域" />
+        <el-table-column prop="createTime" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button @click="handlePosition(scope.row)">定位</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination v-if="crud.data.length!==0" />
+    </div>
+
+    <el-dialog class="positionDialog" append-to-body :close-on-click-modal="false" :modal-append-to-body="false" :before-close="handleCloseDialog" :visible="positionVisible" title="层位定位">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <ul class="book-detail">
+          <li><span>所属机构</span>{{ user.fonds.fondsName }}</li>
+          <li><span>所属楼层</span>{{ positionContent.floorName }}</li>
+          <li><span>所属区域</span>{{ positionContent.regionName }}</li>
+          <li><span>所属书架</span>{{ positionTitle }}</li>
+        </ul>
+        <div class="position-content">
+          <div class="position-left">
+            <h5>平面图</h5>
+            <div class="venue-preview">
+              <div v-show="currentMarkData && currentMarkData.signPoint ">
+                <canvas :id="`canvasPreview${currentMarkData && currentMarkData.id}`" :width="width" :height="height" />
+              </div>
+              <img v-if="currentMarkData && !currentMarkData.signPoint" :src="imageUrl" :onerror="defaultImg" alt="">
+              <img v-if="!currentMarkData" :src="imageUrl" :onerror="defaultImg" alt="">
+            </div>
+          </div>
+          <div class="position-right">
+            <h5>书架图</h5>
+            <div class="shelf-top" :style="rowStyle">
+              <p v-for="(item,index) in reversedRackNum" :key="index" :style="{width: `calc(${'100%/' + rackNum} - 4px )`}"><span>{{ item + '架' }}</span></p>
+            </div>
+            <ul class="data-shelf-row" :style="rowStyle">
+              <li
+                v-for="(cell,i) in booShelfGrid"
+                :key="i"
+                :class="{ active: i === cellIndex }"
+                class="data-shelf-cell"
+                :style="cellStyle"
+              >
+                <span class="cell-name">{{ cell.gridName | removeMianBeforeRefix }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { positionCrud } from '../../visualCheck/checkManage/positionMixins/index'
+import { FetchLibraryFloorListAll } from '@/api/floor/index'
+import { FetchInitLibraryRegionList } from '@/api/area/index'
+import crudShelf from '@/api/shelf/index'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+// import { exportFile } from '@/utils/index'
+// import qs from 'qs'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ShelfAllSearch',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '架位查询', url: 'api/bookShelf/initShelfGridSearch', crudMethod: { ...crudShelf }, sort: [], optShow: {
+      add: false,
+      edit: false,
+      del: false,
+      download: false,
+      group: false,
+      reset: false
+    }})
+  },
+  mixins: [presenter(), header(), crud(), positionCrud],
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'search:add'],
+        edit: ['admin', 'search:edit'],
+        del: ['admin', 'search:del']
+      },
+      floorOptions: [],
+      regionOptions: [],
+      selectFloorVal: null,
+      selectRegionVal: null
+
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseApi',
+      'user'
+    ])
+  },
+  async created() {
+    this.getLibraryFloorListAll()
+  },
+  methods: {
+    // 获取楼层数据
+    getLibraryFloorListAll() {
+      FetchLibraryFloorListAll().then(res => {
+        this.floorOptions = res
+      }).catch(() => {
+      })
+    },
+    getInitLibraryRegionList(val) {
+      const params = {
+        'floorId': val
+      }
+      FetchInitLibraryRegionList(params).then(res => {
+        this.regionOptions = res.content
+        this.crud.toQuery()
+      }).catch(() => {
+      })
+    },
+    changeBeforeFloor(val) {
+      if (val) {
+        this.selectFloorVal = val
+        this.crud.query.floorId = val.id
+        this.getInitLibraryRegionList(val.id)
+      }
+    },
+    changeBeforeRegion(val) {
+      if (val) {
+        this.selectRegionVal = val
+        this.crud.query.regionId = val.id
+        this.crud.toQuery()
+      }
+    },
+    resetQuery() {
+      this.crud.query.search = ''
+      this.selectFloorVal = null
+      this.selectRegionVal = null
+      this.crud.query.floorId = null
+      this.crud.query.regionId = null
+      this.crud.toQuery()
+    },
+    clickRowHandler(row) {
+      this.$refs.table.clearSelection()
+      this.$refs.table.toggleRowSelection(row)
+    },
+    doExport() {
+      console.log('doExport', this.crud.page.total)
+      if (this.crud.page.total > 10000) {
+        this.handleExport('导出数据大于10000条，时间可能较长')
+      } else {
+        this.handleExport('此操作将导出所有数据')
+      }
+    },
+    handleExport(message) {
+      this.crud.downloadLoading = true
+      this.$confirm(message + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消',
+        type: 'warning',
+        dangerouslyUseHTMLString: true
+      }).then(() => {
+        const params = {
+          'libcode': this.user.fonds.fondsNo,
+          'floorId': this.selectFloorVal.id,
+          'regionId': this.selectRegionVal.id,
+          'search': this.crud.query.search
+        }
+        console.log('exportFile', params)
+        // exportFile(this.baseApi + '/api/person/downloadFaceRecognizeLog?' + qs.stringify(params, { indices: false, allowDots: true, skipNulls: false }))
+        this.crud.downloadLoading = false
+      }).catch(() => {
+        console.log('取消')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tag-info{
+  p{
+    margin-right: 20px;
+  }
+}
+</style>
diff --git a/src/views/digitalScreen/index.vue b/src/views/digitalScreen/index.vue
index 2adb9f1..ac5e4ff 100644
--- a/src/views/digitalScreen/index.vue
+++ b/src/views/digitalScreen/index.vue
@@ -77,7 +77,7 @@
             <div v-if="currentScreenItem.id === 1" class="config-item">
               <div class="config-item-main">
                 <span class="data-title">到馆统计</span>
-                <el-radio-group v-model="arrival_library_setting" aria-hidden="false" @change="handleArrivalSettingChange">
+                <el-radio-group v-model="arrival_library_setting" v-removeAriaHidden @change="handleArrivalSettingChange">
                   <el-radio label="1">本地数据</el-radio>
                   <el-radio label="2">基数计算</el-radio>
                   <!-- <el-radio label="3">第三方接口</el-radio> -->
diff --git a/src/views/digitalScreen/module/areaSetting.vue b/src/views/digitalScreen/module/areaSetting.vue
index c62695a..d46c2dc 100644
--- a/src/views/digitalScreen/module/areaSetting.vue
+++ b/src/views/digitalScreen/module/areaSetting.vue
@@ -150,7 +150,7 @@
               </el-form-item>
             </div>
             <el-form-item label="类型" prop="branchType">
-              <el-radio-group v-model="form.branchType" aria-hidden="false" @change="changeBranchType">
+              <el-radio-group v-model="form.branchType" v-removeAriaHidden @change="changeBranchType">
                 <el-radio label="1">总馆</el-radio>
                 <el-radio label="2">分馆</el-radio>
               </el-radio-group>
diff --git a/src/views/faceRecognition/personInfoManage.vue b/src/views/faceRecognition/personInfoManage.vue
index 614a8d0..41b6e91 100644
--- a/src/views/faceRecognition/personInfoManage.vue
+++ b/src/views/faceRecognition/personInfoManage.vue
@@ -58,7 +58,7 @@
                 <el-input v-model="form.phone" placeholder="请输入" />
               </el-form-item>
               <el-form-item label="性别" prop="personSex">
-                <el-radio-group v-model="form.personSex">
+                <el-radio-group v-model="form.personSex" v-removeAriaHidden>
                   <el-radio :label="1">男</el-radio>
                   <el-radio :label="0">女</el-radio>
                 </el-radio-group>
diff --git a/src/views/faceRecognition/personRegister.vue b/src/views/faceRecognition/personRegister.vue
index 33d5272..e77a47a 100644
--- a/src/views/faceRecognition/personRegister.vue
+++ b/src/views/faceRecognition/personRegister.vue
@@ -49,7 +49,7 @@
                 <el-input v-model="form.phone" placeholder="请输入" />
               </el-form-item>
               <el-form-item label="性别" prop="personSex">
-                <el-radio-group v-model="form.personSex">
+                <el-radio-group v-model="form.personSex" v-removeAriaHidden>
                   <el-radio :label="1">男</el-radio>
                   <el-radio :label="0">女</el-radio>
                 </el-radio-group>
diff --git a/src/views/inquiryMachine/column.vue b/src/views/inquiryMachine/column.vue
index 7ad1f8e..a665566 100644
--- a/src/views/inquiryMachine/column.vue
+++ b/src/views/inquiryMachine/column.vue
@@ -65,7 +65,7 @@
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
-              <el-radio-group v-model="form.status">
+              <el-radio-group v-model="form.status" v-removeAriaHidden>
                 <el-radio :label="1">启用</el-radio>
                 <el-radio :label="0">停用</el-radio>
               </el-radio-group>