From ce17027a42026d4c891b0179e1224add3981d704 Mon Sep 17 00:00:00 2001
From: wangqi <3188864257@qq.com>
Date: Tue, 7 Jan 2025 15:48:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=BF=9E=E6=8E=A5=20=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |   2 +-
 public/favicon.ico                            | Bin 4286 -> 9662 bytes
 src/api/module/eam/device/document.ts         |   8 +++++
 .../image/dashboard/common/icon_logo_pg.png   | Bin 667 -> 0 bytes
 .../image/dashboard/common/icon_logo_pg.svg   |   4 +++
 .../dashboard/common/icon_logo_pg_dark.svg    |   5 +++
 src/pages/fileDoc/index.vue                   |  20 ++++++------
 src/pages/fileDoc/utils.ts                    |   2 +-
 src/pages/index.html                          |   2 +-
 src/pages/layout.vue                          |  29 +++++++++++++-----
 src/router/index.ts                           |  27 ++++++++++++----
 11 files changed, 74 insertions(+), 25 deletions(-)
 delete mode 100644 src/assets/image/dashboard/common/icon_logo_pg.png
 create mode 100644 src/assets/image/dashboard/common/icon_logo_pg.svg
 create mode 100644 src/assets/image/dashboard/common/icon_logo_pg_dark.svg

diff --git a/index.html b/index.html
index ecceec8..0718e79 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <link rel="icon" href="/favicon.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>设备管理平台</title>
+        <title>文档管理平台</title>
         <style>
             body {
                 margin: 0;
diff --git a/public/favicon.ico b/public/favicon.ico
index 9a48b39c0ad3ac6d99f218a47370e88d5c8c0b6d..ce701aa31297e461bb762e0a595bd135721ff570 100644
GIT binary patch
literal 9662
zcmcgy*>6<$6}~8zs@e~g{Lm!cm+^`*28?a+ZnGQ43*HwzJcOparcx?}%C1r=O+iZ2
ze<65)A{3-l0-kIMrKv!qN|j33*kH4Gc&uz{8K`=CzTa=o+~2)(XR*N@^v!qn^WEz^
zGuMMHYa9Qos<QYw&$?V>SwFWdtCYbZE5JZpJ$#zp_H!T*NF5&^_cNboo?=WhW*Mtt
zz@BCxhZ;X4^=<3e$h@(!Q|YHpoeD6%W_xXHY>b#0W5h8B%ou8rM^CtSoH>0XyWgaC
zbaXUrWMuRl^9q9i=o4GmD<(OQ9?bfLk@hCq;`I&>52rBBjEszg7&JUQLc(Ih7kI^D
z<#?{lTjstGxGp80mW}3yhK4hThKBAk$cbT>@6N+Vja>(=rth35^+R_!p1Dz-UiE{6
zgS7(#gCS-b7#Ls-5^U|;w)m(K+ho|<*E2B331^&ZmpNbKr7781e}DfdW4*tBfS6-I
za+>@4`oqTwUvknrK*;M^V!LbXJf92R-9M77UbC*Zw|BI!uaEa>u&?aiUfUO2*YuOq
zx9em^JT`k_n?CoAn%WZCCr_TNWvnwuqc_a(-8OuIJMZP&v7R2-;+r!hF5C+(NnK0b
z-94E-Jv|`?0qirMRIF|7OJ1|iOAK{(t!;OAcSq*PTz3y@5VLFHtNF{^6ZbXU)zy{4
zxZBm$P0S3i2Ij%;>_pszU4y*T>AtRTJ!+iu#JA^}b7a05Q}!M1i}~K__jjJbyw1+f
zF!X+olNando!5Sss>S=z?c29$dU{&DUiDm^gKf?eU)b;Whx2|z2Q;a^54^7b6DRy>
zjAaJdIAPd2e*AcJ%&ylpXV0FcCr_S`JQf!h>BA3y>6nE%&RL1)hW9{Y)aP_Z$MJIv
z0x;LjUNNZ`9v=_TjT<-U_3PInJ;I26^UYt>y^quj%WU|t1(J6&=RYxj21kz`OFwq3
zV}(Hg`-;UEcE{o4I-i)Bq+7Rc(W_UlB6?#PFJHb?$2c)Dp?YPu$sHY9hZ%F(&>Fet
zJ96acX$I>)N?<QY?(@(8K$k9EqMJ8w()Zv0ouFs4kM;F+x_9rMniUKN>9fy%@7Rs=
zBU-Ru<Cy3S$j{)=p~Ke?A3j0?_M>cxEiFCXtlWfs^YaUly`m)!e+~Ty4<1TotT8AS
zpj~oHOG^oLY_?#2exA%-*y;8~2lKxfKRs~ZU}t;#K?2y0puPP-#5Utwt>3M~-0fle
z+uGVMFj)Tq0=t2@<iK04-_#;|O--)Y`PSC9AcF)gEwI~NejDj{8!aww-SzX}!Gp+N
z(F2y<5)+?!s=2vkrn$M5Yg&ozFklN1lYA@dU)=2Fov;u3MT6+kEZT%cXUlX`Q}bM7
zV>2~1wUFlK2y>3(Hjv+H{m_A(qQz~Sdf1+AY;1bb(9p>BP1MlP6k*$LRB_ZGww3zl
z<{t14(IR_oO`;Js_4UX%uI}I8@S?uHftVTfifzAv>vRqbJbJWs*U#MCoTmn86CGNo
z=xtctx37MVK^ps+1rpO-SBH2#>wlE+I+lVTe)tFd_~SptO~}x%_hYBt2bSG9zjj>N
zv$eJRW{|I|+o!;Olx@b6)qnZ&6?MJgXMXM4wS?MH0R7OS_t~0EZO9pVrfX_ygEcjE
z#LNK4M<V^WzCQZsS5b35{`lAQ_;LJukJ;JTaG$Bgv_)GaHdS3+bAdr7_U^4!KG?KT
z^YGy#K2y;T9M|OJZ`FS3LA|#3s(CnXpMLtgn4f{rFFIrfSRgrJj-TJNXKyEi1iN=v
zM{KXy!oovZSy@rX@$I*Nr7yntBmaKd>)BIXZO?Vj!uJbbe)%W*?z_Jcj(v4?mG0la
zujY7ZkbW2Yxi)pzu03n$VOD@`LgHXtU#4%?$qamcU%h%&=~`G=AiNgv87Q^rms)cc
z&a>pqyx1nQ4bAF1?5e8W*BSIS0G-dDKaaY=o;`b}K9gj}&Yip7bf3C^#yxap<*w71
z2UJ#8DVR25X5O|@FVKBB@39_JQ^BbD&RKc}X4-LyX$^XxiUpt@j~zR9rZZM6Dt4;*
zY?BGZO&@lw+IaV;xW6&y#F{Jf&03ee!o88-A8`y76_w|<Z{NYXDivUhZ`#P4akn4u
z{uK8I(kp%93!8B>CUG#s@%uaUmzP(hF+vOyl$F`G#7wsHJ5&$+D_8y;>++$mzPcEh
zU0$wx^gPo}xO16%qP{=DF_e{UKT}$|ok~l~T|i7wPFxqxM>Fm*LZRr_@6)GG)%!SR
zJNsp>X5@5UW<!f@bI$YoE9fsNDNAA8Wl(ICJ95Rv&RY2RoC*dn5#Bq2ix-1RyIosO
zZX3QGbI#OSRL>o*iTV8@j-jZiG>Z``Dk>q3Ql4vrbKyAhu(gjG>5+P~U+N?V->!4c
zu;UI5%iI(9`&;P8!{;lmEi5cvXC|Mo!~pzcP(s`vRjXs}9Og@{>?(HmLrbkzm)vtf
zfp4^+pojqM72D*(Lgann8eMDVC8t@}IrGvJFNgg_8~XnXIl}z>!qNPE-#RmC_?Uf^
zmj@rVn<ZALYV10*PkP)jy+ijzYOs4#+T|E>bMtF+a|=QY66ED+8!T|=xKAB}I}Uvk
z(~LSjN8;i6*twx=Ml`!QCnrCPaW^L?kC+v*vtf(xX0s-r>{_!2HF-u(`{DV#D?h2%
zs#|L;KPxLYh4BkUC_6is_iC_D0>on3b}lDUgIYVTdY3tNh7tEYGM2_<;u#s)X^h`6
zRx>kmNWi|shHu8CPT0(|y~6Qx4A0NiWOQw`hIgjF_g?1d_utRD&REOH$RcLetQj`v
zRSdQV);M;Z>jMnOz1T*zylFk_Ol5R3F1-70Mv!@id5-x-7<25;u#MaW25R5R-_H<D
zZX>cR`j2Hbga2h&KLgKL);r)y{`(;?4w9e#3!bnnF6RczS_kJ^7PoPuWi5h#V)G3A
zcPvYI68<*Jax=pJ&&MQ|dFYry+|auS-#8vQPC0Hl4{~1k6shwRId3!J^C;(4&U5&@
F{}1A=)}#Oc

literal 4286
zcmeHKze~eV5Ps4@1W_k-aHzCNi-V4?9mP?oiy%p;j)Jp-ogEy6(xe@n6m=2&2Mj0{
zTy$`9v7jzaPU05t+MazqpUq3vqR^D<<$itNdv~u16`~J5@wmWmaX2Exs1PCz0xppO
zL4WOnSnv9q9WYAHp5fU+B!L>$Zjzq0Wt8kQE@s)9SLLHG5^r;z_Z$y!Hril4iQ{aH
z*U0?IqLtB=bkT~-SjpX`A>sy%ye!~<t;Jk>Q?8+VsV+mlsM>VxqXy0+uLb`aaiq$*
zX+^v?d)zyZ>DZ=g%@e-iS_@N!>>${uAkXR2iisF-9&Q^s`y7*MWqvqES@O4N#ks>?
z*K*+8AvWTC)F^yE%`fji;aYR?f;A5O*C5Z>59EXUD_j%KNr#{3gxS*kZ+LF1<SZh0
zLuPrLVsig^PMB@F&J5w0WoH?&NWg!GG1IemR5(;e`8t};m5c|^v0cJa>B(|#OwOl!
zRj!8bit0&E9Ip=~J?Df!`_P6x<tdMA!?h1I_-KB04K*C6XLr_tj^2OG-&5;c!u*Q4
zMV@^aM@XD^iTHJXci+h&o_72^_ER>l`#<r2`Tp~q?M`|Ub^p+-Rq9uZR=j_8))SRq
z2Qx~}f8ob<{+7@jdEdz2E&YkVlm8zf&$uu5qImxD_4MrSbRdu}U%U<b;-%jg)&5HG
ra9#=g#AWOP#81@iD#S4U0(s3sUx*k<B?ul+E@O2eo8qXOl|k?h>T7?0

diff --git a/src/api/module/eam/device/document.ts b/src/api/module/eam/device/document.ts
index 2eb196f..33707fd 100644
--- a/src/api/module/eam/device/document.ts
+++ b/src/api/module/eam/device/document.ts
@@ -40,6 +40,14 @@ export function deleteFolder(params: { id: number }) {
   })
 }
 
+export function deleteFolderAndFile(id: number) {
+  return documentServer({
+    url: '/folder/delete',
+    method: 'delete',
+    params: { id },
+  })
+}
+
 export function createdFile(data: Omit<DocFileVO, 'id'>) {
   return documentServer({
     url: '/folder/add-file',
diff --git a/src/assets/image/dashboard/common/icon_logo_pg.png b/src/assets/image/dashboard/common/icon_logo_pg.png
deleted file mode 100644
index 7055fee07fb2c52cfedd616be3d3a935de212585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%RY^oaR9HvVRxxN3VHEz}B~c3^x(OCR$i=~-E=mW7cC@P)(GKPU$z28o9b80O
z!L5VXrMa~9zbVoPZYsD~M|G*<Q1cfIf(0ij=wx$GE;Qki%bEO5(!?9zz5jjR`}p7c
ze!`GH8Ztgchd{cZ3udGaL=nbQVaXdFRzm^9*7-od_dtXxYuEt-?DF&=iI7Hby!!tn
z;N-T}2SFmW6rcLP2pG1W1z@+TK?G+tD-BhZlod$X@v8(X1qc8OtERj+a003To${3x
z=u}Ykf7b+53#;UJoC1|%z2pY=z|dE5FWvNVc68j($m>NAt}Aupb2X)NzT{rr@Pjbr
zML+nR()ifU&m%=9I^If(tNhl<ZO!}RJ-J~l65U?TZkGK8(*=Ez8Mnd|iD<hgS2ACJ
z)c?07uwOS!=Mxi5yixOcjc&TT?zaYzMg;&mK#zr4zB>>CMn16y;v|5N!j$Kml{uSa
zcGvb|lfsnmLLVe`1wzfJjT@%&i5Vh(;T2_eFQZ!BplIwBfK$w{97{eoZ2die3t%b<
zt9-4$1eW6Sq|qD*>mn<s{d>P%tnV+PW(9ENcQy9<X!K7Jz+{vnm%Phr6!gzvoC8o4
zrkw4lfa+}f?!b3p%5ndB!`5#Dc;dw(nl`bL`SK~0K=;7Wij&){)bnQ-<Hrsirk&b7
zaQR`=yldn=V8+0BAT0SPbPBo$uVq$*DbKWYdLKXoprzjSuM_h0vm~kk0{d~pu(x5#
zj?WR%RA3VlEjXF-%eI?PvGcyAkB%GmttG`me*xB8VlXltKSTfk002ovPDHLkV1jM~
BIQ0Mk

diff --git a/src/assets/image/dashboard/common/icon_logo_pg.svg b/src/assets/image/dashboard/common/icon_logo_pg.svg
new file mode 100644
index 0000000..ede18e2
--- /dev/null
+++ b/src/assets/image/dashboard/common/icon_logo_pg.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path
+    d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54"></path>
+</svg>
\ No newline at end of file
diff --git a/src/assets/image/dashboard/common/icon_logo_pg_dark.svg b/src/assets/image/dashboard/common/icon_logo_pg_dark.svg
new file mode 100644
index 0000000..a24ee34
--- /dev/null
+++ b/src/assets/image/dashboard/common/icon_logo_pg_dark.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path
+    fill="#fff"
+    d="M12 8a3 3 0 0 0 3-3 3 3 0 0 0-3-3 3 3 0 0 0-3 3 3 3 0 0 0 3 3m0 3.54C9.64 9.35 6.5 8 3 8v11c3.5 0 6.64 1.35 9 3.54 2.36-2.19 5.5-3.54 9-3.54V8c-3.5 0-6.64 1.35-9 3.54"></path>
+</svg>
\ No newline at end of file
diff --git a/src/pages/fileDoc/index.vue b/src/pages/fileDoc/index.vue
index 2c3b49c..42a814e 100644
--- a/src/pages/fileDoc/index.vue
+++ b/src/pages/fileDoc/index.vue
@@ -100,6 +100,7 @@ import {
   updateFile,
   deleteFolder,
   deleteFile,
+  deleteFolderAndFile,
   getMarkdown,
   updateMarkdown,
   type ContentType,
@@ -153,16 +154,17 @@ async function loadData(id: number = 0) {
 
 async function onDelete(item: any) {
   try {
-    let res: any
     await message.delConfirm()
-    switch (item.type) {
-      case floeType.folder:
-        res = await deleteFolder(item.id)
-        break
-      case floeType.file:
-        res = await deleteFile(item.id)
-        break
-    }
+    // switch (item.type) {
+    //   case floeType.folder:
+    //     res = await deleteFolder(item.id)
+    //     break
+    //   case floeType.file:
+    //     res = await deleteFile(item.id)
+    //     break
+    // }
+    const res = await deleteFolderAndFile(item.id)
+
     if (isResError(res)) return
     message.success('删除成功')
     loadData(currentFolderId.value)
diff --git a/src/pages/fileDoc/utils.ts b/src/pages/fileDoc/utils.ts
index c0f8993..430ea9e 100644
--- a/src/pages/fileDoc/utils.ts
+++ b/src/pages/fileDoc/utils.ts
@@ -10,7 +10,7 @@ export const breadcrumbList = ref([{ name: '全部文件', id: 0 }])
 export const fileDropdownMenu = [
   { command: 'open', label: '打开', icon: '' },
   { command: 'rename', label: '重命名', icon: '' },
-  // { command: 'delete', label: '删除', icon: '' },
+  { command: 'delete', label: '删除', icon: '' },
 ]
 export const operationDropdownMenu = [
   { command: 'newFolder', label: '新建文件夹', icon: Folder },
diff --git a/src/pages/index.html b/src/pages/index.html
index c8944a6..c3136d7 100644
--- a/src/pages/index.html
+++ b/src/pages/index.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <link rel="icon" href="/favicon.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>设备管理平台</title>
+        <title>文档管理平台</title>
     </head>
     <body>
         <div id="app"></div>
diff --git a/src/pages/layout.vue b/src/pages/layout.vue
index eb645ca..254c8d5 100644
--- a/src/pages/layout.vue
+++ b/src/pages/layout.vue
@@ -2,11 +2,12 @@
   <div class="root">
     <div class="menu-box">
       <div class="logo">
-        <img :src="logoIcon" alt="" class="logo-icon" />
-        <span class="logo-label">设备管理平台</span>
+        <img :src="iconLogo" alt="" class="logo-icon" />
+        <span class="logo-label">文档管理平台</span>
       </div>
+
       <el-scrollbar>
-        <el-menu :default-active="activeMenu" class="menu" @select="menuClick">
+        <el-menu :default-active="activeMenu" router class="menu" @select="menuClick">
           <template v-for="(menu, idx) in menuData" :key="idx">
             <el-menu-item
               :index="menu.path"
@@ -73,7 +74,7 @@
             v-model="themeSwitch"
             :active-action-icon="Moon"
             :inactive-action-icon="Sunny"
-            style="--el-switch-on-color: #2C2C2C; --el-switch-off-color: #F2F2F2 "
+            style="--el-switch-on-color: #2c2c2c; --el-switch-off-color: #f2f2f2"
             @change="toggle"
           />
           <!-- <el-dropdown
@@ -108,7 +109,9 @@ import Icon from '@/components/dashboard/Icon/src/Icon.vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { cloneDeep, debounce } from 'lodash'
 import { RouterView, useRouter, useRoute } from 'vue-router'
-import logoIcon from '@/assets/image/dashboard/common/icon_logo_pg.png'
+import logoDarkIcon from '@/assets/image/dashboard/common/icon_logo_pg_dark.svg'
+import logoIcon from '@/assets/image/dashboard/common/icon_logo_pg.svg'
+
 import { usePermissionStore } from '@/stores/permission'
 import dayjs from 'dayjs'
 import { useUserStore } from '@/stores/user'
@@ -128,11 +131,19 @@ provide(INIT_OPTIONS_KEY, {
   devicePixelRatio: 2,
 })
 
-const Sunny = useIcon({icon: 'line-md:moon-filled-to-sunny-filled-loop-transition', color: '#2C2C2C'})
-const Moon = useIcon({icon: 'line-md:sunny-filled-loop-to-moon-filled-transition', color: '#2C2C2C'})
+const Sunny = useIcon({
+  icon: 'line-md:moon-filled-to-sunny-filled-loop-transition',
+  color: '#2C2C2C',
+})
+const Moon = useIcon({
+  icon: 'line-md:sunny-filled-loop-to-moon-filled-transition',
+  color: '#2C2C2C',
+})
 
 const themeSwitch = ref(theme.value === 'dark')
 
+const iconLogo = computed(() => (theme.value === 'dark' ? logoDarkIcon : logoIcon))
+
 const route = useRoute()
 
 const breadcrumbItems = computed(() => {
@@ -216,6 +227,10 @@ const menuSwitch = () => {
   }
 }
 const menuClick = (index: string) => {
+  if (index === '/OnlineDocument') {
+    window.open('http://192.168.1.3:5181/', '_blank')
+    return
+  }
   activeIndex.value = index
   push(activeIndex.value)
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index 7ce70c0..8a48f47 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -24,7 +24,7 @@ export const defaultRoute = [
       canTo: true,
       hidden: false,
       noTagsView: false,
-      icon: 'ep:user',
+      icon: 'mage:file-2',
       title: '文件',
     },
     children: [
@@ -33,12 +33,22 @@ export const defaultRoute = [
         component: () => import('@/pages/fileDoc/index.vue'),
         name: 'FileDocument',
         meta: {
-          icon: 'ep:user',
+          icon: 'mage:file-2',
           title: '文档管理',
         },
       },
     ],
   },
+  {
+    path: '/OnlineDocument',
+    name: '/OnlineDocument',
+    component: () => import('@/pages/fileDoc/index.vue'),
+    meta: {
+      hidden: false,
+      icon: 'mage:file-records',
+      title: '在线文档',
+    },
+  },
 ]
 
 const router = createRouter({
@@ -57,6 +67,11 @@ router.beforeEach(async (to, from, next) => {
   //   }
   //   return
   // }
+  if (to.path === '/OnlineDocument') {
+    next('/file/document')
+    return
+  }
+
   if (to.path === '/') {
     next('/file/document')
     return
@@ -76,10 +91,10 @@ router.beforeEach(async (to, from, next) => {
   // if (!userStore.getIsSetUser) {
   //   await userStore.setUserInfoAction()
   //   // 后端过滤菜单
-    await permissionStore.generateRoutes()
-    permissionStore.getAddRouters.forEach(route => {
-      router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
-    })
+  await permissionStore.generateRoutes()
+  permissionStore.getAddRouters.forEach(route => {
+    router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
+  })
   //   const redirectPath = from.query.redirect || to.path
   //   // 修复跳转时不带参数的问题
   //   const redirect = decodeURIComponent(redirectPath as string)