feat:合并

This commit is contained in:
李晓鸽
2022-11-03 15:49:42 +08:00
9 changed files with 436 additions and 283 deletions

View File

@@ -522,7 +522,7 @@
</template>
<script>
import { reactive, toRefs, onMounted, onUnmounted } from "vue";
import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
import AddOnline from "../../components/drawers/AddOnline.vue";
import EditOnline from "../../components/drawers/EditOnline.vue";
import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
@@ -665,95 +665,95 @@ export default {
//任务数据
tableData: [
{
key: 1,
lei: "在线",
// state: "已发布",
creater: "管理者课程",
// pubtime: "2022-07-20 14:00:03",
cretime: "60分钟",
haspub: false,
checked1: false,
checkedd: false,
id: "ssss",
},
{
key: 2,
lei: "面授",
// state: "草稿",
creater: "管理者面授",
// pubtime: "2022-07-20 14:00:03",
cretime: "20分钟",
haspub: true,
checked1: false,
checkedd: false,
},
{
key: 1,
lei: "在线",
// state: "已发布",
creater: "管理者课程",
// pubtime: "2022-07-20 14:00:03",
cretime: "60分钟",
haspub: false,
checked1: false,
checkedd: false,
},
{
key: 3,
lei: "作业",
// state: "已停用",
creater: "管理者作业",
// pubtime: "2022-07-20 14:00:03",
cretime: "60分钟",
haspub: false,
checked1: false,
checkedd: false,
},
{
key: 4,
lei: "考试",
// state: "草稿",
creater: "管理者考试",
// pubtime: "2022-07-20 14:00:03",
cretime: "20分钟",
haspub: true,
checked1: false,
checkedd: false,
},
{
key: 5,
lei: "案例",
// state: "草稿",
creater: "腾飞班1案例",
// pubtime: "2022-07-20 14:00:03",
cretime: "20分钟",
haspub: true,
checked1: true,
checkedd: false,
},
{
key: 4,
lei: "考试",
// state: "草稿",
creater: "管理者考试",
// pubtime: "2022-07-20 14:00:03",
cretime: "20分钟",
haspub: true,
checked1: false,
checkedd: false,
},
{
key: 5,
lei: "案例",
// state: "草稿",
creater: "腾飞班1案例",
// pubtime: "2022-07-20 14:00:03",
cretime: "20分钟",
haspub: true,
checked1: true,
checkedd: false,
},
// {
// key: 1,
// lei: "在线",
// // state: "已发布",
// creater: "管理者课程",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "60分钟",
// haspub: false,
// checked1: false,
// checkedd: false,
// id: "ssss",
// },
// {
// key: 2,
// lei: "面授",
// // state: "草稿",
// creater: "管理者面授",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "20分钟",
// haspub: true,
// checked1: false,
// checkedd: false,
// },
// {
// key: 1,
// lei: "在线",
// // state: "已发布",
// creater: "管理者课程",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "60分钟",
// haspub: false,
// checked1: false,
// checkedd: false,
// },
// {
// key: 3,
// lei: "作业",
// // state: "已停用",
// creater: "管理者作业",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "60分钟",
// haspub: false,
// checked1: false,
// checkedd: false,
// },
// {
// key: 4,
// lei: "考试",
// // state: "草稿",
// creater: "管理者考试",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "20分钟",
// haspub: true,
// checked1: false,
// checkedd: false,
// },
// {
// key: 5,
// lei: "案例",
// // state: "草稿",
// creater: "腾飞班1案例",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "20分钟",
// haspub: true,
// checked1: true,
// checkedd: false,
// },
// {
// key: 4,
// lei: "考试",
// // state: "草稿",
// creater: "管理者考试",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "20分钟",
// haspub: true,
// checked1: false,
// checkedd: false,
// },
// {
// key: 5,
// lei: "案例",
// // state: "草稿",
// creater: "腾飞班1案例",
// // pubtime: "2022-07-20 14:00:03",
// cretime: "20分钟",
// haspub: true,
// checked1: true,
// checkedd: false,
// },
],
drawertableData: [
{
@@ -865,6 +865,7 @@ export default {
deleteInvistID: 4, //评估
deleteDiscussID: null, //删除讨论id
deleteActivityID: null, //删除活动id
deleteID: "", //删除任务的taskID
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
@@ -875,6 +876,47 @@ export default {
const afterVisibleChange = (bool) => {
console.log("visible", bool);
};
// 把数据放到state里
const getTableData = (tableData) => {
let data = tableData;
let array = [];
data.map((value) => {
let obj = {
id: value.projectTaskId,
key: value.projectTaskId,
lei:
value.type == 1
? "在线"
: value.type == 2
? "面授"
: value.type == 3
? "案例"
: value.type == 4
? "作业"
: value.type == 5
? "考试"
: value.type == 6
? "直播"
: value.type == 7
? "外链"
: value.type == 8
? "讨论"
: value.type == 10
? "测评"
: value.type == 11
? "评估"
: value.type == 12
? "投票"
: "-",
creater: value.name,
cretime: value.duration ? value.duration : "-",
checked1: value.flag ? true : false,
};
array.push(obj);
});
state.tableData = array;
};
const tableDataFunc = () => {
const columns = [
{
@@ -991,6 +1033,7 @@ export default {
style="color:#4EA6FF;cursor:pointer"
onClick={() => {
showDelete();
state.deleteID = text.record.id;
}}
>
删除
@@ -1007,17 +1050,19 @@ export default {
//获取任务列表
const getTask = () => {
let obj = {
projectId: 1,
projectId: 28,
};
api
.getTask(obj)
.then((res) => {
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
console.log("22222", res.data.data.stageList[0].taskList);
let arr = res.data.data.stageList[0].taskList;
getTableData(arr);
}
})
.catch((err) => {
console.log(err);
console.log("获取任务列表失败", err);
});
};
//删除直播
@@ -1055,7 +1100,7 @@ export default {
console.log(err);
});
};
//删除讨论
const deleteDiscuss = () => {
let obj = {
discussId: state.deleteDiscussID,
@@ -1152,6 +1197,7 @@ export default {
const deleteEvalText = () => {
let obj = {
evaluationId: state.deleteEvalID,
token: "",
};
apieval
.deleteEvaluationById(obj)
@@ -1265,7 +1311,8 @@ export default {
//删除评估测试
const deleteInvistText = () => {
let obj = {
evaluationId: state.deleteInvistID,
评估信息Id: "",
token: "",
};
apiinvist
.deleteAppraise(obj)
@@ -1313,6 +1360,18 @@ export default {
});
};
//删除任务
const deleteTask = () => {
let obj = { projectTaskIds: state.deleteID };
api
.deleteTask(obj)
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
};
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
@@ -1334,6 +1393,7 @@ export default {
const showModal1 = () => {
//关闭确认框
state.deleteModal = false;
deleteTask();
};
const closeModal = () => {
state.stage = false;
@@ -1344,6 +1404,12 @@ export default {
document.getElementsByTagName("main")[0].style.boxShadow = "none";
getTask();
});
onUpdated(() => {
// getTask();
// setTimeout(() => {
// getTask();
// }, 500);
});
onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff";
document.getElementsByTagName("main")[0].style.boxShadow =
@@ -1451,6 +1517,8 @@ export default {
editLiveBroadcast,
editExternal,
editInvistPath,
getTableData,
deleteTask,
};
},
};