@@ -781,12 +781,12 @@
>. . .
-
+
编辑
删除
@@ -796,13 +796,13 @@
组长：{{ item.leaderName }}
@@ -1666,7 +1666,7 @@
小组名称:
@@ -1702,14 +1702,9 @@
小组长:
@@ -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) => {
- state.stuMemberClassify = classify;
- state.projectGroupId =
- item && item.projectGroupId ? item.projectGroupId : null;
+ const showModal2 = (item) => {
state.stugroup = true;
- console.log("item", item);
- if (item) {
- state.valueaddg = item.groupName;
- state.groupNumber = item.groupMemberCount;
- state.stuGroupName = item.leaderName;
- state.stuGroupId = item.leaderId;
- }
- console.log("编辑小组item", item);
+ state.groupInfo = item || {};
};
const closeModal2 = () => {
state.stugroup = false;
- state.valueaddg = null;
- state.groupNumber = 0;
- state.stuGroupName = null;
- state.stuGroupId = null;
- state.projectGroupId = null;
- state.stuMemberClassify = null;
+ state.groupInfo = {};
};
//点击确定创建小组
const createG = () => {
- if (
- state.stuGroupName == "" ||
- state.valueaddg == "" ||
- state.groupNumber == null
- ) {
- message.destroy();
- return message.warning("请输入必填项");
- } else {
- createGroup();
- closeModal2();
+ if(!state.groupInfo.groupName){
+ return message.warning("请输入小组名称");
}
+ if(!state.groupInfo.leaderId){
+ return message.warning("请选择小组长");
+ }
+ if(!state.groupInfo.leaderName){
+ 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, //组员人数
- source: value.source == 1 ? "指定添加" : "随机分组",
+ groupMemberCount: value.groupMemberCount, //组员人数 == 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)
- .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, "获取列表失败");
- });
+ getGroupList(objf).then((res) => {state.groupPageList = res.data.data.rows})
};
//删除小组
const deleteGroupBtn = (projectGroupId) => {
- deleteGroup({
- projectGroupId: projectGroupId,
- }).then((res) => {
- console.log("删除小组成功", res);
+ deleteGroup({projectGroupId}).then(() => {
message.success("删除小组成功");
getGroup();
});
};
//创建小组
- const createGroup = () => {
- //新建
- if (state.stuMemberClassify === 1) {
- let obj = {
- 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 createGroup = async () => {
+ const id = state.groupInfo.id
+ await editGroup({...state.groupInfo,projectId:state.projectId})
+ message.success(id?'小组编辑成功':"小组创建成功");
+ getGroup();
+ getStu();
};
//搜索小组重置
const resetGroupName = () => {
创建小组