Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
yuping
2023-02-17 21:52:27 +08:00
7 changed files with 53 additions and 34 deletions

View File

@@ -2146,8 +2146,7 @@ export default defineComponent({
const state = reactive({
tableLoading: false,
tableCoursePlanLoading: false,
//新加
//新加
stuColumns: [
{
title: "岗位",
@@ -3345,7 +3344,6 @@ export default defineComponent({
// };
// 渲染开课操作
const getTableDate3 = async () => {
state.tableCoursePlanLoading = true
// let datas = state.tableData6;
let beginTime = "";
let endTime = "";
@@ -3374,7 +3372,6 @@ export default defineComponent({
};
console.log("获取开obj", obj, state.selectTime);
let res = await planList(obj);
state.tableCoursePlanLoading = false
console.log("开课res", res);
const {rows, total, pageNo} = res.data.data;
state.tableDataTotal222 = total;
@@ -3946,31 +3943,48 @@ export default defineComponent({
state.addLoading = true;
if (state.del_hs) {
console.log(11111111);
if (state.offcourseId && state.offcoursePlanId && state.studentId) {
await handleStudent({
console.log(111111);
handleStudent({
offcoursePlanId: state.offcoursePlanId,
score: "",
studentIds: [state.studentId],
type: 5,
})
getTableDate2();
delete_exit1();
}).then((res) => {
if (res.data.code === 200) {
getTableDate2();
delete_exit1();
}
});
} else if (state.offcourseId && state.offcoursePlanId) {
state.tableCoursePlanLoading = true;
delete_exit1();
await deletePlan({offcoursePlanId: state.offcoursePlanId,})
getTableDate3();
console.log(2222222);
deletePlan({
offcoursePlanId: state.offcoursePlanId,
}).then((res) => {
if (res.data.code === 200) {
getTableDate3();
delete_exit1();
}
});
} else if (state.offcourseId) {
state.tableLoading = true;
delete_exit1();
message.success("删除成功");
await handle({offcourseId: state.offcourseId, type: -1,})
getTableDate();
console.log(3333333);
handle({
offcourseId: state.offcourseId,
type: -1,
}).then((res) => {
if (res.data.code === 200) {
message.destroy();
message.success("删除成功");
getTableDate();
delete_exit1();
}
});
}
}
if (state.copy_hs) {
if (state.offcourseId && state.offcoursePlanId) {
state.tableCoursePlanLoading = true;
state.tableLoading = true;
message.success("复制成功");
delete_exit1();
rest();
@@ -3986,15 +4000,20 @@ export default defineComponent({
}
}
if (state.nouse_hs) {
console.log(3333333333);
if (state.offcourseId) {
state.tableLoading = true;
message.success("操作成功");
delete_exit1();
await handle({
console.log(87887);
handle({
offcourseId: state.offcourseId,
type: -2,
})
getTableDate();
}).then((res) => {
if (res.data.code === 200) {
message.destroy();
message.success("操作成功");
getTableDate();
delete_exit1();
}
});
}
}
};