diff --git a/src/components/Modals/ExportHomeWork.vue b/src/components/Modals/ExportHomeWork.vue index 88db9ff3..32afb7ed 100644 --- a/src/components/Modals/ExportHomeWork.vue +++ b/src/components/Modals/ExportHomeWork.vue @@ -27,7 +27,7 @@ style="width: 40px; height: 40px; margin-bottom: 16px" src="../../assets/images/leveladd/success.png" /> - 作业导出完成,请下载本地或去下载中心查看 + 作业导出完成,请下载到本地或去下载中心查看
diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 36963621..9f40ef10 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -105,10 +105,11 @@
+ diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index ffe2b381..24594d6a 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -108,10 +108,11 @@ + diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 59b3d38b..0692b648 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -31,7 +31,7 @@ }}
- 签到时间:{{ beginTime }}~{{ endTime }} + 允许签到时段:{{ beginTime }}~{{ endTime }}
@@ -109,7 +109,7 @@
导出数据
-
+ +
-->
-->
+ diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index a13e2c1d..398e83de 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -87,7 +87,7 @@
导出作业
-
+
+ -->
@@ -240,11 +244,11 @@ export default { value: "1", label: "已完成", }, - { - id: 2, - value: "2", - label: "进行中", - }, + // { + // id: 2, + // value: "2", + // label: "进行中", + // }, ], selectedRowKeys: [], @@ -427,7 +431,7 @@ export default { ); }, }, - { + {/** title: "操作", dataIndex: "operation", key: "operation", @@ -492,7 +496,8 @@ export default { ); }, - }, + */ }, + ], exportHomeWorkV: false, downloadUrl: null, diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index ac2e3067..db64cdf3 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -99,7 +99,7 @@ :columns="tablecolumns" :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" - :scroll="{ x: 900 }" + :scroll="{ x: 1300 }" :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, @@ -122,10 +122,11 @@ + @@ -204,11 +205,11 @@ export default { value: "0", label: "未开始", }, - { - id: 2, - value: "2", - label: "进行中", - }, + // { + // id: 2, + // value: "2", + // label: "进行中", + // }, { id: 3, value: "1", @@ -257,7 +258,7 @@ export default { dataIndex: "studentName", key: "studentName", width: 50, - align: "left", + align: "center", className: "h head", customRender: (text) => { return ( @@ -393,15 +394,15 @@ export default { ); }, }, - { - title: "操作", - dataIndex: "operation", - key: "operation", - width: 100, - align: "center", - ellipsis: true, - className: "h", - }, + // { + // title: "操作", + // dataIndex: "operation", + // key: "operation", + // width: 100, + // align: "center", + // ellipsis: true, + // className: "h", + // }, ], exportHomeWorkV: false, downloadUrl: null, @@ -602,8 +603,8 @@ export default { .then((res) => { console.log("导出作业", JSON.parse(res.data).data); if (JSON.parse(res.data).code === 200) { - message.destroy(); - message.success("导出作业成功"); + // message.destroy(); + //message.success("导出作业成功"); state.exportHomeWorkV = true; state.downloadUrl = JSON.parse(res.data).data; } diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 1aff9909..77064fb0 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -122,10 +122,11 @@ + @@ -182,11 +183,11 @@ export default { value: "0", label: "未开始", }, - { - id: 2, - value: "2", - label: "进行中", - }, + // { + // id: 2, + // value: "2", + // label: "进行中", + // }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 3e1b5cff..dad2f39a 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -121,10 +121,11 @@ + @@ -183,10 +184,10 @@ export default { label: "未开始", }, //{ - // id: 2, - //value: "2", - // label: "进行中", - // }, + // id: 2, + // value: "2", + // label: "进行中", + // }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index b31b466e..50f2943f 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -104,10 +104,11 @@ + @@ -164,11 +165,11 @@ export default { value: "0", label: "未开始", }, - { - id: 2, - value: "2", - label: "进行中", - }, + //{ + // id: 2, + // value: "2", + // label: "进行中", + // }, { id: 3, value: "1", diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index ee7b8dd3..3f88909f 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -107,10 +107,11 @@ + diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index 3f5e7efd..dc86540f 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -25,7 +25,7 @@ {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
- 签到时间:{{ beginTime }}~{{ endTime }} + 允许签到时段:{{ beginTime }}~{{ endTime }}
@@ -103,7 +103,7 @@
导出数据
-
+ +
-->
-->
+ diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index d767cd43..9128156b 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -81,7 +81,7 @@
导出作业
-
+
+
@@ -223,11 +223,11 @@ export default { value: "1", label: "已完成", }, - { - id: 2, - value: "2", - label: "进行中", - }, + //{ + // id: 2, + // value: "2", + // label: "进行中", + // }, ], selectedRowKeys: [], @@ -429,15 +429,15 @@ export default { ); }, }, - { - title: "操作", - dataIndex: "operation", - key: "operation", - width: 100, - align: "center", - ellipsis: true, - className: "h", - }, + // { + // title: "操作", + // dataIndex: "operation", + // key: "operation", + // width: 100, + // align: "center", + // ellipsis: true, + // className: "h", + // }, ], exportHomeWorkV: false, downloadUrl: null, diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 7c69218a..6e1a23fc 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -94,7 +94,7 @@ :columns="tablecolumns" :data-source="tabledata" :loading="tableDataTotal === -1 ? true : false" - :scroll="{ x: 900 }" + :scroll="{ x: 1300 }" :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, @@ -117,10 +117,11 @@
+ @@ -199,11 +200,11 @@ export default { value: "0", label: "未开始", }, - { - id: 2, - value: "2", - label: "进行中", - }, + // { + // id: 2, + // value: "2", + // label: "进行中", + //}, { id: 3, value: "1", @@ -251,7 +252,7 @@ export default { dataIndex: "studentName", key: "studentName", width: 50, - align: "left", + align: "center", className: "h", ellipsis: true, customRender: (text) => { @@ -322,26 +323,7 @@ export default { ); }, }, - { - title: "所属小组", - dataIndex: "studentOrgName", - key: "studentOrgName", - width: 60, - align: "center", - ellipsis: true, - className: "h", - customRender: (text) => { - return ( -
- - {text.record.studentOrgName - ? text.record.studentOrgName - : "-"} - -
- ); - }, - }, + { title: "成绩", dataIndex: "workScore", @@ -406,15 +388,15 @@ export default { ); }, }, - { - title: "操作", - dataIndex: "operation", - key: "operation", - width: 100, - align: "center", - ellipsis: true, - className: "h", - }, + // { + // title: "操作", + // dataIndex: "operation", + // key: "operation", + // width: 100, + // align: "center", + // ellipsis: true, + // className: "h", + // }, ], exportHomeWorkV: false, downloadUrl: null, @@ -612,8 +594,8 @@ export default { .then((res) => { console.log("导出作业", JSON.parse(res.data).data); if (JSON.parse(res.data).code === 200) { - message.destroy(); - message.success("导出作业成功"); + // message.destroy(); + // message.success("导出作业成功"); state.exportHomeWorkV = true; state.downloadUrl = JSON.parse(res.data).data; } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index aa9aeacc..6378dbd8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -94,11 +94,11 @@
- +
导出
@@ -5844,8 +5844,8 @@ export default defineComponent({ } } - .btn1:hover { - background: rgba(64, 158, 255, 0.76); + .btn1 { + .search { background-image: url("../../assets/images/courseManage/search0.png"); @@ -5855,18 +5855,18 @@ export default defineComponent({ color: #ffffff; } } - +/** .btn1:active { background: #0982ff; } - .btn2:hover { + .btn2 { background: rgba(64, 158, 255, 0.1); } .btn2:active { background: rgba(64, 158, 255, 0.2); - } + }*/ } .btns { @@ -5899,31 +5899,22 @@ export default defineComponent({ } } + + .btn3 { - margin-right: 0px; + .search { width: 17px; height: 18px; background-image: url("../../assets/images/courseManage/add0.png"); } - } - - .btn3:hover { - background: rgba(64, 158, 255, 0.76); - - .search { - background-image: url("../../assets/images/courseManage/add0.png"); - } .btnText { color: #ffffff; } } - - .btn3:active { - background: #0982ff; - } + } } @@ -6945,7 +6936,7 @@ export default defineComponent({ } } - .btn1:hover { + .btn1 { background: rgba(64, 158, 255, 1); .search { @@ -6965,7 +6956,7 @@ export default defineComponent({ } } - .btn2:hover { + .btn2{ background: rgba(64, 158, 255, 1); .search { @@ -7357,7 +7348,7 @@ export default defineComponent({ } } - .btn1:hover { + .btn1 { background: #4ea6ff; .search { @@ -7369,7 +7360,7 @@ export default defineComponent({ } } - .btn2:hover { + .btn2 { background: #4ea6ff; .reset { @@ -7585,8 +7576,8 @@ export default defineComponent({ } } - .btn1:hover { - background: rgba(64, 158, 255, 0.76); + .btn1{ + .search { background-image: url("../../assets/images/courseManage/search0.png"); @@ -7596,7 +7587,7 @@ export default defineComponent({ color: #ffffff; } } - +/** .btn1:active { background: #0982ff; } @@ -7608,7 +7599,7 @@ export default defineComponent({ .btn2:active { background: rgba(64, 158, 255, 0.2); } - +*/ .btns { display: flex; @@ -7637,33 +7628,20 @@ export default defineComponent({ line-height: 36px; margin-left: 5px; } - } - - .btn3 { + .btn2 { margin-right: 0px; - .search { + .img2 { width: 17px; height: 18px; - background-image: url("../../assets/images/courseManage/add0.png"); + background-image: url(../../assets/images/coursewareManage/export1.png); } } - - .btn3:hover { - background: rgba(64, 158, 255, 0.76); - - .search { - background-image: url("../../assets/images/courseManage/add0.png"); - } - - .btnText { - color: #ffffff; - } } - .btn3:active { - background: #0982ff; - } + + + } }