hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-15 22:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

Browse Source
This commit is contained in:
wyx
2023-02-14 01:46:00 +08:00
parent 980d6e578d 4016fe6a64
commit 6869af05c3
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/drawers/AddLive.vue
View File

@@ -743,7 +743,6 @@ export default {
liveExplain: state.textV1,
liveNotice: state.liveNotice,
liveFlag: "",
id: props.edit ? Number(props.EditLiveId) : 0,
liveLink: state.inputV4,
liveName: state.inputV1,
livePlayback: state.switchC1 ? "1" : "0",

32
src/views/learningpath/LevelAddDetail.vue
View File

@@ -19,8 +19,8 @@
<draggable v-model="level" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="stage"
animation="500" @end="changeSort">
<template #item="{ element }">
<div class="items" :class="isactive == element.chapterId ? 'active' : ''"
@click="changebgc(element.chapterId)">
<div class="items" :class="isactive == element.id ? 'active' : ''"
@click="changebgc(element.id)">
<div class="items1">
<div class="boxs_left">
<a-popover placement="topLeft" trigger="click">
@@ -54,7 +54,7 @@
<div class="imgIcon" @click="showModal(element)"></div>
</div>
<div class="boxs_right">
<div class="imgIcon" @click="showDeleteChapter(element.chapterId)"></div>
<div class="imgIcon" @click="showDeleteChapter(element.id)"></div>
</div>
</div>
<div class="items2">
@@ -555,7 +555,7 @@
)">
编辑
</span>
<span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.routerTaskId)">
<span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.id)">
删除
</span>
</div>
@@ -1000,6 +1000,7 @@ export default {
chooseChapterId: null,
updateChapterID: null, //编辑关卡id
updateID: null, //编辑关卡id
deleteChapterModal: false, //删除关卡弹窗
deleteChapterId: null, //删除关卡id
@@ -1021,7 +1022,7 @@ export default {
state.value1 = element.name;
state.value2 = element.remark;
state.updateChapterID = element.chapterId;
state.updateID = element.id;
}
};
const closeModal = () => {
@@ -1062,10 +1063,10 @@ export default {
name: state.value1,
remark: state.value2,
routerId: state.routerId,
id: state.updateID,
chapterId: state.updateChapterID,
};
api
.updateChapter(obj)
api.updateChapter(obj)
.then((res) => {
console.log("修改成功", res);
message.success("修改成功");
@@ -1121,7 +1122,7 @@ export default {
const deleteChapter = () => {
console.log("chapterId", state.deleteChapterId);
let obj = {
chapterId: state.deleteChapterId,
id: state.deleteChapterId,
};
api
.deleteChapter(obj)
@@ -1288,22 +1289,16 @@ export default {
const dataAssignment = (id) => {
console.log(state.level);
for (let i = 0; i < state.level.length; i++) {
console.log("state.level[i].chapterId", state.level[i].chapterId, id);
if (state.level[i].chapterId == Number(id)) {
if (state.level[i].id == Number(id)) {
let array = [];
state.chooseProjectList = JSON.stringify(state.level[i].taskList);
console.log("state.level[i].taskList", state.level[i].taskList);
state.level[i].taskList.forEach((element) => {
console.log("element", element);
let obj = {
id: element.routerTaskId,
id: element.id,
key: element.routerTaskId,
lei: checkType(element.type),
creater: element.name,
cretime:
element.duration || element.duration == 0
? element.duration
: "-",
cretime: element.duration || element.duration === 0 ? element.duration : "-",
checked1: element.flag,
routerTaskId: element.routerTaskId,
courseId: element.courseId,
@@ -1313,12 +1308,9 @@ export default {
chapterId: element.chapterId,
...element
};
// console.log("obj", obj);
array.push(obj);
// console.log("array", array);
});
state.tableData = array;
// console.log("tableData", state.tableData);
}
}
};