diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index 07b9a7a3..04a50f82 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -302,13 +302,15 @@
+ :un-check-value="0" + @change="toggleCheckboxes('projectSignFlag')"> 允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加) + :un-check-value="0" + @change="toggleCheckboxes('outSignFlag')"> 允许项目外人员临时到场参加
@@ -434,7 +436,17 @@ const props = defineProps({ const openCourseVisible = ref(false); const offCourseNewVisiable = ref(false); const tableRef = ref(); - +const toggleCheckboxes = (checkedName)=>{ + if (checkedName === 'projectSignFlag') { + if(formData.value.projectSignFlag){ + formData.value.outSignFlag = !formData.value.projectSignFlag; + } + } else if (checkedName === 'outSignFlag') { + if(formData.value.outSignFlag){ + formData.value.projectSignFlag = !formData.value.outSignFlag; + } + } + } const columns = ref([ { title: "名称", diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 06f95d9b..10469460 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -904,9 +904,9 @@ 新建开课
- +
@@ -3707,7 +3707,7 @@ function onFocusEnd(){ CourseModalRef.value.visibleOpen(null, state.xzinputV1); state.valueE1 = ""; - // state.teacher = ""; + state.teacher = ""; state.teacherName = ""; state.qdms_inputV1 = state.xzinputV1; @@ -5051,7 +5051,7 @@ function onFocusEnd(){ let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName); state.codeInfo = { title: type == 1 ? "【课程】二维码" : "【签到】二维码", - name: record.name ? record.name : "", + name: record.name ? record.name+'签到' : "", teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "", url: type == 1 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 49ae8a62..dc2dba94 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -588,13 +588,13 @@ {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
-
-
+
+ + +
+ {{ item.averageScore}}分
+
@@ -2435,6 +2439,9 @@ export default { AddOpenCourse }, setup() { + const exportScore = (item) => { + window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/export?assessmentIds=${item.assessmentIds}&pid=${item.id}`) + }; const coursePlanRef = ref(); const openCourse = async (item) => { await apitl.getDraftTask({projectId: item.projectId}).then((item)=>{ @@ -2461,7 +2468,7 @@ export default { if(qrCodeItems.value.length==1){ qrCode({ title: "【签到】二维码", - courseName: qrCodeItems.value[0].courseName, + courseName: state.name+'项目', name: qrCodeItems.value[0].name+'课程签到', createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher, url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}`, @@ -2473,14 +2480,13 @@ export default { }) } function handleMenuClick({key}) { - const courseName = qrCodeItems.value[key].courseName; const name = qrCodeItems.value[key].name; const teacher = qrCodeItems.value[key].teacher; const id = qrCodeItems.value[key].id; const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', '); qrCode({ title: "【签到】二维码", - courseName: courseName, + courseName: state.name+'项目', name: name+'课程签到', createName:offteachers||teacher, url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}`, @@ -2489,7 +2495,6 @@ export default { const qrCodeItemspg = ref([]); const visibleEwmpg = ref({}); const qrcodeAssement = async (item)=>{ - console.log(item,'item') if(qrCodeItemspg.value.length!=0){ qrCodeItemspg.value = [] } @@ -2505,11 +2510,10 @@ export default { courseName: item.name, })); qrCodeItemspg.value = qrCodeItemspgItem.filter(item => item.assessmentId !== null); - console.log(qrCodeItemspg.value,'长度') if(qrCodeItemspg.value.length==1){ qrCode({ title: "【评估】二维码", - courseName: qrCodeItemspg.value[0].courseName, + courseName: state.name+'项目', name: qrCodeItemspg.value[0].name+'课程评估', createName:qrCodeItemspg.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItemspg.value[0].teacher, url: `${location.protocol}//${location.host}/student-h5/investigatpage?id=${qrCodeItemspg.value[0].id}&type=3&infoId=${qrCodeItemspg.value[0].id}&courseId=${qrCodeItemspg.value[0].assessmentId}&chapterOrStageId=0`, @@ -2518,7 +2522,6 @@ export default { }) } function handleMenuClickpg({key}) { - const courseName = qrCodeItemspg.value[key].courseName; const name = qrCodeItemspg.value[key].name; const offteachers = qrCodeItemspg.value[key].offteachers.map(teacher => teacher.teacherName).join(', '); const teacher = qrCodeItemspg.value[key].teacher; @@ -2526,7 +2529,7 @@ export default { const assessmentId = qrCodeItemspg.value[key].assessmentId; qrCode({ title: "【评估】二维码", - courseName: courseName, + courseName: state.name+'项目', name: name+'课程评估', createName:offteachers||teacher, url: `${location.protocol}//${location.host}/student-h5/investigatpage?id=${id}&type=3&infoId=${id}&courseId=${assessmentId}&chapterOrStageId=0`, @@ -5222,7 +5225,8 @@ export default { visibleEwmpg, handleMenuClickpg, coursePlanRef, - openCourse + openCourse, + exportScore @@ -6734,7 +6738,15 @@ export default { margin-left: 10px; margin-right: 50px; flex-grow: 1; - + .img_daoc { + cursor: pointer; + width: 16px; + height: 18px; + background-image: url(@/assets/images/coursewareManage/export1.png); + background-size: 100% 100%; + background-color: #4ea6ff; + margin-left: 7px; + } .progresstext { color: #ffc067; font-size: 14px; @@ -6744,9 +6756,14 @@ export default { .operations { display: flex; width: 340px; - //flex-grow: 1; + flex-grow: 1; .operations_dropdown{ - padding: 10px;text-align: center;position: relative;margin-left: auto;margin-right: 10px; + padding: 10px; + text-align: center; + position: relative; + margin-left: auto; + margin-right: 10px; + min-width: 90px; } .operation { color: #4ea6ff;