diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue index 7f577ebf..224d3f82 100644 --- a/src/layout/components/NavBar/components/NavbarRight.vue +++ b/src/layout/components/NavBar/components/NavbarRight.vue @@ -36,8 +36,8 @@ import { DeviceEnum } from "@/enums/DeviceEnum"; import { useAppStore, useSettingsStore } from "@/store"; -import UserProfile from "./UserProfile.vue"; -import Notification from "./Notification.vue"; +import UserProfile from "@/layout/components/NavBar/components/UserProfile.vue"; +import Notification from "@/layout/components/NavBar/components/Notification.vue"; const appStore = useAppStore(); const settingStore = useSettingsStore(); diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 86ec1538..7255c45d 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -1,16 +1,28 @@ diff --git a/src/layout/index.vue b/src/layout/index.vue index b4675845..ea52148c 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -62,7 +62,7 @@ import defaultSettings from "@/settings"; import { DeviceEnum } from "@/enums/DeviceEnum"; import { LayoutEnum } from "@/enums/LayoutEnum"; -import Navbar from "./components/NavBar/index.vue"; +import Navbar from "@/layout/components/NavBar/index.vue"; const appStore = useAppStore(); const settingsStore = useSettingsStore(); diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index f5251aa1..59fdee2b 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -69,7 +69,7 @@ export const useUserStore = defineStore("user", () => { } /** - * 清理用户会话 + * 清理用户会话 * * @returns */ diff --git a/src/styles/index.scss b/src/styles/index.scss index 1ad8ad8c..349c84fd 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -26,7 +26,3 @@ color: rgb(32 160 255); } } - -.search-container .el-form .el-input { - width: 16rem !important; -} diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index ff06d2eb..f53def24 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -38,8 +38,8 @@ - - + { const handleDownloadTemplate = () => { UserAPI.downloadTemplate().then((response: any) => { const fileData = response.data; - const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]); + const fileName = decodeURI( + response.headers["content-disposition"].split(";")[1].split("=")[1] + ); const fileType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 076a7419..805be941 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -47,8 +47,12 @@ - 搜索 - 重置 + + 搜索 + + + 重置 + @@ -95,26 +99,55 @@ - + - + - - - + + + - +