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/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 @@
-
编辑案例
+
编辑案例
添加案例
@@ -26,16 +26,21 @@
@@ -51,18 +56,55 @@
+
+
+
+
+
+ 已选择 + {{ 1 }} + 条       + 案例标题: + {{ + selectedRows?.name + ? selectedRows?.name + : selectedRows?.title + }} + +
+
+
+
@@ -74,17 +116,17 @@
\ No newline at end of file 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/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 2bb9e61b..4b1ff864 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -56,11 +56,11 @@
- +
导出数据
@@ -126,6 +126,7 @@ import { message } from "ant-design-vue"; import EScore from "../ExportScore.vue"; import CheckAnsware from '../CheckAnsware.vue' import * as api from '../../../api/indexTaskManage'; +import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -364,7 +365,22 @@ export default { //催促学员学习 const godie = () => { - message.destroy(); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index 151ec439..61f62857 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -57,11 +57,11 @@
- +
导出数据
@@ -130,6 +130,7 @@ import { message } from "ant-design-vue"; import ExportAchievement from "../ExportAchievement.vue"; import * as api from '../../../api/indexTaskManage'; + import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectExternalExamManage", @@ -359,7 +360,22 @@ //催促学员学习 const godie = () => { - message.destroy(); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index 41006a32..84cc0c66 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -57,10 +57,10 @@
- +
导出数据
@@ -129,6 +129,7 @@ import { message } from "ant-design-vue"; import ExportAchievement from "../ExportAchievement.vue"; import * as api from '../../../api/indexTaskManage'; + import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -363,6 +364,22 @@ //催促学员学习 const godie = () => { message.destroy(); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index b8792fc8..4b1b0212 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -33,10 +33,10 @@
- +
导出数据
@@ -88,6 +88,7 @@ import { message } from "ant-design-vue"; import EScore from "../ExportScore.vue"; import CheckAnsware from '../CheckAnsware.vue' import * as api from '../../../api/indexTaskManage'; +import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -365,7 +366,22 @@ export default { //催促学员学习 const godie = () => { - message.destroy(); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩