diff --git a/frontend/.env b/frontend/.env index d6d1181..cdcf40a 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1,5 +1,5 @@ # title -VITE_GLOB_APP_TITLE=自动检测平台 +VITE_GLOB_APP_TITLE=PQS-9100自动检测平台 # 本地运行端口号 VITE_PORT=18091 diff --git a/frontend/components.d.ts b/frontend/components.d.ts index e6726a6..dac9717 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -31,17 +31,12 @@ declare module 'vue' { ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] Loading: typeof import('./src/components/Loading/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/frontend/src/api/config/serviceName.ts b/frontend/src/api/config/serviceName.ts new file mode 100644 index 0000000..40c9e65 --- /dev/null +++ b/frontend/src/api/config/serviceName.ts @@ -0,0 +1,5 @@ + +// 系统&用户模块前缀 +export const ADMIN = "/admin"; + +// todo... 其他业务模块前缀 \ No newline at end of file diff --git a/frontend/src/api/config/servicePort.ts b/frontend/src/api/config/servicePort.ts deleted file mode 100644 index ee1702f..0000000 --- a/frontend/src/api/config/servicePort.ts +++ /dev/null @@ -1,2 +0,0 @@ -// 后端微服务模块前缀 -export const PORT1 = "/admin"; diff --git a/frontend/src/api/modules/login.ts b/frontend/src/api/modules/login.ts index 4a1c473..165bd07 100644 --- a/frontend/src/api/modules/login.ts +++ b/frontend/src/api/modules/login.ts @@ -1,5 +1,5 @@ import { Login } from "@/api/interface/index"; -import { PORT1 } from "@/api/config/servicePort"; +import { ADMIN } from "@/api/config/serviceName"; import http from "@/api"; /** @@ -7,20 +7,20 @@ import http from "@/api"; */ // 用户登录 export const loginApi = (params: Login.ReqLoginForm) => { - return http.post(PORT1 + `/login`, params, { loading: false }); // 正常 post json 请求 ==> application/json + return http.post(ADMIN + `/login`, params, { loading: false }); // 正常 post json 请求 ==> application/json }; // 获取菜单列表 export const getAuthMenuListApi = () => { - return http.get(PORT1 + `/menu/list`, {}, { loading: false }); + return http.get(ADMIN + `/menu/list`, {}, { loading: false }); }; // 获取按钮权限 export const getAuthButtonListApi = () => { - return http.get(PORT1 + `/auth/buttons`, {}, { loading: false }); + return http.get(ADMIN + `/auth/buttons`, {}, { loading: false }); }; // 用户退出登录 export const logoutApi = () => { - return http.post(PORT1 + `/logout`); + return http.post(ADMIN + `/logout`); }; diff --git a/frontend/src/api/modules/upload.ts b/frontend/src/api/modules/upload.ts deleted file mode 100644 index 267b3a4..0000000 --- a/frontend/src/api/modules/upload.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Upload } from "@/api/interface/index"; -import { PORT1 } from "@/api/config/servicePort"; -import http from "@/api"; - -/** - * @name 文件上传模块 - */ -// 图片上传 -export const uploadImg = (params: FormData) => { - return http.post(PORT1 + `/file/upload/img`, params); -}; - -// 视频上传 -export const uploadVideo = (params: FormData) => { - return http.post(PORT1 + `/file/upload/video`, params); -}; diff --git a/frontend/src/api/modules/user.ts b/frontend/src/api/modules/user.ts index 6555808..0374ab1 100644 --- a/frontend/src/api/modules/user.ts +++ b/frontend/src/api/modules/user.ts @@ -1,5 +1,5 @@ import { ResPage, User } from "@/api/interface/index"; -import { PORT1 } from "@/api/config/servicePort"; +import { ADMIN } from "@/api/config/serviceName"; import http from "@/api"; /** @@ -7,65 +7,65 @@ import http from "@/api"; */ // 获取用户列表 export const getUserList = (params: User.ReqUserParams) => { - return http.post>(PORT1 + `/user/list`, params); + return http.post>(ADMIN + `/user/list`, params); }; // 获取树形用户列表 export const getUserTreeList = (params: User.ReqUserParams) => { - return http.post>(PORT1 + `/user/tree/list`, params); + return http.post>(ADMIN + `/user/tree/list`, params); }; // 新增用户 export const addUser = (params: { id: string }) => { - return http.post(PORT1 + `/user/add`, params); + return http.post(ADMIN + `/user/add`, params); }; // 批量添加用户 export const BatchAddUser = (params: FormData) => { - return http.post(PORT1 + `/user/import`, params); + return http.post(ADMIN + `/user/import`, params); }; // 编辑用户 export const editUser = (params: { id: string }) => { - return http.post(PORT1 + `/user/edit`, params); + return http.post(ADMIN + `/user/edit`, params); }; // 删除用户 export const deleteUser = (params: { id: string[] }) => { - return http.post(PORT1 + `/user/delete`, params); + return http.post(ADMIN + `/user/delete`, params); }; // 切换用户状态 export const changeUserStatus = (params: { id: string; status: number }) => { - return http.post(PORT1 + `/user/change`, params); + return http.post(ADMIN + `/user/change`, params); }; // 重置用户密码 export const resetUserPassWord = (params: { id: string }) => { - return http.post(PORT1 + `/user/rest_password`, params); + return http.post(ADMIN + `/user/rest_password`, params); }; // 导出用户数据 export const exportUserInfo = (params: User.ReqUserParams) => { - return http.download(PORT1 + `/user/export`, params); + return http.download(ADMIN + `/user/export`, params); }; // 获取用户状态字典 export const getUserStatus = () => { - return http.get(PORT1 + `/user/status`); + return http.get(ADMIN + `/user/status`); }; // 获取用户性别字典 export const getUserGender = () => { - return http.get(PORT1 + `/user/gender`); + return http.get(ADMIN + `/user/gender`); }; // 获取用户部门列表 export const getUserDepartment = () => { - return http.get(PORT1 + `/user/department`); + return http.get(ADMIN + `/user/department`); }; // 获取用户角色字典 export const getUserRole = () => { - return http.get(PORT1 + `/user/role`); + return http.get(ADMIN + `/user/role`); }; diff --git a/frontend/src/constants/storeKey.ts b/frontend/src/constants/storeKey.ts deleted file mode 100644 index 412b47f..0000000 --- a/frontend/src/constants/storeKey.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 本地缓存Key - */ - -// 用户信息 -export const USER_INFO = 'userInfo' - -// 用户信息 -export const TABS_INFO = 'tabsInfo' - -// WEB端布局配置 -export const STORE_CONFIG = 'storeConfig' - -// 后台标签页 -export const STORE_TAB_VIEW_CONFIG = 'storeTabViewConfig' -// 字典 -export const DICT_DATA = 'dictData' \ No newline at end of file diff --git a/frontend/src/constants/user.ts b/frontend/src/constants/user.ts deleted file mode 100644 index b785286..0000000 --- a/frontend/src/constants/user.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 用户相关的一些常量 - */ - -// 请求头token拼接的前缀 -export const TOKEN_PREFIX = 'bearer ' \ No newline at end of file diff --git a/frontend/src/layouts/LayoutTransverse/index.scss b/frontend/src/layouts/LayoutTransverse/index.scss index c5722b9..3a99303 100644 --- a/frontend/src/layouts/LayoutTransverse/index.scss +++ b/frontend/src/layouts/LayoutTransverse/index.scss @@ -12,12 +12,12 @@ // background-color: var(--el-header-bg-color); background-color: var(--el-color-primary); //默认蓝色风格背景 .logo { - width: 210px; + padding:0 10px 0 15px; margin-right: 30px; .logo-img { width: 28px; object-fit: contain; - margin-right: 6px; + margin-right: 5px; } .logo-text { font-size: 21.5px;