diff --git a/src/api/fileDataLink.js b/src/api/fileDataLink.js
index 8ae2596..e698ac0 100644
--- a/src/api/fileDataLink.js
+++ b/src/api/fileDataLink.js
@@ -3,10 +3,12 @@ import { getAction, deleteAction, putAction, postAction, httpAction,uploadAction
 const getFileLinkInfo = (params)=>getAction("/fileDataLink/getFileLinkInfo",params);
 const processFile = (params)=>postAction("/fileDataLink/processFile",params);
 const fileDataLinkDelete = (params)=>deleteAction("/fileDataLink/delete",params);
+const isDataLinkFileParsed = (params)=>getAction("/fileDataLink/isDataLinkFileParsed",params);
 export {
     getFileLinkInfo,
     processFile,
-    fileDataLinkDelete
+    fileDataLinkDelete,
+    isDataLinkFileParsed
 }
 
 
diff --git a/src/api/recycleBin.js b/src/api/recycleBin.js
new file mode 100644
index 0000000..3100ab2
--- /dev/null
+++ b/src/api/recycleBin.js
@@ -0,0 +1,21 @@
+import { getAction, deleteAction, putAction, postAction, httpAction,uploadAction } from '@/api/manage'
+
+//上传文件目录管理
+const downloadFile = (params)=>httpAction("/file/downloadFile",params);
+const filePreview = (params)=>getAction("/file/filePreview",params);
+const logicDeleteFile = (params)=>deleteAction("/file/logicDeleteFile",params);
+const pageList = (params)=>getAction("/file/pageList",params);
+const uoloadFile = (params)=>uploadAction("/file/uoloadFile",params);
+const verifyFileExist = (params)=>getAction("/file/verifyFileExist",params);
+const fullTextSearching = (params)=>getAction("/file/fullTextSearching",params);
+
+
+export {
+    downloadFile,
+    filePreview,
+    logicDeleteFile,
+    pageList,
+    uoloadFile,
+    verifyFileExist,
+    fullTextSearching
+}
diff --git a/src/views/datalink/modules/SliceUpload.vue b/src/views/datalink/modules/SliceUpload.vue
index f91e9ad..d7d56b8 100644
--- a/src/views/datalink/modules/SliceUpload.vue
+++ b/src/views/datalink/modules/SliceUpload.vue
@@ -182,7 +182,7 @@ export default {
       if (currentRow) {
         // 当前上传进度归0
         currentRow.percentage = 0
-        const _20M = 200000000000 * 1024 * 1024 //设置超大文件判断关闭分片
+        const _20M = 20 * 1024 * 1024 //设置超大文件判断关闭分片
         if (file.size > _20M) { // 20M 以上分片上传
             this.uploadByPieces({ // 这里走分片上传逻辑
               file, // 文件信息
diff --git a/src/views/datalink/waterDocuments.vue b/src/views/datalink/waterDocuments.vue
index 5069f79..6816c76 100644
--- a/src/views/datalink/waterDocuments.vue
+++ b/src/views/datalink/waterDocuments.vue
@@ -42,14 +42,8 @@
 <!--        :locale="myLocale"-->
 
         <!-- 字符串超长截取省略号显示-->
-        <span slot="name" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
-        <span slot="describe" slot-scope="text">
-          <j-ellipsis :value="text" :length="20" />
-        </span>
         <span slot="action" slot-scope="text, record">
-          <a @click="processFile(record)" v-has="'cont:btn'">解析</a>
+          <a @click="processFile(record)" v-has="'cont:btn'" >解析</a>
           <a-divider type="vertical" v-has="'cont:btn'" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
@@ -66,7 +60,7 @@
 
 <script>
   import uploadModal from './modules/uploadModal'
-  import { getFileLinkInfo,processFile,fileDataLinkDelete } from '@/api/fileDataLink'
+  import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from "@/components/jeecg/JEllipsis";
   import {deleteAction, postAction} from '@/api/manage'
diff --git a/src/views/fileManage/recycling.vue b/src/views/fileManage/recycling.vue
new file mode 100644
index 0000000..7583bbe
--- /dev/null
+++ b/src/views/fileManage/recycling.vue
@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="模式名称">
+              <a-input placeholder="请输入搜索关键词" v-model="queryParam.schemaName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="表名">
+              <a-input placeholder="请输入搜索关键词" v-model="queryParam.tableName"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24" >
+                <a-button type="primary"  style="left: 10px" @click="loadData" icon="search">查询</a-button>
+                <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+                <a-button type="primary"  @click="handleAdd" icon="upload" style="margin-left: 8px;left: 10px">上传</a-button>
+            </a-col>
+          </span>
+
+        </a-row>
+      </a-form>
+    </div>
+    <!-- table区域-begin -->
+    <div style="height:900px;overflow-y:auto;">
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange}"
+        @change="handleTableChange">
+<!--        :locale="myLocale"-->
+
+        <!-- 字符串超长截取省略号显示-->
+        <span slot="action" slot-scope="text, record">
+          <a @click="processFile(record)" v-has="'cont:btn'" >解析</a>
+          <a-divider type="vertical" v-has="'cont:btn'" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <uploadModal ref="modalForm" @ok="loadData"></uploadModal>
+  </a-card>
+</template>
+
+<script>
+  import uploadModal from './modules/uploadModal'
+  import { getFileLinkInfo,processFile,fileDataLinkDelete,isDataLinkFileParsed } from '@/api/fileDataLink'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from "@/components/jeecg/JEllipsis";
+  import {deleteAction, postAction} from '@/api/manage'
+  export default {
+    name: "recycling",
+    mixins:[JeecgListMixin],
+    components: {
+      uploadModal,
+      JEllipsis,
+      VNodes: {
+        functional: true,
+        render: (h, ctx) => ctx.props.vnodes,
+      },
+    },
+    data () {
+      return {
+        description: '文件接引',
+        dataSources: [],
+        queryParam: {
+          pageNum :1,
+          pageSize:20,
+          schemaName:'',
+          tableName:'',
+          dataLinkType:'1'
+        },
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'id',
+            width:60,
+            align:"id",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '文件名称',
+            align:"fileName",
+            dataIndex: 'fileName',
+          },
+          {
+            title: '创建时间',
+            align:"createTime",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '模式名称',
+            align:"schemaName",
+            dataIndex: 'schemaName'
+          },
+          {
+            title: '表名',
+            align:"tableName",
+            dataIndex: 'tableName',
+          },
+          {
+            title: '解析进度',
+            align:"center",
+            dataIndex: 'percent',
+          },
+          {
+            title: '解析时间开始',
+            align:"analyzeStartTime",
+            dataIndex: 'analyzeStartTime',
+          },
+          {
+            title: '解析时间完成',
+            align:"analyzeEndTime",
+            dataIndex: 'analyzeEndTime',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            width:180,
+            scopedSlots: { customRender: 'action' },
+          }
+        ]
+      }
+    },
+    computed: {
+    },
+    created () {
+      this.loadData();
+    },
+    methods: {
+      //筛选需要重写handleTableChange
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      loadData() {
+        getFileLinkInfo(this.queryParam).then((res) => {
+            if (res.success) {
+                this.dataSource = res.result.records;
+                if(res.result.total)
+                {
+                  this.ipagination.total = res.result.total;
+                }
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
+      },
+      handleDelete: function (id) {
+        var that = this;
+        deleteAction("/fileDataLink/delete?id="+id,{}).then((res) => {
+            if (res.success) {
+                this.$message.success(res.message);
+                that.loadData();
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
+      },
+      processFile: function (record) {
+        var that = this;
+        postAction("/fileDataLink/processFile?dataLinkId="+record.id,{}).then((res) => {
+            if (res.success) {
+                this.$message.success(res.message);
+                that.loadData();
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
+      },
+      handleAdd() {
+        this.$refs.modalForm.add();
+        this.$refs.modalForm.title = "文件上传";
+        this.$refs.modalForm.dataLinkType=this.queryParam.dataLinkType;
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file