Browse Source

feat: 新建项目展示新项目信息

master
xuesinan 4 years ago
parent
commit
a50e577f5c
  1. 4
      src/components/tall/center/Index.vue
  2. 7
      src/components/tall/left/Index.vue
  3. 26
      src/components/tall/left/Projects.vue
  4. 13
      src/components/tall/task/AssignmentExperiment.vue
  5. 2
      src/views/detail/Test.vue

4
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 }); //
}
});

7
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);
}
</script>

26
src/components/tall/left/Projects.vue

@ -10,7 +10,10 @@
<!-- <div class="precent-num">50%</div> -->
</div>
<div class="time">{{ dayjs(item.startTime).format('HH:mm:ss') }} {{ dayjs(item.endTime).format('HH:mm:ss') }}</div>
<div class="time">
{{ dayjs(Number(item.startTime)).format('MM-DD HH:mm') }}
{{ dayjs(Number(item.endTime)).format('MM-DD HH:mm') }}
</div>
</div>
<div class="right" @click.stop="openMenu">
@ -29,7 +32,9 @@
<!-- <div class="precent-num">50%</div> -->
</div>
<div class="time">{{ dayjs(sonItem.startTime).format('HH:mm:ss') }} {{ dayjs(sonItem.endTime).format('HH:mm:ss') }}</div>
<div class="time">
{{ dayjs(Number(sonItem.startTime)).format('MM-DD HH:mm') }} {{ dayjs(Number(sonItem.endTime)).format('MM-DD HH:mm') }}
</div>
</div>
<div class="right" @click.stop="openMenu">
@ -53,7 +58,8 @@
</div>
<div class="time">
{{ 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') }}
</div>
</div>
</div>
@ -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;

13
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);
}
};
//

2
src/views/detail/Test.vue

@ -3,7 +3,7 @@
<div class="task-con flex">
<!-- {{ taskInfo.name }} -->
<div class="task-con-box">
<div>{{ label }}</div>
<!-- <div>{{ label }}</div> -->
<!-- 课题 -->
<!-- 查看课题进展 -->
<CheckSubjectProgress v-if="label === 'KT_KTJZ'" />

Loading…
Cancel
Save