feat:合并

This commit is contained in:
lixg
2022-12-21 16:32:50 +08:00
2 changed files with 21 additions and 15 deletions

View File

@@ -225,6 +225,7 @@
</div>
<a-radio-group v-model:value="valueE1">
<div class="bc_box">
<!-- 2022-12-21 隐藏 后面放开 lixiaoge -->
<!-- <div class="bc_boxl">
<div class="ol_checkbox" @click="expectOnline">
<a-radio

View File

@@ -1028,19 +1028,7 @@
<div class="close_exit" @click="closeDeleteStage"></div>
</div>
<div class="body">
<span
style="
width: 320px;
display: flex;
justify-content: center;
align-items: center;
"
>{{
level.length == 1
? "当前阶段为第一阶段,删除后任务将被移出,为无阶段模式,确认删除阶段吗?"
: "您确定要删除此阶段"
}}</span
>
<span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段,删除后任务将被移出,为无阶段模式,确认删除阶段吗?":"您确定要删除此阶段"}}</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn1" @click="closeDeleteStage">
@@ -1108,8 +1096,9 @@ export default {
const route = useRoute();
const state = reactive({
projectId: route.query.projectId,
chooseStageId: null,
chooseStageId: null,
removeStageId: null,
onceChoice: true,
edit: false,
isLevel: 2, //学习路径1项目2模板库3
// isRefEdit: 1, //外链编辑
@@ -1268,7 +1257,8 @@ export default {
array.push(obj);
}
});
state.level = array;
console.log(array)
state.level = array.sort((a,b)=>{ return a.id - b.id });
};
const tableDataFunc = () => {
@@ -1406,11 +1396,26 @@ export default {
};
await api.getTask(obj).then((res) => {
console.log("22222", res.data.data.stageList);
if(state.onceChoice){
let data = res.data.data.stageList;
state.onceChoice = false;
let arraynew = []
for(let i=0;i<data.length;i++){
if(data[i].stageId!=='0'){
arraynew.push(data[i])
}
}
console.log(arraynew)
state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
}
state.projectTitle = res.data.data.projectInfo.name;
state.picUrl = res.data.data.projectInfo.picUrl;
state.stageList = res.data.data.stageList;
getStageData(res.data.data.stageList);
updateStageChoosd();
});
};