From 10420088e51415c07d139bfb97840ee5e2966f79 Mon Sep 17 00:00:00 2001 From: yannqing <67121851@qq.com> Date: Sun, 17 Mar 2024 16:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/request.js | 2 +- src/router/index.js | 18 ++- src/views/WorkLoadPage/ChildModule.vue | 120 ++++++++++++++---- src/views/WorkLoadPage/I_Manage.vue | 1 + .../WorkLoadPage/I_Manage_ChildSystem.vue | 48 ++++--- src/views/WorkLoadPage/I_Responsible.vue | 70 +++++----- src/views/WorkLoadPage/PersonalProject.vue | 4 +- 7 files changed, 184 insertions(+), 79 deletions(-) diff --git a/src/js/request.js b/src/js/request.js index 205760a..d41fa78 100644 --- a/src/js/request.js +++ b/src/js/request.js @@ -736,7 +736,7 @@ const moduleDelete = (id ,token) =>{ } /** - * 获取模块信息 + * 获取模块/子系统信息 * @param id * @param token * @returns {Promise> | *} diff --git a/src/router/index.js b/src/router/index.js index 03f3d53..b4715f7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,10 +27,24 @@ const router = createRouter({ name: 'WorkLoadPersonalInformation', component: () => import('@/views/WorkLoadPage/PersonalInformation.vue') }, + /** + * 个人项目页面 + */ { path: '/WorkLoad/PersonalProject', name: 'WorkLoadPersonalProject', - component: () => import('@/views/WorkLoadPage/PersonalProject.vue') + component: () => import('@/views/WorkLoadPage/PersonalProject.vue'), + }, + + { + path: '/WorkLoad/PersonalProject/ChildSystem/:id', + name: 'WorkLoad/PersonalProject/ChildSystem', + component: () => import('@/views/WorkLoadPage/I_Manage_ChildSystem.vue') + }, + { + path: '/WorkLoad/PersonalProject/ChildSystem/ChildModule/:id', + name: 'WorkLoad/PersonalProject/ChildSystem/ChildModule', + component: () => import('@/views/WorkLoadPage/ChildModule.vue') }, { path: '/WorkLoad/PersonalBelongings', @@ -91,7 +105,7 @@ const router = createRouter({ component: () => import('@/views/WorkLoadPage/AuthorityManageModule.vue') }, { - path: '/WorkLoad/I_Manage/I_Manage_ChildSystem', + path: '/WorkLoad/I_Manage/I_Manage_ChildSystem/:id', name: 'WorkLoad/I_Manage/IChildSystem', component: () => import('@/views/WorkLoadPage/I_Manage_ChildSystem.vue') }, diff --git a/src/views/WorkLoadPage/ChildModule.vue b/src/views/WorkLoadPage/ChildModule.vue index 152cde5..7cd4fdb 100644 --- a/src/views/WorkLoadPage/ChildModule.vue +++ b/src/views/WorkLoadPage/ChildModule.vue @@ -6,7 +6,7 @@ 子系统 子模块 -
+
@@ -17,7 +17,7 @@

{{ChildModule.name}}

-

负责人: {{ChildModule.principalId }}

+

负责人: {{ChildModule.principalUser }}

剩余 3 天

@@ -48,30 +48,45 @@
- +
- + - 进行中 - 未开始 - 已完成 + 进行中 + 未开始 + 已完成 + 已暂停
- - + +
- + + + + + 是 + 否 + + +
+
+ - +
@@ -80,9 +95,10 @@ \ No newline at end of file diff --git a/src/views/WorkLoadPage/I_Manage.vue b/src/views/WorkLoadPage/I_Manage.vue index 6725d0c..c418cff 100644 --- a/src/views/WorkLoadPage/I_Manage.vue +++ b/src/views/WorkLoadPage/I_Manage.vue @@ -105,6 +105,7 @@ onMounted(() => { function GetManageProject() { request.projectWorkGet(data, token).then((res) => { ChildProjects.value = res.data.data; + console.log("projects:",ChildProjects.value) }) } diff --git a/src/views/WorkLoadPage/I_Manage_ChildSystem.vue b/src/views/WorkLoadPage/I_Manage_ChildSystem.vue index 4e64320..ee93941 100644 --- a/src/views/WorkLoadPage/I_Manage_ChildSystem.vue +++ b/src/views/WorkLoadPage/I_Manage_ChildSystem.vue @@ -4,18 +4,18 @@ 我的项目 子系统 -
+
- +
-

项目名称：{{ChildProjects.data[0].name}}

-

项目周期：{{ChildProjects.data[0].cycle}} /天

+

项目名称：{{ChildProjects.data.name}}

+

项目周期：{{ChildProjects.data.cycle}} 天

项目开始时间：

项目完成时间：

-

工作量：{{ChildProjects.data[0].workLoad}}人/天

+

工作量：{{ChildProjects.data.workLoad}}人/天

子系统文档
@@ -92,18 +92,21 @@ import {onMounted, reactive, ref, watch} from "vue"; import request from "@/js/request.js"; import router from "@/router/index.js"; +import {useRoute} from "vue-router"; import {CloseOutlined} from '@ant-design/icons-vue'; const showButton = reactive([]); const AddModule = ref(false) const token = window.localStorage.getItem('token') -const id = window.localStorage.getItem('id') +const route = useRoute() +const projectId = route.params.id function showAddModal(){ AddModule.value = true; } +//项目信息 const ChildProjects = reactive({ - data:[{ + data:{ name:'', id:-1, isFinish:'', @@ -111,38 +114,43 @@ const ChildProjects = reactive({ description:'', cycle:'', principalUser: '' - }] + } }); // 使用ref创建响应式数据 +//子系统 const ChildSystems = ref([ ]); const data =reactive({ - is:1, - id:null, + id: parseInt(projectId), tags:[], isFinish:[0,1,2,-1], editing:true }) +const userProfile = reactive({ + id:'' +}) onMounted(() => { - request.projectWorkGet(data, token).then((res) => { + request.projectGetById(projectId, token).then((res) => { + console.log(res) ChildProjects.data = res.data.data; - console.log("res:",res) - console.log('对应项目信息',ChildProjects.data[0]) - - console.log(ChildProjects.data) + console.log('对应项目信息',ChildProjects.data) }) - request.moduleGetByProjectId(id, token).then((res) => { + request.moduleGetByProjectId(projectId, token).then((res) => { console.log("childModules:", res) ChildSystems.value = res.data.data }) + request.userGetProfile(token).then((res)=>{ + console.log("user:",res.data.data) + userProfile.id = res.data.data.id + }) }) function EnterChildModule(ChildSystem){ console.log(ChildSystem.id) window.localStorage.setItem('id',ChildSystem.id) - router.push("/WorkLoad/IChildModule") + router.push('/WorkLoad/PersonalProject/ChildSystem/ChildModule/' + ChildSystem.id) } // 打开add窗口 watch(() => AddModule.value, () => { @@ -171,9 +179,9 @@ const handleAdd = () => { // console.log(2222) formData.projectId = ChildProjects.data[0].id console.log("formData:",formData) - // request.projectWorkAdd(formData,token).then((res)=>{ - // console.log(res) - // }) + request.projectWorkAdd(formData,token).then((res)=>{ + console.log("Add result：",res) + }) // 关闭模态框 AddModule.value = false; diff --git a/src/views/WorkLoadPage/I_Responsible.vue b/src/views/WorkLoadPage/I_Responsible.vue index 7554053..0c2eac5 100644 --- a/src/views/WorkLoadPage/I_Responsible.vue +++ b/src/views/WorkLoadPage/I_Responsible.vue @@ -31,30 +31,31 @@
- - - + + + + + + + + + + - - - + + + + + + + + + + + + + +
@@ -126,12 +127,13 @@