feat:合并

This commit is contained in:
岳佳鑫
2022-11-07 11:14:46 +08:00
6 changed files with 420 additions and 269 deletions

View File

@@ -28,9 +28,7 @@
<template #item="{ element }">
<div
class="item"
:class="
chooseStageId == element.id ? 'bgcactive' : ''
"
:class="chooseStageId == element.id ? 'bgcactive' : ''"
@click="changebgc(element.id)"
>
<div class="itemle">
@@ -173,6 +171,7 @@
v-model:addliveVisible="addlivevisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
/>
</div>
<!-- 添加直播侧弹窗 -->
@@ -190,6 +189,9 @@
<add-ref
v-model:addrefVisible="addrefvisible"
@changeData="updateTableData"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
v-model:isRefEdit="isRefEdit"
/>
</div>
<!-- 添加外链侧弹窗 -->
@@ -763,8 +765,8 @@ import * as apistage from "../../api/indexStage";
import * as apimove from "../../api/indexMovetask";
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
import {updateExamination,deleteExaminationById} from "@/api/indexExam"
import { updateWorkTaskUsing, deleteWorkTask} from "@/api/indexWork";
import { updateExamination, deleteExaminationById } from "@/api/indexExam";
import { updateWorkTaskUsing, deleteWorkTask } from "@/api/indexWork";
const drawercolumns = [
{
@@ -824,8 +826,11 @@ export default {
},
setup() {
const state = reactive({
projectId: storage.get("projectId") ?JSON.parse(storage.get("projectId")) : null,
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
: null,
chooseStageId: null,
isRefEdit: 1, //外链编辑
projectNameList: [
{
id: 1,
@@ -1019,7 +1024,7 @@ export default {
const getTableData = (tableData) => {
let data = tableData;
let array = [];
console.log('data',data)
console.log("data", data);
data.map((value) => {
let obj = {
id: value.projectTaskId,
@@ -1064,13 +1069,13 @@ export default {
const getStageData = (tableData) => {
let data = tableData;
let array = [];
console.log('tableData',data)
console.log("tableData", data);
data.map((value) => {
let obj = {
id: value.stageId,
tit: value.name,
name: value.remark,
taskList:value.taskList,
taskList: value.taskList,
};
array.push(obj);
});
@@ -1220,12 +1225,12 @@ export default {
console.log("22222", res.data.data.stageList);
// console.log("22222", res.data.data.stageList);
let leng = res.data.data.stageList.length;
if( leng > 0){
//获取任务列表
let arr = res.data.data.stageList[0].taskList;
getTableData(arr);
if (leng > 0) {
//获取任务列表
let arr = res.data.data.stageList[0].taskList;
getTableData(arr);
}
let stagearr = res.data.data.stageList;
console.log(stagearr, 111111);
if (stagearr.length > 0) {
@@ -1257,40 +1262,43 @@ export default {
// 编辑考试
const updateTest = (id) => {
let obj = {
"createTime": "",
"createUser": 0,
"examinationDuration": '',
"examinationEndTime": '',
"examinationExplain": '',
"examinationFlag": "",
"examinationId": id || 0,
"examinationLimit": '',
"examinationName": '',
"examinationPaperId": 0,
"examinationPaperName": '',
"examinationStartTime": '',
"examinationTag": "",
"passLine": '',
"questionArrangement": '',
"scoringModel": '',
"showAnalysis": '',
"showAnswers": '',
"updateTime": "",
"updateUser": 0
}
updateExamination(obj).then((res)=>{
console.log(res);
message.error(`编辑成功`);
}).catch(()=>{
message.error(`编辑失败`)
})
}
createTime: "",
createUser: 0,
examinationDuration: "",
examinationEndTime: "",
examinationExplain: "",
examinationFlag: "",
examinationId: id || 0,
examinationLimit: "",
examinationName: "",
examinationPaperId: 0,
examinationPaperName: "",
examinationStartTime: "",
examinationTag: "",
passLine: "",
questionArrangement: "",
scoringModel: "",
showAnalysis: "",
showAnswers: "",
updateTime: "",
updateUser: 0,
};
updateExamination(obj)
.then((res) => {
console.log(res);
message.error(`编辑成功`);
})
.catch(() => {
message.error(`编辑失败`);
});
};
// 删除考试
const deleteTest = () => {
let obj = {
examinationId:0,
}
deleteExaminationById(obj).then((res) => {
examinationId: 0,
};
deleteExaminationById(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
@@ -1299,14 +1307,15 @@ export default {
.catch((err) => {
console.log(err);
});
}
};
// 删除作业
const deleteWork = () => {
let obj = {
workId:0,
}
deleteWorkTask(obj).then((res) => {
workId: 0,
};
deleteWorkTask(obj)
.then((res) => {
console.log("删除成功", res);
message.success("删除成功");
//重新获取列表
@@ -1315,29 +1324,31 @@ export default {
.catch((err) => {
console.log(err);
});
}
};
// 编辑作业
const updateWork = () => {
let obj = {
"createTime": "",
"createUser": 0,
"submitEndTime": '',
"submitStartTime": '',
"updateTime": "",
"updateUser": 0,
"workEnclosureAddress": "",
"workFlag": "",
"workId": 0,
"workName": '',
"workRequirement": '',
"workTag": ""
}
createTime: "",
createUser: 0,
submitEndTime: "",
submitStartTime: "",
updateTime: "",
updateUser: 0,
workEnclosureAddress: "",
workFlag: "",
workId: 0,
workName: "",
workRequirement: "",
workTag: "",
};
updateWorkTaskUsing(obj).then((res) => {
console.log(res);
}).catch((err) => {
message.error(`编辑失败${err}`)
})
updateWorkTaskUsing(obj)
.then((res) => {
console.log(res);
})
.catch((err) => {
message.error(`编辑失败${err}`);
});
};
//删除直播
@@ -1702,9 +1713,9 @@ export default {
//移动任务到阶段
const moveTask = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
arr.map( value => {
console.log("value:",value);
console.log("选择的行信息", arr);
arr.map((value) => {
console.log("value:", value);
let obj = {
chapterId: state.chooseStageId,
routerTaskIdList: value,
@@ -1717,18 +1728,18 @@ export default {
message.success("移动成功");
})
.catch((err) => {
console.log("移动失败",err);
})
})
console.log("移动失败", err);
});
});
};
//批量删除
const deleteTaskAll = () => {
let arr = state.selectRow;
console.log("选择的行信息",arr);
arr.map( value => {
console.log("选择的行信息", arr);
arr.map((value) => {
let obj = {
projectTaskIds: value,
}
};
api
.deleteTask(obj)
.then((res) => {
@@ -1842,11 +1853,11 @@ export default {
const closeDelete = () => {
state.deleteModal = false;
};
const changebgc = ( id) => {
const changebgc = (id) => {
state.isActive = !state.isActive;
state.selectRow = [] //选择行
state.selectAll = 0 //0未选择1全选2部分选择
console.log('state.level',id,state.level);
state.selectRow = []; //选择行
state.selectAll = 0; //0未选择1全选2部分选择
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
getTableData(final.taskList);
@@ -1907,6 +1918,10 @@ export default {
const changeCourseType = (id) => {
console.log("任务id", id);
};
//展示编辑外链弹窗
const showDrawerEditRef = () => {
state.addrefvisible = true;
};
return {
...toRefs(state),
selectProjectName,
@@ -1967,6 +1982,7 @@ export default {
updateWork,
deleteTest,
deleteWork,
showDrawerEditRef,
};
},
};
@@ -2831,7 +2847,7 @@ export default {
display: flex;
margin-left: 10px;
height: 23px;
position: relative;
position: relative;
.bi {
// margin-top: 10px;
width: 63px;