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

@@ -70,10 +70,11 @@
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import { reactive, toRefs } from "vue"; import { reactive, toRefs, onMounted } from "vue";
import * as api from "../../api/indexInvist"; import * as api from "../../api/indexInvist";
import * as apitaskadd from "../../api/indexTaskadd"; import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { toDate } from "../../api/method";
import { RouterEditTask } from "@/api/indexTask"; import { RouterEditTask } from "@/api/indexTask";
export default { export default {
name: "AddInvist", name: "AddInvist",
@@ -97,6 +98,9 @@ export default {
const state = reactive({ const state = reactive({
inputV1: "", inputV1: "",
time: undefined, time: undefined,
currentPage: 1,
pageSize: 10,
tableDataTotal: -1,
tableData: [ tableData: [
// { // {
// key: 1, // key: 1,
@@ -105,13 +109,6 @@ export default {
// creator: "管理员", // creator: "管理员",
// time: "2022-07-21 14:30:25", // time: "2022-07-21 14:30:25",
// }, // },
// {
// key: 2,
// name: "评估",
// num: "8",
// creator: "管理员",
// time: "2022-07-21 14:30:25",
// },
], ],
}); });
const closeDrawer = () => { const closeDrawer = () => {
@@ -175,14 +172,74 @@ export default {
}; };
const rowSelection = { const rowSelection = {
onChange: (selectedRowKeys, selectedRows) => { onChange: (selectedRowKeys, selectedRows) => {
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); console.log(
`selectedRowKeys: ${selectedRowKeys}`,
"selectedRows: ",
selectedRows
);
}, },
getCheckboxProps: record => ({ getCheckboxProps: (record) => ({
// disabled: record.name === 'Disabled User', // disabled: record.name === 'Disabled User',
// // Column configuration not to be checked // // Column configuration not to be checked
name: record.name, name: record.name,
}), }),
}; };
const getTableDate = (tableData) => {
let data = tableData;
let array = [];
data.map((value, index) => {
console.log("123", value);
let obj = {
id: value.routerId,
key: index,
num: value.essayQuestionVoList.length,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: value.createTime
? toDate(new Date(value.createTime).getTime() / 1000, "Y-M-D h:m:s")
: "-",
};
array.push(obj);
});
state.tableData = array;
};
//获取全部评估信息接口
const getAllInvistText = () => {
let obj = {
assessmentName: "",
pageNo: state.currentPage,
pageSize: state.pageSize,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
};
api
.queryAssessmentDetailList(obj)
.then((res) => {
if (res.status === 200) {
// console.log("获取路径列表数据", res.data.data);
let arr = res.data.data.rows;
if (
arr.length === 0 &&
res.data.data.total > 0 &&
state.currentPage > 1
) {
state.currentPage = state.currentPage - 1;
getAllInvistText();
}
getTableDate(arr);
state.tableDataTotal = Number(res.data.data.total);
}
console.log("获取全部评估信息接口成功", res);
message.success("获取全部评估信息接口成功");
console.log(obj);
})
.catch((err) => {
console.log("获取全部评估信息接口失败", err);
// state.createLoading = false;
});
};
//创建评估信息 //创建评估信息
const createInvist = () => { const createInvist = () => {
let obj = { let obj = {
@@ -208,18 +265,18 @@ export default {
closeDrawer(); closeDrawer();
getAllInvistText(); getAllInvistText();
if (props.learn == 0) if (props.learn == 0)
apitaskadd apitaskadd
.addTask({ .addTask({
courseId: 0, courseId: 0,
duration: 0, duration: 0,
flag: true, flag: true,
name: obj.appraiseName, name: obj.appraiseName,
projectId: 28, projectId: 28,
projectTaskId: 0, projectTaskId: 0,
stageId: 3, stageId: 3,
type: 11, type: 11,
}) })
.then((res) => { .then((res) => {
console.log("调用项目添加接口后", res.data); console.log("调用项目添加接口后", res.data);
//自定义事件给父组件传值 //自定义事件给父组件传值
ctx.emit("changeData", false); ctx.emit("changeData", false);
@@ -230,7 +287,7 @@ export default {
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
else { else {
let editObj1 = { let editObj1 = {
chapterId: 36, chapterId: 36,
courseId: 0, courseId: 0,
@@ -241,7 +298,7 @@ export default {
routerTaskId: 0, routerTaskId: 0,
type: 11, type: 11,
}; };
RouterEditTask(editObj1) RouterEditTask(editObj1);
} }
}) })
.catch((err) => { .catch((err) => {
@@ -250,28 +307,10 @@ export default {
}); });
}; };
//获取全部评估信息接口 onMounted(() => {
const getAllInvistText = () => { // createInvist();
let obj = { getAllInvistText();
assessmentName: "", });
pageNo: 0,
pageSize: 0,
releaseStatus: "",
searchEndTime: "",
searchStartTime: "",
};
api
.queryAssessmentDetailList(obj)
.then((res) => {
console.log("获取全部评估信息接口成功", res);
message.success("获取全部评估信息接口成功");
console.log(obj);
})
.catch((err) => {
console.log("获取全部评估信息接口失败", err);
// state.createLoading = false;
});
};
return { return {
...toRefs(state), ...toRefs(state),
afterVisibleChange, afterVisibleChange,

View File

@@ -338,6 +338,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
chooseStageId: {
type: Number,
default: null,
},
}, },
setup(props, ctx) { setup(props, ctx) {
// const router = useRouter(); // const router = useRouter();
@@ -612,7 +616,7 @@ export default {
name: state.obj.liveName, name: state.obj.liveName,
projectId: props.projectId, projectId: props.projectId,
projectTaskId: 0, projectTaskId: 0,
stageId: 0, stageId: props.chooseStageId,
type: 6, type: 6,
}) })
.then((res) => { .then((res) => {

View File

@@ -9,7 +9,7 @@
> >
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">添加外链</div> <div class="headerTitle">{{ title }}外链</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png" src="../../assets/images/basicinfo/close.png"
@@ -111,12 +111,25 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
projectId: {
type: Number,
default: null,
},
chooseStageId: {
type: Number,
default: null,
},
isRefEdit: {
type: Number,
default: null,
},
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
inputV1: "", inputV1: "",
inputV2: "", inputV2: "",
textV1: "", textV1: "",
title: props.isRefEdit == 2 ? "编辑" : "添加",
}); });
const closeDrawer = () => { const closeDrawer = () => {
console.log(props, 1111); console.log(props, 1111);
@@ -129,6 +142,8 @@ export default {
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
console.log("state", bool); console.log("state", bool);
}; };
//编辑外链
//创建外链
const createExternalChain = () => { const createExternalChain = () => {
if (!state.inputV1) return message.warning("请输入外链名称"); if (!state.inputV1) return message.warning("请输入外链名称");
if (!state.inputV2) return message.warning("请输入链接"); if (!state.inputV2) return message.warning("请输入链接");
@@ -150,7 +165,7 @@ export default {
console.log(res.data.data); console.log(res.data.data);
message.success("提交成功"); message.success("提交成功");
closeDrawer(); closeDrawer();
//学习路径的创建
if (props.isStudy == 1) { if (props.isStudy == 1) {
let objj = { let objj = {
chapterId: 36, chapterId: 36,
@@ -170,15 +185,16 @@ export default {
console.log(err, 1111); console.log(err, 1111);
}); });
} else { } else {
//项目的创建
apiTask apiTask
.addTask({ .addTask({
courseId: 0, courseId: 0,
duration: 0, duration: 0,
flag: true, flag: true,
name: obj.linkName, name: obj.linkName,
projectId: 28, projectId: props.projectId,
projectTaskId: 0, projectTaskId: 0,
stageId: 3, stageId: props.chooseStageId,
type: 7, type: 7,
}) })
.then((res) => { .then((res) => {

View File

@@ -18,23 +18,20 @@
</div> </div>
<div class="contentMain"> <div class="contentMain">
<div class="main_item"> <div class="main_item">
<div class="signbox"> <div class="signbox">
<div class="sign"> <div class="sign">
<img <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<span style="margin-right: 3px">投票名称</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入投票名称"
/>
</div>
</div> </div>
<span style="margin-right: 3px">投票名称</span>
</div>
<div class="btnbox">
<a-input
v-model:value="inputV1"
style="width: 424px; height: 32px"
placeholder="请输入投票名称"
/>
</div>
</div>
<div class="box" @click="showDrawerCreVote"> <div class="box" @click="showDrawerCreVote">
<button class="cjtpbtn" @click="addQue()">创建题干</button> <button class="cjtpbtn" @click="addQue()">创建题干</button>
</div> </div>
@@ -112,7 +109,7 @@ export default {
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
inputV1: "", inputV1: "",
creVote:true, creVote: true,
questions: [ questions: [
{ {
inputV: "", inputV: "",
@@ -170,35 +167,32 @@ export default {
// return message.info("请输入选项"); // return message.info("请输入选项");
// } // }
console.log(state.questions[0].inputV); console.log(state.questions[0].inputV);
let obj = { let obj = {
createTime: "", createTime: "",
createUser: 0, createUser: 0,
optionDto: [ optionDto: [
{ {
optionId: 0, optionId: 0,
optionName: "", optionName: "",
optionPictureAddress: "", optionPictureAddress: "",
}, },
], ],
optionId: 0, stemName: "",
optionName: "", updateTime: "",
optionPictureAddress: "", updateUser: 0,
stem: state.questions[0].inputV, voteStemId: 0,
stemId: 0, };
updateTime: "", api
updateUser: 0, .createOptionMessage(obj)
}; .then((res) => {
api console.log("创建成功", res);
.createOptionMessage(obj) message.success("创建成功");
.then((res) => { ctx.emit("getData", state.creVote);
console.log("创建成功", res); closeDrawer();
message.success("创建成功"); })
ctx.emit("getData",state.creVote); .catch((err) => {
closeDrawer(); console.log(err);
}) });
.catch((err) => {
console.log(err);
});
}; };
return { return {
...toRefs(state), ...toRefs(state),

View File

@@ -800,21 +800,41 @@ export default {
edname = key.target.value; edname = key.target.value;
} }
let edcategory = ''; let edcategory = 0;
const edclassificationChange = (key) => { const edclassificationChange = (key) => {
console.log(key) console.log(key)
edcategory = key; edcategory = key;
} }
let edmanage = ''; let edmanage = "";
let edmanageid = ''; let edmanageid = "";
const edclassificationChange1 = (key) => { const edclassificationChange1 = (key, options) => {
console.log(key) console.log(`selected ${key}`, options);
edmanage = key; let mstr = "";
edmanageid = key; let midstr = "";
for (let i = 0; i < key.length; i++) {
if (key.length - 1 !== i) {
midstr += key[i] + ",";
mstr += classifyList1.value[i].label + ",";
} else {
midstr += key[i];
mstr += classifyList1.value[i].label;
}
}
console.log(mstr, midstr);
edvalue3.value = options;
let newoptions = [];
for (let i = 0; i < edvalue3.value.length; i++) {
if (edvalue3.value[i].value) {
newoptions.push(edvalue3.value[i])
}
}
edvalue3.value = newoptions;
edmanage = mstr;
edmanageid = midstr;
} }
let edsource = ''; let edsource = "";
const edclassificationChange5 = (key) => { const edclassificationChange5 = (key) => {
console.log(key) console.log(key)
edsource = key; edsource = key;
@@ -826,7 +846,7 @@ export default {
{ value: 3, label: '项目三' }, { value: 3, label: '项目三' },
]); ]);
let sourceBelongId = ''; let sourceBelongId = 0;
const classificationChange5 = (key) => { const classificationChange5 = (key) => {
console.log(`selected ${key}`); console.log(`selected ${key}`);
sourceBelongId = key; sourceBelongId = key;
@@ -941,39 +961,62 @@ export default {
value5.value = []; value5.value = [];
state.doublepro = false; state.doublepro = false;
}; };
console.log(edmanage, edmanageid)
// 编辑多层项目 // 编辑多层项目
const editStoreyProject = () => { const editStoreyProject = () => {
let obj = { // 查询下项目信息
projectId: Number(state.dcProjectID), api.getProjectDetail({ projectId: Number(state.dcProjectID) }).then(res => {
name: edname, console.log(res)
category: edcategory, let obj = {
manager: edmanage.toString(","), "attach": res.data.data.projectInfo.attach,
managerId: edmanageid.toString(","), "beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
sourceBelongId: edsource, "boeFlag": res.data.data.projectInfo.boeFlag,
type: 1, "category": edcategory ? edcategory : res.data.data.projectInfo.category,
picUrl: 0 "courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
} "endTime": Number(res.data.data.projectInfo.endTime) / 1000,
if (obj.name !== "" || obj.category !== "" || obj.manager !== "" || obj.sourceBelongId !== "") { "level": res.data.data.projectInfo.level,
console.log("我需要编辑") "manager": edmanage ? edmanage.toString(",") : res.data.data.projectInfo.manager,
console.log(obj) "managerId": edmanageid ? edmanageid.toString(",") : res.data.data.projectInfo.managerId,
api.createProject(obj).then(res => { "name": edname ? edname : res.data.data.projectInfo.name,
console.log(res) "notice": res.data.data.projectInfo.notice,
if (res.status == 200 && res.data.code == 200) { "noticeFlag": res.data.data.projectInfo.noticeFlag,
"parentId": res.data.data.projectInfo.parentId,
"picUrl": res.data.data.projectInfo.picUrl,
"projectId": state.dcProjectID ? Number(state.dcProjectID) : res.data.data.projectInfo.projectId,
"remark": res.data.data.projectInfo.remark,
"sourceBelongId": edsource ? edsource : res.data.data.projectInfo.sourceBelongId,
"status": res.data.data.projectInfo.status,
"systemId": res.data.data.projectInfo.systemId,
"templateId": "",
"type": res.data.data.projectInfo.type
}
if (obj.name !== "" || obj.category !== "" || obj.manager !== "" || obj.sourceBelongId !== "") {
console.log("我需要编辑")
console.log(obj)
api.createProject(obj).then(res => {
console.log(res)
if (res.status == 200 && res.data.code == 200) {
state.eddoublepro = false;
message.destroy();
message.success("编辑成功");
getTableDate();
}
}).catch(err => {
console.log(err)
state.eddoublepro = false; state.eddoublepro = false;
message.destroy(); message.destroy();
message.success("编辑成功"); message.error("编辑失败,请检查当前网络状态。");
} })
}).catch(err => {
console.log(err)
state.eddoublepro = false;
message.destroy();
message.error("编辑失败,请检查当前网络状态。");
})
} else { } else {
state.eddoublepro = false;
}
}).catch(err => {
console.log(err)
state.eddoublepro = false; state.eddoublepro = false;
} message.destroy();
message.error("编辑失败,请检查当前网络状态。");
})
} }
const closeeditModal2 = () => { const closeeditModal2 = () => {
@@ -1134,7 +1177,7 @@ export default {
let editChildrensName = ''; let editChildrensName = '';
const edclassificationChange6 = (key) => { const edclassificationChange6 = (key) => {
console.log(key) console.log(key)
editChildrensName = key; editChildrensName = key.target.value;
} }
let editChildrensCategory = ''; let editChildrensCategory = '';
@@ -1146,10 +1189,30 @@ export default {
let editChildrensManege = ''; let editChildrensManege = '';
let editChildrensManegeId = ''; let editChildrensManegeId = '';
const edclassificationChange3 = (key) => { const edclassificationChange3 = (key, options) => {
console.log(key) console.log(`selected ${key}`, options);
editChildrensManege = key; let mstr = "";
editChildrensManegeId = key; let midstr = "";
for (let i = 0; i < key.length; i++) {
if (key.length - 1 !== i) {
midstr += key[i] + ",";
mstr += classifyList1.value[i].label + ",";
} else {
midstr += key[i];
mstr += classifyList1.value[i].label;
}
}
console.log(mstr, midstr);
edvalue8.value = options;
let newoptions = [];
for (let i = 0; i < edvalue8.value.length; i++) {
if (edvalue8.value[i].value) {
newoptions.push(edvalue8.value[i])
}
}
edvalue8.value = newoptions;
editChildrensManege = mstr;
editChildrensManegeId = midstr;
} }
let editChildrensSource = ''; let editChildrensSource = '';
@@ -1158,38 +1221,57 @@ export default {
editChildrensSource = key; editChildrensSource = key;
} }
// 编辑多层子项目
const editChildsProject = () => { const editChildsProject = () => {
let obj = { api.getProjectDetail({ projectId: Number(state.currentEditChildrensProjectId) }).then(res => {
"attach": "", let obj = {
"beginTime": 0, "attach": res.data.data.projectInfo.attach,
"boeFlag": 0, "beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
"category": editChildrensCategory, "boeFlag": res.data.data.projectInfo.boeFlag,
"courseSyncFlag": 0, "category": editChildrensCategory ? Number(editChildrensCategory) : res.data.data.projectInfo.category,
"endTime": 0, "courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
"level": 0, "endTime": Number(res.data.data.projectInfo.endTime) / 1000,
"manager": editChildrensManege, "level": res.data.data.projectInfo.level,
"managerId": editChildrensManegeId, "manager": editChildrensManege ? editChildrensManege.toString(",") : res.data.data.projectInfo.manager,
"name": editChildrensName, "managerId": editChildrensManegeId ? editChildrensManegeId.toString(",") : res.data.data.projectInfo.managerId,
"notice": "", "name": editChildrensName ? editChildrensName : res.data.data.projectInfo.name,
"noticeFlag": 0, "notice": res.data.data.projectInfo.notice,
"parentId": 0, "noticeFlag": res.data.data.projectInfo.noticeFlag,
"picUrl": "", "parentId": res.data.data.projectInfo.parentId,
"projectId": state.currentEditChildrensProjectId, "picUrl": res.data.data.projectInfo.picUrl,
"remark": "", "projectId": state.currentEditChildrensProjectId ? Number(state.currentEditChildrensProjectId) : res.data.data.projectInfo.projectId,
"sourceBelongId": editChildrensSource, "remark": res.data.data.projectInfo.remark,
"status": 0, "sourceBelongId": editChildrensSource ? Number(editChildrensSource) : res.data.data.projectInfo.sourceBelongId,
"systemId": 0, "status": res.data.data.projectInfo.status,
"templateId": 0, "systemId": res.data.data.projectInfo.systemId,
"type": 2 "templateId": "",
} "type": res.data.data.projectInfo.type
}
if (obj.name !== '' || obj.manager !== '' || obj.category !== '' || obj.sourceBelongId !== '') { if (obj.name !== '' || obj.manager !== '' || obj.category !== '' || obj.sourceBelongId !== '') {
alert("我需要修改") console.log("编辑多层子项目传递的参数", obj)
console.log("编辑多层子项目传递的参数", obj) api.createProject(obj).then(ress => {
console.log(ress)
if (ress.status == 200 && ress.data.code == 200) {
state.eddoublesonpro = false;
message.destroy();
message.success("编辑成功");
getTableDate();
}
}).catch(err => {
console.log(err)
state.eddoublesonpro = false;
message.destroy();
message.error("编辑失败,请检查当前网络状态。");
})
} else {
state.eddoublesonpro = false;
}
}).catch(err => {
console.log(err)
state.eddoublesonpro = false; state.eddoublesonpro = false;
} else { message.destroy();
state.eddoublesonpro = false; message.error("编辑失败,请检查当前网络状态。");
} })
} }
const closeeditModal3 = () => { const closeeditModal3 = () => {
@@ -2001,13 +2083,13 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="基础信息" label="基础信息"> <a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{ <div onClick={() => {
router.push({ router.push({
path: "/taskpage", path: "/taskpage",
}); });
storage.set("projectId", value.record.projectId); storage.set("projectId", value.record.projectId);
}}>基础信息</div> }}>基础信息</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
) : value.record.status === 1 || value.record.status == 1 && Number(value.record.beginTime) > Math.ceil(new Date().getTime / 1000) ? ( ) : value.record.status === 1 || value.record.status == 1 && Number(value.record.beginTime) > Math.ceil(new Date().getTime / 1000) ? (
@@ -2054,12 +2136,12 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="基础信息" label="基础信息"> <a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{ <div onClick={() => {
router.push({ router.push({
path: "/taskpage", path: "/taskpage",
}); });
storage.set("projectId", value.record.projectId); storage.set("projectId", value.record.projectId);
}}>基础信息</div> }}>基础信息</div>
</a-select-option> </a-select-option>
</a-select> </a-select>
) : value.record.status === -1 ? ( ) : value.record.status === -1 ? (
@@ -2097,12 +2179,12 @@ export default {
</div> </div>
</a-select-option> </a-select-option>
<a-select-option value="基础信息" label="基础信息"> <a-select-option value="基础信息" label="基础信息">
<div onClick={()=>{ <div onClick={() => {
router.push({ router.push({
path: "/taskpage", path: "/taskpage",
}); });
storage.set("projectId", value.record.projectId); storage.set("projectId", value.record.projectId);
}}>基础信息</div> }}>基础信息</div>
{/** {/**
<router-link to="/taskpage">基础信息</router-link> <router-link to="/taskpage">基础信息</router-link>
*/} */}

View File

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