From f05c8423a6c502c4e2d00f8b0a04d2e60003f4ff Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 10 Jan 2024 09:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/yxk-admin.scss              | 39 +++++++++++++++++++
 .../managementLibrary/file/index.vue          | 24 ++++++++++--
 .../module/uploadFile/index.vue               | 36 ++++++++++++++---
 .../collectReorganizi/batchPaper/index.vue    |  4 +-
 .../collectionLibrary/file/index.vue          | 38 ------------------
 .../module/archivesInfo/index.vue             |  4 ++
 .../module/uploadFile/index.vue               | 35 ++++++++++++++---
 7 files changed, 125 insertions(+), 55 deletions(-)

diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index a7771ee..426d1de 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -2006,4 +2006,43 @@ input[type ='number'] {
 }
 .vue-treeselect--disabled .vue-treeselect__single-value{
   color: #c0c4cc !important;
+}
+
+.fileIcon{
+  display: block;
+  width: 32px;
+  height: 32px;
+  margin: 0 auto;
+  &.icon-image{
+    background: url("~@/assets/images/fileIcon/image.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-excel{
+    background: url("~@/assets/images/fileIcon/excel.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-pdf{
+    background: url("~@/assets/images/fileIcon/pdf.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-ppt{
+    background: url("~@/assets/images/fileIcon/ppt.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-word{
+    background: url("~@/assets/images/fileIcon/word.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-zip{
+    background: url("~@/assets/images/fileIcon/zip.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-txt{
+    background: url("~@/assets/images/fileIcon/txt.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  &.icon-other{
+    background: url("~@/assets/images/fileIcon/attachment.png") no-repeat;
+    background-size: 100% 100%;
+  }
 }
\ No newline at end of file
diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue
index 253798f..fdb6cd9 100644
--- a/src/views/archivesManage/managementLibrary/file/index.vue
+++ b/src/views/archivesManage/managementLibrary/file/index.vue
@@ -31,7 +31,7 @@
         >
           <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="file_name" label="原文名称" show-overflow-tooltip min-width="140" align="center" />
+          <el-table-column prop="file_name" label="原文名称" show-overflow-tooltip min-width="140" />
           <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
           <el-table-column prop="file_size" label="大小" min-width="85" align="center">
             <template slot-scope="scope">
@@ -47,10 +47,28 @@
           <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
-                <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
+                <i class="fileIcon icon-image" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'xlsx' || scope.row.file_type === 'xls'">
+                <i class="fileIcon icon-excel" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'docx' || scope.row.file_type === 'doc'">
+                <i class="fileIcon icon-word" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'pdf'">
+                <i class="fileIcon icon-pdf" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'ppt' || scope.row.file_type === 'pptx'">
+                <i class="fileIcon icon-ppt" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'zip' || scope.row.file_type === 'rar'">
+                <i class="fileIcon icon-zip" />
+              </div>
+              <div v-else-if="scope.row.file_type === 'txt'">
+                <i class="fileIcon icon-txt" />
               </div>
               <div v-else>
-                <svg-icon icon-class="fujian" class-name="svg-style" />
+                <i class="fileIcon icon-other" />
               </div>
             </template>
           </el-table-column>
diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
index 8ef9671..2be5c8d 100644
--- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
@@ -21,26 +21,50 @@
     >
       <el-table-column v-if="isUploadDetail" type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" align="center" />
+      <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
       <el-table-column prop="file_size" label="大小" min-width="85" align="center">
         <template slot-scope="scope">
           {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center" />
+      <el-table-column prop="file_dpi" label="分辨率" min-width="100" align="center">
+        <template slot-scope="scope">
+          <div v-if="!scope.row.file_dpi"> - </div>
+          <div v-else> {{ scope.row.file_dpi }} </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
-            <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
+            <i class="fileIcon icon-image" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'xlsx' || scope.row.file_type === 'xls'">
+            <i class="fileIcon icon-excel" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'docx' || scope.row.file_type === 'doc'">
+            <i class="fileIcon icon-word" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'pdf'">
+            <i class="fileIcon icon-pdf" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'ppt' || scope.row.file_type === 'pptx'">
+            <i class="fileIcon icon-ppt" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'zip' || scope.row.file_type === 'rar'">
+            <i class="fileIcon icon-zip" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'txt'">
+            <i class="fileIcon icon-txt" />
           </div>
           <div v-else>
-            <svg-icon icon-class="fujian" class-name="svg-style" />
+            <i class="fileIcon icon-other" />
           </div>
         </template>
       </el-table-column>
       <el-table-column prop="create_time" label="创建时间" min-width="110" align="center" />
-      <el-table-column v-if="!isUploadDetail && !recycleMain.isRecycle" label="操作" min-width="100" align="center">
+      <!-- && !recycleMain.isRecycle -->
+      <el-table-column v-if="!isUploadDetail " label="操作" min-width="80" align="center">
         <template slot-scope="scope">
           <el-button class="file-down iconfont icon-weibiaoti-2" @click="downloadFile(scope.row)">下载</el-button>
         </template>
@@ -101,7 +125,7 @@ export default {
   mixins: [
     form({})
   ],
-  inject: ['recycleMain'],
+  // inject: ['recycleMain'],
   props: {
     isUploadDetail: {
       type: Boolean,
diff --git a/src/views/collectReorganizi/batchPaper/index.vue b/src/views/collectReorganizi/batchPaper/index.vue
index 730c7af..5176ef2 100644
--- a/src/views/collectReorganizi/batchPaper/index.vue
+++ b/src/views/collectReorganizi/batchPaper/index.vue
@@ -272,7 +272,7 @@ export default {
       })
     },
     normalizer(node) {
-      if (node.children && !node.children.length) {
+      if (node.children === null) {
         delete node.children
       }
       return {
@@ -283,7 +283,7 @@ export default {
       }
     },
     classifyNormalizer(node) {
-      if (node.childArchivesClass && !node.childArchivesClass.length) {
+      if (node.childArchivesClass === null) {
         delete node.childArchivesClass
       }
       return {
diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue
index 096812e..ceef064 100644
--- a/src/views/collectReorganizi/collectionLibrary/file/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue
@@ -239,42 +239,4 @@ export default {
   width: 60px;
   height: 32px;
 }
-.fileIcon{
-  display: block;
-  width: 32px;
-  height: 32px;
-  margin: 0 auto;
-  &.icon-image{
-    background: url("~@/assets/images/fileIcon/image.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-excel{
-    background: url("~@/assets/images/fileIcon/excel.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-pdf{
-    background: url("~@/assets/images/fileIcon/pdf.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-ppt{
-    background: url("~@/assets/images/fileIcon/ppt.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-word{
-    background: url("~@/assets/images/fileIcon/word.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-zip{
-    background: url("~@/assets/images/fileIcon/zip.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-txt{
-    background: url("~@/assets/images/fileIcon/txt.png") no-repeat;
-    background-size: 100% 100%;
-  }
-  &.icon-other{
-    background: url("~@/assets/images/fileIcon/attachment.png") no-repeat;
-    background-size: 100% 100%;
-  }
-}
 </style>
diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
index 2b95c22..d0ce7af 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
@@ -256,4 +256,8 @@ code.hljs {
   width: auto;
   color: #fff;
 }
+
+.detail-tab .tab-nav{
+  margin: 10px 0 18px 0;
+}
 </style>
diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
index 28f8056..1d4e0a7 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
@@ -21,27 +21,50 @@
     >
       <el-table-column v-if="isUploadDetail" type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" align="center" />
+      <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
       <el-table-column prop="file_size" label="大小" min-width="85" align="center">
         <template slot-scope="scope">
           {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center" />
+      <el-table-column prop="file_dpi" label="分辨率" min-width="100" align="center">
+        <template slot-scope="scope">
+          <div v-if="!scope.row.file_dpi"> - </div>
+          <div v-else> {{ scope.row.file_dpi }} </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
-            <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
+            <i class="fileIcon icon-image" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'xlsx' || scope.row.file_type === 'xls'">
+            <i class="fileIcon icon-excel" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'docx' || scope.row.file_type === 'doc'">
+            <i class="fileIcon icon-word" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'pdf'">
+            <i class="fileIcon icon-pdf" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'ppt' || scope.row.file_type === 'pptx'">
+            <i class="fileIcon icon-ppt" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'zip' || scope.row.file_type === 'rar'">
+            <i class="fileIcon icon-zip" />
+          </div>
+          <div v-else-if="scope.row.file_type === 'txt'">
+            <i class="fileIcon icon-txt" />
           </div>
           <div v-else>
-            <svg-icon icon-class="fujian" class-name="svg-style" />
+            <i class="fileIcon icon-other" />
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="create_time" label="创建时间" min-width="110" align="center" />
+      <el-table-column prop="create_time" label="创建时间" min-width="130" align="center" />
       <!-- && !recycleMain.isRecycle -->
-      <el-table-column v-if="!isUploadDetail " label="操作" min-width="100" align="center">
+      <el-table-column v-if="!isUploadDetail " label="操作" min-width="80" align="center">
         <template slot-scope="scope">
           <el-button class="file-down iconfont icon-weibiaoti-2" @click="downloadFile(scope.row)">下载</el-button>
         </template>