From 206eb42500909d87cf0eb330f7d1b0e238181450 Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Thu, 27 Feb 2025 20:56:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/growthpath/CommonHomework.vue | 5 +++-- src/views/growthpath/PathManage.vue | 1 - src/views/report/Employeelearning.vue | 16 ++++++++-------- src/views/report/Operational.vue | 8 ++++---- src/views/report/Overvoew.vue | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/growthpath/CommonHomework.vue b/src/components/growthpath/CommonHomework.vue index 0d94b9af..ad8800dc 100644 --- a/src/components/growthpath/CommonHomework.vue +++ b/src/components/growthpath/CommonHomework.vue @@ -94,6 +94,7 @@ const formData = useResetRef({ }); const emit = defineEmits(["update:info", "close"]); const dateTime = ref([]); +// 验证 const rulesRef = ref({ workName: [ { @@ -121,7 +122,7 @@ const rulesRef = ref({ ], }); -const { resetFields, validate } = Form.useForm(formData, rulesRef); +const { validate } = Form.useForm(formData, rulesRef); onMounted(() => { formData.value = props.info; @@ -135,7 +136,7 @@ const closeDrawer = () => { dateTime.value = []; emit("close"); }; - +// 开始时间结束时间处理 function timeChange(time, timeStr) { formData.value.submitStartTime = timeStr[0]; formData.value.submitEndTime = timeStr[1]; diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue index 0036548e..12e7b20b 100644 --- a/src/views/growthpath/PathManage.vue +++ b/src/views/growthpath/PathManage.vue @@ -403,7 +403,6 @@
diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 63d25a5e..5818f2e5 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -363,14 +363,14 @@ export default { width: 120, align: "center", }, - { - title: "专业力学习", - dataIndex: "growthStudy", - ellipsis: true, - key: "growthStudy", - width: 120, - align: "center", - }, + // { + // title: "专业力学习", + // dataIndex: "growthStudy", + // ellipsis: true, + // key: "growthStudy", + // width: 120, + // align: "center", + // }, { title: "学习时长", dataIndex: "learningDuration", diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index aedf7211..6ac95365 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -106,10 +106,10 @@ label: '学习路径图', value: 6, }, - { - label: '专业力必修', - value: 7, - }, + // { + // label: '专业力必修', + // value: 7, + // }, ]" >
diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 7f9e1cb1..5061be14 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -361,7 +361,7 @@ export default { { text: "课程", num: res.data.result?.courseTotal }, { text: "考试", num: res.data.result?.examTotal }, { text: "案例", num: res.data.result?.caseTotal }, - { text: "专业力", num: 10 }, + // { text: "专业力", num: 10 }, ]; tabData.value = list; }); @@ -899,7 +899,7 @@ export default { { text: "课程", num: "11" }, { text: "考试", num: "10" }, { text: "案例", num: "10" }, - { text: "专业力必修", num: "10" }, + // { text: "专业力必修", num: "10" }, ]); const tabClick = (index) => { state.selectedRowKeys = []; From dacc22e47196a32cc5d5084e393b440ddff1c885 Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Thu, 27 Feb 2025 23:17:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/growthpath/GrowthFaceStu.vue | 33 ++++++++----------- .../growthpath/GrowthFaceTaskManage.vue | 2 +- .../growthpath/GrowthOnlineManage.vue | 9 +---- .../growthpath/GrowthOpenCourse.vue | 1 + src/components/growthpath/ImportStu.vue | 8 ++--- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/components/growthpath/GrowthFaceStu.vue b/src/components/growthpath/GrowthFaceStu.vue index 0f42737e..0295403b 100644 --- a/src/components/growthpath/GrowthFaceStu.vue +++ b/src/components/growthpath/GrowthFaceStu.vue @@ -125,16 +125,11 @@ div style="margin-top: 20px; flex-wrap: wrap" v-if="data?.length" > -
+
添加学员
签到二维码
@@ -156,7 +150,6 @@ div style="margin-right: 20px" v-if="data[coursePlanIndex]?.assessmentId" @click="qrcodeAssement()" - :class="{ notClick: courseSelectRows.length > 0 }" >
评估二维码
@@ -164,7 +157,6 @@ div class="btn btn1" style="margin-right: 20px" @click="qrcodeVisible()" - :class="{ notClick: courseSelectRows.length > 0 }" >
开课二维码
@@ -187,7 +179,6 @@ div class="btn btn1" @click="exportTaskStu" style="margin-right: 20px" - :class="{ notClick: courseSelectRows.length > 0 }" >
导出签到数据
@@ -196,7 +187,6 @@ div class="btn btn1" @click="exportAssessment" v-if="data[coursePlanIndex]?.assessmentId" - :class="{ notClick: courseSelectRows.length > 0 }" >
导出评估数据
@@ -460,8 +450,6 @@ const columns = ref([ title: "考勤情况", ellipsis: true, className: "h", - dataIndex: "opacation", - key: "opacation", width: 130, align: "center", customRender: (text) => @@ -470,13 +458,19 @@ const columns = ref([
stuSign(text)} + onClick={(event) => { + event.stopPropagation(); + stuSign(text); + }} > 签到 stuSign(text)} + onClick={(event) => { + event.stopPropagation(); + stuSign(text); + }} > 请假 @@ -491,7 +485,7 @@ const columns = ref([ className: "h", dataIndex: "opacation", key: "opacation", - width: 130, + width: 80, align: "center", customRender: ({ record }) => data.value[coursePlanIndex.value].type == 4 || @@ -570,17 +564,17 @@ const batchSign = () => { .attendanceSign({ courseId: offcoursePlanId.value, ids: courseSelectRows.value?.map((t) => t.studentId), - taskId: props.datasource.id, taskType: props.datasource.taskType, type: 3, }) .then((res) => { message.success("签到成功"); + tableRef.value.fetch(); }) .catch((err) => { message.error("签到失败"); }); - tableRef.value.fetch(); + }, }); }; @@ -603,7 +597,6 @@ const batchSignAll = () => { .catch((err) => { message.error("签到失败"); }); - tableRef.value.fetch(); }, }); }; @@ -630,7 +623,7 @@ function stuSign(text) { // taskId: props.datasource.id, taskType: props.datasource.taskType, type: 3, - }); + }) } //搜索学员 diff --git a/src/components/growthpath/GrowthFaceTaskManage.vue b/src/components/growthpath/GrowthFaceTaskManage.vue index e0f0ec33..02640d79 100644 --- a/src/components/growthpath/GrowthFaceTaskManage.vue +++ b/src/components/growthpath/GrowthFaceTaskManage.vue @@ -315,7 +315,7 @@ const columns = ref([ dataIndex: "studentName", key: "studentName", width: 50, - align: "left", + align: "center", className: "classify", scopedSlots: { customRender: "action" }, customRender: (text) => ( diff --git a/src/components/growthpath/GrowthOnlineManage.vue b/src/components/growthpath/GrowthOnlineManage.vue index 96843df5..e1661bbc 100644 --- a/src/components/growthpath/GrowthOnlineManage.vue +++ b/src/components/growthpath/GrowthOnlineManage.vue @@ -286,7 +286,6 @@ export default { dataIndex: "stdPositionName", key: "stdPositionName", align: "center", - ellipsis: true, className: "h", customRender: (text) => { return ( @@ -306,7 +305,6 @@ export default { dataIndex: "qualsLevelDesr", key: "qualsLevelDesr", align: "center", - ellipsis: true, className: "h", customRender: (text) => { return ( @@ -326,7 +324,6 @@ export default { dataIndex: "bandCode", key: "bandCode", align: "center", - ellipsis: true, className: "h", customRender: (text) => { return ( @@ -344,7 +341,6 @@ export default { dataIndex: "joinMethod", key: "joinMethod", align: "center", - ellipsis: true, className: "h", customRender: ({ record: { joinMethod } }) => ({ @@ -357,7 +353,6 @@ export default { dataIndex: "progress", key: "progress", align: "center", - ellipsis: true, className: "h", customRender: (text) => { return ( @@ -372,8 +367,7 @@ export default { dataIndex: "finishTime", key: "finishTime", align: "center", - width: 150, - ellipsis: true, + width: 180, customRender: (text) => { return (
@@ -390,7 +384,6 @@ export default { dataIndex: "completionStatus", key: "completionStatus", align: "center", - ellipsis: true, className: "h", customRender: (text) => { return ( diff --git a/src/components/growthpath/GrowthOpenCourse.vue b/src/components/growthpath/GrowthOpenCourse.vue index 9442f13f..d256cf58 100644 --- a/src/components/growthpath/GrowthOpenCourse.vue +++ b/src/components/growthpath/GrowthOpenCourse.vue @@ -603,6 +603,7 @@ const columns = ref([ dataIndex: "teacher", key: "teacher", width: "20%", + ellipsis: true, align: "center", customRender: ({ record }) => { // const teachers = record.offteachers; diff --git a/src/components/growthpath/ImportStu.vue b/src/components/growthpath/ImportStu.vue index a8072eb6..59f98157 100644 --- a/src/components/growthpath/ImportStu.vue +++ b/src/components/growthpath/ImportStu.vue @@ -66,7 +66,7 @@ 上传失败
- {{ uploadpercent == 100 ? "上传成功" : "正在上传" }} + {{ uploadpercent == 100 ? "导入成功" : "正在上传" }}
@@ -189,8 +189,8 @@
- - + +
@@ -346,7 +346,7 @@ export default { }); state.fileName = info.file.name; let i = 0; - message.success("上传成功"); + message.success("导入成功"); if (info.file.response.code == 1) { state.fileList = []; state.addLoading = false; From d69d8a866dea5dfe31d4205c6309fa2ed891404f Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Fri, 28 Feb 2025 00:20:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/growthpath/GrowthScore.vue | 20 ++++++++++---------- src/components/growthpath/ImportStu.vue | 7 ++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/components/growthpath/GrowthScore.vue b/src/components/growthpath/GrowthScore.vue index 0fd84bd7..9502b7fe 100644 --- a/src/components/growthpath/GrowthScore.vue +++ b/src/components/growthpath/GrowthScore.vue @@ -268,16 +268,16 @@ export default { console.log("查询导入状态", res); if (res.data.code === 200) { if (res.data.data.status !== "START") { - if (res.data.data.status === "SUCCESS") { - state.addLoading = false; - state.fileList = []; - state.uploadpercent = -1; - message.destroy(); - // message.error(`当前开课暂无作业，无法导入成绩`); - clearInterval(timer); - clearTimeout(timeouts); - return; - } + // if (res.data.data.status === "SUCCESS") { + // state.addLoading = false; + // state.fileList = []; + // state.uploadpercent = -1; + // message.destroy(); + // message.error(`当前开课暂无作业，无法导入成绩`); + // clearInterval(timer); + // clearTimeout(timeouts); + // return; + // } i++; if (i === 1) { message.destroy(); diff --git a/src/components/growthpath/ImportStu.vue b/src/components/growthpath/ImportStu.vue index 59f98157..639e1897 100644 --- a/src/components/growthpath/ImportStu.vue +++ b/src/components/growthpath/ImportStu.vue @@ -346,7 +346,7 @@ export default { }); state.fileName = info.file.name; let i = 0; - message.success("导入成功"); + if (info.file.response.code == 1) { state.fileList = []; state.addLoading = false; @@ -354,6 +354,11 @@ export default { message.destroy(); message.error(info.file.response.msg); return; + }else if(info.file.response.code === -1){ + state.uploadpercent = -1; + message.error(info.file.response.message); + }else{ + message.success("导入成功"); } // state.timers = setInterval(() => { // state.redisKey = info.file.response.data;