From fcd4d29585ad3a5c67c2e4fd3b58db8e9bfb521e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 9 Jan 2025 17:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E6=A1=A3=E6=A1=88=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archives/archives.js          |   6 ++--
 src/assets/img/fileIcon1.png          | Bin 0 -> 304 bytes
 src/assets/img/fileIcon3.png          | Bin 0 -> 432 bytes
 src/assets/img/grid1.png              | Bin 0 -> 490 bytes
 src/assets/img/grid2.png              | Bin 0 -> 483 bytes
 src/assets/img/list1.png              | Bin 0 -> 369 bytes
 src/assets/img/list2.png              | Bin 0 -> 350 bytes
 src/views/material/archives/index.vue |  45 ++++++++++++++++++++------
 8 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/img/fileIcon1.png
 create mode 100644 src/assets/img/fileIcon3.png
 create mode 100644 src/assets/img/grid1.png
 create mode 100644 src/assets/img/grid2.png
 create mode 100644 src/assets/img/list1.png
 create mode 100644 src/assets/img/list2.png

diff --git a/src/api/archives/archives.js b/src/api/archives/archives.js
index b17eba22..a0e75dda 100644
--- a/src/api/archives/archives.js
+++ b/src/api/archives/archives.js
@@ -72,8 +72,8 @@ export function delArchivesDetailsApi(data) {
 export function downloadFileApi(data) {
   return request({
       url: '/material/archives/download',
-      method: 'post',
-      data: data,
-      // responseType: 'blob'
+      method: 'get',
+      params: data,
+      responseType: 'blob'
   })
 }
\ No newline at end of file
diff --git a/src/assets/img/fileIcon1.png b/src/assets/img/fileIcon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..54739b2ef11213c1b683ee95178ca510ebb7c2f6
GIT binary patch
literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#>PbXFR9Hvtm$423K^TN*5)>o~3Q?#$0}VNp3Y}Nccmbter5BAipiyXOh(<|B
zTp>Xs<W~uD&E4+BDt7CCX1<+GcC&=xMZ@`^j8mcoL2MzIgJ{ulmqESs0X`EW(F{xb
zLlB5?0f-?Tw`mRl*s$W}O#=AOrgZR-p7#in1^*^0lc(8RMfAM@&QZnIzh;vDn*9TS
zX-*K&0<nbuU4$`tI|G*;D2t-}Jp8qR`xTT`P46buY{LTB25bYi0o#CWz&7v?4OB+}
z8=B9$qFe@)b+rsZ8^XGxi=s>hfOO4&P8IP(lRW`j+;@DvI;Xz?0000<MNUMnLSTZj
CPI>?U

literal 0
HcmV?d00001

diff --git a/src/assets/img/fileIcon3.png b/src/assets/img/fileIcon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..39491e3d68e9ada1ed1e0f72c3c769a448b3df1f
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$YDq*vR9Hvtmpx9yKoCaXgxhcfM3Y<siHd@s5CIYe1sy>kQBY72DY2D;iiSgk
zjuXIXkOwwah;58LYrI9IOk>IW?abTR+4Wc`+E}}6aEr42Ypnjo3w_zCmn{{N6Hjy#
z;oZkUiPj6E2rxz1_XbF~ro&Zco*5z!5bF%3+Xz7TM7Z&VXb)f@Ln6Hd?tCEH1#pok
zdVz3ng=inZMUM0wc(6c(0Z1WEfKeSpH~<$p)<cxI3L-2(nu$H&=`V=z0BK?FB0SF_
zgjbHFw*YDfz&W*;yJLa?Sb{H?93TU0fZ!Q$Upsf#``B2Ag)d|}yHOFY0j%e|xJ6~X
zMWZe7+50-}Y67?-tg;R|A5M_(%GdeRS-wwPpMrm8Ae-8{LR*ZtwguLJ7Ts!|0?W#*
zn#v4B`Usp_eKpjL=*wAoOXmKJJIoq7woOauF_51YF5eS67wI4J6xgzPG^^fF4mg&N
a?2Ipr8tx&5wVU(+0000<MNUMnLSTaWHMWER

literal 0
HcmV?d00001

diff --git a/src/assets/img/grid1.png b/src/assets/img/grid1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b5f1f30901289f21d5d3a85925c1516c7b7ee6d
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$q)9|UR9HvtmoZPmKp2MKD;Uwi0HcuvA~h<5lRNwlCKFAxiUX7Xz|BD-IB48W
z`~gldIvc^niV`sn4uzNy7}}nxwpb{TYiM!~?bNj2cYXTaeeZWi!1*GazmJgs;nHIq
zYA`+wC(Ph;VK(^E*h=(9fiImj=Q^Q|NVP!Jkt>k8vY%`YKX(8`ichBmBsW2s4_!mH
zof9kenCQ8@4jtD3QsZ(dP-#hG#{PZ)AX1de1V}SYi-44}E7pwIa6wKB0hC$tC}^Q2
ztsGjheSqlMa}0#Ou?%9yTq=^dZQMsna)D4Bu;%JSO|<vc8b*8{z|CJ6iFP?%DF;B;
zkg=xF2k;g6tAgJ;uClJ=X%-=cw$YMS?+2<Ne)Ssq>Z)}Bi!2aR095CDq0RSvtUCbU
z)=&UkD3Z8i`oIyPIA#Hd&A=Q0#skw*^AuPfJ0QU=RdHw4vgsjN3M41wJWv%k!xsKO
zyCIX59tAlR;5r2^`+>KMkb4=L((^MSm-74V*jK=N1-NfYf4UmaZMkLbTn{D|1lOaP
gM@^1-81DOlZ^nUaFyC&MApigX07*qoM6N<$f=K<+GXMYp

literal 0
HcmV?d00001

diff --git a/src/assets/img/grid2.png b/src/assets/img/grid2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef902816aca13d39e285a117e44be20271bb25c4
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ok>JNR9HvtS3gU`Koo!1CPi1f34)?7c5rfUKS!s4Zt9S<SMv!1mp_ADmF|Kc
zz{!rzV%;jD;9x$04tb3nG$DU#xzxZp<RB34-h27w_wN1P9RbOMNd7)71YlX#HURJ^
zHB?poY&M%Onx=g(0`7U<IwI}|L9mfsZ!{WH!!X{n^Em*Fu}c6rTf)o-B6dyF94BoY
z$2pkIW;X!PTH-sVly;KqDFBSIdjM#Qq@`A?wR*kYGq<%Yt6i_xxv$6=QcBMw!x(_;
zx?70&CK7?$gkg9+7z~d2yKURUFbq#ceGzfTG|g9T9|I`(7u+|dvj}tC5fM943M&8=
z12F^hI-ZE`<iBh}Ldapi-+xS1!DuvE^L>8`0Gom!R;_}Gq9{kYu79NftRN^?l+qLK
z#~8cddL#loDPTDOe1fL}5p_by?vj9ai1-lI@?1l@0I>I)4<Y0!2!h+Jg#XWOC_-gf
zHaP~Qrl4RyD0dS|FGJ}<RFM9v9ajvL&w%tp>Ab7SJC;Y<F7;v(fslGNE33<i#*uy=
Z_yI27dN5J^W$OR{002ovPDHLkV1n&h&XxcG

literal 0
HcmV?d00001

diff --git a/src/assets/img/list1.png b/src/assets/img/list1.png
new file mode 100644
index 0000000000000000000000000000000000000000..db4e3feb914310994f1a0ff853ba8f0521e69a1a
GIT binary patch
literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$D@jB_R9Hu2WEfz;IKcKZz#Skk{kj74KjzGTjErU=M=>!l?Ec5Vbn$(b@>XO=
z3QxTi^pAnjnSqf(i!8_gXW03l>CcJ}nVJtk`r!@`nto?K!~g#Y$cFxBU^wtTOVtrs
zOlaz@Wekjrkz`p8)5OTQ;9aIlBB}$X-Tsfw(05s?DA6Q@LmjCOf|-j5fq`~_;I!NO
z85tNH(0p?BU6!g2vKS6^Bn1F+)FKk$<l7F6%nbD~M=&xlZ2tfM-??|$>J6xA;AR5@
zBa;UM1A{q9wn7zy%>Db9q3=Vk>H(BAK#pP5&@*_-0c!Y$95V(_2#l75xJtOul5n&n
zBqwi^qG#}w1Ejc`nra762#l75qb1>Jn~<7$n-sGKPdPw}tEs7Wz(W84gVy9BV~+QT
P00000NkvXXu0mjfeK(;Q

literal 0
HcmV?d00001

diff --git a/src/assets/img/list2.png b/src/assets/img/list2.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf52db81c09d6b60210e7b724148d8fe0b703f0
GIT binary patch
literal 350
zcmV-k0iphhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$7)eAyR9Hvtma%TaFc60SlV7BB#avdZF3fCfW$XjwB2TbIxq(-Jsp=jvpbqc^
zl{$3qgCqe_HBqpFge^<);EdMYf1mHpzd{)Jqk-$A1<11OK`HeH;OQUglZd{PB-wQ#
z^E{sccp;)kNBDhJRUcaG-%EZAAR-$8uZHN6nV-97BJvJk?pVA@+cNXQ1UU7HGV|4#
zM5H&)7O2tfc3^OT1AvKflOJXt86)V6vu!{-+U^oglv2wEf{2Q`uD{YWT^UQbBBCjP
zv2E4AnG+RdS+2F#$EzK15%ZA~jt}^_jf+M&9f(eN%i*FEMkjQ6+cr7j_<#+y&)9G}
w5S=hOp@_tPLZ8q3Zmn>9;BI8kfrEG841Z+LA);l&F#rGn07*qoM6N<$f?>d#Bme*a

literal 0
HcmV?d00001

diff --git a/src/views/material/archives/index.vue b/src/views/material/archives/index.vue
index f4d8de6b..8304fa6a 100644
--- a/src/views/material/archives/index.vue
+++ b/src/views/material/archives/index.vue
@@ -87,7 +87,7 @@
           </el-form-item>
         </el-form> -->
 
-        <el-row :gutter="16" style="margin-bottom: 20px;">
+        <el-row :gutter="14" style="margin-bottom: 20px;">
           <el-col :span="2">
             <el-button type="primary" plain icon="el-icon-upload" size="mini" @click="openUpLoadDialog">上传</el-button>
           </el-col> 
@@ -99,19 +99,30 @@
           </el-col> 
           <el-col :span="2">
             <el-button type="danger" plain icon="el-icon-download" :disabled="multiple" size="mini" @click="handleAllDel">删除</el-button>
-          </el-col> 
+          </el-col>
+
+          <el-col :span="4" style="float: right;display: flex;">
+            <div style="display: flex;align-items: center;height: 32px;margin-right: 10px;" @click="changeShowType(1)">
+              <img src="../../../assets/img/list1.png" v-if="showType==1" style="width: 18px;height: 18px;" alt="">
+              <img src="../../../assets/img/list2.png" v-else style="width: 18px;height: 18px;" alt="">
+            </div> 
+            <div style="display: flex;align-items: center;height: 32px;" @click="changeShowType(2)">
+              <img src="../../../assets/img/grid1.png" v-if="showType==2" style="width: 18px;height: 18px;" alt="">
+              <img src="../../../assets/img/grid2.png" v-else style="width: 18px;height: 18px;" alt="">
+            </div> 
+          </el-col>
           <el-col :span="4" style="float: right;">
             <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="handleAdd">新建文件夹</el-button>
-          </el-col>
+          </el-col> 
         </el-row>
         <el-row :gutter="10" style="margin-bottom: 20px;">
           <el-breadcrumb separator-class="el-icon-arrow-right">
-            <el-breadcrumb-item v-for="(item,index) in breadcrumbList" :key="item.id">
+            <el-breadcrumb-item v-for="(item,index) in breadcrumbList" :key="item.id" style="margin-bottom: 5px;">
               <span @click="breadClick(item,index)" style="cursor: pointer;">{{item.docName}}</span>
             </el-breadcrumb-item>
           </el-breadcrumb>
         </el-row>
-        <el-table v-loading="loading" :data="tableDataList"  @selection-change="handleSelectionChange" row-key="detailsId">
+        <el-table v-loading="loading" v-if="showType==1" :data="tableDataList"  @selection-change="handleSelectionChange" row-key="detailsId">
           <el-table-column type="selection" width="55" align="center"/>
           <el-table-column label="序号" align="center" width="80" type="index">
                 <template slot-scope="scope">
@@ -145,10 +156,20 @@
           </el-table-column>
           <el-table-column label="年 度" align="center" prop="year" show-overflow-tooltip/>
           <el-table-column label="修改时间 " align="center" prop="updateTime" show-overflow-tooltip width="180"/>
-          <el-table-column label="上传人员 " align="center" prop="createBy" show-overflow-tooltip/> 
-          
+          <el-table-column label="上传人员 " align="center" prop="createBy" show-overflow-tooltip/>
         </el-table>
 
+        
+        <div style="width: 100%;height: 300px;display: flex;" v-if="showType==2">
+          <div style="width: 140px;height: 140px;display: flex;flex-direction: column;align-items: center;margin: 10px;" v-for="item in tableDataList" :key="item.detailsId" @click="getSubDetails(item)">
+            <img src="../../../assets/img/fileIcon1.png" v-if="item.docType=='文件夹'" style="width: 60px;height: 60px;">
+            <img src="../../../assets/img/fileIcon3.png" v-else style="width: 50px;height: 50px;">
+            <div style="font-size: 12px;margin-top: 10px;">
+              {{ item.docName }}
+            </div>
+          </div>
+        </div>
+
         <pagination
           v-show="total > 0"
           :total="total"
@@ -354,6 +375,7 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/file/upload'
       },
+      showType:1
 
     };
   },
@@ -755,7 +777,7 @@ export default {
       this.ids.forEach(item=>{
         arr.push(item.detailsId)
       })
-      downloadFileApi({'detailsIdList':arr}).then((res) => {
+      downloadFileApi({'ids':arr.join(',')}).then((res) => {
         downloadFile({
           fileName: "文件档案下载.zip",
           fileData: res,
@@ -764,7 +786,7 @@ export default {
       });  
       // this.download(
       //   "/material/archives/download",
-      //   {'detailsIdList':arr},
+      //   {'ids':arr.join(',')},
       //   `文件档案下载_${new Date().getTime()}.zip`
       // );
 
@@ -773,6 +795,11 @@ export default {
 
     },
 
+    changeShowType(val){
+      this.showType=val;
+
+    }
+
 
   },
 };