-- fix bug

src/views/projectcenter/TaskPage.vue

@@ -747,7 +747,7 @@
                   </div>
                 </div>
                 <div class="second2" v-if="checkPer(permissions)">
-                  <div class="btn1" @click="showModal2(1, null)">
+                  <div class="btn1" @click="showModal2()">
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
@@ -769,7 +769,7 @@
                 <div class="groupmain">
                   <div
                     class="groupbox"
-                    v-for="item in groupList"
+                    v-for="item in groupPageList"
                     :key="item.projectGroupId"
                   >
                     <div style="width: 90%">
@@ -781,12 +781,12 @@
                             >. . .</span
                           >
                           <div class="moreItems" v-if="checkPer(permissions)">
-                            <div class="sammo" @click="showModal2(2, item)">
+                            <div class="sammo" @click="showModal2(item)">
                               编辑
                             </div>
                             <div
                               class="sammo"
-                              @click="deleteGroupBtn(item.projectGroupId)"
+                              @click="deleteGroupBtn(item.id)"
                             >
                               删除
                             </div>
@@ -796,13 +796,13 @@
                       <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="item.completeRatio" />
+                        <a-progress :percent="(item.completeRatio || 0) * 100" />
                       </div>
                       <div
                         class="grofooter"
                         @click="
                           showMemberList(
-                            item.projectGroupId,
+                            item.id,
                             item.groupName,
                             item.groupMemberCount
                           )
@@ -1645,7 +1645,7 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px">{{
-              stuMemberClassify === 1 ? "创建小组" : "编辑小组"
+                !groupInfo?.id ? "创建小组" : "编辑小组"
             }}</span>
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
@@ -1666,7 +1666,7 @@
             <div class="inname">小组名称:</div>
             <div class="in">
               <a-input
-                v-model:value="valueaddg"
+                v-model:value="groupInfo.groupName"
                 placeholder="请输入小组名称"
                 style="border-radius: 8px; height: 40px"
                 :maxlength="100"
@@ -1688,7 +1688,7 @@
                 :max="300"
                 :precision="0"
                 style="width: 395px; height: 40px; border-radius: 8px"
-                v-model:value="groupNumber"
+                v-model:value="groupInfo.groupMemberCount"
               ></a-input-number>
             </div>
           </div>
@@ -1702,14 +1702,9 @@
             <div class="inname">小组长:</div>
             <div class="in">
               <ProjectManager
-                v-model:value="stuGroupId"
+                v-model:value="groupInfo.leaderId"
-                v-model:name="stuGroupName"
+                v-model:name="groupInfo.leaderName"
               ></ProjectManager>
-              <!-- <a-input
-                v-model:value="valueaddm"
-                placeholder="请输入小组长"
-                style="border-radius: 8px; height: 40px"
-              /> -->
             </div>
           </div>
           <div class="pubtn">
@@ -2389,6 +2384,8 @@ export default {
       inputValue3: 5,
       valueaddm: "", //创建小组输入小组长
       valueaddg: "", //创建小组输入名称
+      groupInfo: {leaderName:'',leaderId:''}, //创建小组
+      groupPageList: [], //小组列表
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
       valuegood: "",
@@ -3019,42 +3016,30 @@ export default {
       console.log("点击换组", record.studentId);
       state.checkgroupStuId = record.studentId;
     };
-    const showModal2 = (classify, item) => {
+    const showModal2 = (item) => {
-      state.stuMemberClassify = classify;
-      state.projectGroupId =
-        item && item.projectGroupId ? item.projectGroupId : null;
       state.stugroup = true;
-      console.log("item", item);
+      state.groupInfo = item || {};
-      if (item) {
-        state.valueaddg = item.groupName;
-        state.groupNumber = item.groupMemberCount;
-        state.stuGroupName = item.leaderName;
-        state.stuGroupId = item.leaderId;
-      }
-      console.log("编辑小组item", item);
     };
     const closeModal2 = () => {
       state.stugroup = false;
-      state.valueaddg = null;
+      state.groupInfo = {};
-      state.groupNumber = 0;
-      state.stuGroupName = null;
-      state.stuGroupId = null;
-      state.projectGroupId = null;
-      state.stuMemberClassify = null;
     };
     //点击确定创建小组
     const createG = () => {
-      if (
+      if(!state.groupInfo.groupName){
-        state.stuGroupName == "" ||
+        return message.warning("请输入小组名称");
-        state.valueaddg == "" ||
+      }
-        state.groupNumber == null
+      if(!state.groupInfo.leaderId){
-      ) {
+        return message.warning("请选择小组长");
-        message.destroy();
+      }
-        return message.warning("请输入必填项");
+      if(!state.groupInfo.leaderName){
-      } else {
+        return message.warning("请选择小组长");
+      }
+      if(!state.groupInfo.groupMemberCount){
+        return message.warning("请输入组员数量");
+      }
       createGroup();
       closeModal2();
-      }
     };
     const showFaceIn = () => {
       state.TaskFaceImpStuvisible = true;
@@ -3684,12 +3669,12 @@ export default {
       data.map((value) => {
         let obj = {
           projectId: value.projectId, //项目id
-          projectGroupId: value.projectGroupId, //小组id
+          projectGroupId: value.id, //小组id
           groupName: value.groupName, //小组名称
           leaderId: value.leaderId, //组长id
           leaderName: value.leaderName, //组长名称
-          groupMemberCount: value.groupMemberCount, //组员人数
+          groupMemberCount: value.groupMemberCount, //组员人数 == 1 ? "指定添加" : "随机分组",
-          source: value.source == 1 ? "指定添加" : "随机分组",
+          source: value.source ,
           completeTaskCnt: value.completeTaskCnt, //完成任务数
           totalTaskCnt: value.totalTaskCnt, //累计任务数
           completeRatio: value.completeRatio ? value.completeRatio : 0, //完成比例
@@ -3854,78 +3839,22 @@ export default {
         pageSize: 10,
         projectId: state.projectId,
       };
-      getGroupList(objf)
+      getGroupList(objf).then((res) => {state.groupPageList = res.data.data.rows})
-        .then((res) => {
-          console.log(res.data.data.rows, "获取小组列表成功");
-          if (res.data.code === 200) {
-            let arr = res.data.data.rows;
-            setGroupList(arr);
-          }
-          // let leng = res.data.data.rows.length;
-          // if (leng > 0) {
-          // }
-        })
-        .catch((err) => {
-          console.log(err, "获取列表失败");
-        });
     };
     //删除小组
     const deleteGroupBtn = (projectGroupId) => {
-      deleteGroup({
+      deleteGroup({projectGroupId}).then(() => {
-        projectGroupId: projectGroupId,
-      }).then((res) => {
-        console.log("删除小组成功", res);
         message.success("删除小组成功");
         getGroup();
       });
     };
     //创建小组
-    const createGroup = () => {
+    const createGroup = async () => {
-      //新建
+      const id = state.groupInfo.id
-      if (state.stuMemberClassify === 1) {
+      await editGroup({...state.groupInfo,projectId:state.projectId})
-        let obj = {
+      message.success(id?'小组编辑成功':"小组创建成功");
-          groupName: state.valueaddg,
-          groupMemberCount: state.groupNumber,
-          leaderId: state.stuGroupId,
-          leaderName: state.stuGroupName,
-          // projectGroupId: 0,
-          projectId: state.projectId,
-        };
-        console.log("小组创建obj", obj);
-        editGroup(obj)
-          .then((res) => {
-            console.log("小组创建成功", res);
-            message.success("小组创建成功");
       getGroup();
       getStu();
-          })
-          .catch((err) => {
-            console.log("小组创建失败", err);
-            message.warning("小组创建失败");
-          });
-      }
-      //编辑
-      if (state.stuMemberClassify === 2) {
-        let obj = {
-          groupName: state.valueaddg,
-          groupMemberCount: state.groupNumber,
-          leaderId: state.stuGroupId,
-          leaderName: state.stuGroupName,
-          projectGroupId: state.projectGroupId,
-          projectId: state.projectId,
-        };
-        console.log("编辑小组obj", obj);
-        editGroup(obj)
-          .then((res) => {
-            console.log("小组编辑成功", res);
-            message.success("小组编辑成功");
-            getGroup();
-          })
-          .catch((err) => {
-            console.log("小组编辑失败", err);
-            message.warning("小组编辑失败");
-          });
-      }
     };
     //搜索小组重置
     const resetGroupName = () => {