From a50e577f5cd5f42c9621ca508bfdd017e1b95418 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Mon, 6 Dec 2021 15:20:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tall/center/Index.vue | 4 ++- src/components/tall/left/Index.vue | 7 ++++- src/components/tall/left/Projects.vue | 26 ++++++++++++------- .../tall/task/AssignmentExperiment.vue | 13 ++++++---- src/views/detail/Test.vue | 2 +- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/components/tall/center/Index.vue b/src/components/tall/center/Index.vue index 78cd2c2..d4196f7 100644 --- a/src/components/tall/center/Index.vue +++ b/src/components/tall/center/Index.vue @@ -127,7 +127,9 @@ watch(project, async () => { }); watch(refreshProjects, async () => { - if (roleId.value) { + if (project.value.id) { + await getRoles(project.value.id); // 通过项目id获取角色信息 + await getPermanentData(roleId.value); // 根据角色查找永久的日常任务 await getTasks({ roleId: roleId.value }); // 根据角色查找定期任务 } }); diff --git a/src/components/tall/left/Index.vue b/src/components/tall/left/Index.vue index 5f28595..29a7328 100644 --- a/src/components/tall/left/Index.vue +++ b/src/components/tall/left/Index.vue @@ -52,6 +52,12 @@ const handleOk = async () => { async function createExperiment() { try { const data = await create(); + const obj = { + id: data.projectId, + name: data.projectName, + }; + store.commit('projects/setProject', obj); + store.commit('task/setTaskDetail', null); store.commit('layout/setRefreshProjects'); return data; } catch (error) { @@ -61,7 +67,6 @@ async function createExperiment() { } function changeTime(data) { - console.log(data); store.commit('layout/setSelectTime', data); } diff --git a/src/components/tall/left/Projects.vue b/src/components/tall/left/Projects.vue index f238a14..22c6dd9 100644 --- a/src/components/tall/left/Projects.vue +++ b/src/components/tall/left/Projects.vue @@ -10,7 +10,10 @@ -
{{ dayjs(item.startTime).format('HH:mm:ss') }} 至 {{ dayjs(item.endTime).format('HH:mm:ss') }}
+
+ {{ dayjs(Number(item.startTime)).format('MM-DD HH:mm') }} 至 + {{ dayjs(Number(item.endTime)).format('MM-DD HH:mm') }} +
@@ -29,7 +32,9 @@
-
{{ dayjs(sonItem.startTime).format('HH:mm:ss') }} 至 {{ dayjs(sonItem.endTime).format('HH:mm:ss') }}
+
+ {{ dayjs(Number(sonItem.startTime)).format('MM-DD HH:mm') }} 至 {{ dayjs(Number(sonItem.endTime)).format('MM-DD HH:mm') }} +
@@ -53,7 +58,8 @@
- {{ dayjs(thirdItem.startTime).format('HH:mm:ss') }} 至 {{ dayjs(thirdItem.endTime).format('HH:mm:ss') }} + {{ dayjs(Number(thirdItem.startTime)).format('MM-DD HH:mm') }} 至 + {{ dayjs(Number(thirdItem.endTime)).format('MM-DD HH:mm') }}
@@ -81,7 +87,7 @@ const store = useStore(); const visible = ref(false); const deleteId = ref(null); -const projectId = sessionStorage.getItem('projectId'); // 项目ID缓存 +// const projectId = sessionStorage.getItem('projectId'); // 项目ID缓存 const sessionProject = sessionStorage.getItem('project'); // 项目信息缓存 const projectInfo = computed(() => store.state.projects.project); // 当前选择项目信息 @@ -107,11 +113,11 @@ if (planStartTime) { } if (subStartTime) { - store.commit('layout/setFirPlanTime', { startTime: subStartTime, endTime: subEndTime }); + store.commit('layout/setSecPlanTime', { startTime: subStartTime, endTime: subEndTime }); } if (expreStartTime) { - store.commit('layout/setFirPlanTime', { startTime: expreStartTime, endTime: expreEndTime }); + store.commit('layout/setThirdPlanTime', { startTime: expreStartTime, endTime: expreEndTime }); } if (sessionProject) { @@ -149,11 +155,11 @@ const showActionCard = item => { async function getProjectsList() { try { const data = await getProjects(startTime.value, endTime.value); - + console.log(projectInfo.value); data.forEach(item => { item.show = false; - if (item.id === projectId) { + if (item.id === projectInfo.value.id) { item.show = true; } @@ -161,7 +167,7 @@ async function getProjectsList() { item.sonProjectList.forEach(sonItem => { sonItem.show = false; - if (sonItem.id === projectId) { + if (sonItem.id === projectInfo.value.id) { item.show = true; sonItem.show = true; } @@ -169,7 +175,7 @@ async function getProjectsList() { if (sonItem.sonProjectList) { sonItem.sonProjectList.forEach(val => { val.show = false; - if (val.id === projectId) { + if (val.id === projectInfo.value.id) { item.show = true; sonItem.show = true; val.show = true; diff --git a/src/components/tall/task/AssignmentExperiment.vue b/src/components/tall/task/AssignmentExperiment.vue index 16bfb3c..f437730 100644 --- a/src/components/tall/task/AssignmentExperiment.vue +++ b/src/components/tall/task/AssignmentExperiment.vue @@ -111,11 +111,14 @@ const onSubmit = async () => { } } - const params = { param: assignExperFormData.value }; - await createExperiment(params); - store.commit('layout/setThirdPlanTime', { startTime: assignExperFormData.value.startTime, endTime: assignExperFormData.value.endTime }); - - await getSubProject(experimentationId.value); + try { + const params = { param: assignExperFormData.value }; + await createExperiment(params); + store.commit('layout/setThirdPlanTime', { startTime: assignExperFormData.value.startTime, endTime: assignExperFormData.value.endTime }); + await getSubProject(experimentationId.value); + } catch (error) { + message.info(error); + } }; // 获取成员列表 diff --git a/src/views/detail/Test.vue b/src/views/detail/Test.vue index e9bb4b9..7b0fca9 100644 --- a/src/views/detail/Test.vue +++ b/src/views/detail/Test.vue @@ -3,7 +3,7 @@
-
{{ label }}
+