diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue index 135b6c1e..0b92ab72 100644 --- a/src/components/drawers/CheckStu.vue +++ b/src/components/drawers/CheckStu.vue @@ -22,8 +22,8 @@
-
{{pro.name}}
-
{{pro.deptName?pro.deptName:"" + '-' + pro.jobName?pro.jobName:""}}
+
{{pro.userInfoBo.userName}}
+
{{pro.userInfoBo.deptName?pro.userInfoBo.deptName:"" + '-' + pro.userInfoBo.jobName?pro.userInfoBo.jobName:""}}
进度排名
@@ -68,7 +68,7 @@
--> - +
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index c9d32502..7f8462d8 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -128,7 +128,7 @@ const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, { totalPage: res => res.result.total_page_num, total: res => res.result.count }) -console.log(data) +console.log(data,222) watch(taskIndex, () => { if (taskIndex.value >= 0) { rowSelectKeys.value = [props.taskList[taskIndex.value].courseId] @@ -194,19 +194,26 @@ function confirm() { } if (taskIndex.value === -1) { let list = props.taskList - list.push({ + console.log(props,222,list); + if(list!=undefined){ + list.push({ name: selectsData.value[0].title, type: 3, courseId: selectsData.value[0].id, info: selectsData.value[0] }) + } + } else { const data = props.taskList[taskIndex.value] data.name = selectsData.value[0].title data.courseId = selectsData.value[0].id data.info = selectsData.value[0] } - emit('update:taskList', [...props.taskList]) + if(props.taskList!=undefined){ + emit('update:taskList', [...props.taskList]) + } + closeDrawer() }