diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 6d5fc9ab..6952daf9 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -940,6 +940,7 @@ export default { }; const signQR = () => { console.log("props.datasource", props.datasource); + console.log("是项目还是路径图啊") state.codevisible = true; state.codeInfo = { title: "【签到】二维码", @@ -948,7 +949,7 @@ export default { process.env.VUE_APP_BASE_API + `/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${ props.datasource.type - }&type=${1}`, + }&type=${props.datasource.routerId?2:1}`, }; console.log("codeInfo", state.codeInfo); state.codeIndex = 0; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index dfce029a..58009db8 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -219,7 +219,7 @@
@@ -228,7 +228,7 @@ 考试说明:
-
@@ -266,7 +266,8 @@ const initValue = { showAnalysis: 2, scoringModel: 2, questionArrangement: 4, - externalExplain: "" + externalExplain: "", + examinationExplain: "" } const formData = ref(initValue) const innerRule = { diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index d4846eaa..4dcc8621 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -117,13 +117,22 @@
-
-
{{ item.complete }}
+
{{ item.complete }}
--> + +
+
{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index d78015cb..5994d21b 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -500,7 +500,6 @@ export default { // 导出数据 function exportTaskStu() { - debugger if(props.datasource.type==1){ {/* 在线课导出 */} window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 79ba5630..9dcfc1de 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -692,7 +692,6 @@ const deleteId = ref(null); const deleteTargetId = ref(null); const deleteType = ref(null); function del(id, row) { - debugger if (row.isLeader === "1") { return message.warning("" + row.name + "是小组长,请勿删除!"); } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 3d68b861..a48b7ea3 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1251,6 +1251,7 @@ :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs" + :permissions="permissions" :isgetStudent="isgetStudent" >