From 2bfbbe1c8bb5295474225483fbd703acd4128523 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sat, 3 Aug 2024 15:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86=E3=80=81?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86=E3=80=90=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E5=AF=86=E9=9B=86=E6=9F=9C=E3=80=91=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue  |   3 -
 .../src/views/dangan/collection/index.vue     | 129 +++++-------------
 dangan-ui/src/views/dangan/czrkdj/index.vue   |   4 -
 .../src/views/dangan/pictureRecard/index.vue  |  33 -----
 dangan-ui/src/views/dangan/qyz/index.vue      |   3 -
 dangan-ui/src/views/dangan/task/index.vue     |   2 +-
 dangan-ui/src/views/dangan/ytzm/index.vue     |   3 -
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue |   3 -
 dangan-ui/src/views/dangan/zqz/index.vue      |   3 -
 9 files changed, 33 insertions(+), 150 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 38d9c94..7e47dfc 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -657,14 +657,12 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-        <!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -712,7 +710,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index 5d2890f..cd88f24 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -71,56 +71,36 @@
 
     </el-row>
 
-    <el-dialog title="档案文件上传" :visible.sync="upload.open" width="700px" append-to-body>
+    <el-dialog title="档案本地上传" :visible.sync="upload.open" width="400px" append-to-body>
 
       <div v-loading="upload.loading">
-        <div style="margin-bottom: 30px;display: flex;min-height: 300px;">
-          <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
-            <div style="margin-bottom: 5px;">档案室密集柜：</div>
-            <el-tree
-              :data="shuJiaOptions"
-              :props="{
-            children: 'children',
-            label: 'label'
-          }"
-              :expand-on-click-node="false"
-              ref="myTreeSelect"
-              node-key="id"
-              highlight-current
-              @node-click="selectTree"
-            />
-          </div>
-
-          <div v-show="upload.id" style="width: 360px;margin-left: 20px;">
-            <el-upload :show-file-list="false"
-                       ref="upload"
-                       action="#"
-                       accept="image/*"
-                       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">只能上传图片，且不超过{{ upload.fileSize }}MB</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 style="margin-bottom: 20px;min-height: 400px;">
+          <el-upload :show-file-list="false"
+                     ref="upload"
+                     action="#"
+                     accept="image/*"
+                     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">只能上传图片，且不超过{{ upload.fileSize }}MB</div>
+          </el-upload>
+
+          <ul class="el-upload-list el-upload-list--text" style="max-height:200px;overflow-y:auto;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 style="text-align: center">
@@ -130,27 +110,12 @@
 
     </el-dialog>
 
-    <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="1000px" append-to-body>
+    <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="750px" append-to-body>
 
       <div v-loading="smwj.loading">
         <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 300px;">
-          <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
-            <div style="margin-bottom: 5px;">档案室密集柜：</div>
-            <el-tree
-              :data="shuJiaOptions"
-              :props="{
-            children: 'children',
-            label: 'label'
-          }"
-              :expand-on-click-node="false"
-              ref="myTreeSelect"
-              node-key="id"
-              highlight-current
-              @node-click="selectTree1"
-            />
-          </div>
 
-          <div v-if="smwj.id && smwj.list.length===0" style="width: 650px;margin-left: 20px;" v-loading="smwj.smloading" element-loading-text="文件扫描中"
+          <div style="width: 700px;margin-left: 20px;" v-loading="smwj.smloading" element-loading-text="文件扫描中"
                element-loading-spinner="el-icon-loading">
             <div>
               <el-row class="sm_row" :gutter="20">
@@ -185,7 +150,7 @@
 
           </div>
 
-          <div v-if="smwj.id && smwj.list.length>0" style="width: 560px;margin-left: 20px;display: flex;flex-wrap: wrap">
+          <div v-if="smwj.list.length>0" style="width: 560px;margin-left: 20px;display: flex;flex-wrap: wrap">
 
             <div v-for="(item,index) in smwj.list" class="smwjList">
               <el-image
@@ -376,11 +341,8 @@ export default {
         loading: false,
         // 是否显示弹出层（用户导入）
         open: false,
-        id: undefined,
-        wlsjNode: undefined
+        id: undefined
       },
-      // 书架树选项
-      shuJiaOptions: [],
       // 上传图片记录
       pictureRecard: [],
       // 已识别图片
@@ -397,7 +359,6 @@ export default {
         // 是否显示弹出层（用户导入）
         open: false,
         id: undefined,
-        wlsjNode: undefined,
         list: []
       },
     };
@@ -566,7 +527,6 @@ export default {
     handleUpload() {
       if(this.dangAnNode){
         this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
-          this.getTreeselect();
           this.fileList = []
           this.upload.id=undefined;
           this.upload.wlsjNode=undefined;
@@ -584,10 +544,7 @@ export default {
     handleScan(){
       if(this.dangAnNode){
         this.$modal.confirm(`是否确认选择【${this.dangAnNode.label}】档案目录？`).then(() => {
-          this.getTreeselect();
           this.smwj.list = [];
-          this.smwj.id=undefined;
-          this.smwj.wlsjNode=undefined;
           this.smwj.open = true;
         }).catch(() => {
           this.smwj.open = false;
@@ -598,12 +555,6 @@ export default {
         });
       }
     },
-    /** 查询目录下拉树结构 */
-    getTreeselect() {
-      getCabinetTree().then(response => {
-        this.shuJiaOptions = response.data
-      });
-    },
     // 上传文件之前的钩子
     beforeUpload(file) {
       this.$refs.upload.clearFiles();
@@ -617,9 +568,7 @@ export default {
     submitFiles(type) {
 
       this.checkAll = false;
-
       if (type === 1) {
-
         if (this.smwj.list.length === 0) {
           this.$alert(`请先开始扫描！`, `提示`, {
             type: 'warning'
@@ -641,8 +590,6 @@ export default {
           DaPicturesRecard.muId = this.dangAnNode.key;
           DaPicturesRecard.muPath = this.getAllLabels(this.dangAnNode);
           DaPicturesRecard.ywType = this.dangAnNode.data.ywType;
-          DaPicturesRecard.wlsjId = this.smwj.wlsjNode.key;
-          DaPicturesRecard.wlsjPath = this.getAllLabels(this.smwj.wlsjNode);
           formData.append('picRecard', new Blob([JSON.stringify(DaPicturesRecard)], {type: 'application/json',}));
           this.smwj.loading = true;
           collectSaves(formData).then(response => {
@@ -681,8 +628,6 @@ export default {
           DaPicturesRecard.muId = this.dangAnNode.key;
           DaPicturesRecard.muPath = this.getAllLabels(this.dangAnNode);
           DaPicturesRecard.ywType = this.dangAnNode.data.ywType;
-          DaPicturesRecard.wlsjId = this.upload.wlsjNode.key;
-          DaPicturesRecard.wlsjPath = this.getAllLabels(this.upload.wlsjNode);
           formData.append('picRecard', new Blob([JSON.stringify(DaPicturesRecard)], {type: 'application/json',}));
           this.upload.loading = true;
 
@@ -701,16 +646,6 @@ export default {
         }
       }
     },
-    // 档案室密集柜树选择 点击上传
-    selectTree(data, Node) {
-      this.upload.id = data.id;
-      this.upload.wlsjNode = Node;
-    },
-    // 档案室密集柜树选择 扫描上传
-    selectTree1(data, Node) {
-      this.smwj.id = data.id;
-      this.smwj.wlsjNode = Node;
-    },
     // 获取所有label
     getAllLabels(obj) {
       let values = '';
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index fbcd897..6a6d8dc 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -2252,14 +2252,12 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath"  min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -2307,7 +2305,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
@@ -2642,7 +2639,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      console.log(33);
       this.queryParams.pageNum = 1;
       this.getList();
     },
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index db74653..11bf3b2 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -41,30 +41,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-<!--        <el-form-item label="图片名称" prop="picName">
-          <el-input
-            v-model="queryParams.picName"
-            placeholder="请输入图片名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>-->
-<!--        <el-form-item label="档案室密集柜ID" prop="wlsjId">
-          <el-input
-            v-model="queryParams.wlsjId"
-            placeholder="请输入档案室密集柜ID"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>-->
-        <el-form-item label="档案室密集柜路径" prop="wlsjPath">
-          <el-input
-            v-model="queryParams.wlsjPath"
-            placeholder="请输入档案室密集柜路径"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <el-form-item label="是否纠错" prop="errorCorrect">
           <el-select
             v-model="queryParams.errorCorrect"
@@ -126,14 +102,7 @@
       <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="50" align="center" fixed/>
         <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
-<!--        <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
-          </template>
-        </el-table-column>-->
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-<!--        <el-table-column label="档案室密集柜ID" align="center" prop="wlsjId" min-width="120"/>-->
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
@@ -145,13 +114,11 @@
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
-<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片路径" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
           </template>
         </el-table-column>
-        <!--      <el-table-column label="备注" align="center" prop="remark" />-->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index 17d7446..d68a970 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@@ -664,14 +664,12 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-        <!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -719,7 +717,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
diff --git a/dangan-ui/src/views/dangan/task/index.vue b/dangan-ui/src/views/dangan/task/index.vue
index 0ab1b6a..6151dac 100644
--- a/dangan-ui/src/views/dangan/task/index.vue
+++ b/dangan-ui/src/views/dangan/task/index.vue
@@ -146,7 +146,7 @@
       <div>
         <el-table v-loading="xgtp.loading" :data="xgtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="120" show-overflow-tooltip/>
+<!--          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="120" show-overflow-tooltip/>-->
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
               <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index aa81841..46dca8b 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -601,14 +601,12 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -656,7 +654,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index 0a146e9..fb29b85 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -694,14 +694,12 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-        <!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -749,7 +747,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index 6c6d998..c2b7b4e 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -795,14 +795,12 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="图片ID" align="center" prop="id"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
@@ -850,7 +848,6 @@
         <el-table v-loading="sbtp.loading" :data="sbtp.list" border>
           <el-table-column label="图片ID" align="center" prop="id" fixed min-width="90"/>
           <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-          <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="140" show-overflow-tooltip/>
           <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" show-overflow-tooltip/>
           <el-table-column label="图片路径" align="center" prop="picUrl">
             <template slot-scope="scope">