diff --git a/src/api/indexInvist.js b/src/api/indexInvist.js index 550a5803..31bb417f 100644 --- a/src/api/indexInvist.js +++ b/src/api/indexInvist.js @@ -43,13 +43,15 @@ export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseM //删除评估信息 export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj }) - //根据ID获取评估信息详情 export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj }) //修改评估信息 export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj) +//获取全部评估信息接口 +export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) + // 测试方法 // import * as api from '../../api/index' diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 56a53e9d..fd16928c 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -72,6 +72,7 @@ import { reactive, toRefs, ref } from "vue"; import * as api from "../../api/indexDiscuss"; import * as apiTask from "../../api/indexTaskadd"; +import { RouterEditTask } from "@/api/indexTask" import { message } from "ant-design-vue"; const rowSelection = ref({ checkStrictly: false, @@ -98,14 +99,18 @@ export default { type: Boolean, default: false, }, + isStudiscuss: { + type: Boolean, + default: false, + } }, setup(props, ctx) { + console.log("学习路径",props.isStudiscuss); const state = reactive({ inputV1: "", inputV2: "", textV1: "", checkedC1: "", - add: true, }); const closeDrawer = () => { ctx.emit("update:adddiscussVisible", false); @@ -116,7 +121,7 @@ export default { console.log("state", bool); }; - //创建讨论 + //创建讨论（项目任务列表） const createDiscuss = () => { if (!state.inputV1) { message.destroy(); @@ -144,7 +149,27 @@ export default { message.success("创建成功"); ctx.emit("update:adddiscussVisible", false); //console.log("discussName",obj.discussName); - apiTask + console.log("学习路径",props.isStudiscuss); + if(props.isStudiscuss){ + let editObj1 = { + chapterId:36, + courseId: 0, + duration: 0, + flag: true, + name: obj.discussName, + routerId: 92, + routerTaskId: 0, + type: 8, + } + RouterEditTask(editObj1).then(res => { + console.log("新增关卡任务成功",res); + closeDrawer(); + }).catch(err => { + console.log("新增关卡任务失败",err); + }) + }else{ + console.log("项目添加讨论"); + apiTask .addTask({ courseId: 0, duration: 0, @@ -165,7 +190,8 @@ export default { .catch((err) => { console.log(err); }); - }) + } + }) .catch((err) => { console.log("创建失败", err); }); diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index d9ba6590..cf9bba58 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -112,6 +112,7 @@ import * as api from "../../api/indexEval"; import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { toDate } from "../../api/method"; +import { RouterEditTask } from "@/api/indexTask"; // const router = useRouter(); export default { name: "AddEval", @@ -126,6 +127,10 @@ export default { type: Boolean, default: false, }, + learn: { + type: Number, + default: 0, + }, }, setup(props, ctx) { const state = reactive({ @@ -184,8 +189,7 @@ export default { }; const beforeUpload = (file) => { - const isJpgOrPng = - file.type === "image/jpg" || file.type === "image/png"; + const isJpgOrPng = file.type === "image/jpg" || file.type === "image/png"; if (!isJpgOrPng) { message.error("You can upload JPG/PNG file!"); } @@ -235,27 +239,49 @@ export default { api .createEvaluation(obj) .then((res) => { - console.log("创建成功", res); - message.success("创建成功"); + console.log("创建成功", res); + message.success("创建成功"); closeDrawer(); - apitaskadd - .addTask({ + console.log("1111", props.learn); + if (props.learn == 0) + apitaskadd + .addTask({ + courseId: 0, + duration: 0, + flag: true, + name: obj.evaluationName, + projectId: 28, + projectTaskId: 0, + stageId: 3, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); + else { + let editObj1 = { + chapterId: 36, courseId: 0, duration: 0, flag: true, name: obj.evaluationName, - projectId: 28, - projectTaskId: 0, - stageId: 3, + routerId: 92, + routerTaskId: 0, type: 10, - }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - ctx.emit("changeData",false); - }) - .catch((err) => { - console.log(err); - }); + }; + RouterEditTask(editObj1) + .then((res) => { + console.log("调用学历路径添加接口后", res.data); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err); + }); + } }) .catch((err) => { console.log("创建失败", err); diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index aac2ce44..9e9e9c1d 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -38,31 +38,27 @@
+ style="border: 1px solid #f2f6fe" + :columns="tableDataFunc()" + :data-source="tableData" + :loading="tableDataTotal === -1 ? true : false" + expandRowByClick="true" + @expand="expandTable" + :pagination="false" + :row-selection="rowSelection" + /> -
- -
+
+ +
@@ -74,7 +70,7 @@ - - \ No newline at end of file diff --git a/src/components/drawers/DWF - 快捷方式.lnk b/src/components/drawers/DWF - 快捷方式.lnk new file mode 100644 index 00000000..070c295a Binary files /dev/null and b/src/components/drawers/DWF - 快捷方式.lnk differ diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index e3478562..ba441477 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -603,7 +603,7 @@ import ManageRight from "../../components/drawers/ManageRight"; import * as api from "../../api/index1"; import { message } from "ant-design-vue"; import { toDate } from "../../api/method"; - +import { storage } from "../../api/storage"; export default { name: "learningPath", components: { OwnerShip, PowerList, QueryRight, ManageRight }, @@ -1081,7 +1081,7 @@ export default { router.push({ path: "/leveladd", }); - localStorage.setItem("routerId", text.record.id); + storage.set("routerId", text.record.id); }} > 管理 diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index d920b069..3bbbf7e2 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -899,6 +899,8 @@ import WorkManage from "../../components/drawers/WorkManage"; // import { useRoute } from "vue-router"; // import { useStore } from "vuex"; import * as api from "../../api/index1"; +import { storage } from "../../api/storage"; + export default { name: "LevelAdd", components: { @@ -917,7 +919,7 @@ export default { // const routers = useRoute(); // const store = useStore(); const state = reactive({ - routerId: localStorage.getItem("routerId"), //学习路径页面传的学习路径id + routerId: storage.get("routerId") ? storage.get("routerId") : null, //学习路径页面传的学习路径id gatename: null, //关卡名称 gatenamee: null, //学员管理关卡名称 deleteAll: false, //批量删除学员弹窗 @@ -1236,7 +1238,7 @@ export default { }, ], }); - console.log("store", state.routerId); + // console.log("store", state.routerId); const selectProjectName = (value, index) => { console.log("value", value, index); if (value === "批量删除") { diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index dc8aa688..85eb6d5b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -175,7 +175,7 @@
@@ -190,12 +190,16 @@
- +
-
+
@@ -204,7 +208,7 @@
-
+
@@ -212,7 +216,7 @@
-
+
@@ -221,7 +225,7 @@
-
+
@@ -241,6 +245,7 @@
@@ -255,7 +260,10 @@
评估
- +
@@ -269,13 +277,16 @@
投票
- +
-
+
+ +
+ +
+ + +
+ +
+
+ + + + + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此任务吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
@@ -551,26 +613,35 @@ import AddStu from "../../components/drawers/AddLevelAddStu"; import ImpStu from "../../components/drawers/AddLevelImportStu"; import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; +import AddDiscuss from "../../components/drawers/AddDiscuss.vue"; +import AddActive from "../../components/drawers/AddActive.vue"; import AddEval from "../../components/drawers/AddEval.vue"; import AddInvist from "../../components/drawers/AddInvist.vue"; import AddVote from "../../components/drawers/AddVote.vue"; +import AddLive from "../../components/drawers/AddLive.vue"; +import AddRef from "../../components/drawers/AddRef.vue"; import * as api from "../../api/indexLevel"; import { GetRouterDetail, RouterDeleteTask } from "../../api/indexTask"; import { message } from "ant-design-vue"; +import { storage } from "../../api/storage"; export default { name: "LevelAddDetail", components: { AddStu, ImpStu, AddHomework, + AddDiscuss, + AddActive, AddTest, AddEval, AddInvist, AddVote, + AddLive, + AddRef, }, setup() { const state = reactive({ - routerId: localStorage.getItem("routerId"), + routerId: storage.get("routerId")?storage.get("routerId"):null, level: [ { chapterId: "1", @@ -582,6 +653,7 @@ export default { { key: 1, lei: "在线", + routerTaskId: 0, // state: "已发布", creater: "管理者课程", // pubtime: "2022-07-20 14:00:03", @@ -765,18 +837,28 @@ export default { visible: false, AddSvisible: false, //添加学员抽屉 AddImpStuvisible: false, //导入学员抽屉 + addlivevisible: false, //添加直播抽屉 + addrefvisible: false, //添加外链抽屉 modal: false, clos: false, stm_hs: false, deleteAll: false, closeDeleteAll: false, + deleteModal: false, // 删除弹窗 + deleteID: "", // 要删除的任务的id + editID: "", // 要编辑的任务id + cC: false, value1: "", value2: "", selectedRowKeys: [], edit: false, //是否点击编辑 + learn: 0, gqxy_hs: true, isactive: 0, projectChecked: null, //项目单选框 + adddiscussvisible: false, //讨论抽屉 + isStudiscuss: false, + addactivevisible: false, //活动抽屉 addhomeworkvisible: false, addtestvisible: false, addevalvisible: false, @@ -786,7 +868,13 @@ export default { // 表示当前触发列表的id,用来发送编辑和删除 ListChoosedId: 0, }); - + const showDrawerAddDiscuss = () => { + state.adddiscussvisible = true; + state.isStudiscuss = true; + }; + const showDrawerAddActive = () => { + state.addactivevisible = true; + }; //新建关卡 const editChapter = () => { if (!state.value1) return message.warning("请输入关卡名称"); @@ -847,6 +935,7 @@ export default { //测试评估投票抽屉 const showDrawerAddEval = () => { state.addevalvisible = true; + state.learn = 1; }; const showDrawerAddInvist = () => { state.addinvistvisible = true; @@ -865,25 +954,19 @@ export default { creater: element.name, cretime: element.duration, checked1: element.flag, + routerTaskId: element.routerTaskId, }; }); }; - const getDetail = (index) => { GetRouterDetail(92) .then((res) => { state.level = res.data.data.chapterList; console.log(state.level); if (index == 0) { - // state.tableData[1] = { - // key: 2, - // lei: "在线", - // creater: "管理者课程", - // cretime: "60", - // checked1: true, - // } dataAssignment(0); } + state.deleteModal = false; }) .catch((err) => { message.error(err); @@ -1007,15 +1090,15 @@ export default { // width: 100, align: "center", scopedSlots: { customRender: "action" }, //引入的插槽 - customRender: () => { + customRender: (e) => { return (
{ - state.edit = true; - state.addevalvisible = true; + state.editID = e.record.routerTaskId; + state.addhomeworkvisible = true; }} > 编辑 @@ -1023,7 +1106,7 @@ export default { { - deleteLevelTask(); + showDeleteModal(e.record.routerTaskId); }} > 删除 @@ -1257,6 +1340,15 @@ export default { const delete_exit = () => { state.deleteAll = false; }; + const showDeleteModal = (id) => { + state.deleteID = id; + state.deleteModal = true; + }; + const closeConfirm = () => { + state.deleteModal = false; + state.deleteID = ""; + state.editID = ""; + }; const deleteLevelTask = () => { RouterDeleteTask(state.listChoosedId) .then((res) => { @@ -1268,6 +1360,23 @@ export default { }); }; + const showDrawerAddLive = () => { + state.addlivevisible = true; + }; + const showDrawerAddRef = () => { + state.addrefvisible = true; + }; + + const closeDeleteModel = () => { + state.deleteModal = false; + state.deleteID = ""; + }; + // 子组件触发的清空 editid 事件 + const clearEditData = () => { + state.editID = ""; + getDetail(0); + }; + return { ...toRefs(state), tableDataFunc, @@ -1285,6 +1394,7 @@ export default { gqxy_hShow, showDeleteALLModal, delete_exit, + closeConfirm, drawertableColumns, editChapter, // updateChapter, @@ -1294,12 +1404,129 @@ export default { showDrawerAddInvist, showDrawerAddVote, deleteLevelTask, + showDrawerAddLive, + showDrawerAddRef, + closeDeleteModel, + clearEditData, + showDrawerAddDiscuss, + showDrawerAddActive, }; }, };