Merge remote-tracking branch 'origin/develop' into develop

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);

src/components/drawers/AddOpenCourse.vue

@@ -166,7 +166,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 88%">
+            <div class="select" style="width: 74.5%">
               <ProjectManager
                 v-model:value="formData.teacherId"
                 v-model:name="formData.teacher"

src/components/drawers/project/ProjectEvalManage.vue

@@ -69,11 +69,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-        <!-- 
+        
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
-          </div>-->
+          </div>
           <div class="btn btn2" @click="exportTaskStu"  v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      //项目催促请求报文
+      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);

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

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

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -68,6 +68,10 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
+          <div class="btn btn1" @click="godie" style="margin-right: 20px">
+            <div class="img1"></div>
+            <div class="wz">催促学习</div>
+          </div>
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      //项目催促请求报文
+      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 = () => {

src/components/drawers/project/ProjectOnlineManage.vue

@@ -85,11 +85,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-         <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
+         <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>
-        -->
+       
           <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      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);

src/components/drawers/project/ProjectVoteManage.vue

@@ -69,11 +69,11 @@
             </div>
             </div>
             <div class="btnss" style="margin-top: 20px">
-            <!--
+            
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
                 <div class="wz">催促学习</div>
-            </div>-->
+            </div>
             <div class="btn btn2" @click="exportTaskStu" v-if="checkPer(permissions,createId)">
                 <div class="img2"></div>
                 <div class="wz">导出数据</div>
@@ -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();
+        //项目催促请求报文
+        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);

src/components/drawers/router/RouterCommonManage.vue

@@ -85,11 +85,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
-        <!--
+        
           <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
-          </div>-->
+          </div>
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      //考试催促请求报文
+      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);

src/components/drawers/router/RouterEvaluationManage.vue

@@ -68,10 +68,10 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
-          <!-- <div class="btn btn1" @click="godie" style="margin-right: 20px">
+          <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
-          </div> -->
+          </div>
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      //考试催促请求报文
+      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);

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

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

src/components/drawers/router/RouterHomeworkManage.vue

@@ -39,6 +39,10 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
+          <div class="btn btn1" @click="godie" style="margin-right: 20px">
+            <div class="img1"></div>
+            <div class="wz">催促学习</div>
+          </div>
           <div class="btn btn2" @click="exportTaskStu">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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();
+      //考试催促请求报文
+      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 = () => {

src/components/drawers/router/RouterProjectManage.vue

@@ -69,11 +69,11 @@
             </div>
             </div>
             <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
-            <!--
+            
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
                 <div class="wz">催促学习</div>
-            </div>-->
+            </div>
             <div class="btn btn2" @click="exportTaskStu">
                 <div class="img2"></div>
                 <div class="wz">导出数据</div>
@@ -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();
+        //考试催促请求报文
+        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);

src/components/drawers/router/RouterVoteManage.vue

@@ -69,11 +69,11 @@
             </div>
             </div>
             <div class="btnss" style="margin-top: 20px" v-if="checkPer(permissions,createId)">
-            <!--
+            
             <div class="btn btn1" @click="godie" style="margin-right: 20px">
                 <div class="img1"></div>
                 <div class="wz">催促学习</div>
-            </div>-->
+            </div>
             <div class="btn btn2" @click="exportTaskStu">
                 <div class="img2"></div>
                 <div class="wz">导出数据</div>
@@ -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();
+        //考试催促请求报文
+        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);