diff --git a/package.json b/package.json index efe5786..10315ba 100644 --- a/package.json +++ b/package.json @@ -27,80 +27,80 @@ }, "dependencies": { "@iconify/iconify": "^2.2.1", - "@vueuse/core": "^9.0.2", + "@vueuse/core": "^9.1.0", "@wangeditor/editor": "^5.1.14", "@wangeditor/editor-for-vue": "^5.1.10", - "@zxcvbn-ts/core": "^2.0.3", + "@zxcvbn-ts/core": "^2.0.4", "animate.css": "^4.1.1", "axios": "^0.27.2", "echarts": "^5.3.3", "echarts-wordcloud": "^2.0.0", - "element-plus": "2.2.11", + "element-plus": "2.2.13", "intro.js": "^6.0.0", "lodash-es": "^4.17.21", "mitt": "^3.0.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", - "pinia": "^2.0.17", + "pinia": "^2.0.18", "pinia-plugin-persist": "^1.0.0", "qrcode": "^1.5.1", "qs": "^6.11.0", "url": "^0.11.0", "vue": "3.2.37", - "vue-i18n": "9.1.10", + "vue-i18n": "9.2.2", "vue-router": "^4.1.3", - "vue-types": "^4.2.0", + "vue-types": "^4.2.1", "web-storage-cache": "^1.1.1" }, "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "@iconify/json": "^2.1.85", - "@intlify/vite-plugin-vue-i18n": "^5.0.1", - "@purge-icons/generated": "^0.8.1", + "@iconify/json": "^2.1.91", + "@intlify/vite-plugin-vue-i18n": "^6.0.1", + "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", "@types/lodash-es": "^4.17.6", - "@types/node": "^18.6.2", + "@types/node": "^18.7.2", "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.4.2", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.31.0", - "@typescript-eslint/parser": "^5.31.0", - "@vitejs/plugin-vue": "^3.0.1", + "@typescript-eslint/eslint-plugin": "^5.33.0", + "@typescript-eslint/parser": "^5.33.0", + "@vitejs/plugin-vue": "^3.0.3", "@vitejs/plugin-vue-jsx": "^2.0.0", "autoprefixer": "^10.4.8", - "eslint": "^8.20.0", + "eslint": "^8.21.0", "eslint-config-prettier": "^8.5.0", - "eslint-define-config": "^1.5.1", + "eslint-define-config": "^1.6.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.3.0", "husky": "^8.0.1", "less": "^4.1.3", "lint-staged": "^13.0.3", "plop": "^3.1.1", - "postcss": "^8.4.14", + "postcss": "^8.4.16", "postcss-html": "^1.5.0", "postcss-less": "^6.0.0", "prettier": "^2.7.1", "rimraf": "^3.0.2", - "rollup": "^2.77.2", - "stylelint": "^14.9.1", + "rollup": "^2.77.3", + "stylelint": "^14.10.0", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.3", - "stylelint-config-recommended": "^8.0.0", - "stylelint-config-standard": "^26.0.0", + "stylelint-config-recommended": "^9.0.0", + "stylelint-config-standard": "^27.0.0", "stylelint-order": "^5.0.0", "typescript": "4.7.4", - "unplugin-vue-define-options": "^0.6.2", - "vite": "3.0.4", - "vite-plugin-eslint": "^1.7.0", + "unplugin-vue-macros": "^0.8.3", + "vite": "3.0.7", + "vite-plugin-eslint": "^1.8.0", "vite-plugin-html": "^3.2.0", "vite-plugin-mock": "^2.9.6", - "vite-plugin-purge-icons": "^0.8.2", - "vite-plugin-style-import": "1.4.1", + "vite-plugin-purge-icons": "^0.9.0", + "vite-plugin-style-import": "2.0.0", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-windicss": "^1.8.7", - "vue-tsc": "^0.39.2", + "vue-tsc": "^0.40.1", "windicss": "^3.5.6", "windicss-analysis": "^0.3.5" }, diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 54c2da8..3f78a52 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -1,15 +1,11 @@ -import { useAxios } from '@/hooks/web/useAxios' - -const request = useAxios() +import request from '@/config/axios' // 获取所有字典 -export const getDictApi = async (): Promise => { - const res = await request.get({ url: '/dict/list' }) - return res && res.data +export const getDictApi = (): Promise => { + return request.get({ url: '/dict/list' }) } // 模拟获取某个字典 export const getDictOneApi = async (): Promise => { - const res = await request.get({ url: '/dict/one' }) - return res && res.data + return request.get({ url: '/dict/one' }) } diff --git a/src/api/dashboard/analysis/index.ts b/src/api/dashboard/analysis/index.ts index d392c06..1f00ed0 100644 --- a/src/api/dashboard/analysis/index.ts +++ b/src/api/dashboard/analysis/index.ts @@ -1,4 +1,4 @@ -import { useAxios } from '@/hooks/web/useAxios' +import request from '@/config/axios' import type { AnalysisTotalTypes, UserAccessSource, @@ -6,24 +6,18 @@ import type { MonthlySales } from './types' -const request = useAxios() - -export const getCountApi = async (): Promise> => { - const res = await request.get({ url: '/analysis/total' }) - return res && res.data +export const getCountApi = (): Promise> => { + return request.get({ url: '/analysis/total' }) } -export const getUserAccessSourceApi = async (): Promise> => { - const res = await request.get({ url: '/analysis/userAccessSource' }) - return res && res.data +export const getUserAccessSourceApi = (): Promise> => { + return request.get({ url: '/analysis/userAccessSource' }) } -export const getWeeklyUserActivityApi = async (): Promise> => { - const res = await request.get({ url: '/analysis/weeklyUserActivity' }) - return res && res.data +export const getWeeklyUserActivityApi = (): Promise> => { + return request.get({ url: '/analysis/weeklyUserActivity' }) } -export const getMonthlySalesApi = async (): Promise> => { - const res = await request.get({ url: '/analysis/monthlySales' }) - return res && res.data +export const getMonthlySalesApi = (): Promise> => { + return request.get({ url: '/analysis/monthlySales' }) } diff --git a/src/api/dashboard/workplace/index.ts b/src/api/dashboard/workplace/index.ts index b517fdb..0880640 100644 --- a/src/api/dashboard/workplace/index.ts +++ b/src/api/dashboard/workplace/index.ts @@ -1,29 +1,22 @@ -import { useAxios } from '@/hooks/web/useAxios' +import request from '@/config/axios' import type { WorkplaceTotal, Project, Dynamic, Team, RadarData } from './types' -const request = useAxios() - -export const getCountApi = async (): Promise> => { - const res = await request.get({ url: '/workplace/total' }) - return res && res.data +export const getCountApi = (): Promise> => { + return request.get({ url: '/workplace/total' }) } -export const getProjectApi = async (): Promise> => { - const res = await request.get({ url: '/workplace/project' }) - return res && res.data +export const getProjectApi = (): Promise> => { + return request.get({ url: '/workplace/project' }) } -export const getDynamicApi = async (): Promise> => { - const res = await request.get({ url: '/workplace/dynamic' }) - return res && res.data +export const getDynamicApi = (): Promise> => { + return request.get({ url: '/workplace/dynamic' }) } -export const getTeamApi = async (): Promise> => { - const res = await request.get({ url: '/workplace/team' }) - return res && res.data +export const getTeamApi = (): Promise> => { + return request.get({ url: '/workplace/team' }) } -export const getRadarApi = async (): Promise> => { - const res = await request.get({ url: '/workplace/radar' }) - return res && res.data +export const getRadarApi = (): Promise> => { + return request.get({ url: '/workplace/radar' }) } diff --git a/src/api/login/index.ts b/src/api/login/index.ts index fa66be1..04bcbda 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -1,20 +1,16 @@ -import { useAxios } from '@/hooks/web/useAxios' +import request from '@/config/axios' import type { UserType } from './types' interface RoleParams { roleName: string } -const request = useAxios() - -export const loginApi = async (data: UserType): Promise> => { - const res = await request.post({ url: '/user/login', data }) - return res && res.data +export const loginApi = (data: UserType): Promise> => { + return request.post({ url: '/user/login', data }) } -export const loginOutApi = async (): Promise => { - const res = await request.get({ url: '/user/loginOut' }) - return res && res.data +export const loginOutApi = (): Promise => { + return request.get({ url: '/user/loginOut' }) } export const getUserListApi = ({ params }: AxiosConfig) => { @@ -24,14 +20,12 @@ export const getUserListApi = ({ params }: AxiosConfig) => { }>({ url: '/user/list', params }) } -export const getAdminRoleApi = async ( +export const getAdminRoleApi = ( params: RoleParams ): Promise> => { - const res = await request.get({ url: '/role/list', params }) - return res && res.data + return request.get({ url: '/role/list', params }) } -export const getTestRoleApi = async (params: RoleParams): Promise> => { - const res = await request.get({ url: '/role/list', params }) - return res && res.data +export const getTestRoleApi = (params: RoleParams): Promise> => { + return request.get({ url: '/role/list', params }) } diff --git a/src/api/table/index.ts b/src/api/table/index.ts index 0527a24..bd4f0b9 100644 --- a/src/api/table/index.ts +++ b/src/api/table/index.ts @@ -1,24 +1,18 @@ -import { useAxios } from '@/hooks/web/useAxios' +import request from '@/config/axios' import type { TableData } from './types' -const request = useAxios() - -export const getTableListApi = async (params: any): Promise => { - const res = await request.get({ url: '/example/list', params }) - return res && res.data +export const getTableListApi = (params: any): Promise => { + return request.get({ url: '/example/list', params }) } -export const saveTableApi = async (data: Partial): Promise => { - const res = await request.post({ url: '/example/save', data }) - return res && res.data +export const saveTableApi = (data: Partial): Promise => { + return request.post({ url: '/example/save', data }) } -export const getTableDetApi = async (id: string): Promise> => { - const res = await request.get({ url: '/example/detail', params: { id } }) - return res && res.data +export const getTableDetApi = (id: string): Promise> => { + return request.get({ url: '/example/detail', params: { id } }) } -export const delTableListApi = async (ids: string[] | number[]): Promise => { - const res = await request.post({ url: '/example/delete', data: { ids } }) - return res && res.data +export const delTableListApi = (ids: string[] | number[]): Promise => { + return request.post({ url: '/example/delete', data: { ids } }) } diff --git a/src/components/Footer/src/Footer.vue b/src/components/Footer/src/Footer.vue index a2b9e94..e7a778d 100644 --- a/src/components/Footer/src/Footer.vue +++ b/src/components/Footer/src/Footer.vue @@ -15,7 +15,7 @@ const title = computed(() => appStore.getTitle)