From a5a64b7131d2eeb151e56642e2125485f609c7ae Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 17 Feb 2025 14:12:34 +0800 Subject: [PATCH] sc --- .env.base | 4 +- .env.dev | 2 +- .env.front | 4 +- .env.stage | 2 +- .env.static | 2 +- .env.test | 2 +- package.json | 1 + src/router/modules/remaining.ts | 58 +- src/views/Home/FalseDiligenceReport/index.vue | 9 +- src/views/Home/Salary/index.vue | 2 +- .../OKR/Management/Components/DialogOkr.vue | 611 ++++++++++++++++++ .../Management/Components/DialogOkrInfo.vue | 526 +++++++++++++++ .../OKR/Management/Components/ObjectList.vue | 165 +++++ src/views/OKR/Management/index.vue | 53 ++ yarn.lock | 12 + 15 files changed, 1417 insertions(+), 36 deletions(-) create mode 100644 src/views/OKR/Management/Components/DialogOkr.vue create mode 100644 src/views/OKR/Management/Components/DialogOkrInfo.vue create mode 100644 src/views/OKR/Management/Components/ObjectList.vue create mode 100644 src/views/OKR/Management/index.vue diff --git a/.env.base b/.env.base index 1cbc08d..ef509f9 100644 --- a/.env.base +++ b/.env.base @@ -4,11 +4,11 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -# VITE_BASE_URL='http://118.31.23.45:48080' +# VITE_BASE_URL='http://47.98.161.246:48080' VITE_BASE_URL='http://114.55.169.15:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload' # 接口前缀 diff --git a/.env.dev b/.env.dev index c1c1d41..2d7d01d 100644 --- a/.env.dev +++ b/.env.dev @@ -7,7 +7,7 @@ VITE_DEV=false VITE_BASE_URL='http://localhost:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/oa-api diff --git a/.env.front b/.env.front index 17ac8f7..c33e9c1 100644 --- a/.env.front +++ b/.env.front @@ -4,10 +4,10 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://118.31.23.45:48080' +VITE_BASE_URL='http://47.98.161.246:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/oa-api diff --git a/.env.stage b/.env.stage index a01f3af..a6929a4 100644 --- a/.env.stage +++ b/.env.stage @@ -7,7 +7,7 @@ VITE_DEV=false VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/oa-api diff --git a/.env.static b/.env.static index 92ebab9..2936e60 100644 --- a/.env.static +++ b/.env.static @@ -7,7 +7,7 @@ VITE_DEV=false VITE_BASE_URL='http://localhost:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/oa-api diff --git a/.env.test b/.env.test index caa2f7c..4b719d8 100644 --- a/.env.test +++ b/.env.test @@ -7,7 +7,7 @@ VITE_DEV=false VITE_BASE_URL='http://localhost:48080' # 上传路径 -VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload' +VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' # 接口前缀 VITE_API_BASEPATH=/oa-api diff --git a/package.json b/package.json index fbda02b..cb33cf5 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "vue-i18n": "9.2.2", "vue-router": "^4.2.1", "vue-types": "^5.0.3", + "vue3-tree-org": "^4.2.2", "vuedraggable": "^4.1.0", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.7", diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index cb2703c..0b546ef 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -106,29 +106,41 @@ const remainingRouter: AppRouteRecordRaw[] = [ } ] }, - // { - // path: '/Basic', - // component: Layout, - // name: 'Basic', - // meta: { - // title: '菜单管理' - // }, - // 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: '/Basic', + component: Layout, + name: 'Basic', + meta: { + title: '菜单管理' + }, + 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: 'okr', + component: () => import('@/views/OKR/Management/index.vue'), + name: 'OkrManagement', + meta: { + canTo: true, + // hidden: true, + noTagsView: false, + icon: 'ep:user', + title: 'Okr管理' + } + } + ] + }, { path: '/login', component: () => import('@/views/Login/Login.vue'), diff --git a/src/views/Home/FalseDiligenceReport/index.vue b/src/views/Home/FalseDiligenceReport/index.vue index c1fca50..b7c1396 100644 --- a/src/views/Home/FalseDiligenceReport/index.vue +++ b/src/views/Home/FalseDiligenceReport/index.vue @@ -48,7 +48,7 @@ :tree-props="{ children: 'userDingAttendanceRespVOList', hasChildren: 'hasChildren' }" :span-method="spanMethod" > - + - + +