From d944e38dd923b4eb8412c73b81b137dc7230191f Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 14:55:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BD=91=E6=A0=A1?= =?UTF-8?q?=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/leftMenu/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compenents/leftMenu/index.tsx b/src/compenents/leftMenu/index.tsx index bf3b92a..90c9a39 100644 --- a/src/compenents/leftMenu/index.tsx +++ b/src/compenents/leftMenu/index.tsx @@ -21,7 +21,6 @@ function getItem(label: any, key: any, icon: any, children: any, type: any) { } const items = [ getItem("首页概览", "/", , null, null), - getItem("网校装修", "/decoration", , null, null), getItem( "课程内容", "3", From 40fffcc6ad86bd43be430c2abf7be69eda82b6ab Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 14:57:45 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/department/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/department/index.tsx b/src/pages/department/index.tsx index 8153ac6..1e20f1c 100644 --- a/src/pages/department/index.tsx +++ b/src/pages/department/index.tsx @@ -161,6 +161,7 @@ export const DepartmentPage: React.FC = () => {
Date: Tue, 7 Mar 2023 14:58:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/leftMenu/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compenents/leftMenu/index.tsx b/src/compenents/leftMenu/index.tsx index 90c9a39..9a2a910 100644 --- a/src/compenents/leftMenu/index.tsx +++ b/src/compenents/leftMenu/index.tsx @@ -46,7 +46,6 @@ const items = [ [getItem("部门", "/department", null, null, null)], null ), - getItem("证书管理", "5", , [], null), getItem( "系统设置", "6", From 4231366fae476481ce80b5d9b33d5e3921c8300a Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 14:59:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=8D=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/index.ts | 2 +- src/compenents/{leftMenu => left-menu}/index.module.less | 0 src/compenents/{leftMenu => left-menu}/index.tsx | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/compenents/{leftMenu => left-menu}/index.module.less (100%) rename src/compenents/{leftMenu => left-menu}/index.tsx (100%) diff --git a/src/compenents/index.ts b/src/compenents/index.ts index 14b2134..9575d06 100644 --- a/src/compenents/index.ts +++ b/src/compenents/index.ts @@ -1,6 +1,6 @@ export * from "./footer"; export * from "./header"; -export * from "./leftMenu"; +export * from "./left-menu"; export * from "./upload-image-button"; export * from "./treeDepartment"; export * from "./back-bar"; \ No newline at end of file diff --git a/src/compenents/leftMenu/index.module.less b/src/compenents/left-menu/index.module.less similarity index 100% rename from src/compenents/leftMenu/index.module.less rename to src/compenents/left-menu/index.module.less diff --git a/src/compenents/leftMenu/index.tsx b/src/compenents/left-menu/index.tsx similarity index 100% rename from src/compenents/leftMenu/index.tsx rename to src/compenents/left-menu/index.tsx From f50a94535871d55c23938ca92354ef5036d24629 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 15:01:08 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/left-menu/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/compenents/left-menu/index.tsx b/src/compenents/left-menu/index.tsx index 9a2a910..95c552e 100644 --- a/src/compenents/left-menu/index.tsx +++ b/src/compenents/left-menu/index.tsx @@ -22,13 +22,12 @@ function getItem(label: any, key: any, icon: any, children: any, type: any) { const items = [ getItem("首页概览", "/", , null, null), getItem( - "课程内容", + "资源管理", "3", , [ - getItem("视频", "/vod", null, null, null), - getItem("文章", "/topic", null, null, null), - getItem("试卷", "/paper", null, null, null), + getItem("视频", "/videos", null, null, null), + getItem("图片", "/images", null, null, null), ], null ), From f848e31a8667e9c92461ac88e152931e51a7d816 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 15:01:43 +0800 Subject: [PATCH 6/8] == -> === --- src/utils/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 3a5e40a..bc2d71c 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -21,7 +21,7 @@ export const generateUUID = (): string => { for (var i = 1; i <= 32; i++) { var n = Math.floor(Math.random() * 16.0).toString(16); guid += n; - if (i == 8 || i == 12 || i == 16 || i == 20) guid += "-"; + if (i === 8 || i === 12 || i === 16 || i === 20) guid += "-"; } return guid; -}; \ No newline at end of file +}; From 75921f6e10835ac9d95f2c25be84cea8e0388a82 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 15:02:14 +0800 Subject: [PATCH 7/8] var => let --- src/utils/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index bc2d71c..7220245 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -17,9 +17,9 @@ export function dateFormat(dateStr: string) { } export const generateUUID = (): string => { - var guid = ""; - for (var i = 1; i <= 32; i++) { - var n = Math.floor(Math.random() * 16.0).toString(16); + let guid = ""; + for (let i = 1; i <= 32; i++) { + let n = Math.floor(Math.random() * 16.0).toString(16); guid += n; if (i === 8 || i === 12 || i === 16 || i === 20) guid += "-"; } From 70a56dbd39c7d99ff0f1269debf6e4c3cd5aaab4 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Mar 2023 15:09:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96404=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/error/index.module.less | 4 ++++ src/pages/error/index.tsx | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/pages/error/index.module.less b/src/pages/error/index.module.less index e69de29..6e35a80 100644 --- a/src/pages/error/index.module.less +++ b/src/pages/error/index.module.less @@ -0,0 +1,4 @@ +.main { + width: 100vw; + height: 100vh; +} diff --git a/src/pages/error/index.tsx b/src/pages/error/index.tsx index e05a98f..3ab4378 100644 --- a/src/pages/error/index.tsx +++ b/src/pages/error/index.tsx @@ -1,11 +1,27 @@ +import { Button, Result } from "antd"; import React from "react"; +import { useNavigate } from "react-router-dom"; import styles from "./index.module.less"; export const ErrorPage: React.FC = () => { + const navigate = useNavigate(); + return ( -
-

Oops!

-

路由不存在

-
+ { + navigate("/"); + }} + > + 返回首页 + + } + /> ); };