diff --git a/src/api/index.js b/src/api/index.js index f1afd2ed..883c6a74 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -41,4 +41,7 @@ import http from "./config"; export const createProject = (obj) => http.post('/admin/project/edit', obj) // 获取项目列表 -export const getProjectList = (obj) => http.post('/admin/project/list', obj) \ No newline at end of file +export const getProjectList = (obj) => http.post('/admin/project/list', obj) + +// 获取项目详情信息（包含阶段及任务列表） +export const getProjectDetail = (obj) => http.get('/admin/project/detail', { params: obj }) \ No newline at end of file diff --git a/src/api/indexStage.js b/src/api/indexStage.js new file mode 100644 index 00000000..7b0d3fb1 --- /dev/null +++ b/src/api/indexStage.js @@ -0,0 +1,8 @@ +import http from "./config"; + +//添加阶段 +export const editStage = (obj) => http.post('/admin/project/editStage', obj, { + headers: { + 'token': '123' + } +}); \ No newline at end of file diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index b4fe8827..aeaebb45 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -224,6 +224,7 @@ - - \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index cefe7a20..2043dcf8 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1292,7 +1292,11 @@ export default { message.destroy(); return message.warning("请输入路径图名称"); } - // if (!state.organizationSelectName) return message.warning("请选择归属组织"); + + // if (!state.organizationSelectName){ + // message.destroy(); + // return message.warning("请选择归属组织"); + // } // state.createLoading = true; let obj = { name: state.pathName, @@ -1303,14 +1307,19 @@ export default { api .createLearnPath(obj) .then((res) => { - setTimeout(() => { - console.log("创建成功", res); - message.success("创建成功"); - // state.createLoading = false; - state.currentPage = 1; - router.push("/leveladd"); - // getLearnPath(); - }, 1000); + console.log("创建成功", res); + message.destroy(); + message.success("创建成功"); + router.push("/leveladd"); + // setTimeout(() => { + // console.log("创建成功", res); + // message.destroy(); + // message.success("创建成功"); + // // state.createLoading = false; + // state.currentPage = 1; + // router.push("/leveladd"); + // // getLearnPath(); + // }, 1000); }) .catch((err) => { console.log("创建失败", err); @@ -1365,6 +1374,7 @@ export default { .handleLearnPath(obj) .then((res) => { console.log("删除成功", res); + message.destroy(); message.success("删除成功"); state.deleteModal = false; getLearnPath(); @@ -1375,8 +1385,15 @@ export default { }; //编辑学习路径图 const editLearnPath = () => { - if (!state.pathName) return message.warning("请输入路径图名称"); - // if (!state.organizationSelectName) return message.warning("请选择归属组织"); + if (!state.pathName) { + message.destroy(); + return message.warning("请输入路径图名称"); + } + + // if (!state.organizationSelectName){ + // message.destroy(); + // return message.warning("请选择归属组织"); + // } // state.createLoading = true; let obj = { routerId: state.editPathId, @@ -1388,15 +1405,23 @@ export default { api .createLearnPath(obj) .then((res) => { - setTimeout(() => { - console.log("修改成功", res); - message.success("修改成功"); - // state.createLoading = false; - // state.currentPage = 1; - state.out1 = false; - // router.push("/leveladd"); - getLearnPath(); - }, 1000); + console.log("修改成功", res); + message.destroy(); + message.success("修改成功"); + // state.createLoading = false; + // state.currentPage = 1; + state.out1 = false; + // router.push("/leveladd"); + getLearnPath(); + // setTimeout(() => { + // console.log("修改成功", res); + // message.success("修改成功"); + // // state.createLoading = false; + // // state.currentPage = 1; + // state.out1 = false; + // // router.push("/leveladd"); + // getLearnPath(); + // }, 1000); }) .catch((err) => { console.log("修改失败", err); @@ -2175,6 +2200,7 @@ export default { .g1 { color: #4ea6ff; font-size: 14px; + cursor: pointer; } } } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 0fc9e098..d920b069 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -258,9 +258,7 @@ - +
-
+
{{ value1.length }}/20
-
-
+
关卡说明：
- +
@@ -221,30 +230,45 @@
-
+
测评
+ +
+ +
+
-
+
评估
+ +
+ +
+
-
+
投票
+ +
+ +
+
@@ -524,6 +548,9 @@ 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 AddEval from "../../components/drawers/AddEval.vue"; +import AddInvist from "../../components/drawers/AddInvist.vue"; +import AddVote from "../../components/drawers/AddVote.vue"; import * as api from "../../api/indexLevel"; import { GetRouterDetail, RouterDeleteTask } from "../../api/indexTask"; import { message } from "ant-design-vue"; @@ -533,16 +560,20 @@ export default { AddStu, ImpStu, AddHomework, - AddTest + AddTest, + AddEval, + AddInvist, + AddVote, }, setup() { const state = reactive({ + routerId: localStorage.getItem("routerId"), level: [ { chapterId: "1", remark: "关卡说明", name: "默认关卡", - } + }, ], tableData: [ { @@ -739,19 +770,23 @@ export default { value1: "", value2: "", selectedRowKeys: [], + edit:false, //是否点击编辑 gqxy_hs: true, isactive: 0, projectChecked: null, //项目单选框 addhomeworkvisible: false, - addtestvisible:false, + addtestvisible: false, + addevalvisible: false, + addinvistvisible: false, + addvotevisible: false, updateChapterID: null, //修改关卡id // 表示当前触发列表的id,用来发送编辑和删除 - ListChoosedId:0 + ListChoosedId: 0, }); //新建关卡 const editChapter = () => { - if(!state.value1) return message.warning("请输入关卡名称"); + if (!state.value1) return message.warning("请输入关卡名称"); let obj = { name: state.value1, remark: state.value2, @@ -774,7 +809,7 @@ export default { .catch((err) => { console.log("创建失败", err); }); - } + }; //编辑关卡 // const updateChapter = () => { @@ -800,44 +835,56 @@ export default { // 作业和考试的抽屉 const showDrawerAddHomework = () => { state.addhomeworkvisible = true; - state.ListChoosedId = 0 + state.ListChoosedId = 0; }; const showDrawerAddTest = () => { state.addtestvisible = true; - state.ListChoosedId = 0 + state.ListChoosedId = 0; + }; + //测试评估投票抽屉 + const showDrawerAddEval = () => { + state.addevalvisible = true; + }; + const showDrawerAddInvist = () => { + state.addinvistvisible = true; + }; + const showDrawerAddVote = () => { + state.addvotevisible = true; }; // tableData数据赋值方法 const dataAssignment = () => { - console.log((state.level)); - state.level[0].taskList.forEach((element,index) => { + console.log(state.level); + state.level[0].taskList.forEach((element, index) => { state.tableData[index] = { - key:element.routerTaskId, - lei:checkType(element.type), - creater:element.name, - cretime:element.duration, - checked1:element.flag - } + key: element.routerTaskId, + lei: checkType(element.type), + creater: element.name, + cretime: element.duration, + checked1: element.flag, + }; }); - } + }; 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) - } - }).catch((err) => { - message.error(err) - }) - } + 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); + } + }) + .catch((err) => { + message.error(err); + }); + }; const closeDrawer = () => { state.visible = false; }; @@ -960,12 +1007,23 @@ export default { return (
- + { + state.edit = true; + state.addevalvisible = true; + }} + > 编辑 - { - deleteLevelTask() - }}>删除 + { + deleteLevelTask(); + }} + > + 删除 +
); @@ -975,9 +1033,22 @@ export default { return columns; }; const checkType = (index) => { - let typeRules = ["","在线","面授","案例","作业","考试","直播","外链","讨论","测评","评估","投票"]; + let typeRules = [ + "", + "在线", + "面授", + "案例", + "作业", + "考试", + "直播", + "外链", + "讨论", + "测评", + "评估", + "投票", + ]; return typeRules[index]; - } + }; const tableDataFunc2 = () => { const columns = [ { @@ -1162,7 +1233,7 @@ export default { document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)"; document.getElementsByTagName("main")[0].style.boxShadow = "none"; - getDetail(0) + getDetail(0); }); onUnmounted(() => { document.getElementsByTagName("main")[0].style.background = "#ffffff"; @@ -1183,13 +1254,15 @@ export default { state.deleteAll = false; }; const deleteLevelTask = () => { - RouterDeleteTask(state.listChoosedId).then((res) => { - console.log(`删除成功${res}`); - message.success('删除成功') - }).catch((err) => { - console.log(`删除失败${err}`); - }) - } + RouterDeleteTask(state.listChoosedId) + .then((res) => { + console.log(`删除成功${res}`); + message.success("删除成功"); + }) + .catch((err) => { + console.log(`删除失败${err}`); + }); + }; return { ...toRefs(state), @@ -1213,6 +1286,9 @@ export default { // updateChapter, showDrawerAddHomework, showDrawerAddTest, + showDrawerAddEval, + showDrawerAddInvist, + showDrawerAddVote, deleteLevelTask, }; }, @@ -1339,9 +1415,9 @@ export default { width: 100px; height: 40px; border-radius: 4px; - border: 1px solid #409EFF; + border: 1px solid #409eff; font-size: 14px; - color: #409EFF; + color: #409eff; cursor: pointer; background: #ffffff; margin-right: 20px; @@ -1354,7 +1430,7 @@ export default { color: #fff; cursor: pointer; border: 0; - background: #409EFF; + background: #409eff; } } } diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index e6e459d8..2d2eb91f 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -1,68 +1,44 @@ diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 0d7cf5e9..a60311c5 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -565,7 +565,7 @@
- +
@@ -577,7 +577,7 @@
- 您确定要存为模板吗 + 您确定要存为模版吗
@@ -1358,15 +1358,15 @@ export default { 基础信息 - + {/*
{ showStartModal(); }} > - 存为模板 + 存为模版
- + */}
@@ -1860,13 +1860,13 @@ export default { 删除
- +
{ showStartModal(); }} > - 存为模板 + 存为模版
@@ -1880,13 +1880,13 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - +
{ showStartModal(); }} > - 存为模板 + 存为模版
@@ -1918,13 +1918,13 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - +
{ showStartModal(); }} > - 存为模板 + 存为模版
@@ -1947,13 +1947,13 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > - +
{ showStartModal(); }} > - 存为模板 + 存为模版
@@ -2214,7 +2214,7 @@ export default { }, }; -