diff --git a/src/api/buildNode/index.js b/src/api/buildNode/index.js index 8ffc19c..e26f469 100644 --- a/src/api/buildNode/index.js +++ b/src/api/buildNode/index.js @@ -101,8 +101,9 @@ const listByProject=(projectId)=>{ objs.forEach(it => { it.children = tmps.filter(item => item.parentLvl == it.lvl) it.children.forEach(item => { - item.children = tmps.filter(item3 => item3.parentLvl == item.lvl); + item.children = tmps.filter(item3 => item3.planStartDate && item3.parentLvl == item.lvl ); }); + it.children=it.children.filter(item=>item.children.length>0||item.planStartDate); }) resolve(objs); }) diff --git a/src/api/project/index.js b/src/api/project/index.js index 8b1fda1..d48c484 100644 --- a/src/api/project/index.js +++ b/src/api/project/index.js @@ -20,9 +20,9 @@ const getProgressProjects=()=>{ }) }; -const groupByProjectCategory=(cb)=>{ +const groupByProjectCategory=(deptId,cb)=>{ request({ - url:`bgscreen/project/groupByProjectCategory`, + url:`bgscreen/project/groupByProjectCategory?deptId=${deptId}`, method: 'get' }).then(res=>{ let objs=(res.data||[]).map(it=>{ diff --git a/src/pages/detail/projectInfoDlg.vue b/src/pages/detail/projectInfoDlg.vue new file mode 100644 index 0000000..beed17f --- /dev/null +++ b/src/pages/detail/projectInfoDlg.vue @@ -0,0 +1,619 @@ + + + + + \ No newline at end of file diff --git a/src/pages/dlg/workTrainDlg.vue b/src/pages/dlg/workTrainDlg.vue index 7ab0362..7db6902 100644 --- a/src/pages/dlg/workTrainDlg.vue +++ b/src/pages/dlg/workTrainDlg.vue @@ -1,12 +1,43 @@