feat:修改作业

This commit is contained in:
lixg
2022-11-30 21:48:40 +08:00
parent 84897bb330
commit b652030ee5
9 changed files with 242 additions and 239 deletions

View File

@@ -128,7 +128,7 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectTemplateId:{ projectTemplateId: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -165,7 +165,7 @@ export default {
state.textV1 = ""; state.textV1 = "";
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
} };
const queryDiscuss = () => { const queryDiscuss = () => {
if (props.edit) { if (props.edit) {
//编辑讨 //编辑讨
@@ -197,7 +197,6 @@ export default {
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
@@ -214,7 +213,6 @@ export default {
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
@@ -231,7 +229,6 @@ export default {
type: 8, type: 8,
}) })
.then(() => { .then(() => {
//message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
}) })
.catch(() => { .catch(() => {
@@ -258,11 +255,11 @@ export default {
updateTask(res); updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy() message.destroy();
message.success("创建讨论成功"); message.success("创建讨论成功");
}) })
.catch(() => { .catch(() => {
message.destroy() message.destroy();
message.error("创建讨论失败"); message.error("创建讨论失败");
}); });
} else { } else {
@@ -272,11 +269,11 @@ export default {
updateTask(res); updateTask(res);
closeDrawer(); closeDrawer();
ctx.emit("changeData", false); ctx.emit("changeData", false);
message.destroy() message.destroy();
message.success("创建讨论成功"); message.success("创建讨论成功");
}) })
.catch(() => { .catch(() => {
message.destroy() message.destroy();
message.error("创建讨论失败"); message.error("创建讨论失败");
}); });
} }

View File

@@ -169,7 +169,7 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
projectTemplateId:{ projectTemplateId: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -263,20 +263,18 @@ export default {
const fileList = ref([]); const fileList = ref([]);
const closeDrawer = () => { const closeDrawer = () => {
formState.choosedTime = ""; formState.choosedTime = "";
ctx.emit("update:addhomeworkVisible", false); ctx.emit("update:addhomeworkVisible", false);
ctx.emit("update:edit", false); ctx.emit("update:edit", false);
ctx.emit("update:EditWorkId", state.EditWorkId); ctx.emit("update:EditWorkId", state.EditWorkId);
console.log("state.EditWorkId==============",state.EditWorkId); console.log("state.EditWorkId==============", state.EditWorkId);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
fileList.value = []; fileList.value = [];
resetForm(); resetForm();
}; };
const afterVisibleChange = () => { const afterVisibleChange = () => {
if (props.EditWorkId >0) { if (props.EditWorkId > 0) {
state.EditWorkId = props.EditWorkId; state.EditWorkId = props.EditWorkId;
queryWork(); queryWork();
} }
@@ -292,9 +290,10 @@ export default {
workName: formState.workName, workName: formState.workName,
workRequirement: formState.workRequirement, workRequirement: formState.workRequirement,
}; };
if (props.EditWorkId >0) { if (props.EditWorkId > 0) {
updateWorkTaskUsing(obj) updateWorkTaskUsing(obj)
.then((res) => { .then((res) => {
// console.log("添加成功", res);
updateTask(res); updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
@@ -306,6 +305,7 @@ export default {
} else { } else {
createWorkTask(obj) createWorkTask(obj)
.then((res) => { .then((res) => {
console.log("添加成功", res);
updateTask(res); updateTask(res);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
@@ -336,11 +336,9 @@ export default {
}; };
// 新增编辑或新增项目任务 // 新增编辑或新增项目任务
const updateTask = (res) => { const updateTask = (res) => {
if (props.faceLevel) {
if(props.faceLevel){ state.EditWorkId = res.data.data.workId;
state.EditWorkId = res.data.data.workId } else {
}else{
if (props.isLevel == 1) { if (props.isLevel == 1) {
let editObj1 = { let editObj1 = {
chapterId: props.isactive, chapterId: props.isactive,
@@ -356,6 +354,8 @@ export default {
//message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`); //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`);
state.addLoading = false; state.addLoading = false;
ctx.emit("changeData", false);
closeDrawer();
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`); //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`);
@@ -364,33 +364,38 @@ export default {
let editObj = { let editObj = {
courseId: res.data.data.workId, courseId: res.data.data.workId,
name: res.data.data.workName, name: res.data.data.workName,
projectId: props.EditWorkId > 0 ? props.projectId : 0, projectId: props.projectId > 0 ? props.projectId : 0,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0 , stageId: props.chooseStageId || 0,
type: 4, type: 4,
}; };
console.log("editObj", editObj);
ProjectEditTask(editObj) ProjectEditTask(editObj)
.then(() => { .then((res) => {
//message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`); //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
console.log("chenggong", res);
state.addLoading = false; state.addLoading = false;
ctx.emit("changeData", false);
closeDrawer();
}) })
.catch(() => { .catch((err) => {
console.log("shibaii", err);
//message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log("projectTemplateId,===",props.projectTemplateId); console.log("projectTemplateId,===", props.projectTemplateId);
addTempTask({ addTempTask({
courseId: res.data.data.workId, courseId: res.data.data.workId,
name: res.data.data.workName, name: res.data.data.workName,
projectTemplateId:props.projectTemplateId, projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 4, type: 4,
}) })
.then(() => { .then(() => {
//message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`); //message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false; state.addLoading = false;
}) })
.catch(() => { .catch(() => {
@@ -398,7 +403,6 @@ export default {
}); });
} }
} }
}; };
const cle = () => { const cle = () => {

View File

@@ -33,7 +33,7 @@
<a-input <a-input
v-model:value="inputV1" v-model:value="inputV1"
style="width: 400px; height: 32px" style="width: 400px; height: 32px"
placeholder="请输入考试名称" placeholder="请输入直播名称"
maxlength="20" maxlength="20"
/> />
</div> </div>
@@ -45,7 +45,7 @@
<div class="textarea"> <div class="textarea">
<a-textarea <a-textarea
v-model:value="textV1" v-model:value="textV1"
placeholder="请输入考试说明" placeholder="请输入直播说明"
allow-clear allow-clear
maxlength="364px" maxlength="364px"
/> />
@@ -132,7 +132,6 @@
<span style="margin-right: 14px">直播封面</span> <span style="margin-right: 14px">直播封面</span>
</div> </div>
<div class="item_inp"> <div class="item_inp">
<a-upload <a-upload
name="avatar" name="avatar"
list-type="picture-card" list-type="picture-card"
@@ -179,7 +178,7 @@
<a-switch v-model:checked="switchC1" @click="PlayBack" /> <a-switch v-model:checked="switchC1" @click="PlayBack" />
</div> </div>
</div> </div>
<div v-if ="switchC1"> <div v-if="switchC1">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">回放链接</span> <span style="margin-right: 3px">回放链接</span>
@@ -199,29 +198,32 @@
<span style="margin-right: 3px">评估</span> <span style="margin-right: 3px">评估</span>
</div> </div>
<div class="btnbox2"> <div class="btnbox2">
<a-checkbox v-model:checked="needEval" @click="needEval=!needEval" <a-checkbox
>需要评估</a-checkbox > v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估</a-checkbox
>
</div> </div>
</div> </div>
<div v-if="needEval" class="main_item"> <div v-if="needEval" class="main_item">
<div class="signbox"> <div class="signbox"></div>
</div>
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button> <button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if = "assessmentId >0 "> <div v-if="assessmentId > 0">
<a-tag closable color="processing" @close="logA"> <a-tag closable color="processing" @close="logA">
<span style="font-size:14px;line-height: 33px;" >删除评估</span> <span style="font-size: 14px; line-height: 33px"
</a-tag></div> >删除评估</span
>
</a-tag>
</div>
<AssessmentList <AssessmentList
v-model:assessmentVisible="assessmentVisible" v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag" v-model:titleTag="titleTag"
v-model:assessmentId="assessmentId" v-model:assessmentId="assessmentId"
/> />
</div> </div>
</div> </div>
<div class="main_item2"> <div class="main_item2">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">考勤设置</span> <span style="margin-right: 3px">考勤设置</span>
@@ -346,8 +348,8 @@ function getBase64(img, callback) {
export default { export default {
name: "AddLive", name: "AddLive",
components:{ components: {
AssessmentList AssessmentList,
}, },
props: { props: {
addliveVisible: { addliveVisible: {
@@ -394,7 +396,7 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectTemplateId:{ projectTemplateId: {
type: Number, type: Number,
default: null, default: null,
}, },
@@ -409,8 +411,8 @@ export default {
fetching: false, fetching: false,
totalPages: 0, totalPages: 0,
memberValue: { memberValue: {
value:"", value: "",
label:"" label: "",
}, // 授课老师关键词 }, // 授课老师关键词
inputV1: "", //*直播名称 inputV1: "", //*直播名称
time: "", //*直播时间 time: "", //*直播时间
@@ -434,9 +436,9 @@ export default {
obj: {}, //要传的obj数据 obj: {}, //要传的obj数据
assessment: [], //评估信息 assessment: [], //评估信息
assessmentvalue: null, assessmentvalue: null,
needEval:false, needEval: false,
otherSettings:false, otherSettings: false,
assessmentVisible:false, assessmentVisible: false,
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:addliveVisible", false); ctx.emit("update:addliveVisible", false);
@@ -455,14 +457,14 @@ export default {
state.textV1 = ""; state.textV1 = "";
state.switchC1 = ""; state.switchC1 = "";
state.imageUrl = ""; state.imageUrl = "";
state.needEval=false; state.needEval = false;
state.otherSettings; state.otherSettings;
ctx.emit("changeData", false); ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive); localStorage.setItem("chapterId", props.isactive);
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
if (props.edit&&bool) { if (props.edit && bool) {
queryLive(); queryLive();
} }
api api
@@ -512,7 +514,6 @@ export default {
}); });
}; };
const cloradio1 = (value) => { const cloradio1 = (value) => {
if (state.radioV1 === value.target._value) { if (state.radioV1 === value.target._value) {
state.radioV1 = ""; state.radioV1 = "";
@@ -579,12 +580,12 @@ export default {
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
console.log("props.projectTemplateId",props.projectTemplateId); console.log("props.projectTemplateId", props.projectTemplateId);
addTempTask({ addTempTask({
courseId: res.data.data.liveId, courseId: res.data.data.liveId,
duration: res.data.data.duration, duration: res.data.data.duration,
name: res.data.data.liveName, name: res.data.data.liveName,
projectTemplateId:props.projectTemplateId, projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 6, type: 6,
@@ -599,9 +600,8 @@ export default {
} }
}; };
const showAssessment = () => { const showAssessment = () => {
state.assessmentVisible = true; state.assessmentVisible = true;
console.log("hshs======",state.assessmentVisible); console.log("hshs======", state.assessmentVisible);
}; };
//创建直播 //创建直播
const updateLiveBroadcast = () => { const updateLiveBroadcast = () => {
@@ -651,7 +651,7 @@ export default {
otherSettings: state.otherSettings, //1或0 otherSettings: state.otherSettings, //1或0
signOutTime: state.inputV8, signOutTime: state.inputV8,
standardSettings: state.radioV1, //1或2 standardSettings: state.radioV1, //1或2
isEvaluate:state.eedEval ? "1":"0", isEvaluate: state.eedEval ? "1" : "0",
}; };
if (props.edit) { if (props.edit) {
api api
@@ -928,7 +928,7 @@ export default {
align-items: start; align-items: start;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
.i_bottom{ .i_bottom {
margin-bottom: 30px; margin-bottom: 30px;
} }
.item_nam { .item_nam {
@@ -979,7 +979,6 @@ export default {
} }
} }
} }
} }
} }
.main_btns { .main_btns {

View File

@@ -24,13 +24,14 @@
> >
系统考试 系统考试
</button> </button>
<button <!-- 2022-11-30注释 后面放开 -->
<!-- <button
style="width: 100px" style="width: 100px"
@click="changeOuter(2)" @click="changeOuter(2)"
:class="[isOuter == 2 ? 'outer' : 'notOuter']" :class="[isOuter == 2 ? 'outer' : 'notOuter']"
> >
外部考试 外部考试
</button> </button> -->
</div> </div>
<a-form <a-form
v-if="isOuter == 1" v-if="isOuter == 1"

View File

@@ -343,7 +343,8 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div class="template"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="template">
<div class="name"> <div class="name">
<div class="inname" style="width: 50px">模版</div> <div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px"> <div class="in select" style="margin-left: 2px">
@@ -381,7 +382,7 @@
</a-select> </a-select>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">

View File

@@ -358,7 +358,8 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div class="template"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="template">
<div class="name"> <div class="name">
<div class="inname" style="width: 50px">模版</div> <div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px"> <div class="in select" style="margin-left: 2px">
@@ -396,7 +397,7 @@
</a-select> </a-select>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">

View File

@@ -37,7 +37,8 @@
> >
</a-input> </a-input>
</div> </div>
<div class="select"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="select">
<a-select <a-select
v-model:value="sProjectState" v-model:value="sProjectState"
style="width: 270px" style="width: 270px"
@@ -47,7 +48,7 @@
allowClear allowClear
showSearch showSearch
></a-select> ></a-select>
</div> </div> -->
<div class="select"> <div class="select">
<a-date-picker <a-date-picker
v-model:value="sProjectTime" v-model:value="sProjectTime"

View File

@@ -343,7 +343,8 @@
</div> </div>
</div> --> </div> -->
</div> </div>
<div class="template"> <!-- 2022-11-30注释 后面放开 -->
<!-- <div class="template">
<div class="name"> <div class="name">
<div class="inname" style="width: 50px">模版</div> <div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px"> <div class="in select" style="margin-left: 2px">
@@ -381,7 +382,7 @@
</a-select> </a-select>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">

View File

@@ -1202,7 +1202,7 @@ export default {
let data = tableData; let data = tableData;
let array = []; let array = [];
data.map((value) => { data.map((value) => {
if(value.stageId!=0){ if (value.stageId != 0) {
let obj = { let obj = {
id: value.stageId, id: value.stageId,
tit: value.name, tit: value.name,
@@ -1213,7 +1213,6 @@ export default {
}; };
array.push(obj); array.push(obj);
} }
}); });
state.level = array; state.level = array;
}; };
@@ -1374,23 +1373,21 @@ export default {
let stageList = res.data.data.stageList; //阶段数组 let stageList = res.data.data.stageList; //阶段数组
let result = stageList.find((item) => item.stageId == stage); let result = stageList.find((item) => item.stageId == stage);
console.log("又找到了", result); console.log("又找到了", result);
if(result!=null){ if (result != null) {
getTableData(result.taskList); getTableData(result.taskList);
} }
} else { } else {
//没有选中的阶段时,获取全部的任务 //没有选中的阶段时,获取全部的任务
console.log(stage); console.log(stage);
let stageList = res.data.data.stageList; //阶段数组 let stageList = res.data.data.stageList; //阶段数组
if(stageList!=null){ if (stageList != null) {
let taskListAll =null; let taskListAll = null;
stageList.forEach((item) => { stageList.forEach((item) => {
taskListAll =[taskListAll,...item.taskList]; taskListAll = [taskListAll, ...item.taskList];
}); });
console.log("taskListAll",taskListAll); console.log("taskListAll", taskListAll);
getTableData(taskListAll); getTableData(taskListAll);
} }
} }
// 每次都获取了第一条taskList // 每次都获取了第一条taskList
@@ -1667,6 +1664,7 @@ export default {
state.projectTaskId = eleId; state.projectTaskId = eleId;
}; };
const showDrawerAddHomework = (id, eleId) => { const showDrawerAddHomework = (id, eleId) => {
console.log("id222222", id, eleId);
state.EditWorkId = id; state.EditWorkId = id;
state.projectTaskId = eleId; state.projectTaskId = eleId;
state.addhomeworkvisible = true; state.addhomeworkvisible = true;