From 0ee26671ceaa9689b580a59bf48ecb63a26da563 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 27 Sep 2024 10:30:55 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 760 ++++++++++--------- 1 file changed, 391 insertions(+), 369 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cac253e2..57a45c0a 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -10,6 +10,7 @@ v-model:value="createName" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入创建人" + @pressEnter="handleSearch1" />
@@ -17,6 +18,7 @@ v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入名称" + @pressEnter="handleSearch1" />
@@ -24,6 +26,7 @@ v-model:value="projectName" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入所属项目" + @pressEnter="handleSearch1" />
@@ -679,9 +682,8 @@ -
重置
+ +
@@ -769,6 +773,7 @@
+
@@ -788,12 +793,12 @@
-
+
+
+ 评估码 +
- 签到 + 签到码
- + { @@ -2048,16 +2056,33 @@ const columns6 = [ width: 100, align: "center", ellipsis: true, + customRender: ({ text }) => { + return( +
+ {text || '0'} +
xixi
+
+ ) + }, + }, + { + title: "评分", + dataIndex: "studentCnt", + key: "studentCnt", + width: 100, + align: "center", + ellipsis: true, customRender: ({ text }) => { return text ? text : "0"; }, }, { title: "操作", - width: 200, + width: 300, dataIndex: "operation", key: "operation", align: "center", + fixed: "right", slots: { customRender: "action" }, }, ]; @@ -3820,7 +3845,7 @@ function onFocusEnd(){ const stm_exit = () => { state.stm_hs = false; handleCancelStu(); - handleRestTable(); + // handleRestTable(); }; const createkk = () => { state.xjkkinputV1 = state.newCourseName @@ -5108,19 +5133,19 @@ function onFocusEnd(){ state.codevisible = true; let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName); state.codeInfo = { - title: type == 1 ? "【课程】二维码" : "【签到】二维码", - name: record.name ? record.name+'签到' : "", + title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码", + name: record.name ? record.name + type == 2 ?'签到' : '评估' : "", teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "", url: type == 1 ? process.env.VUE_APP_BASE_API + `/stu/project/redirectDetail?courseId=${record.id}` - : process.env.VUE_APP_BASE_API + + : type == 2 ? process.env.VUE_APP_BASE_API + `/admin/student/studentSign?taskId=${ record.id }&taskType=${2}&type=${3}&openCourseId=${ record.id - }`, + }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}` }; console.log("codeInfo", state.codeInfo, record); state.codeIndex = 0; @@ -5286,6 +5311,9 @@ function onFocusEnd(){ }); diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 1f3fb378..5f8fd451 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -196,7 +196,7 @@ :data-source="tableData.list" :pagination="stuPagination" :loading="tableData.loading" - :scroll="{ x: 1500 }" + :scroll="{ x: 'max-content' }" row-key="id" :row-selection="stuRowSelection" > @@ -467,7 +467,7 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "10%", + width: "160px", align: "left", className: "h", ellipsis: true, @@ -496,7 +496,7 @@ const tablecolumns = ref([ title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: "20%", + width: "120px", align: "center", className: "h", ellipsis: true, @@ -505,12 +505,12 @@ const tablecolumns = ref([ title: "部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: "15%", + width: "200px", align: "center", className: "h", - ellipsis: true, + customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, customRender: ({ record: { studentOrgName, studentDepartName } }) => - allDepartShow(studentOrgName), + {allDepartShow(studentOrgName)} }, { title: "所属小组", @@ -525,8 +525,9 @@ const tablecolumns = ref([ title: "加入方式", dataIndex: "source", key: "source", - width: "10%", + width: "120px", align: "center", + ellipsis: true, customRender: ({ record: { source } }) => // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]), ({ @@ -544,7 +545,8 @@ const tablecolumns = ref([ title: "操作", dataIndex: "operation", key: "operation", - width: 260, + width: '260px', + fixed: "right", align: "center", slots: { customRender: "action" }, }, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 1d878845..a56458f8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -755,7 +755,7 @@ v-model:value="selectTime" type="date" style="width: 300px; margin-right: 14px" - :placeholder="[' 课程开始时间', ' 课程结束时间']" + :placeholder="[' 面授开始时间', ' 面授结束时间']" :show-time="{ defaultValue: [ moment('00:00', 'HH:mm'), @@ -819,7 +819,7 @@ @@ -2776,7 +2772,7 @@ export default defineComponent({ scoreId: null, //录入成绩id isgetStudent: false, //是否重新获取学员 //结业 - jyradioV1: "", + jyradioV1: 1, imageUrl: "", imgList: [], @@ -4432,6 +4428,7 @@ function onFocusEnd(){ const graduate_exit = () => { state.graduate_hs = false; state.addLoading = false; + state.jyradioV1 = 1; }; const agreereject_exit = () => { state.agreereject_hs = false; @@ -4498,7 +4495,7 @@ function onFocusEnd(){ } }; const handleJie = async () => { - if (state.graduate_hs) { + if (state.graduate_hs && state.jyradioV1 == 1) { // state.studentItem.id // console.log("state.studentItem.id", state.studentItem.id); api1 @@ -4514,6 +4511,8 @@ function onFocusEnd(){ delete_exit1(); } }); + }else{ + graduate_exit() } }; //确认复制 From 0fea8c564db8c60ae33a03dba938314415c672f7 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 11 Oct 2024 16:57:08 +0800 Subject: [PATCH 24/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=BB=93=E4=B8=9A?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E=E4=B8=8D=E7=BB=93=E4=B8=9A?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index b08bf869..5bfc0ef7 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4333,7 +4333,7 @@ function onFocusEnd(){ return (
{ - record.signStatus == 1 && record.completionStatus != 1 ? ( + record.signStatus == 1 && record.completionStatus != 1 && record.completionStatus != 2 ? (
{ @@ -4344,6 +4344,8 @@ function onFocusEnd(){
) : record.completionStatus == 1 ? (
已结业
+ ) : record.completionStatus == 2 ?( +
不结业
) : (
-
)} @@ -4495,12 +4497,12 @@ function onFocusEnd(){ } }; const handleJie = async () => { - if (state.graduate_hs && state.jyradioV1 == 1) { + if (state.graduate_hs) { // state.studentItem.id // console.log("state.studentItem.id", state.studentItem.id); api1 .batchUpdateStatus({ - completionStatus: 1, + completionStatus: state.jyradioV1, ids: [state.studentItem?.id], // status: 1, }) @@ -4511,8 +4513,6 @@ function onFocusEnd(){ delete_exit1(); } }); - }else{ - graduate_exit() } }; //确认复制 From 9b4f1bca9c626695b06f143cb84e3e7ebe6c784a Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 11 Oct 2024 18:01:33 +0800 Subject: [PATCH 25/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=BB=93=E4=B8=9A?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4=E7=BB=93=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5bfc0ef7..11295e94 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4450,6 +4450,7 @@ function onFocusEnd(){ state.rg_hs = false; state.graduate_hs = false; state.addLoading = false; + state.jyradioV1 = 1; }; const handleRejectExit = (id, index, record) => { dialog({ From b070b73e7b77c9a5ef4d5bc1f6663bf1c79f8360 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 11 Oct 2024 18:11:49 +0800 Subject: [PATCH 26/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B1=95=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index d8382800..a9fb4050 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -510,7 +510,8 @@ const tablecolumns = ref([ className: "h", customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, customRender: ({ record: { studentOrgName, studentDepartName } }) => - {allDepartShow(studentOrgName)} + // {allDepartShow(studentOrgName)} + {studentDepartName} }, { title: "所属小组", @@ -522,7 +523,7 @@ const tablecolumns = ref([ ellipsis: true, }, { - title: "加入方式", + title: "报名方式", dataIndex: "source", key: "source", width: "60px", From ee22560fa69ba7405b409754fb81514b0b1dd240 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Sat, 12 Oct 2024 14:04:10 +0800 Subject: [PATCH 27/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 11295e94..d0f5516f 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1106,17 +1106,17 @@
- 现场参与 + 签到设置
- 是否允许未报名的学员扫码签到、扫码评估 + 是否允许未报名的学员签到、评估
- 签到设置 + 签到时间
Date: Sat, 12 Oct 2024 15:30:43 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=BC=80=E8=AF=BE=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 45 ++++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index d0f5516f..f2d08b0e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1093,27 +1093,6 @@
-
-
- 报名设置 -
-
- - 是否允许公开报名 - -
-
- -
-
- 签到设置 -
-
- - 是否允许未报名的学员签到、评估 - -
-
签到时间 @@ -1122,7 +1101,7 @@
- 开始前： + 开始前 分钟
- 开始后： + 开始后
+
+
+ 签到设置 +
+
+ + 是否允许未报名的学员签到、评估 + +
+
+
+
+ 报名设置 +
+
+ + 是否允许公开报名 + +
+
结业设置 From 34709d7a886e506d52b842cafd861dfb9b6b12d4 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 15 Oct 2024 17:36:09 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index f2d08b0e..44348ac6 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4006,8 +4006,8 @@ function onFocusEnd(){ homeWorkId: state.EditWorkId, name: state.xjkkinputV1, signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否 - autoCompleteFlag: state.xjkkradioVEnd ? 1 : 0, - afterDays: state.xjkkradioVEndTime, + autoGraduateEnabled: state.xjkkradioVEnd ? 1 : 0, + autoGraduateDays: state.xjkkradioVEndTime, // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否 // teacherId: state.member.value, // teacher: state.member.name, @@ -4131,12 +4131,12 @@ function onFocusEnd(){ state.onceName = item.name; state.beforeValue = item.beforeStart; //考勤 开始前 state.afterStartValue = item.afterStart; //考勤 开始后 - state.xjkkradioVEndTime = item.afterDays; + state.xjkkradioVEndTime = item.autoGraduateDays; if (item.signFlag === 1) { //是否允许未报名的签到:1是0否 state.xjkkradioV1 = true; } - if(item.autoCompleteFlag === 1){ + if(item.autoGraduateEnabled === 1){ state.xjkkradioVEnd = true; } // state.member = { value: item.teacherId, name: item.teacher };