diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 1f3db7e2..a0d5170d 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -109,7 +109,7 @@
导出数据
- - - +
批量通过
@@ -506,7 +511,8 @@ function exportTaskStu() { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0` + process.env.VUE_APP_BASE_API + }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0` ); } @@ -682,15 +688,13 @@ const exportHomeWorkShow = () => { taskType: 0, type: 3, }; - api - .exportHomeWork(obj) - .then((res) => { - console.log("导出作业", res.data.data); - //message.destroy(); - // message.success("导出作业成功"); - exportHomeWorkV.value = true; - downloadUrl.value = res.data.data; - }) + api.exportHomeWork(obj).then((res) => { + console.log("导出作业", res.data.data); + //message.destroy(); + // message.success("导出作业成功"); + exportHomeWorkV.value = true; + downloadUrl.value = res.data.data; + }); }; // //导出作业 // const exportHomeWork = () => { @@ -704,7 +708,8 @@ const exportHomeWorkShow = () => { const exportStu = () => { window.open( `${ - process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` + process.env.VUE_APP_BASE_API + }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` ); }; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 8c921fd0..36d931d5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2030,7 +2030,11 @@
取消
-
+
确定
@@ -3067,7 +3071,8 @@ export default defineComponent({ dataIndex: "evastatus", key: "8", align: "center", - customRender: ({record}) => record.assessmentStatus ? '已评估' : '未评估' + customRender: ({ record }) => + record.assessmentStatus ? "已评估" : "未评估", }, { title: "作业成绩", @@ -3118,14 +3123,15 @@ export default defineComponent({ key: "8", align: "center", }, - { - title: "结业状态", - width: "15%", - dataIndex: "completionStatus", - key: "8", - align: "center", - customRender: ({ record }) =>
{{1:'结业'}[record.completionStatus] || '-'}
, - }, + // 2023-1-12 隐藏 后面放开 + // { + // title: "结业状态", + // width: "15%", + // dataIndex: "completionStatus", + // key: "8", + // align: "center", + // customRender: ({ record }) =>
{{1:'结业'}[record.completionStatus] || '-'}
, + // }, ], shipType: 1, addLoading: false, @@ -4755,7 +4761,7 @@ export default defineComponent({ }; const handleJoin = async () => { - state.lrcj_inputV1 || message.error("请输入成绩") + state.lrcj_inputV1 || message.error("请输入成绩"); if (state.rg_hs) { if (state.piliang) { api1.updateStudent({ @@ -5840,8 +5846,6 @@ export default defineComponent({ } .btn1 { - - .search { background-image: url("../../assets/images/courseManage/search0.png"); } @@ -5850,7 +5854,7 @@ export default defineComponent({ color: #ffffff; } } -/** + /** .btn1:active { background: #0982ff; } @@ -5894,11 +5898,7 @@ export default defineComponent({ } } - - .btn3 { - - .search { width: 17px; height: 18px; @@ -5909,7 +5909,6 @@ export default defineComponent({ color: #ffffff; } } - } } @@ -6951,7 +6950,7 @@ export default defineComponent({ } } - .btn2{ + .btn2 { background: rgba(64, 158, 255, 1); .search { @@ -7571,9 +7570,7 @@ export default defineComponent({ } } - .btn1{ - - + .btn1 { .search { background-image: url("../../assets/images/courseManage/search0.png"); } @@ -7582,7 +7579,7 @@ export default defineComponent({ color: #ffffff; } } -/** + /** .btn1:active { background: #0982ff; } @@ -7624,19 +7621,15 @@ export default defineComponent({ margin-left: 5px; } .btn2 { - margin-right: 0px; + margin-right: 0px; - .img2 { - width: 17px; - height: 18px; - background-image: url(../../assets/images/coursewareManage/export1.png); + .img2 { + width: 17px; + height: 18px; + background-image: url(../../assets/images/coursewareManage/export1.png); + } } } - } - - - - } }