diff --git a/dangan-ui/src/api/dangan/collection.js b/dangan-ui/src/api/dangan/collection.js
new file mode 100644
index 0000000..9d02656
--- /dev/null
+++ b/dangan-ui/src/api/dangan/collection.js
@@ -0,0 +1,23 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function collectSaves(data) {
+  return request({
+    url: '/dangan/collect/saves',
+    headers: {
+      'Content-Type': 'multipart/form-data',
+      repeatSubmit: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增档案目录
+export function collectRecongnize(data) {
+  return request({
+    url: '/dangan/collect/recongnize',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index 62bf243..476fb81 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -100,9 +100,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['dangan:catalog:edit']"
+            icon="el-icon-thumb"
+            @click="handleDACJ(scope.row)"
           >档案采集</el-button>
         </template>
       </el-table-column>
@@ -321,6 +320,10 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
+    },
+    // 档案采集
+    handleDACJ(row){
+      this.$router.push("/dangan/collection?id=" + row.id);
     }
   }
 };
diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index 15412d8..404473a 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -30,32 +30,110 @@
       <!--档案上传-->
       <el-col :span="20" :xs="24">
         <div style="display: flex; justify-content: space-between">
-          <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
-          <el-button icon="el-icon-full-screen" type="primary">OCR识别</el-button>
+          <el-button icon="el-icon-upload2" type="primary" @click="handleImport">点击上传</el-button>
+          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="OCRRecognition">OCR识别</el-button>
         </div>
 
-        <div style="margin-top: 20px;">
-          <el-empty :image-size="240"></el-empty>
+        <div style="margin-top: 100px;">
+          <el-empty :image-size="240" v-if="pictureRecard.length===0"></el-empty>
+
+          <div v-if="pictureRecard.length>0">
+            <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+            <div style="margin: 15px 0;"></div>
+            <el-checkbox v-for="item in pictureRecard" :label="item.picName" :key="item.id" v-model="item.checked" @change="handleCheckChange(item)">
+              <div style="width: 150px;">
+                <el-image
+                  style="width: 120px; height: 120px"
+                  :src="item.picUrl"
+                  :preview-src-list="[item.picUrl]">
+                </el-image>
+                <p>{{ item.picName }}</p>
+                <p>{{ item.muPath }}</p>
+                <p>{{ item.wlsjPath }}</p>
+              </div>
+            </el-checkbox>
+          </div>
+
         </div>
 
       </el-col>
 
     </el-row>
 
+    <el-dialog title="档案文件上传" :visible.sync="upload.open" width="700px" append-to-body>
+      <div style="margin-bottom: 30px;display: flex;min-height: 250px">
+        <div style="width:250px;border: 1px solid #eee; padding: 10px;">
+          <div style="margin-bottom: 5px;">物理书架：</div>
+          <el-tree
+            :data="shuJiaOptions"
+            :props="{
+            children: 'children',
+            label: 'name'
+          }"
+            :expand-on-click-node="false"
+            ref="myTreeSelect"
+            node-key="shelfId"
+            default-expand-all
+            highlight-current
+            @node-click="selectTree"
+          />
+        </div>
+
+        <div v-show="upload.shelfId" style="width: 360px;margin-left: 20px;">
+          <el-upload :show-file-list="false"
+                     ref="upload"
+                     action="#"
+                     drag
+                     :before-upload="beforeUpload"
+                     :http-request="httpRequest"
+                     multiple
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
+
+          <ul class="el-upload-list el-upload-list--text" style="max-height:200px;overflow-y:scroll;padding: 15px;">
+            <li tabindex="0" class="el-upload-list__item is-success" v-for="(item,index) in fileList" :key="item.uid">
+              <a class="el-upload-list__item-name">
+                <i class="el-icon-document"></i>
+                {{ item.name }}
+              </a>
+              <label class="el-upload-list__item-status-label">
+                <i class="el-icon-upload-success el-icon-circle-check"></i>
+              </label>
+              <i class="el-icon-close" @click="deleteFile(index)"></i>
+            </li>
+          </ul>
+
+        </div>
+
+      </div>
+
+      <div style="text-align: center">
+        <el-button style="width:300px;" type="primary" @click="submitFiles">确定上传</el-button>
+      </div>
+
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { catalogTreeselect } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listBookshelf } from "@/api/dangan/bookshelf";
+import { collectSaves, collectRecongnize } from "@/api/dangan/collection";
 
 export default {
   name: "Collection",
-  components: { Treeselect },
+  components: {Treeselect},
   data() {
     return {
+      fileList: [],
+      dangAnID: '',
+      dangAnNode: undefined,
       // 档案目录树选项
       dangAnOptions: undefined,
       // 档案目录名称
@@ -64,17 +142,18 @@ export default {
         children: "children",
         label: "label"
       },
-      // 档案导入参数
+      // 用户导入参数
       upload: {
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的档案数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        // 是否显示弹出层（用户导入）
+        open: false,
+        shelfId: undefined,
+        wlsjNode: undefined
       },
+      // 书架树选项
+      shuJiaOptions: [],
+      pictureRecard: [],
+      // 是否全选
+      checkAll: false,
     };
   },
   watch: {
@@ -91,6 +170,12 @@ export default {
     getDeptTree() {
       catalogTreeselect().then(response => {
         this.dangAnOptions = response.data;
+
+        this.$nextTick(() => {
+          this.$refs.tree.setCurrentKey(this.$route.query.id);
+          this.dangAnNode = this.$refs.tree.getNode(this.$route.query.id)
+        });
+
       });
     },
     // 筛选节点
@@ -99,31 +184,126 @@ export default {
       return data.label.indexOf(value) !== -1;
     },
     // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.handleQuery();
+    handleNodeClick(data, Node) {
+      this.dangAnID = data.id;
+      this.dangAnNode = Node;
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "档案上传";
+      this.getTreeselect();
+      this.fileList = []
+      this.upload.shelfId=undefined;
+      this.upload.wlsjNode=undefined;
       this.upload.open = true;
     },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
+    /** 查询目录下拉树结构 */
+    getTreeselect() {
+      listBookshelf().then(response => {
+        this.shuJiaOptions = this.handleTree(response.rows, "shelfId", "pid")
+      });
     },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
+    // 上传文件之前的钩子
+    beforeUpload(file) {
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      this.fileList.push(file);
     },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
+    httpRequest(file) {
+      console.log('httpRequest', this.fileList, file);
+    },
+    submitFiles() {
+      const formData = new FormData();
+      this.fileList.forEach((file) => {
+        formData.append('files', file);
+      });
+
+      const DaPicturesRecard = {}
+      DaPicturesRecard.muId = this.dangAnNode.key;
+      DaPicturesRecard.muPath = this.getAllLabels(this.dangAnNode);
+
+      DaPicturesRecard.wlsjId = this.upload.wlsjNode.key;
+      DaPicturesRecard.wlsjPath = this.getAllLabels(this.upload.wlsjNode);
+
+      formData.append('picRecard', new Blob([JSON.stringify(DaPicturesRecard)],{ type: 'application/json', }));
+
+       collectSaves(formData).then(response => {
+         this.pictureRecard = response.data;
+         this.upload.open = false;
+       });
+    },
+    selectTree(data, Node) {
+      this.upload.shelfId = data.shelfId;
+      this.upload.wlsjNode = Node;
+    },
+    getAllLabels(obj) {
+      let values = '';
+
+      function getValues(obj) {
+        if(values.length>0){
+          values = obj.label+'/'+values
+        }else {
+          values = obj.label
+        }
+
+        if(obj.level>1){
+          getValues(obj.parent);
+        }
+      }
+
+      getValues(obj);
+      return values;
+    },
+    handleCheckAllChange(val) {
+      this.pictureRecard.forEach(item =>{
+        item['checked']= val
+      })
+      this.pictureRecard = [...this.pictureRecard]
+    },
+    handleCheckChange(val) {
+      let checkAll = true
+      this.pictureRecard.forEach(item=>{
+        if(!item['checked']){
+          checkAll = false
+        }
+      })
+      this.pictureRecard = [...this.pictureRecard]
+      this.checkAll = checkAll
+    },
+    OCRRecognition(){
+      let arr = [];
+      this.pictureRecard.forEach(item => {
+        if(item.checked){
+          arr.push(item)
+        }
+      })
+
+      if(arr.length>0){
+        collectRecongnize(arr).then(response => {
+          this.pictureRecard = [];
+          this.$modal.msgSuccess("操作成功");
+        });
+      }else {
+        this.$alert(`请先选择需要识别的档案！`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    deleteFile(index){
+      this.fileList.splice(index, 1);
     }
   }
 };
 </script>
+
+<style lang="scss" scoped>
+
+::v-deep .el-checkbox__inner{
+  width: 20px;
+  height: 20px;
+}
+
+::v-deep .el-checkbox__inner::after {
+  height: 10px;
+  left: 7px;
+  top: 2px;
+}
+</style>