diff --git a/src/api/index1.js b/src/api/index1.js index e72c8d52..db43fa13 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -222,6 +222,8 @@ export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCer //添加外部考试 export const createExamination = (obj) => http.post('/examination/createExamination', obj) +//催促考试 +export const batchSendMessage = (obj) => http.post('/admin/taskmanage/batchSendMessage', obj) // 外部考试导入成绩 export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } }) //分组 diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index b40ab272..185ef73b 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -11,14 +11,14 @@
起止时间:{{ - datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-" + datasource.startTime ? datasource.startTime : "-" }} ~ - {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }} + {{ datasource.endTime ? datasource.endTime : "-" }}
-
签到时间:{{ beginTime }}
-
签退时间:{{ endTime }}
+
签到时间:{{ beginTime }} ~ {{ endTime }}
+
+
+
+
+
+
+ 已选择 + {{ 1 }} + 条       + 案例标题: + {{ + selectedRows?.name + ? selectedRows?.name + : selectedRows?.title + }} + +
+
+
+
@@ -74,17 +116,17 @@ \ No newline at end of file diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 29ed863b..b521e30c 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -41,6 +41,12 @@
+
+ +
讨论说明:
@@ -91,6 +97,12 @@ const rulesRef = ref({ message: '请输入讨论名称', }, ], + discussExplain: [ + { + required: true, + message: '请输入讨论说明', + }, + ], }); const {resetFields, validate} = Form.useForm(formData, rulesRef); diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 93b5d457..68e63583 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -76,7 +76,11 @@
-
+
@@ -204,13 +208,22 @@ const columns = ref([ width: "20%", ellipsis: true, customRender: ({ record: { gaName, faName, name } }) => ( -
- { - faName ? gaName !== null - ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName) - : faName.length > 16 ? faName.slice(0, 16) + '...' : faName - : name.length > 16 ? name.slice(0, 16) + '...' : name +
+ {faName + ? gaName !== null + ? (gaName + "/" + faName).length > 16 + ? (gaName + "/" + faName).slice(0, 16) + "..." + : gaName + "/" + faName + : faName.length > 16 + ? faName.slice(0, 16) + "..." + : faName + : name.length > 16 + ? name.slice(0, 16) + "..." + : name}
), }, @@ -257,7 +270,7 @@ const { data, loading, total, fetch } = useRowsPage( total: (res) => res.result.count, } ); -console.log(data) +console.log(data); watch(taskIndex, () => { // if (taskIndex.value >= 0) { // rowSelectKeys.value = [props.taskList[taskIndex.value].courseId] diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index d94cfdd0..79707622 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -236,7 +236,6 @@