diff --git a/src/App.vue b/src/App.vue index 3ee9c0a4..c330b262 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本3.0.3------------"); +console.log("版本3.0.4------------"); diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 540c754e..b15466fb 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -37,19 +37,19 @@ :placeholder="[' 开始时间', ' 结束时间']" /> - +
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 585056e5..230f6186 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -52,19 +52,19 @@ valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
- +
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 0b93f53c..c812cb10 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -74,7 +74,7 @@ const columns = ref([ key: "type", width: "100px", align: "center", - customRender: ({ record: { type } }) => ({ 10: "微课", 21: "直播", 20: "录播", 30: "面授", 90: "混合" }[type]), + customRender: () => 在线课, }, { title: "创建人", @@ -83,13 +83,13 @@ const columns = ref([ width: "100px", align: "center", }, - { - title: "时长", - dataIndex: "studyTime", - key: "studyTime", - width: "80px", - align: "center", - }, + // { + // title: "时长", + // dataIndex: "studyTime", + // key: "studyTime", + // width: "80px", + // align: "center", + // }, { title: "发布时间", dataIndex: "publishTime", diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index 5577840a..34fe03ad 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -113,24 +113,6 @@ >
-
-
-
-
- 地点 -
-
- -
- {{ formData.address.length || 0 }}/50 -
-
-
@@ -172,6 +154,49 @@ v-model:name="formData.teacher" >
+
+
+
+
+ +
+ 持续时间 +
+
+ +
+ 分钟 +
+
+
+
+
+
+
+ 地点 +
+
+ +
+ {{ formData.address.length || 0 }}/50 +
+
@@ -451,6 +476,7 @@ const formData = useResetRef({ evalFlag: 0, assessmentName: "", assessmentId: "", + duration: "", workInfo: {}, examInfo: {}, attach: "", @@ -490,6 +516,12 @@ const formDataRule = { message: "请选择教师", }, ], + duration: [ + { + required: true, + message: "请输入持续时间", + }, + ], }; const { validate } = Form.useForm(formData, formDataRule); diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 99b4d304..92844756 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -307,7 +307,7 @@ export default { state.CWvisible = true }} > - 查看作业2 + 查看作业 } {value.examStatus===1 && - 查看答卷3 + 查看答卷 }
) ); diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index bf47a3a3..ac1b623f 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -43,7 +43,7 @@
-
+
姓名：
@@ -81,7 +81,7 @@
-
+
+ customRender: ({record:{workStatus,answerId,examinationScore,studentId,finishStatus}}) =>
- examinationScore && showExamAnswer(answerId)}>查看答卷 - workStatus && showCWvisible(studentId)}>查看作业 + {examinationScore? examinationScore && showExamAnswer(answerId)}>查看答卷:''} + {workStatus ? workStatus && showCWvisible(studentId)}>查看作业:''} + {finishStatus != 1 ? finishTask(studentId)}>标记为完成 : ''}
}, ]); @@ -339,6 +340,23 @@ const batchFinish = () => { }); }; +const finishTask = (stuId) => dialog({ + content: "确定标注完成吗？", + ok: async () => { + message.success("标注完成成功"); + tableRef.value.toLoading(); + await api.batchFinishTask({ + ids: [stuId], + type: 3, + taskId: props.datasource.routerTaskId, + pid: offcoursePlanId.value, + taskType: props.datasource.type, + currentStageId: props.datasource.currentStageId, + }); + tableRef.value.fetch(); + }, + }); + const answerId = ref(''); const showExamAnswer = (id) => { answerId.value = id; diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index 2e77fd2c..70ac40ab 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -43,7 +43,7 @@
-
+
姓名：
@@ -81,7 +81,7 @@
-
+
签到二维码
+
+
评估二维码
+
批量签到
-
+
-
导出数据
+
导出签到数据
+
+
+
+
导出评估数据
@@ -151,6 +163,7 @@ import {useRequest} from "@/api/request"; import CommonImport from "@/components/common/CommonImport"; import CommonStudent from "@/components/student/CommonStudent"; import dayjs from "dayjs"; +import {delStudentList} from "@/api/index1"; const coursePlanIndex = ref(0); const tableRef = ref(); @@ -291,6 +304,19 @@ const columns = ref([ stuSign(text)}>请假
}, + { + title: "操作", + ellipsis: true, + className: "h", + dataIndex: "opacation", + key: "opacation", + width: 130, + align: "center", + customRender: (text) => +
+ removeStu(text.record.id)}>删除 +
+ }, ]); const { data = [], loading, fetchData } = useRequest(COURSE_PLAN_LIST, planParams, false); @@ -309,6 +335,11 @@ const ChoiceCourse = (n) => { tableRef.value.fetch(); }; +const removeStu=(id)=> dialog({ + content: "确定删除该学员吗？", + ok: () => delStudentList({ ids: [id] }).then(() => fetchData()) +}) + const closeDrawer = () => emit("update:FSvisible", false); //批量签到 const batchSign = () => { @@ -369,6 +400,8 @@ function exportTaskStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=3&pid=${offcoursePlanId.value}&thirdType=2`); } +const exportAssessment = () =>window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.type === 1 ? props.datasource.stageId : props.datasource.chapterId}&type=${props.type}&pid=${props.type === 1 ? props.datasource.projectId : props.datasource.routerId}&courseId=${data.value[coursePlanIndex.value].assessmentId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`); + function afterVisibleChange(bool) { bool && fetchData() } @@ -396,6 +429,14 @@ const qrcodeVisibleSign = () => { }); }; +const qrcodeAssement = () =>{ + qrCode({ + title: "【评估】二维码", + name: data.value[coursePlanIndex.value]?.assessmentName, + url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/student-h5/investigatpage?id=${data.value[coursePlanIndex.value]?.id}&type=3&infoId=${data.value[coursePlanIndex.value]?.id}&courseId=${data.value[coursePlanIndex.value].assessmentId}&chapterOrStageId=0`, + }); +} + const change = (e) => { console.log(e) if(e==="end"){ diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5f3f516e..f362aa57 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3202,26 +3202,22 @@ export default defineComponent({ console.log(val); rest(); - getTea(); }; const handelChangePageTea1 = (page, pageSize) => { state.currentPageTea1 = page; state.pageSizeTea1 = pageSize; rest(); - getTea(); }; const handleChangeTea2 = (val) => { console.log(787877); console.log(val); options4CurName.value = val; rest(); - getTea(); }; const handelChangePageTea2 = (page, pageSize) => { state.currentPageTea2 = page; state.pageSizeTea2 = pageSize; rest(); - getTea(); }; //获取分类、场景、封面图、-----------字典配置------------------------------- @@ -3476,7 +3472,6 @@ export default defineComponent({ const options4CurName = ref("张"); const of_hShow = () => { state.offcourseId = ""; - getTea(); if (state.of_hs == false) { state.of_hs = true; } @@ -3546,7 +3541,6 @@ export default defineComponent({ state.qdms_inputV1 = state.xzinputV1; state.xzinputV1 = ""; - getTea(); } if (state.bs_hs && state.valueE1 == 1) { state.addOnlineCoursevisible = true; @@ -4325,50 +4319,6 @@ export default defineComponent({ // }); */ // } }; - //获取教师 - const getTea = async () => { - options4CurName.value = state.teacher; - options4CurId.value = state.teacherId; - const item1 = await getMemberInfoApi({ - pageNo: state.currentPageTea1, - pageSize: state.pageSizeTea1, - keyWord: options4CurName.value, - id: options4CurId.value ? options4CurId.value : null, - }) - .then((res) => { - console.log("获取授课教师", res); - if (res.data.code === 200) return res.data.data; - }) - .catch((err) => { - console.log("获取授课教师失败", err); - }); - const { rows, total } = item1; - state.tableDataTotalTea1 = total; - state.tableDataTotalTea2 = total; - let newArr = []; - for (let item of rows) { - if (options4CurId.value === item.id) { - if (state.offcoursePlanId && state.offcourseId) { - options4CurName.value = item.realName; - state.xjkkinputV4 = item.realName; - state.teacherId = item.id; - } else if (state.offcourseId) { - options4CurName.value = item.realName; - state.qdms_inputV5 = item.realName; - state.teacher = item.realName; - state.teacherId = item.id; - console.log("那个老师", item); - } - } - newArr.push({ - value: item.id, - label: item.realName, - }); - } - options4.value = newArr; - console.log("options4.value"); - console.log(options4.value); - }; //编辑面授课 const handleEdit = async (itm, type) => { if (type === "1") { @@ -4423,7 +4373,6 @@ export default defineComponent({ // state.ft_hs = true; CourseModalRef.value.visibleOpen(state.offcourseId, null); state.ft_eidt = true; - // getTea(); }; // handleTagChange diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 378040a9..d7520b9e 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -12,12 +12,8 @@ >
- 编辑面授课 - + 新建面授课
-
课程信息
@@ -133,21 +128,16 @@ align-items: center; " > - +
-
-
- 课程价值 -
-
-
- -
- - {{ qdms_inputV3.length }}/200 - +
+
+
+ asterisk +
+ 课程简介
-
-
-
- -
-
- 场景 -
-
-
- -
- - {{ chang_jin.length }}/50 - +
+
+ +
+ + {{ qdms_inputV6.length }}/200 + +
+
-
- -
- -
-
- 内容标签 -
-
- -
- - -
-
- - {{ item }} - -
-
-
- +
+
+ 内容标签 +
+
-
-
-
- asterisk -
- 课程简介 +
+ + +
+
+ + {{ item }} + +
+
-
-
- -
- - {{ qdms_inputV6.length }}/150 - + +
+
+ 场景 +
+
+
+ +
+ {{ chang_jin.length }}/200 +
+
+
+
+ +
+
+ 课程价值 +
+
+
+ +
+ {{ qdms_inputV3.length }}/200 +
-
+
附件 @@ -515,11 +472,8 @@ :key="item.id" class="learnBgItem" :style="{ - border: - pathBgId === item.id - ? '3px solid rgba(78, 166, 255, 1)' - : '1px solid #ccc', - 'background-image': 'url(' + item.value + ')', + border: pathBgId === item.id? '3px solid rgba(78, 166, 255, 1)' : '1px solid #ccc', + 'background': `url(${item.value}) center center / 100% no-repeat`, }" > @@ -1568,8 +1522,6 @@ export default defineComponent({ width: 100px; height: 100px; background-size: 100%; - background-repeat: no-repeat; - // margin-bottom: 20px; margin-right: 6px; }