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

This commit is contained in:
岳佳鑫
2022-11-07 18:02:36 +08:00
3 changed files with 210 additions and 194 deletions

3
src/api/indexStudy.js Normal file
View File

@@ -0,0 +1,3 @@
import http from "./config";
//路径图删除任务
export const deleteStudyTask = (obj) => http.delete('/admin/router/deleteTask', { params: obj })

View File

@@ -382,4 +382,4 @@ export default {
} }
} }
} }
</style> </style>

View File

@@ -501,12 +501,13 @@
margin-right: 25px; margin-right: 25px;
cursor: pointer; cursor: pointer;
" "
@click="decideType(element.lei, element.courseId)"
> >
编辑 编辑
</span> </span>
<span <span
style="color: #4ea6ff; cursor: pointer" style="color: #4ea6ff; cursor: pointer"
@click="showDelete(element.id)" @click="showDeleteModal(element.id)"
> >
删除 删除
</span> </span>
@@ -516,22 +517,6 @@
</div> </div>
</template> </template>
</draggable> </draggable>
<!-- <a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:customRow="handleClickRow"
:pagination="false"
:row-selection="{
columnWidth: 30,
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/> -->
</div> </div>
<!-- 无数据样式 --> <!-- 无数据样式 -->
<div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }"> <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
@@ -780,9 +765,16 @@
<add-live <add-live
v-model:addliveVisible="addlivevisible" v-model:addliveVisible="addlivevisible"
v-model:isStudy="isStudy" v-model:isStudy="isStudy"
v-model:isactive="isactive"
v-model:routerId="routerId"
/> />
<!-- 添加外链抽屉 --> <!-- 添加外链抽屉 -->
<add-ref v-model:addrefVisible="addrefvisible" v-model:isStudy="isStudy" /> <add-ref
v-model:addrefVisible="addrefvisible"
v-model:isStudy="isStudy"
v-model:isactive="isactive"
v-model:routerId="routerId"
/>
<!-- 是否确认删除任务弹窗 --> <!-- 是否确认删除任务弹窗 -->
<!-- 确认删除阶段弹窗 --> <!-- 确认删除阶段弹窗 -->
<a-modal <a-modal
@@ -831,9 +823,10 @@ import AddVote from "../../components/drawers/AddVote.vue";
import AddLive from "../../components/drawers/AddLive.vue"; import AddLive from "../../components/drawers/AddLive.vue";
import AddRef from "../../components/drawers/AddRef.vue"; import AddRef from "../../components/drawers/AddRef.vue";
import * as api from "../../api/indexLevel"; import * as api from "../../api/indexLevel";
import { GetRouterDetail, RouterDeleteTask } from "../../api/indexTask"; import { GetRouterDetail } from "../../api/indexTask";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { storage } from "../../api/storage"; import { storage } from "../../api/storage";
import { deleteStudyTask } from "../../api/indexStudy";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
export default { export default {
name: "LevelAddDetail", name: "LevelAddDetail",
@@ -863,6 +856,10 @@ export default {
name: "默认关卡", name: "默认关卡",
}, },
], ],
isRefEdit: 1, //外链编辑
isLiveEdit: 1, //直播编辑
EditRefId: null, //要编辑的外链的id
EditLiveId: null, //要编辑的直播的id
tableData: [ tableData: [
{ {
key: 1, key: 1,
@@ -1178,6 +1175,7 @@ export default {
cretime: element.duration, cretime: element.duration,
checked1: element.flag, checked1: element.flag,
routerTaskId: element.routerTaskId, routerTaskId: element.routerTaskId,
courseId: element.courseId,
}; };
array.push(obj); array.push(obj);
}); });
@@ -1220,135 +1218,128 @@ export default {
const showImpStu = () => { const showImpStu = () => {
state.AddImpStuvisible = true; state.AddImpStuvisible = true;
}; };
const tableDataFunc = () => { // const tableDataFunc = () => {
const columns = [ // const columns = [
{ // {
title: "类型", // title: "类型",
dataIndex: "state", // dataIndex: "state",
// width: "30%", // // width: "30%",
key: "state", // key: "state",
width: 60, // width: 60,
align: "left", // align: "left",
className: "classify", // className: "classify",
scopedSlots: { customRender: "action" }, //引入的插槽 // scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => { // customRender: (text) => {
// console.log(text.record.checked1); // // console.log(text.record.checked1);
return ( // return (
<div class="racona"> // <div class="racona">
<div // <div
class="img" // class="img"
style={{ cursor: "pointer" }} // style={{ cursor: "pointer" }}
onClick={() => { // onClick={() => {
console.log("点击了"); // console.log("点击了");
}} // }}
></div> // ></div>
<span> {text.record.lei}</span> // <span> {text.record.lei}</span>
// </div>
{/** // );
<div class="img"></div> // },
<a-checkbox class="ch" checked={text.record.checkedd}> // },
{text.record.lei} // {
</a-checkbox> // title: "任务名称",
*/} // dataIndex: "creater",
</div> // // width: "30%",
); // key: "creater",
}, // width: 200,
}, // align: "center",
{ // className: "h",
title: "任务名称", // },
dataIndex: "creater", // {
// width: "30%", // title: "必修/选修",
key: "creater", // dataIndex: "pubtime",
width: 200, // key: "pubtime",
align: "center", // // width: 100,
className: "h", // align: "center",
}, // className: "h",
{ // scopedSlots: { customRender: "action" }, //引入的插槽
title: "必修/选修", // customRender: (text) => {
dataIndex: "pubtime", // // console.log(text.record.checked1);
key: "pubtime", // return (
// width: 100, // <div class="opat">
align: "center", // <div class="opacationt clearfix">
className: "h", // <a-switch
scopedSlots: { customRender: "action" }, //引入的插槽 // style="margin-left:-50px;margin-top:3px"
customRender: (text) => { // checked={text.record.checked1}
// console.log(text.record.checked1); // size="small"
return ( // active-color="red"
<div class="opat"> // onClick={() => {
<div class="opacationt clearfix"> // console.log("点击了");
<a-switch // text.record.checked1 = !text.record.checked1;
style="margin-left:-50px;margin-top:3px" // }}
checked={text.record.checked1} // />
size="small" // <div class="showt clearfix">
active-color="red" // <div
onClick={() => { // class="bi"
console.log("点击了"); // style={
text.record.checked1 = !text.record.checked1; // text.record.checked1 ? "z-index:999" : "z-index:998"
}} // }
/> // >
<div class="showt clearfix"> // 必修
<div // </div>
class="bi" // <div class="xuan">选修</div>
style={ // </div>
text.record.checked1 ? "z-index:999" : "z-index:998" // </div>
} // </div>
> // );
必修 // },
</div> // },
<div class="xuan">选修</div> // {
</div> // title: "时长",
</div> // dataIndex: "cretime",
</div> // key: "cretime",
); // // width: 100,
}, // align: "center",
}, // className: "h",
{ // },
title: "时长", // {
dataIndex: "cretime", // title: "操作",
key: "cretime", // className: "h",
// width: 100, // dataIndex: "opacation",
align: "center", // key: "opacation",
className: "h", // // width: 100,
}, // align: "center",
{ // scopedSlots: { customRender: "action" }, //引入的插槽
title: "操作", // customRender: (e) => {
className: "h", // return (
dataIndex: "opacation", // <div class="opa">
key: "opacation", // <div class="opacation">
// width: 100, // <span
align: "center", // style="color:#4EA6FF;margin-right:25px;cursor:pointer"
scopedSlots: { customRender: "action" }, //引入的插槽 // onClick={() => {
customRender: (e) => { // console.log("编辑id", e.record.routerTaskId);
return ( // console.log("编辑类型", e.record.lei);
<div class="opa"> // state.editID = e.record.routerTaskId;
<div class="opacation"> // //state.addhomeworkvisible = true;
<span // }}
style="color:#4EA6FF;margin-right:25px;cursor:pointer" // >
onClick={() => { // 编辑
console.log("编辑id", e.record.routerTaskId); // </span>
console.log("编辑类型", e.record.lei); // <span
state.editID = e.record.routerTaskId; // style="color:#4EA6FF;cursor:pointer"
//state.addhomeworkvisible = true; // onClick={() => {
}} // showDeleteModal(e.record.routerTaskId);
> // }}
编辑 // >
</span> // 删除
<span // </span>
style="color:#4EA6FF;cursor:pointer" // </div>
onClick={() => { // </div>
showDeleteModal(e.record.routerTaskId); // );
}} // },
> // },
删除 // ];
</span> // return columns;
</div> // };
</div>
);
},
},
];
return columns;
};
const checkType = (index) => { const checkType = (index) => {
let typeRules = [ let typeRules = [
"", "",
@@ -1383,13 +1374,6 @@ export default {
return ( return (
<div class="racona"> <div class="racona">
<span> {text.record.name}</span> <span> {text.record.name}</span>
{/**
<div class="img"></div>
<a-checkbox class="ch" checked={text.record.checkedd}>
{text.record.lei}
</a-checkbox>
*/}
</div> </div>
); );
}, },
@@ -1560,9 +1544,9 @@ export default {
}); });
const changebgc = (chapterId) => { const changebgc = (chapterId) => {
state.isactive = chapterId; state.isactive = chapterId;
state.selectRow = [] //选择行 state.selectRow = []; //选择行
state.selectAll = 0 //0未选择1全选2部分选择 state.selectAll = 0; //0未选择1全选2部分选择
dataAssignment(chapterId); dataAssignment(chapterId);
}; };
const gqxy_hShow = () => { const gqxy_hShow = () => {
state.gqxy_hs = !state.gqxy_hs; state.gqxy_hs = !state.gqxy_hs;
@@ -1576,6 +1560,7 @@ export default {
}; };
const showDeleteModal = (id) => { const showDeleteModal = (id) => {
state.deleteID = id; state.deleteID = id;
console.log(id);
state.deleteModal = true; state.deleteModal = true;
}; };
const closeConfirm = () => { const closeConfirm = () => {
@@ -1584,14 +1569,17 @@ export default {
state.editID = ""; state.editID = "";
}; };
const deleteLevelTask = () => { const deleteLevelTask = () => {
RouterDeleteTask(state.listChoosedId) deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>
.then((res) => { console.log("删除成功", res)
console.log(`删除成功${res}`); );
message.success("删除成功"); // RouterDeleteTask(state.listChoosedId)
}) // .then((res) => {
.catch((err) => { // console.log(`删除成功${res}`);
console.log(`删除失败${err}`); // message.success("删除成功");
}); // })
// .catch((err) => {
// console.log(`删除失败${err}`);
// });
}; };
const showDrawerAddLive = () => { const showDrawerAddLive = () => {
@@ -1665,44 +1653,65 @@ export default {
//批量删除任务 //批量删除任务
const deletecTaskAll = () => { const deletecTaskAll = () => {
let arr = state.selectRow; let arr = state.selectRow;
console.log("选择的行信息",arr); console.log("选择的行信息", arr);
arr.map( value => { arr.map((value) => {
let obj = { let obj = {
routerTaskIds: value, routerTaskIds: value,
} };
console.log("value",value); console.log("value", value);
api api
.deleteTask(obj) .deleteTask(obj)
.then((res) => { .then((res) => {
console.log(res); console.log(res);
message.destroy(); message.destroy();
message.success("批量删除成功"); message.success("批量删除成功");
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
}) });
} };
//移动任务到关卡 //移动任务到关卡
const moveTask = () => { const moveTask = () => {
let obj = { let obj = {
chapterId: state.isactive, chapterId: state.isactive,
routerTaskIdList: state.selectRow, routerTaskIdList: state.selectRow,
} };
api api
.moveTask(obj) .moveTask(obj)
.then((res) => { .then((res) => {
console.log("移动成功",res); console.log("移动成功", res);
message.destroy(); message.destroy();
message.success("移动成功"); message.success("移动成功");
}) })
.catch((err) => { .catch((err) => {
console.log("移动失败",err); console.log("移动失败", err);
}) });
} };
//打开编辑外链的弹窗
const showEditRefDrawer = (id) => {
state.addrefvisible = true;
state.isRefEdit = 2;
state.EditRefId = id;
};
//打开编辑直播的弹窗
const showEditLiveDrawer = (id) => {
state.addlivevisible = true;
state.isLiveEdit = 2;
state.EditLiveId = id;
};
//编辑的按钮
const decideType = (type, id) => {
console.log(type, id);
if (type == "外链") {
showEditRefDrawer(id);
} else if (type == "直播") {
showEditLiveDrawer(id);
}
};
return { return {
...toRefs(state), ...toRefs(state),
tableDataFunc, // tableDataFunc,
tableDataFunc2, tableDataFunc2,
showDrawer, showDrawer,
closeDrawer, closeDrawer,
@@ -1737,6 +1746,10 @@ export default {
changeRow, changeRow,
deletecTaskAll, deletecTaskAll,
moveTask, moveTask,
showDeleteModal,
showEditRefDrawer,
showEditLiveDrawer,
decideType,
}; };
}, },
}; };