feat:合并

src/components/drawers/ActiveAttendance.vue

@@ -71,7 +71,7 @@
           </div>
           <div class="btn btn1" @click="exportTaskStu">
             <div class="img2"></div>
-            <div class="wz">导出数据1</div>
+            <div class="wz">导出数据</div>
           </div>
         </div>
         <!-- <div class="line">

src/components/student/CommonStudent.vue

@@ -395,6 +395,7 @@ const getStu = () => {
           realName: value.studentName,
           userNo: value.studentId,
           isLeader: value.isLeader,
+          groupId: value.groupId,
           orgName: value.studentOrgName ? value.studentOrgName : "-",
           departName: value.studentDepartName ? value.studentDepartName : "-",
         };
@@ -458,8 +459,8 @@ const searchOrgName = ref({
 const stageIds = computed(() => props.stage);
 const {
   data: stuData,
-  fetch: searchStu,
   page: stuPageNo,
+  fetch: searchStu,
   pageSize: stuPageSize,
   loading: stuLoading,
   total: stuTotal,
@@ -742,6 +743,7 @@ const resetStu = () => {
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
   selectedOrgKeys.value = [];
+  projectSelectKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -775,7 +777,17 @@ const submitAuth = () => {
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
-    if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
+    let selectMember = 0;
+    if (activeKey.value === 4) { // 项目内选人
+      selectMember = selectsData.value.projectMemberList.length
+    } else if (activeKey.value === 1) {
+      selectMember = selectsData.value.studentList.length
+    } else if (activeKey.value === 2) {
+      selectMember = selectsData.value.groupList.length
+    } else if (activeKey.value === 3) {
+      selectMember = selectsData.value.deptList.length
+    }
+    if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
       return message.warning("添加小组学员超过最大值");
     }
     // 判断是否是组长，组长不能添加

src/views/projectcenter/LibraryAdd.vue

@@ -1163,29 +1163,34 @@ export default defineComponent({
     };
     const getScoreRule = () => {
       scoreRule({
-        projectId: localStorage.getItem("projectTemplateId"),
+        projectId: projectTemplateId,
       })
           .then((res) => {
-            console.log("获取了项目积分规则", res.data.data);
             let result = res.data.data;
-            console.log("获取了项目积分规则:", result);
-            if (result.size > 0) {
-              scoresum.value = result.totalScore == null ? 0 : result.totalScore; //Write operation failed: computed value is readonly
-              state.seven1 = result.leaderScore;
-              state.score1 = result.courseScore;
-              state.done2 = result.homeworkItem[1].scoreLimit;
-              state.done3 = result.homeworkItem[1].score;
-              state.four1 = result.topCompleteCourseItem[0].numLimit;
-              state.four2 = result.topCompleteCourseItem[0].score;
-              state.four3 = result.homeworkItem[0].numLimit;
-              state.four4 = result.homeworkItem[0].scoreLimit;
-              state.four5 = result.homeworkItem[0].score;
-              state.five1 = result.examItem[0].scoreLimit;
-              state.five2 = result.examItem[0].score;
-              state.six1 = result.signScore;
-              state.seven1 = result.leaderScore;
-              state.seven2 = result.topStudentScore;
-            }
+           //Write operation failed: computed value is readonly 总积分
+
+            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
+
+            state.score1 = result[0].pointsCount; 
+
+            state.done2 = result[1].typeDescConfig;
+            state.done3 = result[1].pointsCount;
+
+            state.four1 = result[2].typeDescConfig;
+            state.four2 = result[2].pointsCount;
+
+            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
+            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
+            state.four5 = result[3].pointsCount;
+
+            state.five1 = result[4].typeDescConfig;
+            state.five2 = result[4].pointsCount;
+
+            state.six1 = result[5].pointsCount;
+
+            state.seven1 = result[6].pointsCount;
+
+            state.seven2 = result[7].pointsCount;
 
           })
           .catch((err) => {
@@ -1307,45 +1312,57 @@ export default defineComponent({
     //设置积分规则
     const editRule = () => {
       let obj = {
-        courseScore: state.score1,
-        examItem: [
+        projectId: projectTemplateId,
+        datas:[
           {
-            numLimit: 0,
-            score: state.five2,
-            scoreLimit: state.five1,
-            type: 3,
+              "type": 1,
+              "pointsCount": Number(state.score1),
+              "typeDesc": "完成【必修/选修】获得%p积分",
+              "typeDescConfig": ""
           },
-        ],
-
-        homeworkItem: [
-          //有名次要求的提交作业
           {
-            numLimit: state.four3,
-            score: state.four5,
-            scoreLimit: state.four4,
-            type: 2,
+              "type": 2,
+              "pointsCount": Number(state.done3),
+              "typeDesc": "完成作业成绩不低于%d分获得%p积分",
+              "typeDescConfig": state.done2
           },
-          //无名次要求的提交作业
           {
-            numLimit: 0,
-            score: state.done3,
-            scoreLimit: state.done2,
-            type: 2,
+              "type": 3,
+              "pointsCount": Number(state.four2),
+              "typeDesc": "前%d名学完在线课程获得%p积分",
+              "typeDescConfig": state.four1
           },
-        ],
-        leaderScore: state.seven1,
-        projectId: localStorage.getItem("projectTemplateId"),
-        signScore: state.six1,
-        topCompleteCourseItem: [
           {
-            numLimit: state.four1,
-            score: state.four2,
-            scoreLimit: 0,
-            type: 1,
+              "type": 4,
+              "pointsCount": Number(state.four5),
+              "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
+              "typeDescConfig":  state.four3 + ';' + state.four4
           },
-        ],
-        topStudentScore: state.seven2,
-        totalScore: scoresum.value,
+          {
+              "type": 5,
+              "pointsCount": Number(state.five2),
+              "typeDesc": "考试成绩高于%d分获得%p积分",
+              "typeDescConfig": state.five1
+          },
+          {
+              "type": 6,
+              "pointsCount": Number(state.six1),
+              "typeDesc": "考勤正常学员获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 7,
+              "pointsCount": Number(state.seven1),
+              "typeDesc": "成为小组长获得%p积分",
+              "typeDescConfig": ""
+          },
+          {
+              "type": 8,
+              "pointsCount": Number(state.seven2),
+              "typeDesc": "优秀学员可获得%p积分",
+              "typeDescConfig": ""
+          }
+        ]
       };
       console.log(obj);
       setScoreRule(obj)