feat:合并

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" } })
 //分组

src/components/drawers/ActiveAttendance.vue

@@ -71,7 +71,7 @@
           </div>
           <div class="btn btn1" @click="exportTaskStu">
             <div class="img2"></div>
-            <div class="wz">导出数据</div>
+            <div class="wz">导出数据1</div>
           </div>
         </div>
         <!-- <div class="line">
@@ -858,10 +858,11 @@ 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

src/components/drawers/ProjectAudit.vue

@@ -304,7 +304,7 @@ export default {
       faceclassScene: [],
       projectInfo: {},
 
-      tableDataTotal: 20,
+      tableDataTotal: 2,
       pageSize: 10,
       currentPage: 1,
       tableData: [],

src/components/drawers/ProjectScore.vue

@@ -13,7 +13,7 @@
               placeholder="请输入姓名"
             />
           </div>
-          <div class="groupright">
+          <div class="groupright" style="margin-left: 16px;">
             <div class="btn1" @click="searchStu">
               <img src="../../assets/images/courseManage/search0.png" />
               <span class="btn1text">搜索</span>
@@ -75,7 +75,7 @@
               <div class="groupname">姓名：</div>
               <a-input
                 class="ant-input"
-                style="width: 152px"
+                style="width: 152px;"
                 v-model:value="searchRankName"
                 placeholder="请输入姓名"
               />

src/components/drawers/StuScoreDetail.vue

@@ -109,8 +109,8 @@ export default {
         },
         {
           title: "类型",
-          dataIndex: "type",
+          dataIndex: "typeDesc",
-          key: "type",
+          key: "typeDesc",
           width: 60,
           align: "center",
           className: "h",

src/components/drawers/project/AddCertificate.vue

@@ -603,6 +603,7 @@ export default {
               props.ACertificateEdit ? "证书修改成功" : "证书添加成功"
             );
             props.getCertificate && props.getCertificate();
+            closeDrawer();
           }
         })
         .catch((err) => {

src/components/drawers/project/ProjectExamManage.vue

@@ -56,11 +56,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="exportData">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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 + "成功");
     };
     //导入成绩

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -57,11 +57,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="exportData">
               <div class="img2"></div>
               <div class="wz">导出数据</div>
@@ -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 + "成功");
       };
       //导入成绩

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -57,10 +57,10 @@
             </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>
             <div class="btn btn2" @click="exportData">
               <div class="img2"></div> 
               <div class="wz">导出数据</div>
@@ -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 + "成功");
       };
       //导入成绩

src/components/drawers/router/RouterExaminationManage.vue

@@ -33,10 +33,10 @@
           </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>
           <div class="btn btn2" @click="exportData">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -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 + "成功");
     };
     //导入成绩

src/components/student/CommonStudent.vue

@@ -295,7 +295,7 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  // USER_LIST, 
+  // USER_LIST,
   USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
@@ -700,7 +700,7 @@ function onOrgSelectChange(e, l) {
   selectsData.value.deptList = l.selectedNodes;
 
   // 获取被点击的树节点
-  
+
 }
 
 function onAuditSelectChange(e, l) {
@@ -781,7 +781,7 @@ function handleStageOk() {
     // 判断是否是组长，组长不能添加
     const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1');
     if (leaderArray.length > 0) {
-      return message.warning("当前选学员"+leaderArray[0].realName+"已在其他小组为小组长，请勿重复选择。");
+      return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
     }
     // 对选中的人员进行判断是否已经分组了
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);

src/views/examine/CourseReviewedN.vue

@@ -148,10 +148,10 @@
 		</a-modal>
 		<!-- 邀请审核弹窗 -->
 		<a-modal v-model:visible="courInvitationAuditModal" :footer="null" :closable="closeBack" wrapClassName="courAuditModal"
-			centered="true">
+			centered="true" style="height:400px;">
 			<div class="delete">
 				<div class="del_header"></div>
-				<div class="del_main">
+				<div class="del_main" style="height:400px;">
 					<div class="header">
 						<div class="icon"></div>
 						<span>请选择教师</span>

src/views/projectcenter/TaskPage.vue

@@ -909,6 +909,7 @@
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
           <ProjectScore
+            v-if="activeKey=='5'"
             :permissions="permissions"
             :projectId="projectId"
           ></ProjectScore>
@@ -2456,6 +2457,7 @@ export default {
       valueaddm: "", //创建小组输入小组长
       valueaddg: "", //创建小组输入名称
       groupInfo: { leaderName: "", leaderId: "" }, //创建小组
+      groupMemberCountContrast: null,
       groupPageList: [], //小组列表
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
@@ -3083,7 +3085,6 @@ export default {
     };
     //显示学员换组弹窗
     const showChangeGroupModal = (record) => {
-      debugger;
       console.log("单个");
       state.changegroupV = true;
       console.log("点击换组", record.id);
@@ -3094,10 +3095,12 @@ export default {
       state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
+      state.groupMemberCountContrast = item.groupMemberCount;
     };
     const closeModal2 = () => {
       state.stugroup = false;
       state.groupInfo = {};
+      state.groupMemberCountContrast = null;
     };
     //点击确定创建小组
     const createG = () => {
@@ -3114,7 +3117,6 @@ export default {
         return message.warning("请输入组员数量");
       }
       createGroup();
-      closeModal2();
     };
     const showFaceIn = () => {
       state.TaskFaceImpStuvisible = true;
@@ -3165,7 +3167,6 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
-      debugger;
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";
@@ -3932,20 +3933,24 @@ export default {
     //创建小组
     const createGroup = async () => {
       console.log("state.groupPageList" + state.groupPageList);
-      const d = state.groupPageList.filter(
+      const id = state.groupInfo.id;
+      const d = state.groupPageList.filter(item => item.id !== id).filter(
         (item) => item.leaderId === state.groupInfo.leaderId
       );
-      const id = state.groupInfo.id;
       if (state.isEdit) {
         if (d.length > 0 && d[0].id !== id) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
+        // 小组人数只能由小改大，不能由大改小
+        if (state.groupMemberCountContrast > state.groupInfo.groupMemberCount) {
+          return message.warn("当前不支持修改组员人数小于原组员数量。");
+        }
       } else {
         if (d.length > 0) {
-          return message.warn(d[0].leaderName + "已是小组长，请重新选择");
+           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
       }
-      // 过滤掉编辑时候，只修改了组员最大值时候
+
 
       state.isEdit = false;
       await editGroup({ ...state.groupInfo, projectId: state.projectId });
@@ -3953,6 +3958,7 @@ export default {
       getGroup();
       console.log("state.groupPageList:");
       getStu();
+      closeModal2();
     };
     //搜索小组重置
     const resetGroupName = () => {