From dbcd0f209b324fc625aefe6099fc8800c45b46ac Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Tue, 29 Oct 2024 23:51:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 3 ++- src/types/components.d.ts | 12 +++++------- src/views/login/index.vue | 3 ++- .../MyNotice.vue} | 0 .../DeptTree.vue} | 0 .../{import.vue => components/UserImport.vue} | 0 src/views/system/user/index.vue | 19 ++++++++++++------- 7 files changed, 21 insertions(+), 16 deletions(-) rename src/views/system/notice/{my-notice.vue => components/MyNotice.vue} (100%) rename src/views/system/user/{dept-tree.vue => components/DeptTree.vue} (100%) rename src/views/system/user/{import.vue => components/UserImport.vue} (100%) diff --git a/src/router/index.ts b/src/router/index.ts index d3871fbe..fdc4bd2c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -65,7 +65,8 @@ export const constantRoutes: RouteRecordRaw[] = [ { path: "myNotice", name: "MyNotice", - component: () => import("@/views/system/notice/my-notice.vue"), + component: () => + import("@/views/system/notice/components/MyNotice.vue"), meta: { title: "我的通知", icon: "user", hidden: true }, }, ], diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 4bf78f0e..1b92fb30 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -60,18 +60,18 @@ declare module "vue" { ElUpload: (typeof import("element-plus/es"))["ElUpload"]; ElWatermark: (typeof import("element-plus/es"))["ElWatermark"]; ElSkeleton: (typeof import("element-plus/es"))["ElSkeleton"]; + FileUpload: (typeof import("./../components/Upload/FileUpload.vue"))["default"]; Form: (typeof import("./../components/CURD/Form.vue"))["default"]; - FunnelChart: (typeof import("./../views/dashboard/components/FunnelChart.vue"))["default"]; + Fullscreen: (typeof import("./../components/Fullscreen/index.vue"))["default"]; GithubCorner: (typeof import("./../components/GithubCorner/index.vue"))["default"]; Hamburger: (typeof import("./../components/Hamburger/index.vue"))["default"]; IconSelect: (typeof import("./../components/IconSelect/index.vue"))["default"]; LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"]; MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"]; - Notice: (typeof import("./../components/Notice/index.vue"))["default"]; - NoticeDetail: (typeof import("../views/system/notice/notice-detail.vue"))["default"]; + MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"]; LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"]; - NavBar: (typeof import("./../layout/components/NavBar/index.vue"))["default"]; - NavbarAction: (typeof import("./../layout/components/NavBar/components/NavbarAction.vue"))["default"]; + Navbar: (typeof import("./../layout/components/Navbar/index.vue"))["default"]; + NavbarRight: (typeof import("./../layout/components/Navbar/NavbarRight.vue"))["default"]; PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"]; PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"]; PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"]; @@ -91,8 +91,6 @@ declare module "vue" { TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"]; TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"]; ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"]; - FileUpload: (typeof import("./../components/Upload/FileUpload.vue"))["default"]; - MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"]; SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"]; WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"]; } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ecb49c83..1aff0d6b 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -188,6 +188,7 @@ import defaultSettings from "@/settings"; import { ThemeEnum } from "@/enums/ThemeEnum"; import { useSettingsStore, useUserStore, useDictStore } from "@/store"; + const userStore = useUserStore(); const settingsStore = useSettingsStore(); const dictStore = useDictStore(); @@ -351,7 +352,7 @@ onMounted(() => { .title { margin: auto 5px; - font-size: 26px; + font-size: 24px; font-weight: bold; color: transparent; background: linear-gradient(to right, #3b82f6, #14b8a6); diff --git a/src/views/system/notice/my-notice.vue b/src/views/system/notice/components/MyNotice.vue similarity index 100% rename from src/views/system/notice/my-notice.vue rename to src/views/system/notice/components/MyNotice.vue diff --git a/src/views/system/user/dept-tree.vue b/src/views/system/user/components/DeptTree.vue similarity index 100% rename from src/views/system/user/dept-tree.vue rename to src/views/system/user/components/DeptTree.vue diff --git a/src/views/system/user/import.vue b/src/views/system/user/components/UserImport.vue similarity index 100% rename from src/views/system/user/import.vue rename to src/views/system/user/components/UserImport.vue diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 6bf78531..1e70ea60 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -307,11 +307,12 @@ import UserAPI, { UserPageQuery, UserPageVO, } from "@/api/system/user"; + import DeptAPI from "@/api/system/dept"; import RoleAPI from "@/api/system/role"; -import DeptTree from "./dept-tree.vue"; -import UserImport from "./import.vue"; +import DeptTree from "./components/DeptTree.vue"; +import UserImport from "./components/UserImport.vue"; const queryFormRef = ref(ElForm); const userFormRef = ref(ElForm); @@ -320,17 +321,17 @@ const loading = ref(false); const removeIds = ref([]); const total = ref(0); const pageData = ref(); -/** 部门下拉选项 */ +// 部门下拉数据源 const deptOptions = ref(); -/** 角色下拉选项 */ +// 角色下拉数据源 const roleOptions = ref(); -/** 用户查询参数 */ +// 用户查询参数 const queryParams = reactive({ pageNum: 1, pageSize: 10, }); -/** 用户弹窗对象 */ +// 用户弹窗 const dialog = reactive({ visible: false, title: "", @@ -393,7 +394,11 @@ function handleSelectionChange(selection: any) { removeIds.value = selection.map((item: any) => item.id); } -/** 重置密码 */ +/** + * 重置密码 + * + * + */ function hancleResetPassword(row: { [key: string]: any }) { ElMessageBox.prompt( "请输入用户「" + row.username + "」的新密码",