From 112d7ddb63fe338c7cd9b08f5e2e7e3a9b712085 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 12 Jan 2023 19:06:00 +0800 Subject: [PATCH 01/11] bug --- src/components/drawers/project/ProjectFaceTaskManage.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 3115d3c2..b99b6c72 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -681,9 +681,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ - props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2` + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId = ${props.projectTaskInfo.projectTaskId}&taskType=2` ); // api // .exportTaskStudent({ From 14938f85322da3c3d2cac67b6cbc6682d76d4d45 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 20:17:03 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=96=87=E5=AD=97=E8=B6=85=E5=87=BA=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F=E3=80=81=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=AE=A1=E7=90=86=E5=AD=A6=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8F=8A=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLevelImportStu.vue | 7 +++++- src/views/projectcenter/ProjectManage.vue | 2 +- src/views/research/ManagePage.vue | 26 +++++++++++--------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 49f3d6c0..77360b65 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -80,7 +80,7 @@
-
{{ fileName }}
+
{{ fileName }}
{ showBackModal(value.record.projectId); }} - style="cursor:pointer" + style="cursor:pointer; margin-left: 21px; width:70px;" class="operation3" > 撤回发布 diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 43acfa15..64d20a0d 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -72,17 +72,19 @@
- +
+ +
@@ -133,7 +135,7 @@ export default { state.evalStuListLoading = true; api.QueryAssessmentManageMessage({ "assessmentId": router.currentRoute.value.params.id, - "pageNo": state.currentPage, + "pageNo": state.evalCurrentPage, "pageSize": state.pageSize }).then(res=>{ console.log('获取学员信息',res) From 989b421029ebe92cab57d4cc4cbdac3d18b6ddf6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 12 Jan 2023 22:09:37 +0800 Subject: [PATCH 03/11] bug --- src/components/drawers/project/ProjectFaceStu.vue | 8 +------- src/components/drawers/project/ProjectFaceTaskManage.vue | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 49e56635..11550c31 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -865,13 +865,7 @@ export default { function exportTaskStu() { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( - `${ - process.env.VUE_APP_BASE_API - }/admin/student/exportTaskStudent?currentStageId=${ - props.projectTaskInfo.stageId - }&type=${1}&pid=${ - props.projectTaskInfo.projectId - }&taskType=2&thirdType=2` + `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2` ); // api // .exportTaskStudent({ diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index b99b6c72..94534cf5 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -681,7 +681,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId = ${props.projectTaskInfo.projectTaskId}&taskType=2` + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${props.projectTaskInfo.projectTaskId}&taskType=2` ); // api // .exportTaskStudent({ From 6d1b728dd7fd709506db90d224a270b80fd3b282 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 12 Jan 2023 22:51:57 +0800 Subject: [PATCH 04/11] bug --- src/views/courselibrary/CoursewareManage.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 7afdf2ed..d2cf7ca0 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3054,16 +3054,7 @@ export default defineComponent({ dataIndex: "signstatus", key: "7", align: "center", - customRender: ({ record }) => { - switch (String(record.signStatus)) { - case "0": - return "未签到"; - case "1": - return "已签到"; - case "2": - return "请假"; - } - }, + customRender: ({ record }) => record.signStatus?'已签到':'未签到', }, { title: "评估状态", From eacf0317fdeeaa781ca3c3871328fbb34f2fbc9e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 12 Jan 2023 23:14:02 +0800 Subject: [PATCH 05/11] =?UTF-8?q?--fix=20=E4=B8=8D=E8=AE=A9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=BD=95=E5=85=A5=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index d2cf7ca0..54687478 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3074,17 +3074,18 @@ export default defineComponent({ customRender: ({ record }) => { return (
- {record.score ? ( - {record.score} + {record.workScore ? ( + {record.workScore} ) : ( - { - handlJoinStu(record); - }} - > - 成绩录入 - + // { + // handlJoinStu(record); + // }} + // > + // 成绩录入 + // + )}
); From e879d251d23a554d6ddf3e04030354ef059f2091 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 13 Jan 2023 00:59:06 +0800 Subject: [PATCH 06/11] =?UTF-8?q?style=EF=BC=9A=E5=AD=A6=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 43 ++--------- src/views/courselibrary/CoursewareManage.vue | 78 ++++++++++---------- 2 files changed, 45 insertions(+), 76 deletions(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 7b847b60..03924a16 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -187,6 +187,7 @@ :data-source="tableData.list" :pagination="stuPagination" :loading="tableData.loading" + :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection" > @@ -228,13 +229,7 @@ -->
通过 @@ -242,13 +237,7 @@
拒绝 @@ -257,13 +246,7 @@
删除
@@ -425,7 +408,7 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "12%", + width: "10%", align: "left", className: "h", ellipsis: true, @@ -454,7 +437,7 @@ const tablecolumns = ref([ title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: "15%", + width: "20%", align: "center", className: "h", ellipsis: true, @@ -472,7 +455,7 @@ const tablecolumns = ref([ title: "加入方式", dataIndex: "source", key: "source", - width: "15%", + width: "10%", align: "center", customRender: ({ record: { source } }) => ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]), @@ -934,17 +917,7 @@ const AddImpStuvisibleClose = (isget) => { } } - .btn5:hover { - background: #4ea6ff; - - .export { - background-image: url("@/assets/images/coursewareManage/export1.png"); - } - - .btnText { - color: #ffffff; - } - } + } /*.delete { z-index: 9999; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 54687478..0b46c720 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -94,11 +94,11 @@
-
+
导出
@@ -2712,7 +2712,7 @@ const columns6 = [ // title: "序号", // dataIndex: "num", // key: "num", - // width: "6%", + // width: "8%", // align: "center", // ellipsis: true, // customRender: ({ index, record }) => { @@ -2747,7 +2747,7 @@ const columns6 = [ title: "教师名称", dataIndex: "teacher", key: "teacher", - width: "10%", + width: "8%", align: "center", ellipsis: true, customRender: ({ text }) => { @@ -2783,7 +2783,7 @@ const columns6 = [ title: "创建人", dataIndex: "createName", key: "createName", - width: "10%", + width: "8%", align: "center", ellipsis: true, customRender: ({ text }) => { @@ -2998,7 +2998,7 @@ export default defineComponent({ stuColumns: [ { title: "岗位", - width: "15%", + width: "8%", dataIndex: "studentJobName", key: "7", align: "center", @@ -3016,7 +3016,7 @@ export default defineComponent({ }, { title: "Band", - width: "15%", + width: "8%", dataIndex: "studentBandDesc", key: "7", align: "center", @@ -3032,7 +3032,7 @@ export default defineComponent({ }, { title: "报名状态", - width: "15%", + width: "8%", dataIndex: "status", key: "5", align: "center", @@ -3050,7 +3050,7 @@ export default defineComponent({ { title: "签到状态", - width: "15%", + width: "8%", dataIndex: "signstatus", key: "7", align: "center", @@ -3058,7 +3058,7 @@ export default defineComponent({ }, { title: "评估状态", - width: "15%", + width: "8%", dataIndex: "evastatus", key: "8", align: "center", @@ -3067,7 +3067,7 @@ export default defineComponent({ }, { title: "作业成绩", - width: "15%", + width: "8%", dataIndex: "workScore", key: "7", align: "center", @@ -3110,7 +3110,7 @@ export default defineComponent({ }, { title: "考试成绩", - width: "15%", + width: "8%", dataIndex: "examinationScore", key: "8", align: "center", @@ -5835,6 +5835,11 @@ export default defineComponent({ height: 18px; background-image: url("../../assets/images/courseManage/reset1.png"); } + .daochu{ + width: 16px; + height: 18px; + background-image: url("../../assets/images/coursewareManage/export.png"); + } } .btn1 { @@ -6934,25 +6939,15 @@ export default defineComponent({ } } - .btn2 { + .btn2 { .search { - width: 15px; - height: 17px; - background-image: url("@/assets/images/coursewareManage/reset1.png"); + width: 16px; + height: 18px; + margin-right: 6px; + background-image: url("../../assets/images/courseManage/reset1.png"); } } - .btn2 { - background: rgba(64, 158, 255, 1); - - .search { - background-image: url("@/assets/images/coursewareManage/reset0.png"); - } - - .btnText { - color: #ffffff; - } - } } } } @@ -7571,19 +7566,7 @@ export default defineComponent({ color: #ffffff; } } - /** - .btn1:active { - background: #0982ff; - } - .btn2:hover { - background: rgba(64, 158, 255, 0.1); - } - - .btn2:active { - background: rgba(64, 158, 255, 0.2); - } -*/ .btns { display: flex; @@ -7621,10 +7604,23 @@ export default defineComponent({ background-image: url(../../assets/images/coursewareManage/export1.png); } } + + } + .btn3 { + .search { + width: 17px; + height: 18px; + background-image: url("../../assets/images/courseManage/add0.png"); + } + + .btnText { + color: #ffffff; + } + } } } - +/** .btn3 { width: 130px; height: 40px; @@ -7652,7 +7648,7 @@ export default defineComponent({ margin-right: 6px; } } - } + } */ .notable { width: 100%; From 29b1c61a595b9618971e05372a7f0d623d300657 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 13 Jan 2023 02:50:06 +0800 Subject: [PATCH 07/11] --fix --- src/components/drawers/project/ProjectFaceTaskManage.vue | 5 +---- src/components/drawers/router/RouterFaceTeachManage.vue | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 94534cf5..cb2a9874 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -397,10 +397,7 @@ export default { return (
- {text.record.assessmentScore || - text.record.assessmentScore == 0 - ? text.record.examinationScore - : "-"} + {text.record.assessmentScore || "-"}
); diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 9d9c85de..6ca01869 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -395,10 +395,7 @@ export default { return (
- {text.record.assessmentScore || - text.record.assessmentScore == 0 - ? text.record.examinationScore - : "-"} + {text.record.assessmentScore || "-"}
); From e034f0c7a0a61983e35fdde8f6df0df478399312 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 13 Jan 2023 03:17:26 +0800 Subject: [PATCH 08/11] --fix --- src/components/drawers/project/ProjectFaceStu.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 11550c31..2390a49b 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -69,7 +69,6 @@ :options="projectNameList2" @change="selectProjectName2" allowClear - showSearch >
@@ -806,6 +805,7 @@ export default { pid: props.projectTaskInfo.projectId, // status: Number(state.name), studentName: state.name, + signStatus: state.projectName2, taskId: props.projectTaskInfo.projectTaskId, }); api @@ -818,6 +818,7 @@ export default { // status: Number(state.name), studentName: state.name, taskId: props.projectTaskInfo.projectTaskId, + signStatus: state.projectName2, taskType: props.projectTaskInfo.type, }) .then((res) => { From dd840d67e7ebef2bb89a445225f323984f4a3f10 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 13 Jan 2023 03:23:56 +0800 Subject: [PATCH 09/11] --fix --- src/components/drawers/project/ProjectFaceTaskManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index cb2a9874..b9ad2021 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -148,7 +148,7 @@ ? projectTaskInfo.projectTaskId : null " - :type="2" + :type="1" :pid=" projectTaskInfo && projectTaskInfo.projectId ? projectTaskInfo.projectId From 06e6843af61edea931614c9d25bd9d46fdd9cad2 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 13 Jan 2023 08:03:25 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 4ba1c1e5..e7b5d0c8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.0.6------------"); + console.log("版本2.0.7------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); From 108478124442e8f78e54a9e1636d51e83fd75cd8 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 13 Jan 2023 08:33:25 +0800 Subject: [PATCH 11/11] =?UTF-8?q?style=EF=BC=9A=E5=BC=B9=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AllStuOver.vue | 2 ++ src/views/learningpath/LevelAdd.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/AllStuOver.vue b/src/components/drawers/AllStuOver.vue index 7940a5a9..41bb4b12 100644 --- a/src/components/drawers/AllStuOver.vue +++ b/src/components/drawers/AllStuOver.vue @@ -116,7 +116,9 @@ export default {