diff --git a/.env b/.env index 0f9c97e2e..ec523d92b 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=芋道管理系统 +VITE_APP_TITLE=ncc项目管理系统 # 项目本地运行端口号 VITE_PORT=80 @@ -8,13 +8,13 @@ VITE_PORT=80 VITE_OPEN=true # 租户开关 -VITE_APP_TENANT_ENABLE=true +VITE_APP_TENANT_ENABLE=false # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false # 文档地址的开关 -VITE_APP_DOCALERT_ENABLE=true +VITE_APP_DOCALERT_ENABLE=false # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc diff --git a/.env.prod b/.env.prod index 2ee5cf440..7286cfdfe 100644 --- a/.env.prod +++ b/.env.prod @@ -3,8 +3,8 @@ NODE_ENV=production VITE_DEV=false -# 请求路径(修改为实际的后端服务地址,如果前后端在同一服务器,可以使用相对路径或当前域名) -VITE_BASE_URL='http://localhost:48080' +# 请求路径(如果前后端部署在同一台服务器上就设置为空,否则设置为后端实际的ip+port) +VITE_BASE_URL='' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/project/acceptance/index.ts b/src/api/project/acceptance/index.ts index 2186d9edb..0d9e5b165 100644 --- a/src/api/project/acceptance/index.ts +++ b/src/api/project/acceptance/index.ts @@ -175,6 +175,11 @@ export const getTodoList = () => { return request.get({ url: '/project/acceptance/todo' }) } +// 查询已办任务 +export const getDoneList = () => { + return request.get({ url: '/project/acceptance/done' }) +} + // 获取验收状态列表 export const getStatusList = () => { return request.get<{ code: string; name: string }[]>({ url: '/project/acceptance/status-list' }) diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue index 781263d2c..d87a43695 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue @@ -1,6 +1,6 @@ diff --git a/src/views/project/acceptance/index.vue b/src/views/project/acceptance/index.vue index f876e3abe..1182866bd 100644 --- a/src/views/project/acceptance/index.vue +++ b/src/views/project/acceptance/index.vue @@ -146,6 +146,7 @@ 审核 归档 - -
- +
+ +
+
+
+ + 我的验收任务 +
+
管理您参与的所有验收任务
+
+
+
+ {{ todoList.length }} + 待处理 +
+
+
+ {{ doneList.length }} + 已处理 +
+
- - - - - - - - - - - - - - - - - - - + +
+ + 待处理 + {{ todoList.length }} + + + 已处理 + +
+ + +
+ + + +
+
+ + diff --git a/src/views/project/project/index.vue b/src/views/project/project/index.vue index 8c7f5648c..21b8a4daf 100644 --- a/src/views/project/project/index.vue +++ b/src/views/project/project/index.vue @@ -1,162 +1,126 @@ + +