@@ -953,6 +966,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 AddHomework from "../../components/drawers/AddHomework.vue";
import AddTest from "../../components/drawers/AddTest.vue";
import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -969,12 +984,17 @@ import { storage } from "../../api/storage";
import { deleteStudyTask } from "../../api/indexStudy";
import draggable from "vuedraggable";
import { editTask } from "../../api/indexTaskadd";
+import * as apiProj from "../../api/indexInvist.js";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
import { toDate } from "../../api/method";
export default {
name: "LevelAddDetail",
components: {
AddStu,
ImpStu,
+ AddOnline,
+ AddCase,
AddHomework,
AddDiscuss,
AddActive,
@@ -1087,104 +1107,108 @@ export default {
time: "2022-07-15 14:00",
},
],
- drawertableData: [
- {
- key: 1,
- projectName: "管理者进阶",
- manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- children: [
- {
- key: "1-1",
- projectName: "管理者进阶-腾飞班",
- manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- children: [
- {
- key: "1-1-1",
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- ],
- },
- ],
- },
- {
- key: 2,
- projectName: "管理者进阶",
- manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- children: [
- {
- key: "2-1",
- projectName: "管理者进阶-腾飞班",
- manager: "黄华 刘俊",
+ drawertableData: [],
+ // drawertableData: [
+ // {
+ // key: 1,
+ // projectName: "管理者进阶",
+ // manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // children: [
+ // {
+ // key: "1-1",
+ // projectName: "管理者进阶-腾飞班",
+ // manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // children: [
+ // {
+ // key: "1-1-1",
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // ],
+ // },
+ // ],
+ // },
+ // {
+ // key: 2,
+ // projectName: "管理者进阶",
+ // manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // children: [
+ // {
+ // key: "2-1",
+ // projectName: "管理者进阶-腾飞班",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- children: [
- {
- key: "2-1-1",
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- ],
- },
- ],
- },
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // children: [
+ // {
+ // key: "2-1-1",
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // ],
+ // },
+ // ],
+ // },
- {
- key: 3,
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
+ // {
+ // key: 3,
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- {
- key: 4,
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // {
+ // key: 4,
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- {
- key: 5,
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // {
+ // key: 5,
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- {
- key: 6,
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // {
+ // key: 6,
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- {
- key: 7,
- projectName: "管理者进阶-腾飞班K1",
- manager: "黄华 刘俊",
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // {
+ // key: 7,
+ // projectName: "管理者进阶-腾飞班K1",
+ // manager: "黄华 刘俊",
- creater: "毛继禹",
- time: "2022-07-20 14:00:03",
- },
- ],
+ // creater: "毛继禹",
+ // time: "2022-07-20 14:00:03",
+ // },
+ // ],
currentPage: 1,
- tableDataTotal: 100,
+ tableDataTotal: 0,
pageSize: 10,
visible: false,
+ //项目
+ editproj: false,
+ addprojvisible: false,
AddSvisible: false, //添加学员抽屉
AddImpStuvisible: false, //导入学员抽屉
addlivevisible: false, //添加直播抽屉
@@ -1197,7 +1221,9 @@ export default {
deleteModal: false, // 删除弹窗
deleteID: "", // 要删除的任务的id
editID: "", // 要编辑的任务id
- EditWorkId: "", // 要编辑的 workid
+ EditOnlineId:"", // 要编辑的 workid
+ EditCaseId:"",
+ EditWorkId: "",
EditTestId: "",
EditRefId: "",
EditLiveId: "",
@@ -1206,6 +1232,8 @@ export default {
EditEvalId: "",
EditInvistId: "",
EditVoteId: "",
+ //项目
+ EditProjId: "",
routerTaskId: "",
chapterId: "",
stageId: "",
@@ -1221,6 +1249,8 @@ export default {
adddiscussvisible: false, //讨论抽屉
isStudiscuss: false,
addactivevisible: false, //活动抽屉
+ addonlinevisible:false,
+ addcasevisible:false,
addhomeworkvisible: false,
addtestvisible: false,
addevalvisible: false,
@@ -1235,6 +1265,13 @@ export default {
styTitle: null,
creTime: null,
picUrl: null,
+ //项目抽屉参数
+ time: undefined,
+ assessmentId: null,
+ assessmentName: "",
+ projectId: null,
+ projectTaskId: null,
+ chooseStageId: null,
});
//新建关卡
@@ -1285,6 +1322,23 @@ export default {
const showDrawer = () => {
state.visible = true;
};
+ //关闭项目抽屉
+ const leaveProjDrawer = () => {
+ state.addprojvisible = false;
+ state.isLevel = false;
+ };
+ //在线抽屉
+ const showDrawerAddOnline = (id,eleId)=>{
+ state.addonlinevisible = true;
+ state.EditWorkId = id;
+ state.routerTaskId = eleId;
+ }
+ //案例抽屉
+ const showDrawerAddCase = (id,eleId)=>{
+ state.addcasevisible = true;
+ state.EditWorkId = id;
+ state.routerTaskId = eleId;
+ }
// 作业和考试的抽屉
const showDrawerAddHomework = (id, eleId) => {
console.log("homework==============", id, state.isactive);
@@ -1337,6 +1391,12 @@ export default {
state.EditActiveId = id;
state.routerTaskId = eleId;
};
+ //打开项目抽屉
+ const showDrawerAddProj = (id, eleId) => {
+ state.addprojvisible = true;
+ state.EditActiveId = id;
+ state.routerTaskId = eleId;
+ };
// tableData数据赋值方法
const dataAssignment = (id) => {
@@ -1525,23 +1585,11 @@ export default {
};
const drawertableColumns = () => {
- // let arr = state.drawertableData;
- // function traverse(arr) {
- // for (var a in arr) {
- // // console.log(arr[a]);
- // if (arr[a].children) {
- // traverse(arr[a].children); //递归遍历
- // } else {
- // console.log(arr[a].children); //如果是值就显示
-
- // }
- // }
- // }
- // traverse(arr);
const drawercolumns = [
{
title: "项目名称",
- dataIndex: "projectName",
+ dataIndex: "name",
+ // dataIndex: "projectName",
key: "projectName",
width: 200,
// align: "center",
@@ -1584,7 +1632,7 @@ export default {
{
title: "创建人",
- dataIndex: "creater",
+ dataIndex: "creator",
// width: "30%",
key: "creater",
width: 100,
@@ -1614,6 +1662,7 @@ export default {
"rgb(245, 247, 250,1)";
document.getElementsByTagName("main")[0].style.boxShadow = "none";
getDetail();
+ getAllProjText();
});
onUnmounted(() => {
document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1792,6 +1841,12 @@ export default {
showDrawerAddEval(id, eleId);
} else if (type == "投票") {
showDrawerAddVote(id, eleId);
+ } else if (type == "项目") {
+ showDrawerAddProj(id, eleId);
+ } else if (type == "在线") {
+ showDrawerAddOnline(id, eleId);
+ } else if (type == "案例") {
+ showDrawerAddCase(id, eleId);
}
};
//删除关卡
@@ -1850,6 +1905,78 @@ export default {
console.log("阶段改变", value, option);
state.removeStageId = option.chapterId;
};
+
+ //项目抽屉用的
+ const rowSelection = {
+ onSelect: (selectedRows, selected, selectedRowKeys) => {
+ console.log(
+ "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+ console.log(selectedRows.assessmentId);
+ state.assessmentId = selectedRows.assessmentId;
+ state.assessmentName = selectedRows.name;
+ },
+ };
+ const getTableDate = (drawertableData) => {
+ let data = drawertableData;
+ let array = [];
+ data.map((value, index) => {
+ let obj = {
+ key: index,
+ assessmentId: value.assessmentId,
+ num: value.essayQuestionVoList.length,
+ name: value.assessmentName ? value.assessmentName : "-",
+ creator: value.createUser ? value.createUser : "-",
+ time: dayjs(value.createTime).format("YYYY-MM-DD"),
+ };
+ array.push(obj);
+ });
+ state.drawertableData = array;
+ };
+ //获取全部项目信息接口
+ const getAllProjText = () => {
+ apiProj
+ .queryAssessmentDetailList({
+ assessmentName: "",
+ pageNo: state.currentPage,
+ pageSize: state.pageSize,
+ })
+ .then((res) => {
+ let arr = res.data.data.rows;
+ if (res.status === 200) {
+ getTableDate(arr);
+ console.log('---------------项目信息---------------------------');
+ }
+ })
+ .catch((err) => {
+ console.log("获取全部项目信息接口失败", err);
+ 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,
+ })
+ .then((res) => {
+ console.log(res, 11111);
+ message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
+ // ctx.emit("changeData", false);
+ closeDrawer();
+ state.addLoading = false;
+ })
+ .catch((err) => {
+ console.log(err, 1111);
+ });
+ }
+ onMounted(() => {
+ // createCase();
+ getAllProjText();
+ });
return {
...toRefs(state),
// tableDataFunc,
@@ -1871,6 +1998,8 @@ export default {
drawertableColumns,
editChapter,
// updateChapter,
+ showDrawerAddOnline,
+ showDrawerAddCase,
showDrawerAddHomework,
showDrawerAddTest,
showDrawerAddEval,
@@ -1879,6 +2008,8 @@ export default {
deleteLevelTask,
showDrawerAddLive,
showDrawerAddRef,
+ showDrawerAddProj,
+ leaveProjDrawer,
closeDeleteModel,
clearEditData,
showDrawerAddDiscuss,
@@ -1895,6 +2026,10 @@ export default {
showChangeModal,
closeChangeModal,
handleChangeStage,
+ rowSelection,
+ getTableDate,
+ getAllProjText,
+ updateTask,
};
},
};
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 369f8e5f..1dd9ddc0 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -1,55 +1,89 @@
-
-
-
-
-
-
-

-
项目归属
-
-
-
- {{ projectAscription }}
-
-
-
-
-
-

-
班级名称
-
-
-
-
-
-

-
分类
-
-
-
-
-
-

-
封面图
-
-
+
+
+
+
+
+

+
项目归属
+
+
+
+ {{ projectAscription }}
+
+
+
+
+
+

+
班级名称
+
+
+
+
+
+

+
分类
+
+
+
+
+
+

+
封面图
+
+
-
-
+
+
-
-
-
-
-
-
-

-
子项目时间
-
+ "
+ v-if="imageUrl"
+ :src="imageUrl"
+ alt="avatar"
+ />
+
+
+
+
+
+
+

+
子项目时间
+
-
-
-
-
-

-
子项目经理
-
-
-
-
-
-

-
资源归属
-
+
+
+
+
+

+
子项目经理
+
+
+
+
+
+

+
资源归属
+
-
-
-
-
+
+
+
+
+
同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
-
-
-
-
-

-
项目级别
-
-
-
-
-
-

-
培训体系
-
-
-
-
-
-

-
是否BOEU实施
-
-
-
同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
+
+
+
+
+

+
项目级别
+
+
+
+
+
+

+
培训体系
+
+
+
+
+
+

+
是否BOEU实施
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 9d48e5f9..deb832c8 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -28,6 +28,7 @@
placeholder="请输入项目名称"
show-count
:maxlength="30"
+ :disabled="viewDetail ? true : false"
/>