diff --git a/src/App.vue b/src/App.vue index 9bb37f3f..a160e81d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.2.0------------"); +console.log("版本2.2.2------------"); // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index e9e2cb3e..1536dbfe 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -166,7 +166,7 @@ 授课教师 -
+
- +
导出数据
@@ -120,6 +120,7 @@ import { message } from "ant-design-vue"; // import * as api from "../../../api/index"; import * as api from "../../../api/indexTaskManage"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectEvalManage", @@ -343,8 +344,22 @@ export default { }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.stageId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 2e004edc..d0aa2e15 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -178,12 +178,12 @@ export default { }, { id: 2, - value: "9", + value: "1", label: "已完成", }, { id: 3, - value: "1", + value: "9", label: "进行中", }, ], @@ -314,7 +314,7 @@ export default { align: "center", ellipsis: true, className: "h", - customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'), + customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'), }, { title: "操作", @@ -379,7 +379,7 @@ export default { 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 'chapterId': props.datasource.stageId,//阶段或关卡Id diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index 6a921d0a..7ef97ef5 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -366,7 +366,7 @@ 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.projectId,//任务的routerTaskld或projectTaskld + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 'chapterId': props.datasource.stageId,//阶段或关卡Id diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 0c2afacd..b253a28b 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -68,6 +68,10 @@
+
+
+
催促学习
+
导出数据
@@ -165,6 +169,7 @@ import EScore from "../ExportScore.vue"; import * as api from "../../../api/index1"; import ExportHomeWork from "../../Modals/ExportHomeWork.vue"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectHomeWorkManage", components: { @@ -503,8 +508,22 @@ export default { }; //催促学员学习 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //项目催促请求报文 + var obj = { + 'courseId': props.projectTaskInfo.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.projectTaskInfo.id,//任务的routerTaskld或projectTaskld + 'targetId': props.projectTaskInfo.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.projectTaskInfo.type,//催促的任务的类型 + 'chapterId': props.projectTaskInfo.stageId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; //表头清空 const clearLine = () => { diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index b0c787c3..bdb53b28 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -85,11 +85,11 @@
- +
导出数据
@@ -139,6 +139,7 @@ import { message } from "ant-design-vue"; import * as api from "../../../api/indexTaskManage"; import ViewAssess from "../ViewAssess"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectOnlineManage", @@ -379,8 +380,21 @@ export default { }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.stageId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index 7d11f90d..bb2eab39 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -69,11 +69,11 @@
- +
导出数据
@@ -126,6 +126,7 @@ import * as api from "../../../api/indexTaskManage"; import CVote from "../CheckVote.vue" import {checkPer} from "@/utils/utils"; + import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectVoteManage", @@ -351,8 +352,22 @@ }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.projectId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.stageId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index c5821df4..e33b8957 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -85,11 +85,11 @@
- +
导出数据
@@ -139,6 +139,7 @@ import ViewAssess from "../ViewAssess"; // import * as api from "../../../api/index"; import * as api from "../../../api/indexTaskManage"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "RouterCommonManage", components: { ViewAssess }, @@ -386,8 +387,22 @@ export default { }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的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("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 533b2e72..6c831325 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -68,10 +68,10 @@
- +
导出数据
@@ -118,6 +118,7 @@ import { message } from "ant-design-vue"; // import * as api from "../../../api/index"; import * as api from "../../../api/indexTaskManage"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "RouterEvaluationManage", @@ -341,8 +342,22 @@ export default { }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的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("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index 44c7deb1..af6f24c2 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -379,7 +379,7 @@ 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 'chapterId': props.datasource.chapterId,//阶段或关卡Id diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 3989bafa..180d0d57 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -380,7 +380,7 @@ export default { 'courseId': props.datasource.courseId,//任务的Id 'courseName': props.title,//任务的名称 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 - 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 'taskType': props.datasource.type,//催促的任务的类型 'chapterId': props.datasource.chapterId,//阶段或关卡Id diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index e126f66e..de444c21 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -39,6 +39,10 @@
+
+
+
催促学习
+
导出数据
@@ -108,6 +112,7 @@ import EScore from "../ExportScore.vue"; import * as api from "../../../api/index1"; import ExportHomeWork from "../../Modals/ExportHomeWork.vue"; import {checkPer} from "@/utils/utils"; +import { batchSendMessage } from "@/api/index1"; export default { name: "RouterCommonManage", components: { @@ -445,8 +450,22 @@ export default { }; //催促学员学习 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的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("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; //表头清空 const clearLine = () => { diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue index a20cabe5..8a5f0b1f 100644 --- a/src/components/drawers/router/RouterProjectManage.vue +++ b/src/components/drawers/router/RouterProjectManage.vue @@ -69,11 +69,11 @@
- +
导出数据
@@ -127,6 +127,7 @@ import * as api from "../../../api/indexTaskManage"; import CheckStu from "../CheckStu"; import {checkPer} from "@/utils/utils"; + import { batchSendMessage } from "@/api/index1"; export default { name: "RouterProjectManage", @@ -420,8 +421,22 @@ }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的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("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber); diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index 098f6f66..eef66450 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -69,11 +69,11 @@
- +
导出数据
@@ -126,6 +126,7 @@ import * as api from "../../../api/indexTaskManage"; import CVote from "../CheckVote.vue" import {checkPer} from "@/utils/utils"; + import { batchSendMessage } from "@/api/index1"; export default { name: "RouterVoteManage", @@ -372,8 +373,22 @@ }; //催促 const godie = () => { - message.destroy(); - message.success("催促" + props.title + "成功"); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.id,//任务的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("催促" + props.title + "成功"); + }).catch(err => { + console.log(err) + }) }; const onChange = (pageNumber) => { console.log("Page: ", pageNumber);