@@ -72,7 +71,7 @@
-
+
+
-
-
-
-
+
+
+ 创建投票：
- 创建投票
+ 创建投票
@@ -135,6 +135,17 @@
+ Some contents...
+Some contents...
+Some contents...
+
-
@@ -238,11 +244,17 @@
-
-
+
@@ -966,8 +978,8 @@
import { reactive, toRefs, onMounted, onUnmounted } from "vue";
import AddStu from "../../components/drawers/AddLevelAddStu";
import ImpStu from "../../components/drawers/AddLevelImportStu";
-import AddOnline from "../../components/drawers/AddOnline.vue"
-import AddCase from "../../components/drawers/AddCase.vue"
+import AddOnline from "../../components/drawers/AddOnline.vue";
+import AddCase from "../../components/drawers/AddCase.vue";
import AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -1221,8 +1233,8 @@ export default {
deleteModal: false, // 删除弹窗
deleteID: "", // 要删除的任务的id
editID: "", // 要编辑的任务id
- EditOnlineId:"", // 要编辑的 workid
- EditCaseId:"",
+ EditOnlineId: "", // 要编辑的 workid
+ EditCaseId: "",
EditWorkId: "",
EditTestId: "",
EditRefId: "",
@@ -1249,8 +1261,8 @@ export default {
adddiscussvisible: false, //讨论抽屉
isStudiscuss: false,
addactivevisible: false, //活动抽屉
- addonlinevisible:false,
- addcasevisible:false,
+ addonlinevisible: false,
+ addcasevisible: false,
addhomeworkvisible: false,
addtestvisible: false,
addevalvisible: false,
@@ -1272,6 +1284,7 @@ export default {
projectId: null,
projectTaskId: null,
chooseStageId: null,
+ chooseChapterId: null,
});
//新建关卡
@@ -1328,17 +1341,17 @@ export default {
state.isLevel = false;
};
//在线抽屉
- const showDrawerAddOnline = (id,eleId)=>{
+ const showDrawerAddOnline = (id, eleId) => {
state.addonlinevisible = true;
state.EditWorkId = id;
state.routerTaskId = eleId;
- }
+ };
//案例抽屉
- const showDrawerAddCase = (id,eleId)=>{
+ const showDrawerAddCase = (id, eleId) => {
state.addcasevisible = true;
state.EditWorkId = id;
state.routerTaskId = eleId;
- }
+ };
// 作业和考试的抽屉
const showDrawerAddHomework = (id, eleId) => {
console.log("homework==============", id, state.isactive);
@@ -1434,6 +1447,7 @@ export default {
GetRouterDetail(state.routerId)
.then((res) => {
console.log("res.data.data.chapterList", res.data.data.chapterList);
+ //给level赋初始值
state.level = res.data.data.chapterList;
state.styTitle = res.data.data.routerInfo.name;
state.creTime = toDate(
@@ -1448,8 +1462,14 @@ export default {
item["label"] = item.name;
});
if (state.level.length > 0) {
- dataAssignment(state.level[0].chapterId);
- state.isactive = state.level[0].chapterId;
+ let chapter = localStorage.getItem("chapterId");
+ if (chapter !== null) {
+ dataAssignment(chapter);//用哪个的任务表
+ state.isactive = chapter;//哪个亮
+ } else {
+ dataAssignment(state.level[0].chapterId);
+ state.isactive = state.level[0].chapterId;
+ }
}
state.deleteModal = false;
})
@@ -1674,6 +1694,7 @@ export default {
state.selectRow = []; //选择行
state.selectAll = 0; //0：未选择，1：全选，2：部分选择
dataAssignment(chapterId);
+ state.chooseChapterId = chapterId;
};
const gqxy_hShow = () => {
state.gqxy_hs = !state.gqxy_hs;
@@ -1811,6 +1832,8 @@ export default {
console.log("移动成功", res);
message.destroy();
message.success("移动成功");
+ localStorage.setItem("chapterId", state.chooseChapterId);
+ getDetail();
})
.catch((err) => {
console.log("移动失败", err);
@@ -1910,7 +1933,13 @@ export default {
const rowSelection = {
onSelect: (selectedRows, selected, selectedRowKeys) => {
console.log(
- "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+ "selectedRowKeys",
+ selectedRowKeys,
+ "selectedRows",
+ selectedRows,
+ "selected",
+ selected
+ );
console.log(selectedRows.assessmentId);
state.assessmentId = selectedRows.assessmentId;
state.assessmentName = selectedRows.name;
@@ -1944,35 +1973,35 @@ export default {
let arr = res.data.data.rows;
if (res.status === 200) {
getTableDate(arr);
- console.log('---------------项目信息---------------------------');
+ console.log("---------------项目信息---------------------------");
}
})
.catch((err) => {
console.log("获取全部项目信息接口失败", err);
- console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+ console.log("+++++++++++++++++++++++++++++++++++++++++++++++");
// state.createLoading = false;
});
};
const updateTask = () => {
- RouterEditTask({
- chapterId: state.isactive,
- courseId: state.assessmentId,
- name: state.assessmentName,
- routerId: state.routerId,
- routerTaskId: state.routerTaskId || 0,
- type: 13,
+ RouterEditTask({
+ chapterId: state.isactive,
+ courseId: state.assessmentId,
+ name: state.assessmentName,
+ routerId: state.routerId,
+ routerTaskId: state.routerTaskId || 0,
+ type: 13,
+ })
+ .then((res) => {
+ console.log(res, 11111);
+ message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
+ // ctx.emit("changeData", false);
+ closeDrawer();
+ state.addLoading = false;
})
- .then((res) => {
- console.log(res, 11111);
- message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
- // ctx.emit("changeData", false);
- closeDrawer();
- state.addLoading = false;
- })
- .catch((err) => {
- console.log(err, 1111);
- });
- }
+ .catch((err) => {
+ console.log(err, 1111);
+ });
+ };
onMounted(() => {
// createCase();
getAllProjText();
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8a83b195..48725a2e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1395,6 +1395,7 @@ export default {
//获取任务列表
const getTask = () => {
+ // console.log("state.projectId", state.projectId);
let obj = {
projectId: state.projectId,
// projectId: 28,
@@ -1409,28 +1410,30 @@ export default {
state.picUrl = res.data.data.projectInfo.picUrl;
let leng = res.data.data.stageList.length;
if (leng > 0) {
- // let stage = localStorage.getItem("stageId")
- // ? localStorage.getItem("stageId")
- // : null;
- // if (stage !== null) {
- // // console.log("找到了origin", originStageList);
- // let originStageList = res.data.data.stageList.find((item) => {
- // item.stageId == stage;
- // });
- // getTableData(originStageList.taskList);
- // console.log("找到了origin", originStageList);
- // } else {
- // let arr = res.data.data.stageList[0].taskList;
- // console.log("任务列表", arr);
- // getTableData(arr);
- // }
-
let stage = localStorage.getItem("stageId")
? localStorage.getItem("stageId")
: null;
- let arr = res.data.data.stageList[0].taskList;
- console.log("任务列表", stage, arr);
- getTableData(arr);
+ console.log("zhaodaole", stage);
+
+ if (stage !== null) {
+ let stageList = res.data.data.stageList; //阶段数组
+ let result = stageList.find((item) => item.stageId == stage);
+ console.log("又找到了", result);
+ getTableData(result.taskList);
+ } else {
+ let arr = res.data.data.stageList[0].taskList;
+ console.log("任务列表", arr);
+ getTableData(arr);
+ }
+ // let stageList = res.data.data.stageList; //阶段数组
+ // let result = stageList.find((item) => item.stageId == stage);
+ // console.log("又找到了", result);
+ // getTableData(result.taskList);
+
+ // 每次都获取了第一条taskList
+ // let arr = res.data.data.stageList[0].taskList;
+ // console.log("任务列表", stage, arr);
+ // getTableData(arr);
}
let stagearr = res.data.data.stageList;
From 5bd067c4d0a9599741c9c385bad0e374bf13ecb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?=
Date: Thu, 17 Nov 2022 16:26:17 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=A0=E5=8F=82?=
=?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddActive.vue | 212 +++---
src/components/drawers/AddCase.vue | 411 ++++++-----
src/components/drawers/AddDiscuss.vue | 1 +
src/components/drawers/AddEval.vue | 196 ++---
src/components/drawers/AddFaceteach.vue | 2 +
src/components/drawers/AddHomework.vue | 114 ++-
src/components/drawers/AddInvist.vue | 381 +++++-----
src/components/drawers/AddLive.vue | 3 +
src/components/drawers/AddOnline.vue | 523 +++++++-------
src/components/drawers/AddRef.vue | 277 +++----
src/components/drawers/AddTest.vue | 920 ++++++++++++++----------
src/components/drawers/AddVote1.vue | 33 +-
src/components/drawers/AddVotebak.vue | 142 ++--
13 files changed, 1724 insertions(+), 1491 deletions(-)
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 30b44ff3..7b0db77d 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -9,15 +9,14 @@
>
@@ -102,11 +108,11 @@ import * as api from "../../api/indexEval";
import * as apitaskadd from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
// const router = useRouter();
export default {
name: "AddEval",
- components: {
+ components: {
EvList,
},
props: {
@@ -118,7 +124,8 @@ export default {
type: Number,
default: null,
},
- edit: { // 是否为编辑
+ edit: {
+ // 是否为编辑
type: Boolean,
default: null,
},
@@ -134,11 +141,13 @@ export default {
type: Number,
default: 0,
},
- isLevel: { // 是否是关卡页面触发
+ isLevel: {
+ // 是否是关卡页面触发
type: Number,
default: null,
},
- projectTaskId: { // 要编辑的projectId
+ projectTaskId: {
+ // 要编辑的projectId
type: Number,
default: null,
},
@@ -157,10 +166,10 @@ export default {
inputV2: "",
time: undefined,
EvalId: null,
- evaluationTypeId:null,
- evaluationTypeName:"",
- description:"",
- EvalListVisible:false,
+ evaluationTypeId: null,
+ evaluationTypeName: "",
+ description: "",
+ EvalListVisible: false,
// addLoading:false,
});
@@ -169,67 +178,72 @@ export default {
ctx.emit("update:edit", false);
state.inputV1 = "";
state.inputV2 = "";
+ localStorage.setItem("stageId", props.chooseStageId);
+ localStorage.setItem("chapterId", props.isactive);
};
const afterVisibleChange = (bool) => {
- if(props.edit && bool){
+ if (props.edit && bool) {
queryEval();
}
};
- const showEvalDrawer = () =>{
+ const showEvalDrawer = () => {
state.EvalListVisible = true;
console.log("进来了吗");
};
- const queryEval = () =>{
+ const queryEval = () => {
api
- .queryEvaluationDetailById({evaluationId:props.evaluationId})
- .then((res) => {
- console.log("调用项目添加接口后", res.data.data);
- state.inputV1 = res.data.data.evaluationName;
- state.time = [dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD")];
- state.evaluationTypeId = res.data.data.evaluationTypeId;
- state.evaluationTypeName =res.data.data.evaluationTypeName;
- //state.description =
+ .queryEvaluationDetailById({ evaluationId: props.evaluationId })
+ .then((res) => {
+ console.log("调用项目添加接口后", res.data.data);
+ state.inputV1 = res.data.data.evaluationName;
+ state.time = [
+ dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
+ dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
+ ];
+ state.evaluationTypeId = res.data.data.evaluationTypeId;
+ state.evaluationTypeName = res.data.data.evaluationTypeName;
+ //state.description =
})
.catch((err) => {
console.log(err);
});
- }
- const updateTask = (res)=>{
- if(props.isLevel ==1){
+ };
+ const updateTask = (res) => {
+ if (props.isLevel == 1) {
apitaskadd
- .addTask({
- courseId: res.data.data.evaluationId,
- name: res.data.data.evaluationName,
- projectId: props.projectId,
- projectTaskId: props.projectTaskId || 0,
- stageId: props.chooseStageId,
- type: 10,
- })
- .then((res) => {
- console.log("调用项目添加接口后", res.data);
-
- })
- .catch((err) => {
- console.log(err);
- });
- }else if(props.isLevel ==2){
+ .addTask({
+ courseId: res.data.data.evaluationId,
+ name: res.data.data.evaluationName,
+ projectId: props.projectId,
+ projectTaskId: props.projectTaskId || 0,
+ stageId: props.chooseStageId,
+ type: 10,
+ })
+ .then((res) => {
+ console.log("调用项目添加接口后", res.data);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ } else if (props.isLevel == 2) {
RouterEditTask({
- chapterId: props.isactive,
- courseId: res.data.data.evaluationId,
- name: res.data.data.evaluationName,
- routerId: props.routerId,
- routerTaskId: props.routerTaskId || 0,
- type: 10,
- }).then((res) => {
- console.log("调用项目添加接口后", res.data);
-
- }).catch((err) => {
- console.log(err);
- });
- }else if(props.isLevel ==3){
- console.log("模板库任务")
+ chapterId: props.isactive,
+ courseId: res.data.data.evaluationId,
+ name: res.data.data.evaluationName,
+ routerId: props.routerId,
+ routerTaskId: props.routerTaskId || 0,
+ type: 10,
+ })
+ .then((res) => {
+ console.log("调用项目添加接口后", res.data);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ } else if (props.isLevel == 3) {
+ console.log("模板库任务");
}
- }
+ };
//创建或编辑测评信息
const createEvalText = () => {
if (!state.inputV1) {
@@ -248,36 +262,36 @@ export default {
let obj = {
evaluationName: state.inputV1,
evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
- evaluationId: props.edit?props.evaluationId:0,
+ evaluationId: props.edit ? props.evaluationId : 0,
evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
- evaluationTypeId:state.evaluationTypeId,
- evaluationTypeName:state.evaluationTypeName,
+ evaluationTypeId: state.evaluationTypeId,
+ evaluationTypeName: state.evaluationTypeName,
//state.description
};
- if(props.edit){
+ if (props.edit) {
api
- .createEvaluation(obj)
- .then((res) => {
- updateTask(res);
- message.success("创建成功");
- closeDrawer();
- ctx.emit("changeData", false);
- })
- .catch((err) => {
- console.log(err);
- });
- }else{
+ .createEvaluation(obj)
+ .then((res) => {
+ updateTask(res);
+ message.success("创建成功");
+ closeDrawer();
+ ctx.emit("changeData", false);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ } else {
api
- .updateEvaluation(obj)
- .then((res) => {
- updateTask(res);
- message.success("创建成功");
- closeDrawer();
- ctx.emit("changeData", false);
- })
- .catch((err) => {
- console.log(err);
- });
+ .updateEvaluation(obj)
+ .then((res) => {
+ updateTask(res);
+ message.success("创建成功");
+ closeDrawer();
+ ctx.emit("changeData", false);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
}
};
@@ -318,7 +332,7 @@ export default {
display: flex;
justify-content: space-between;
.main_left {
- margin-top:32px;
+ margin-top: 32px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 25a37258..a6b099c3 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -384,6 +384,8 @@ export default {
ctx.emit("update:addfaceteachVisible", false);
state.radioV1 = "";
state.radioV2 = "";
+ localStorage.setItem("stageId", props.chooseStageId);
+ localStorage.setItem("chapterId", props.isactive);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 8c0dbe82..e1149ca0 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -279,6 +279,9 @@ export default {
formState.choosedTime = "";
ctx.emit("update:addhomeworkVisible", false);
ctx.emit("update:edit", false);
+ ctx.emit("changeData", false);
+ localStorage.setItem("stageId", props.chooseStageId);
+ localStorage.setItem("chapterId", props.isactive);
};
const afterVisibleChange = (bool) => {
if (props.addhomeworkVisible && props.edit) {
@@ -288,38 +291,35 @@ export default {
console.log("state", bool);
};
-
-
// 新增任务
const updteHomeWork = () => {
let obj = {
submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
workEnclosureAddress: "",
- workId: props.edit?props.EditWorkId:0,
+ workId: props.edit ? props.EditWorkId : 0,
workName: formState.workName,
workRequirement: formState.workRequirement,
};
- if(props.edit){
+ if (props.edit) {
updateWorkTaskUsing(obj)
- .then((res) => {
- updateTask(res);
- closeDrawer();
- })
- .catch((err) => {
- message.error(`添加失败${err}`);
- });
- }else{
+ .then((res) => {
+ updateTask(res);
+ closeDrawer();
+ })
+ .catch((err) => {
+ message.error(`添加失败${err}`);
+ });
+ } else {
createWorkTask(obj)
- .then((res) => {
- updateTask(res);
- closeDrawer();
- })
- .catch((err) => {
- message.error(`添加失败${err}`);
- });
+ .then((res) => {
+ updateTask(res);
+ closeDrawer();
+ })
+ .catch((err) => {
+ message.error(`添加失败${err}`);
+ });
}
-
};
// 查询任务
@@ -345,50 +345,48 @@ export default {
};
// 新增编辑或新增项目任务
const updateTask = (res) => {
- if(props.isLevel==1 ){
+ if (props.isLevel == 1) {
let editObj1 = {
- chapterId: props.isactive,
- courseId: res.data.data.workId,
- name: res.data.data.workName,
- routerId: props.routerId,
- routerTaskId: props.routerTaskId || 0,
- type: 4,
- };
+ chapterId: props.isactive,
+ courseId: res.data.data.workId,
+ name: res.data.data.workName,
+ routerId: props.routerId,
+ routerTaskId: props.routerTaskId || 0,
+ type: 4,
+ };
- RouterEditTask(editObj1)
- .then(() => {
- message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
- ctx.emit("changeData", false);
- state.addLoading = false;
- })
- .catch(() => {
- message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
- });
- }else if(props.isLevel==2){
+ RouterEditTask(editObj1)
+ .then(() => {
+ message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+ ctx.emit("changeData", false);
+ state.addLoading = false;
+ })
+ .catch(() => {
+ message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+ });
+ } else if (props.isLevel == 2) {
let editObj = {
- courseId: res.data.data.workId,
- name:res.data.data.workName,
- projectId: props.edit?props.projectId:0,
- projectTaskId: props.projectTaskId || 0,
- stageId: props.chooseStageId,
- type: 4,
- };
- ProjectEditTask(editObj)
- .then(() => {
- message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
- ctx.emit("changeData", false);
- state.addLoading = false;
- })
- .catch(() => {
- message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
- });
- }else if(props.isLevel==3){
+ courseId: res.data.data.workId,
+ name: res.data.data.workName,
+ projectId: props.edit ? props.projectId : 0,
+ projectTaskId: props.projectTaskId || 0,
+ stageId: props.chooseStageId,
+ type: 4,
+ };
+ ProjectEditTask(editObj)
+ .then(() => {
+ message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+ ctx.emit("changeData", false);
+ state.addLoading = false;
+ })
+ .catch(() => {
+ message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+ });
+ } else if (props.isLevel == 3) {
console.log("模板库更新更新任务列表");
}
-
};
-
return {
afterVisibleChange,
closeDrawer,
@@ -440,7 +438,7 @@ export default {
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
- margin-top:32px;
+ margin-top: 32px;
.main_item {
display: flex;
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index f7140bef..e6d9fa53 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -18,51 +18,61 @@
/>
-
- 
- {{edit?'编辑':'添加'}}活动
+ {{ edit ? "编辑" : "添加" }}活动
+
@@ -226,9 +225,9 @@
import { reactive, toRefs, ref } from "vue";
import * as api from "../../api/indexActivity";
import * as apiTask from "../../api/indexTaskadd";
-import { RouterEditTask } from "@/api/indexTask"
+import { RouterEditTask } from "@/api/indexTask";
import { message } from "ant-design-vue";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
const rowSelection = ref({
checkStrictly: false,
onChange: (selectedRowKeys, selectedRows) => {
@@ -258,7 +257,8 @@ export default {
type: Number,
default: null,
},
- edit: { // 是否为编辑
+ edit: {
+ // 是否为编辑
type: Boolean,
default: null,
},
@@ -274,15 +274,18 @@ export default {
type: Number,
default: 0,
},
- isLevel: { // 是否是关卡页面触发
+ isLevel: {
+ // 是否是关卡页面触发
type: Number,
default: null,
},
- EditWorkId: { // 要编辑的workId
+ EditWorkId: {
+ // 要编辑的workId
type: Number,
default: null,
},
- projectTaskId: { // 要编辑的projectId
+ projectTaskId: {
+ // 要编辑的projectId
type: Number,
default: null,
},
@@ -293,7 +296,7 @@ export default {
isactive: {
type: Number,
default: null,
- }
+ },
},
setup(props, ctx) {
//console.log("学习路径",props.isStudiscuss);
@@ -322,35 +325,46 @@ export default {
state.textV1 = "";
state.textV2 = "";
state.time = "";
- message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-
+ message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+ localStorage.setItem("stageId", props.chooseStageId);
+ localStorage.setItem("chapterId", props.isactive);
};
const queryActive = () => {
- console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId);
- api.getActivity(props.EditActiveId).then(res => {
- console.log('获取讨论信息成功',res.data.data.standardSettings)
-
+ console.log(
+ "props.EditActiveId======",
+ props.EditActiveId,
+ props.chooseStageId,
+ props.routerTaskId
+ );
+ api
+ .getActivity(props.EditActiveId)
+ .then((res) => {
+ console.log("获取讨论信息成功", res.data.data.standardSettings);
+
//更新讨论信息
- state.inputV1 = res.data.data.activityName;
+ state.inputV1 = res.data.data.activityName;
state.textV1 = res.data.data.activityNotice;
state.textV2 = res.data.data.activityExplain;
state.inputV2 = res.data.data.activityDuration;
state.inputV3 = res.data.data.activityAddress;
state.inputV5 = res.data.data.afterSignIn;
- state.inputV6 =res.data.data.signOutTime;
+ state.inputV6 = res.data.data.signOutTime;
state.inputV4 = res.data.data.beforeSignIn;
state.radioV1 = Number(res.data.data.standardSettings);
-
- state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")]
- }).catch(err=>{
- console.log('获取讨论信息失败',err)
+
+ state.time = [
+ dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
+ dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
+ ];
})
- }
+ .catch((err) => {
+ console.log("获取讨论信息失败", err);
+ });
+ };
const afterVisibleChange = (bool) => {
- if(bool && props.edit){
+ if (bool && props.edit) {
queryActive();
}
-
};
const cloradio1 = (value) => {
if (value != "") {
@@ -358,109 +372,109 @@ export default {
}
};
const updateTask = (res) => {
- if(props.isLevel == 1 ){
+ if (props.isLevel == 1) {
RouterEditTask({
- chapterId:props.isactive,
- courseId: res.data.data.activityId,
- duration: res.data.data.activityDuration,
- name: res.data.data.activityName,
- routerId: props.routerId,
- routerTaskId: props.routerTaskId ||0,
- type: 9,
- }).then(res => {
- console.log("新增关卡任务成功",res);
-
- }).catch(err => {
- console.log("新增关卡任务失败",err);
+ chapterId: props.isactive,
+ courseId: res.data.data.activityId,
+ duration: res.data.data.activityDuration,
+ name: res.data.data.activityName,
+ routerId: props.routerId,
+ routerTaskId: props.routerTaskId || 0,
+ type: 9,
+ })
+ .then((res) => {
+ console.log("新增关卡任务成功", res);
})
- }else if(props.isLevel==2){
- apiTask.addTask({
+ .catch((err) => {
+ console.log("新增关卡任务失败", err);
+ });
+ } else if (props.isLevel == 2) {
+ apiTask
+ .addTask({
courseId: res.data.data.activityId,
duration: res.data.data.activityDuration,
name: res.data.data.activityName,
projectId: props.projectId,
- projectTaskId: props.projectTaskId ||0,
- stageId:props.chooseStageId,
+ projectTaskId: props.projectTaskId || 0,
+ stageId: props.chooseStageId,
type: 9,
- }).then((res)=> {
- console.log("更新任务列表成功",res);
-
})
- .catch((err)=> {
- console.log("更新任务列表失败",err);
+ .then((res) => {
+ console.log("更新任务列表成功", res);
})
- }else if(props.isLevel == 3){
+ .catch((err) => {
+ console.log("更新任务列表失败", err);
+ });
+ } else if (props.isLevel == 3) {
console.log("模板库更新更新任务列表");
}
- }
+ };
//创建活动
const updateActivityInfo = () => {
- if(!state.inputV1){
+ if (!state.inputV1) {
message.destroy();
return message.warning("请输入活动名称");
- }
- if(!state.textV1){
+ }
+ if (!state.textV1) {
message.destroy();
return message.warning("请输入活动公告");
- }
- if(!state.time){
+ }
+ if (!state.time) {
message.destroy();
return message.warning("请输入活动时间");
- }
- if(!state.inputV2){
+ }
+ if (!state.inputV2) {
message.destroy();
return message.warning("请输入活动时长");
- }
- if(!state.inputV3){
+ }
+ if (!state.inputV3) {
message.destroy();
return message.warning("请输入活动地址");
- }
-
+ }
+
let obj = {
- activityAddress: state.inputV3, //活动地址
- activityDuration: state.inputV2, //活动时长
- activityExplain: state.textV2, //活动说明
- activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
- activityId: props.edit?props.EditActiveId:0, //活动ID
- activityName: state.inputV1, //活动名称
- activityNotice: state.textV1, //活动公告
- activityStartTime:dayjs(state.time[0]).format("YYYY-MM-DD"),//活动开始时间
- activityTag: "", //活动逻辑删除标识
- afterSignIn: state.inputV5, //活动开始后多少分钟签到
- beforeSignIn: state.inputV4, //活动开始前多少分钟签到
- signOutTime: state.inputV6, //签退开始时间
- standardSettings: state.radioV1, //标准设置
-
+ activityAddress: state.inputV3, //活动地址
+ activityDuration: state.inputV2, //活动时长
+ activityExplain: state.textV2, //活动说明
+ activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
+ activityId: props.edit ? props.EditActiveId : 0, //活动ID
+ activityName: state.inputV1, //活动名称
+ activityNotice: state.textV1, //活动公告
+ activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), //活动开始时间
+ activityTag: "", //活动逻辑删除标识
+ afterSignIn: state.inputV5, //活动开始后多少分钟签到
+ beforeSignIn: state.inputV4, //活动开始前多少分钟签到
+ signOutTime: state.inputV6, //签退开始时间
+ standardSettings: state.radioV1, //标准设置
};
- if(props.edit){
+ if (props.edit) {
//更新编辑活动信息
api
- .updateActivity(obj)
- .then((res) => {
- closeDrawer();
- updateTask(res);
- ctx.emit("changeData", false);
- })
- .catch((err) => {
- console.log("更新失败",err);
- })
- }else{
+ .updateActivity(obj)
+ .then((res) => {
+ closeDrawer();
+ updateTask(res);
+ ctx.emit("changeData", false);
+ })
+ .catch((err) => {
+ console.log("更新失败", err);
+ });
+ } else {
//新建活动信息
api
- .createActivity(obj)
- .then((res) => {
+ .createActivity(obj)
+ .then((res) => {
message.success("创建成功");
closeDrawer();
updateTask(res);
ctx.emit("changeData", false);
- })
- .catch((err) => {
- console.log("创建失败",err);
- })
+ })
+ .catch((err) => {
+ console.log("创建失败", err);
+ });
}
-
};
-
+
return {
...toRefs(state),
afterVisibleChange,
@@ -505,7 +519,7 @@ export default {
border-radius: 8px;
}
.main_left {
- margin-top:32px;
+ margin-top: 32px;
padding-right: 30px;
flex: 1;
border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index de4d8c9d..ba1475b3 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -8,7 +8,7 @@
@after-visible-change="afterVisibleChange"
>
-
-
-
-
+
![]()
- 编辑案例
添加案例
重置
-
+
+
+
+
-
+
@@ -90,7 +99,8 @@ export default {
type: Number,
default: null,
},
- edit: { // 是否为编辑
+ edit: {
+ // 是否为编辑
type: Boolean,
default: null,
},
@@ -106,11 +116,13 @@ export default {
type: Number,
default: 0,
},
- isLevel: { // 是否是关卡页面触发
+ isLevel: {
+ // 是否是关卡页面触发
type: Number,
default: null,
},
- projectTaskId: { // 要编辑的projectId
+ projectTaskId: {
+ // 要编辑的projectId
type: Number,
default: null,
},
@@ -121,14 +133,15 @@ export default {
isactive: {
type: Number,
default: null,
- }
+ },
},
setup(props, ctx) {
const state = reactive({
tableData: [
{
key: "1",
- title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
+ title:
+ "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
name: "李玉冰",
time: "2022-10-31 23:12:00",
},
@@ -136,7 +149,7 @@ export default {
currentPage: 1,
tableDataTotal: 0,
pageSize: 10,
- inputV1: '',
+ inputV1: "",
time: undefined,
assessmentId: null,
assessmentName: "",
@@ -144,6 +157,8 @@ export default {
const closeDrawer = () => {
ctx.emit("update:addcaseVisible", false);
ctx.emit("update:edit", false);
+ localStorage.setItem("stageId", props.chooseStageId);
+ localStorage.setItem("chapterId", props.isactive);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
@@ -179,7 +194,13 @@ export default {
const rowSelection = {
onSelect: (selectedRows, selected, selectedRowKeys) => {
console.log(
- "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+ "selectedRowKeys",
+ selectedRowKeys,
+ "selectedRows",
+ selectedRows,
+ "selected",
+ selected
+ );
console.log(selectedRows.assessmentId);
state.assessmentId = selectedRows.assessmentId;
state.assessmentName = selectedRows.name;
@@ -228,8 +249,8 @@ export default {
});
};
const updateTask = () => {
- console.log("jinlaile=================", state.assessmentName)
- if (props.isLevel==1) {
+ console.log("jinlaile=================", state.assessmentName);
+ if (props.isLevel == 1) {
RouterEditTask({
chapterId: props.isactive,
courseId: state.assessmentId,
@@ -240,7 +261,7 @@ export default {
})
.then((res) => {
console.log(res, 11111);
- message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+ message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
ctx.emit("changeData", false);
closeDrawer();
state.addLoading = false;
@@ -248,7 +269,7 @@ export default {
.catch((err) => {
console.log(err, 1111);
});
- } else if(props.isLevel==2){
+ } else if (props.isLevel == 2) {
console.log("=========projectTaskId", props.projectTaskId);
apiTask
.addTask({
@@ -267,10 +288,10 @@ export default {
.catch((err) => {
console.log(err, 111111);
});
- }else if(props.isLevel==3){
+ } else if (props.isLevel == 3) {
console.log("模板库");
}
- }
+ };
//重置案例信息
const resetCase = () => {
state.inputV1 = "";
@@ -297,181 +318,181 @@ export default {
\ No newline at end of file
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 82c753f3..7cd9a3c9 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -174,6 +174,7 @@ export default {
state.inputV1 = "";
state.textV1 = "";
message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+ // ctx.emit("changeData", false);
localStorage.setItem("stageId", props.chooseStageId);
localStorage.setItem("chapterId", props.isactive);
};
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index daf6e24b..b934924f 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -9,7 +9,7 @@
>
- 选择测评：
{{edit?'编辑':'添加'}}测评
+ {{ edit ? "编辑" : "添加" }}测评
选择测评：
-
+
-
+
@@ -78,8 +80,12 @@
测评说明：
-
-
-
-
-
-
-
-
-
-
- 已选择 0 条
-
-
- 已选择 1 条;
- 名称： {{assessment.name}}
- 题数： {{assessment.num}}
- 创建人： {{assessment.creator}}
- 创建时间： {{assessment.time}}
-
-
-
-
-
-
-
-
- 选择评估
-
-
-
+
+
-
+
+
+
+
+
+ 已选择 0 条
+
+
+ 已选择 1 条;
+ 名称： {{ assessment.name }}
+
+ 题数： {{ assessment.num }}
+
+ 创建人： {{ assessment.creator }}
+
+ 创建时间： {{ assessment.time }}
+
+
+
+
+
+
+
+ 选择评估
+
+
+
+
+
+
-
-
-