diff --git a/package-lock.json b/package-lock.json
index fc6622f3..52bc5ebc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9526,7 +9526,7 @@
},
"node_modules/sortablejs": {
"version": "1.15.0",
- "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
},
"node_modules/source-map": {
@@ -10456,7 +10456,7 @@
},
"node_modules/vuedraggable": {
"version": "4.1.0",
- "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
"dependencies": {
"sortablejs": "1.14.0"
@@ -10467,7 +10467,7 @@
},
"node_modules/vuedraggable/node_modules/sortablejs": {
"version": "1.14.0",
- "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
},
"node_modules/vuex": {
@@ -19032,7 +19032,7 @@
},
"sortablejs": {
"version": "1.15.0",
- "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
},
"source-map": {
@@ -19805,7 +19805,7 @@
},
"vuedraggable": {
"version": "4.1.0",
- "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
"requires": {
"sortablejs": "1.14.0"
@@ -19813,7 +19813,7 @@
"dependencies": {
"sortablejs": {
"version": "1.14.0",
- "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
}
}
diff --git a/src/api/indexActivity.js b/src/api/indexActivity.js
index c7fac455..8adaca20 100644
--- a/src/api/indexActivity.js
+++ b/src/api/indexActivity.js
@@ -12,6 +12,9 @@ export const deleteActivity = (obj) => http.post('/activity/deleteActivity', { p
//修改活动接口
export const updateActivity = (obj) => http.post('/activity/updateActivity', obj);
+//修改阶段任务信息
+export const updateTask=(obj)=>http.post('/admin/project/editTask',obj)
+
//修改活动是否为必修接口
export const updateActivityToCompulsory = (obj) => http.post('/activity/updateActivityToCompulsory', { params: obj });
diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js
index ee85fa44..f9e07d46 100644
--- a/src/api/indexDiscuss.js
+++ b/src/api/indexDiscuss.js
@@ -1,16 +1,17 @@
import http from "./config";
+//import qs from 'qs';
//创建讨论
export const createDiscuss = (obj) => http.post("/discuss/createDiscuss", obj);
//获取讨论信息接口
-export const getDiscussDetail = (obj) =>
- http.post("/discuss/getDiscussDetail", { params: obj });
+export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj);
//删除讨论接口
export const deleteDiscuss = (obj) =>
http.post("/discuss/deleteDiscuss", { params: obj });
//修改讨论接口
-export const updateDiscuss = (obj) =>
- http.post("/discuss/updateDiscuss", { params: obj });
+export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', obj );
+//修改阶段任务信息
+export const updateTask=(obj)=>http.post('/admin/project/editTask',obj)
diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
new file mode 100644
index 00000000..0dc883a6
--- /dev/null
+++ b/src/api/indexProjStu.js
@@ -0,0 +1,7 @@
+import http from "./config";
+
+//获取项目学员列表
+export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
+
+//删除学员
+export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
\ No newline at end of file
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 030878b3..a520aab3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -17,7 +17,7 @@
@click="closeDrawer"
/>
-
-
-
-
+
+
+
@@ -277,6 +277,14 @@ export default {
edit: {
type: Boolean,
default: false,
+ },
+ editActivityId: {
+ type: Boolean,
+ default: false,
+ },
+ projectTaskId: {
+ type: Boolean,
+ default: false,
}
},
setup(props, ctx) {
@@ -309,13 +317,44 @@ export default {
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
+ console.log("活动ID",props.editActivityId);
+ console.log("项目中任务ID",props.projectTaskId);
+ if(bool){
+ if(props.isStudiscuss == false){
+ if(props.edit){
+ //编辑讨论
+ console.log("props.editActivityId",props.editActivityId)
+ let obj = {
+ activityId: props.editActivityId,
+ }
+ api.getActivity(obj).then(res => {
+ console.log('获取讨论信息成功',res.data.data)
+
+ //更新讨论信息
+ state.inputV1 = res.data.data.activityName;
+ state.textV1 = res.data.data.activityNotice;
+ state.textV2 = res.data.data.activityExplain;
+ state.inputV2 = res.data.data.activityDuration;
+ state.inputV3 = res.data.data.activityAddress;
+ state.inputV5 = res.data.data.afterSignIn;
+ state.inputV4 = res.data.data.beforeSignIn;
+ state.radioV1 = res.data.data.standardSettings;
+ state.time[0] = res.data.data.activityStartTime;
+ state.time[1] = res.data.data.activityEndTime;
+ console.log(state.time[0])
+ }).catch(err=>{
+ console.log('获取讨论信息失败',err)
+ })
+
+ }
+ }
+ }
};
const cloradio1 = (value) => {
if (value != "") {
state.radioV1 = "";
}
};
-
//创建活动
const createActivity = () => {
if(!state.inputV1){
@@ -352,14 +391,16 @@ export default {
activityTag: "", //活动逻辑删除标识
afterSignIn: state.inputV5, //活动开始后多少分钟签到
beforeSignIn: state.inputV4, //活动开始前多少分钟签到
- createTime: "", //创建时间
- createUser: 0, //创建人
signOutTime: state.inputV6, //签退开始时间
standardSettings: state.radioV1, //标准设置
- updateTime: "", //更新时间
- updateUser: 0, //更新人
+
};
- api
+ if(props.edit){
+ //更新编辑活动信息
+ updateActivity();
+ }else{
+ //新建活动信息
+ api
.createActivity(obj)
.then((res) => {
console.log("创建成功", res);
@@ -396,7 +437,7 @@ export default {
}else{
apiTask
.addTask({
- courseId: 0,
+ courseId: res.data.data.activityId,
duration: obj.activityDuration,
flag: true,
name: obj.activityName,
@@ -421,8 +462,36 @@ export default {
.catch((err) => {
console.log("创建失败",err);
})
+ }
+
+ };
+ //更新编辑活动信息
+ const updateActivity = (obj) => {
+ console.log("编辑");
+ api.updateActivity(obj)
+ .then((res) => {
+ console.log("更新成功",res);
+ let taskObj = {
+ courseId: res.data.data.activityId,
+ duration: obj.activityDuration,
+ flag: true,
+ name: obj.activityName,
+ projectId: props.projectId,
+ projectTaskId: props.projectTaskId,
+ stageId: 0,
+ type: 9,
+ }
+ api.updateTask(taskObj).then((res)=> {
+ console.log("更新任务列表成功",res);
+ })
+ .catch((err)=> {
+ console.log("更新任务列表失败",err);
+ })
+ })
+ .catch((err) => {
+ console.log("更新失败",err);
+ })
};
-
return {
...toRefs(state),
afterVisibleChange,
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index e13afc92..ccaaad30 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -130,6 +130,10 @@ export default {
editDiscussId: {
type: Number,
default: null,
+ },
+ projectTaskId: {
+ type: Number,
+ default: null,
}
},
setup(props, ctx) {
@@ -144,13 +148,36 @@ export default {
const closeDrawer = () => {
ctx.emit("update:adddiscussVisible", false);
ctx.emit("update:edit", false);
+ console.log("编辑状态",props.edit);
state.inputV1 = "";
state.textV1 = "";
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
+ console.log("项目任务ID",props.projectTaskId);
+ if(bool){
+ if(props.isStudiscuss == false){
+ if(props.edit){
+ //编辑讨论
+ console.log("props.editDiscussId",props.editDiscussId)
+ let formData = new FormData();
+ formData.append('discussId',props.editDiscussId);
+ console.log("formData",formData);
+ api.getDiscussDetail(formData).then(res => {
+ console.log('获取讨论信息成功',res.data.data)
+ //更新讨论信息
+ state.inputV1 = res.data.data.discussName;
+ state.textV1 = res.data.data.discussExplain;
+ state.checkedC1 = res.data.data.discussSettings;
+ }).catch(err=>{
+ console.log('获取讨论信息失败',err)
+ })
+
+ }
+ }
+ }
};
-
+ //console.log("编辑状态",props.edit);
//创建讨论（项目任务列表）
const createDiscuss = () => {
if (!state.inputV1) {
@@ -169,26 +196,9 @@ export default {
discussTag: "", //是否必修的标识
updateTime: "", //更新时间
updateUser: 0, //更新人
- projectId: 0, //项目id
+ projectId: props.projectId, //项目id
};
- if(props.edit){
- //console.log("编辑");
- console.log("props.editDiscussId",props.editDiscussId)
-
- let obj = {
- discussId: props.editDiscussId,
- }
- console.log(obj)
- api
- .getDiscussDetail(obj)
- .then((res) => {
- console.log("获取成功",res.data);
- })
- .catch((err) => {
- console.log("获取失败",err.data);
- })
-
- }else{
+ if(props.edit == false){
api
.createDiscuss(obj)
.then((res) => {
@@ -213,8 +223,7 @@ export default {
console.log("新增关卡任务成功",res);
setTimeout(()=>{
message.success("创建成功");
- ctx.emit("update:adddiscussVisible", false);
- closeDrawer();
+ ctx.emit("update:adddiscussVisible", false);
state.addLoading=false
},1000)
}).catch(err => {
@@ -229,7 +238,7 @@ export default {
flag: true,
name: obj.discussName,
projectId: props.projectId,
- projectTaskId: 0,
+ projectTaskId: "",
stageId: props.chooseStageId,
type: 8,
})
@@ -248,10 +257,36 @@ export default {
})
.catch((err) => {
console.log("创建失败", err);
- });
+ });
+ }else{
+ api
+ .updateDiscuss(obj)
+ .then((res)=> {
+ console.log("更新成功",res);
+ console.log("项目任务ID",props.projectTaskId)
+ let taskObj={
+ courseId: res.data.data.discussId,
+ name: obj.discussName,
+ projectId: props.projectId,
+ projectTaskId: props.projectTaskId,
+ stageId: props.stageId,
+ type: 8,
+
+ }
+ api.updateTask(taskObj).then(taskRes=>{
+ console.log('更新阶段任务成功',taskRes)
+ }).catch(taskErr=>{
+ console.log('更新阶段任务失败',taskErr)
+ })
+ })
+ .catch((err) => {
+ console.log("更新失败",err)
+ })
}
-
+
+
};
+
return {
...toRefs(state),
afterVisibleChange,
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index a571428d..fa3a1fe9 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -3,7 +3,7 @@
@after-visible-change="afterVisibleChange">
+
+
+
