This commit is contained in:
kclf
2022-11-25 20:51:26 +08:00
parent 4bcc5ead9e
commit d7f06c34ec
4 changed files with 19 additions and 97 deletions

View File

@@ -52,7 +52,6 @@
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
onSelect: onSelect,
}"
:columns="tableDataFunc()"
:data-source="tableData"
@@ -197,10 +196,6 @@ export default {
state.selectedRowKeys = selectedRowKeys;
state.apiTaskList = selectedRows;
};
const onSelect = (record) => {
state.caseId = record.caseid;
state.caseName = record.title;
};
const handelChangePage = (page, pageSize) => {
state.currentPage = page;
state.pageSize = pageSize;
@@ -287,27 +282,6 @@ export default {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
});
}
// } else {
// apiTask
// .addTask({
// "courseId": state.caseId,
// "duration": 0,
// "flag": true,
// "name": state.caseName,
// "projectId": props.projectId,
// "projectTaskId": props.projectTaskId,
// "stageId": props.chooseStageId,
// "type": 3,
// })
// .then(() => {
// message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
// ctx.emit("changeData", false);
// closeDrawer();
// })
// .catch(() => {
// message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
// });
// }
} else if (props.isLevel == 3) {
for (let i = 0; i < state.apiTaskList.length; i++) {
console.log(
@@ -349,7 +323,6 @@ export default {
closeDrawer,
tableDataFunc,
onSelectChange,
onSelect,
handelChangePage,
getTableDate,
updateTask,

View File

@@ -97,11 +97,8 @@
</div>
<EvList
v-model:EvalListVisible="EvalListVisible"
@getEvLsitDate="checkFinish"
@getEvListData="checkFinish"
/>
<!-- v-model:evaluationTypeId="evaluationTypeId"
v-model:evaluationTypeName="evaluationTypeName" -->
<!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
<a-spin :spinning="addLoading" tip="添加中..." />
</div> -->
@@ -166,11 +163,10 @@ export default {
setup(props, ctx) {
const state = reactive({
inputV1: "",
inputV2: "",
time: undefined,
EvalId: null,
//子传回来的参数
evaluationTypeId: null,
evaluationTypeId: 0,
evaluationTypeName: "",
description: "",
EvalListVisible: false,
@@ -226,13 +222,13 @@ export default {
} else if (props.isLevel == 2) {
apitaskadd
.addTask({
// courseId: res.data.data.evaluationId,
// name: res.data.data.evaluationName,
duration: 0,
flag: true,
courseId: Number(value.evaluationId),
name: value.evaluationName,
projectId: props.projectId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId,
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
type: 10,
})
.then(() => {
@@ -330,15 +326,10 @@ export default {
message.destroy();
return message.info("请输入测评名称");
}
if (!state.inputV2) {
if (!state.evaluationTypeId) {
message.destroy();
return message.info("请选择测评");
}
if (!state.time) {
message.destroy();
return message.warning("请输入直播时间");
}
let obj = {
evaluationName: state.inputV1,
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
@@ -346,6 +337,10 @@ export default {
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
evaluationTypeId: state.evaluationTypeId,
evaluationTypeName: state.evaluationTypeName,
evaluationFlag: "",
evaluationPictureAddress: "",
evaluationTag: "",
updateTime: "",
};
api
.createEvaluation(obj)
@@ -434,6 +429,10 @@ export default {
margin-left: 15px;
color: #fff;
}
.tag-style {
color: rgb(113, 113, 237);
background-color: #d7d1f7;
}
}
}
.main_item2 {

View File

@@ -83,40 +83,6 @@
/>
</div>
</div>
<div class="btnss" style="margin-top: 20px">
<div class="btn btn1" @click="newTest()" style="margin-right: 20px">
<div class="wz">新建考试</div>
</div>
</div>
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotal === -1 ? true : false"
:row-selection="{selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="onChange"
/>
</div>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
<button class="btn2" @click="CreatSTText()">确定</button>
</div>
</div>
<div class="btnn">

View File

@@ -1215,7 +1215,6 @@ export default {
isLevel: 1, //学习路径1项目2模板库3
gqxy_hs: true,
isactive: 0,
projectChecked: null, //项目单选框
adddiscussvisible: false, //讨论抽屉
isStudiscuss: false,
addactivevisible: false, //活动抽屉
@@ -1346,14 +1345,6 @@ export default {
console.log("删除关卡失败", err);
});
};
const showDrawer = () => {
state.visible = true;
};
//关闭项目抽屉
const leaveProjDrawer = () => {
state.addprojvisible = false;
};
//在线抽屉
const showDrawerAddOnline = (id, eleId) => {
state.addonlinevisible = true;
@@ -1387,14 +1378,12 @@ export default {
};
//测试抽屉
const showDrawerAddEval = (id, eleId) => {
// state.addevalVisible = true;
state.addevalvisible = true;
state.EditEvalId = id;
state.routerTaskId = eleId;
};
//评估抽屉
const showDrawerAddInvist = (id, eleId) => {
// state.addinvistVisible = true;
state.addinvistvisible = true;
state.routerTaskId = eleId;
state.EditInvistId = id;
@@ -1506,6 +1495,7 @@ export default {
message.error(err);
});
};
const showAddStu = () => {
state.AddSvisible = true;
};
@@ -1663,7 +1653,6 @@ export default {
"rgb(245, 247, 250,1)";
document.getElementsByTagName("main")[0].style.boxShadow = "none";
getDetail();
getAllProjText();
});
onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1837,9 +1826,9 @@ export default {
} else if (type == "活动") {
showDrawerAddActive(id, eleId);
} else if (type == "测评") {
showDrawerAddInvist(id, eleId);
} else if (type == "评估") {
showDrawerAddEval(id, eleId);
} else if (type == "评估") {
showDrawerAddInvist(id, eleId);
} else if (type == "投票") {
showDrawerAddVote(id, eleId);
} else if (type == "项目") {
@@ -1898,16 +1887,10 @@ export default {
const showModeVisible = () => {
state.unlockModeVisible = true;
};
onMounted(() => {
// createCase();
// getAllProjText();
});
return {
...toRefs(state),
// tableDataFunc,
tableDataFunc2,
showDrawer,
// closeDrawer,
showModal,
closeModal,
showAddStu,
@@ -1949,6 +1932,7 @@ export default {
closeChangeModal,
handleChangeStage,
showDeleteChapter,
closeDeleteChapter,
deleteChapter,