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 }}
+
@@ -354,25 +354,24 @@ export default {
// 计算签到时间
const isSignClick = () => {
- // debugger
- console.log("计算签到时间", props.datasource.info);
- let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
- let endTime = !props.datasource.info.afterSignIn
- ? new Date(props.datasource.info.liveEndTime).getTime()
- : new Date(props.datasource.info.liveStartTime).getTime();
+ console.log("计算签到时间", props.datasource);
+ let beginTime = new Date(props.datasource.startTime).getTime();
+ let endTime = !props.datasource.afterStart
+ ? new Date(props.datasource.endTime).getTime()
+ : new Date(props.datasource.startTime).getTime();
- if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ if (props.datasource.beforeStart && props.datasource.afterStart) {
//有开始前有开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111", beginTime, endTime);
- } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
+ } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
//只有开始前无开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
console.log("11112222", beginTime);
- } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
//无开始前有开始后
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111333", endTime);
}
@@ -393,7 +392,6 @@ export default {
};
const getTableData = () => {
- debugger
// debugger
console.log('当前是项目还是路径图 1 项目 2 路径图', props)
console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
@@ -690,7 +688,6 @@ export default {
{
- debugger
{/* debugger */ }
console.log("点击签到", value);
// 获取当前时间
@@ -858,20 +855,21 @@ export default {
// 导出数据
function exportTaskStu() {
+ debugger
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);
- if (props.types == 1) {
+ if (props.types == 2) {
window.open(
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
- }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+ }&type=2&pid=${props.datasource.routerId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
} else {
window.open(
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
- }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+ }&type=1&pid=${props.datasource.projectId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
}
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 7b344437..5c14abea 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -3,20 +3,20 @@
+
+
+

+
讨论说明:
@@ -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 @@