From fd4e927ca6b5c9c887aa9548ca8bc7d96b7d9b5a Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 15 Jul 2024 18:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.base | 2 +- .env.dev | 2 +- .env.front | 2 +- .env.pro | 6 +- .env.stage | 2 +- .env.static | 2 +- .env.test | 2 +- src/permission.js | 4 +- src/router/modules/remaining.ts | 21 +++++ src/views/Basic/Salary/index.vue | 21 ----- src/views/Basic/WorkAttendance/index.vue | 7 -- .../Commission}/Comp/DialogPlan.vue | 0 .../Commission/index.vue} | 2 +- .../Salary/Comp/DialogSalary.vue | 0 .../Salary/index.vue} | 2 +- src/views/Home/Salary/index.vue | 7 ++ src/views/Pers/Employee/index.vue | 76 +++++++++++++++++++ src/views/Pers/Setting/index.vue | 7 ++ vite.config.js | 4 +- 19 files changed, 126 insertions(+), 43 deletions(-) delete mode 100644 src/views/Basic/Salary/index.vue delete mode 100644 src/views/Basic/WorkAttendance/index.vue rename src/views/{Basic/Salary => Finance/Commission}/Comp/DialogPlan.vue (100%) rename src/views/{Basic/Salary/Comp/CommissionPlan.vue => Finance/Commission/index.vue} (98%) rename src/views/{Basic => Finance}/Salary/Comp/DialogSalary.vue (100%) rename src/views/{Basic/Salary/Comp/EmployeeList.vue => Finance/Salary/index.vue} (97%) create mode 100644 src/views/Home/Salary/index.vue create mode 100644 src/views/Pers/Employee/index.vue create mode 100644 src/views/Pers/Setting/index.vue diff --git a/.env.base b/.env.base index ca2e2f8..cbfa635 100644 --- a/.env.base +++ b/.env.base @@ -12,7 +12,7 @@ VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.dev b/.env.dev index 81c0390..c1c1d41 100644 --- a/.env.dev +++ b/.env.dev @@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080' VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.front b/.env.front index 5340573..17ac8f7 100644 --- a/.env.front +++ b/.env.front @@ -10,7 +10,7 @@ VITE_BASE_URL='http://118.31.23.45:48080' VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.pro b/.env.pro index 52746ef..346ee60 100644 --- a/.env.pro +++ b/.env.pro @@ -4,13 +4,13 @@ VITE_NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='/crm-api' +VITE_BASE_URL='/oa-api' # 上传路径 -VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload' +VITE_UPLOAD_URL='/oa-api/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.stage b/.env.stage index b849f05..a01f3af 100644 --- a/.env.stage +++ b/.env.stage @@ -10,7 +10,7 @@ VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.static b/.env.static index a3c722b..92ebab9 100644 --- a/.env.static +++ b/.env.static @@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080' VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/.env.test b/.env.test index ee40e26..caa2f7c 100644 --- a/.env.test +++ b/.env.test @@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080' VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' # 接口前缀 -VITE_API_BASEPATH=/crm-api +VITE_API_BASEPATH=/oa-api # 接口地址 VITE_API_URL=/admin-api diff --git a/src/permission.js b/src/permission.js index 60f59f9..94d6878 100644 --- a/src/permission.js +++ b/src/permission.js @@ -54,9 +54,9 @@ router.beforeEach(async (to, from, next) => { const tenantId = getTenantId() const appId = getAppId() if (tenantId && appId) { - next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/oa/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 } else { - next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/oa/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 } } } diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 4458222..07b1cf8 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -106,6 +106,27 @@ const remainingRouter: AppRouteRecordRaw[] = [ } ] }, + // { + // path: '/Basic', + // component: Layout, + // name: 'Basic', + // meta: {}, + // redirect: '/Basic/menu', + // children: [ + // { + // path: 'menu', + // component: () => import('@/views/Basic/Menu/index.vue'), + // name: 'Menu', + // meta: { + // canTo: true, + // hidden: true, + // noTagsView: false, + // icon: 'ep:user', + // title: '菜单管理' + // } + // } + // ] + // }, { path: '/login', component: () => import('@/views/Login/Login.vue'), diff --git a/src/views/Basic/Salary/index.vue b/src/views/Basic/Salary/index.vue deleted file mode 100644 index 383ab55..0000000 --- a/src/views/Basic/Salary/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/src/views/Basic/WorkAttendance/index.vue b/src/views/Basic/WorkAttendance/index.vue deleted file mode 100644 index 9a9af28..0000000 --- a/src/views/Basic/WorkAttendance/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/views/Basic/Salary/Comp/DialogPlan.vue b/src/views/Finance/Commission/Comp/DialogPlan.vue similarity index 100% rename from src/views/Basic/Salary/Comp/DialogPlan.vue rename to src/views/Finance/Commission/Comp/DialogPlan.vue diff --git a/src/views/Basic/Salary/Comp/CommissionPlan.vue b/src/views/Finance/Commission/index.vue similarity index 98% rename from src/views/Basic/Salary/Comp/CommissionPlan.vue rename to src/views/Finance/Commission/index.vue index d276c44..b03c3aa 100644 --- a/src/views/Basic/Salary/Comp/CommissionPlan.vue +++ b/src/views/Finance/Commission/index.vue @@ -53,7 +53,7 @@ + + diff --git a/src/views/Pers/Employee/index.vue b/src/views/Pers/Employee/index.vue new file mode 100644 index 0000000..1733c5c --- /dev/null +++ b/src/views/Pers/Employee/index.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/Pers/Setting/index.vue b/src/views/Pers/Setting/index.vue new file mode 100644 index 0000000..24d6898 --- /dev/null +++ b/src/views/Pers/Setting/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/vite.config.js b/vite.config.js index ac78303..617d0c5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -40,11 +40,11 @@ export default ({ command, mode }) => { changeOrigin: true, rewrite: (path) => path.replace(new RegExp(`^/call-api`), '') }, - ['/crm-api']: { + ['/oa-api']: { target: env.VITE_BASE_URL, ws: false, changeOrigin: true, - rewrite: (path) => path.replace(new RegExp(`^/crm-api`), '') + rewrite: (path) => path.replace(new RegExp(`^/oa-api`), '') } } },