-- fix bug

This commit is contained in:
yuping
2023-03-02 11:48:11 +08:00
parent ce554b07f4
commit 5f1157c028
2 changed files with 107 additions and 83 deletions

View File

@@ -82,8 +82,8 @@
</div>
<div class="name">
<div
class="d"
style="width: 10px;
class="d"
style="width: 10px;
height: 10px;
margin-top: 2px;
margin-right: 2px;"></div>
@@ -118,9 +118,9 @@
<div class="select" style="margin-right:90px;">
<span>学习模式</span>
<span
style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
{{
routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式' : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式' : ''
routerInfo.routerInfo.unlockMode == 1 ? "自由学习模式" : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? "闯关模式" : ""
}}
</span>
<unlock-mode :routerInfo="routerInfo.routerInfo" :types="types">
@@ -216,8 +216,8 @@
animation="500">
<template #item="{ element,index }">
<div
v-if="!element.deleted"
style="
v-if="!element.deleted"
style="
height: 50px;
display: flex;
justify-content: space-between;
@@ -241,7 +241,7 @@
left: -25px;"></div>
<a-checkbox :id="element.id" v-model:checked="element.checked"></a-checkbox>
<div style="margin-top: 2px; margin-left: 8px">
{{ TASK_TYPE[element.type]?.name || '' }}
{{ TASK_TYPE[element.type]?.name || "" }}
</div>
</div>
</div>
@@ -280,10 +280,10 @@
<div class="opa">
<div class="opacation">
<span
style="color: #4ea6ff;
style="color: #4ea6ff;
margin-right: 25px;
cursor: pointer;"
@click="editTaskForType(element,index)">
@click="editTaskForType(element,index)">
编辑
</span>
<span style="color: #4ea6ff; cursor: pointer" @click="deleteTask(element,index)">
@@ -374,48 +374,47 @@ import {ROUTER_DETAIL_MODIFY} from "@/api/apis";
import {request} from "@/api/request";
import dialog from "@/utils/dialog";
const {query: {routerId}} = useRoute();
const modal = ref(false)
const ischapterEdit = ref(false)
const visiblene = ref(false)
const cancleLoading = ref(false)
const confirmLoading = ref(false)
const moveChapterIndex = ref('')
const activeIndex = ref(0)
const types = 1 // 1 路径图 2 项目
const courseRef = ref({})
const formValue = ref({draftTaskList: []})
const routerInfo = ref({chapterList: [{name: '关卡一', draftTaskList: []}], routerInfo: {}})
const { query: { routerId } } = useRoute();
const modal = ref(false);
const ischapterEdit = ref(false);
const visiblene = ref(false);
const cancleLoading = ref(false);
const confirmLoading = ref(false);
const moveChapterIndex = ref("");
const activeIndex = ref(0);
const types = 1; // 1 路径图 2 项目
const courseRef = ref({});
const formValue = ref({ draftTaskList: [] });
const routerInfo = ref({ chapterList: [{ name: "关卡一", draftTaskList: [] }], routerInfo: {} });
const selectAll = computed(() => {
const selectedNum = routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).length
const selectedNum = routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).length;
if (!selectedNum) {
return 0
return 0;
}
if (selectedNum === routerInfo.value.chapterList[activeIndex.value].draftTaskList.length) {
return 1
return 1;
}
return 2
})
return 2;
});
watch(() => routerInfo.value.chapterList, () => {
routerInfo.value.chapterList.forEach((t, i) => {
t.sort = i;
t.draftTaskList?.forEach((s, j) => {
s.sort = j
})
})
}, {deep: true})
s.sort = j;
});
});
}, { deep: true });
const showModal = (e,type) => {
const showModal = (e, type) => {
ischapterEdit.value = (type === "edit");
console.log(ischapterEdit.value)
if(type == 'edit'){
console.log(ischapterEdit.value);
if (type == "edit") {
console.log("关卡信息:" + e.name);
formValue.value = e;//回传修改的信息
}else{
} else {
//关卡信息初始化
formValue.value = {};
}
@@ -430,26 +429,30 @@ const editChapter = () => {
if (!formValue.value.name) {
return message.warning("请输入关卡名称");
}
if(ischapterEdit.value){
routerInfo.value.chapterList = [{...formValue.value, draftTaskList: []}];
if (ischapterEdit.value) {
routerInfo.value.chapterList = [{ ...formValue.value, draftTaskList: [] }];
} else {
routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] });
}
else{
routerInfo.value.chapterList.push({...formValue.value, draftTaskList: []})
}
formValue.value = {draftTaskList: []}
closeModal()
formValue.value = { draftTaskList: [] };
closeModal();
};
//删除关卡
const deleteChapter = () => {
dialog({
content: '确定要删除关卡吗?',
content: "确定要删除关卡吗?",
ok: () => {
if (routerInfo.value.chapterList.length === 1) {
message.warning("至少保留一个关卡");
return
return;
}
if (routerInfo.value.chapterList[activeIndex.value].id) {
routerInfo.value.chapterList[activeIndex.value].deleted = true;
routerInfo.value.chapterList[activeIndex.value].draftTaskList?.forEach((t, i) => t.id ? (t.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(i, 1));
} else {
routerInfo.value.chapterList.splice(activeIndex.value, 1);
}
routerInfo.value.chapterList[activeIndex.value].id ? (routerInfo.value.chapterList[activeIndex.value].deleted = true) : routerInfo.value.chapterList.splice(activeIndex.value, 1);
activeIndex.value && (activeIndex.value = activeIndex.value - 1);
message.info("删除关卡成功");
},
@@ -458,8 +461,8 @@ const deleteChapter = () => {
const getDetail = async () => {
await GetRouterDraftDetail(routerId).then((res) => {
routerInfo.value = res.data.data
})
routerInfo.value = res.data.data;
});
};
onMounted(() => {
@@ -467,19 +470,19 @@ onMounted(() => {
});
const changebgc = (index) => {
activeIndex.value = index
activeIndex.value = index;
};
const subdeleteAll = () => {
if (!routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList?.filter(t => t.checked)?.length) {
message.warning("请选择要删除的任务!");
return
return;
}
dialog({
content: '确定要删除所选任务吗?',
content: "确定要删除所选任务吗?",
ok: () => {
for (let i = 0; i < routerInfo.value.chapterList[activeIndex.value].draftTaskList.length; i++) {
const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i]
const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i];
if (t.checked) {
if (t.id) {
t.checked = false;
@@ -497,10 +500,10 @@ const subdeleteAll = () => {
//全选任务或全不选任务
const selectRowAll = () => {
if (selectAll.value === 1) {
routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = false)
return
routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = false);
return;
}
routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = true)
routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = true);
};
//移动任务到关卡
const moveTask = () => {
@@ -513,15 +516,15 @@ const moveTask = () => {
};
//编辑的按钮
const editTaskForType = (ele, index) => {
courseRef.value['el' + ele.type].openDrawer(index, ele)
courseRef.value["el" + ele.type].openDrawer(index, ele);
};
function deleteTask(element, index) {
dialog({
content: '确定要删除此任务吗?',
content: "确定要删除此任务吗?",
ok: () => {
message.success("删除成功");
routerInfo.value.chapterList[activeIndex.value].draftTaskList[index].id ? (element.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(index, 1)
routerInfo.value.chapterList[activeIndex.value].draftTaskList[index].id ? (element.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(index, 1);
},
});
}
@@ -529,51 +532,51 @@ function deleteTask(element, index) {
const showChangeModal = () => {
if (routerInfo.value?.chapterList?.length <= 1) {
message.warning("请添加关卡!");
return
return;
}
if (!routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList?.filter(t => t.checked)?.length) {
message.warning("请选择要移动的任务!");
return
return;
}
visiblene.value = true
visiblene.value = true;
};
const closeChangeModal = () => {
visiblene.value = false
visiblene.value = false;
};
//暂存
const temporaryStorage = async () => {
confirmLoading.value = true
await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
await getDetail()
confirmLoading.value = true;
await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
await getDetail();
message.success("暂存成功");
confirmLoading.value = false
confirmLoading.value = false;
};
const submitStorage = async () => {
if (routerInfo.value.routerInfo.status === 1) {
dialog({
content: '该路径图已经发布,修改后如未点击暂存当前操作未保存数据将丢失,确认保存?',
content: "该路径图已经发布,修改后如未点击暂存当前操作未保存数据将丢失,确认保存?",
ok: async () => {
confirmLoading.value = true
await releaseRouter(routerId)
confirmLoading.value = true;
await releaseRouter(routerId);
message.success("关卡和任务数据已保存");
confirmLoading.value = false
confirmLoading.value = false;
},
})
return
});
return;
}
confirmLoading.value = true
await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
message.success("关卡和任务数据已保存")
confirmLoading.value = false
confirmLoading.value = true;
await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
message.success("关卡和任务数据已保存");
confirmLoading.value = false;
};
//取消
const cancelStorage = async () => {
cancleLoading.value = true
await getDetail()
cancleLoading.value = true;
await getDetail();
message.success("取消成功");
cancleLoading.value = false
cancleLoading.value = false;
};
</script>
@@ -605,7 +608,7 @@ const cancelStorage = async () => {
width: calc(100%);
height: 40px;
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0) 100%);
}
.del_main {
@@ -722,7 +725,7 @@ const cancelStorage = async () => {
position: relative;
justify-content: center;
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0) 100%);
.inhe {
width: 80%;
@@ -835,8 +838,8 @@ const cancelStorage = async () => {
width: 624px;
height: 68px;
background: linear-gradient(180deg,
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
display: flex;
justify-content: center;
@@ -2076,7 +2079,7 @@ const cancelStorage = async () => {
width: calc(100%);
height: 40px;
background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
rgba(78, 166, 255, 0) 100%);
rgba(78, 166, 255, 0) 100%);
}
.del_main {