diff --git a/src/api/index.js b/src/api/index.js index 49ade8be..f1afd2ed 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -37,11 +37,8 @@ import http from "./config"; // 接口-请求 -// 创建编辑单层项目 +// 创建编辑单层项目（type=3）/ 多层项目（type=1）/ 多层子项目（type=2） export const createProject = (obj) => http.post('/admin/project/edit', obj) -// 创建多层项目 -export const createStoreyProject = (obj) => http.post('/admin/project/edit', obj) - // 获取项目列表 export const getProjectList = (obj) => http.post('/admin/project/list', obj) \ No newline at end of file diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js index cc9863a9..5167f69c 100644 --- a/src/api/indexDiscuss.js +++ b/src/api/indexDiscuss.js @@ -10,4 +10,4 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', export const deleteDiscuss = (obj) => http.post('/discuss/deleteDiscuss', { params: obj }); //修改讨论接口 -export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', { params: obj }); \ No newline at end of file +export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', obj ); \ No newline at end of file diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js index 39e22fcd..b7b1b400 100644 --- a/src/api/indexLevel.js +++ b/src/api/indexLevel.js @@ -1,8 +1,14 @@ import http from "./config"; -//新建或编辑关卡 +//新建关卡 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, { headers: { 'token': '123' } +}); +//编辑关卡 +export const updateChapter = (obj) => http.post('/admin/router/editChapter', 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 5388f71c..baceb73c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -71,6 +71,12 @@
+
+ +
活动时间：
@@ -284,8 +290,9 @@ export default { //创建活动 const createActivity = () => { if(!state.inputV1) return message.warning("请输入活动名称"); - if(!state.inputV2) return message.warning("请输入活动时长"); if(!state.textV1) return message.warning("请输入活动公告"); + if(!state.time) return message.warning("请输入活动时间"); + if(!state.inputV2) return message.warning("请输入活动时长"); if(!state.inputV3) return message.warning("请输入活动地址"); let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D"); let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D"); diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue index 5c365471..49e1cc79 100644 --- a/src/components/drawers/ProMess.vue +++ b/src/components/drawers/ProMess.vue @@ -3,7 +3,7 @@ :visible="Provisible" class="drawerStyle promess" placement="right" - width="50%" + width="70%" @after-visible-change="afterVisibleChange" >
@@ -75,7 +75,7 @@ export default { } } .drawerMain { - min-width: 434px; + min-width: 600px; margin: 0px 32px 0px 32px; overflow-x: scroll; display: flex; diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 36657360..42932f58 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -69,178 +69,74 @@
-
-
- -
-
阶段1 腾飞班阶段1
-
-
-
-
-
-
在线
-
如何成为一个产品经理
-
-
-
- + + + +
+
+
+
{{item.course}}
+
{{item.name}}
-
已完成
-
-
-
-
-
-
直播
-
管理者播课
-
-
-
- +
+
+ +
+
{{item.complete}}
-
已完成
-
-
-
-
-
-
面授
-
管理面授课
-
-
-
- -
-
未完成
-
-
-
-
-
-
活动
-
管理者活动
-
-
-
- -
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
- -
-
未完成
-
-
-
-
-
-
-
- -
-
阶段2 腾飞班阶段2
-
-
-
-
-
-
在线
-
如何成为一个产品经理
-
-
-
- -
-
已完成
-
-
-
-
-
-
直播
-
管理者播课
-
-
-
- -
-
已完成
-
-
-
-
-
-
面授
-
管理面授课
-
-
-
- -
-
未完成
-
-
-
-
-
-
活动
-
管理者活动
-
-
-
- -
-
未完成
-
-
-
-
-
-
作业
-
管理者作业
-
-
-
- -
-
未完成
-
-
-
+
+ +
- + - diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue index 0f5291e3..6174797b 100644 --- a/src/views/projectcenter/SonProject.vue +++ b/src/views/projectcenter/SonProject.vue @@ -1,528 +1,875 @@ + diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 29072afe..f72d91a4 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -539,6 +539,7 @@ import AddVote from "../../components/drawers/AddVote.vue"; import { message } from "ant-design-vue"; import * as api from "../../api/indexTaskadd"; import * as apilive from "../../api/indexLiveBroadcast"; +import * as apiExternal from "../../api/indexExternalChain"; import * as apidiscuss from "../../api/indexDiscuss"; import * as apiactivity from "../../api/indexActivity"; import * as apieval from "../../api/indexEval"; @@ -674,6 +675,7 @@ export default { haspub: false, checked1: false, checkedd: false, + id: "ssss", }, { key: 2, @@ -858,6 +860,7 @@ export default { isactive: -1, isActive: false, deleteLiveID: null, //删除直播id + deleteExternalID: null, //删除外链id deleteEvalID: null, //测评 deleteInvistID: 4, //评估 deleteDiscussID: null, //删除讨论id @@ -1035,7 +1038,22 @@ export default { console.log(err); }); }; - //删除讨论 + + //删除外链 + const deleteExternalChain = () => { + let obj = { + linkId: state.deleteExternalID, + }; + apiExternal + .deleteLink(obj) + .then((res) => { + console.log(res); + }) + .catch((err) => { + console.log(err); + }); + }; + const deleteDiscuss = () => { let obj = { discussId: state.deleteDiscussID, @@ -1053,6 +1071,31 @@ export default { console.log("删除失败", err); }); }; + //编辑讨论 + const editDiscuss = () => { + let obj = { + createTime: "", + createUser: 0, + discussExplain: "", + discussFlag: "", + discussId: 0, + discussName: "", + discussSettings: "", + discussTag: "", + projectId: 0, + updateTime: "", + updateUser: 0 + }; + apidiscuss + .updateDiscuss(obj) + .then((res) => { + console.log("更新成功", res); + message.success("更新成功"); + }) + .catch((err) => { + console.log("更新失败", err); + }); + }; //删除活动 const deleteActivity = () => { let obj = { @@ -1071,10 +1114,42 @@ export default { console.log("删除失败", err); }); }; + //编辑活动 + const editActivity = () => { + let obj = { + activityAddress: "", + activityDuration: "", + activityEndTime: "", + activityExplain: "", + activityFlag: "", + activityId: 0, + activityName: "", + activityNotice: "", + activityStartTime: "", + activityTag: "", + afterSignIn: "", + beforeSignIn: "", + createTime: "", + createUser: 0, + signOutTime: "", + standardSettings: "", + updateTime: "", + updateUser: 0, + }; + apiactivity + .updateActivity(obj) + .then((res) => { + console.log("更新成功", res); + message.success("更新成功"); + }) + .catch((err) => { + console.log("更新失败", err); + }); + }; //删除测评测试 const deleteEvalText = () => { let obj = { - evaluationId: state.deleteEvalID, + evaluationId: state.deleteEvalID, }; apieval .deleteEvaluationById(obj) @@ -1104,7 +1179,7 @@ export default { evaluationTypeId: 0, evaluationTypeName: "", updateTime: "", - updateUser: 0, + updateUser: 0 }; apieval .updateEvaluation(obj) @@ -1125,7 +1200,7 @@ export default { //删除评估测试 const deleteInvistText = () => { let obj = { - evaluationId: state.deleteInvistID, + evaluationId:state.deleteInvistID, }; apiinvist .deleteAppraise(obj) @@ -1139,40 +1214,7 @@ export default { console.log("删除失败", err); }); }; - - //编辑测评信息 - const editInvistPath = () => { - let obj = { - appraiseEndTime: "", - appraiseExplain: "", - appraiseFlag: "", - appraiseId: 0, - appraiseName: "", - appraiseStartTime: "", - appraiseTag: "", - createTime: "", - createUser: 0, - researchId: 0, - researchName: "", - updateTime: "", - updateUser: 0, - }; - apiinvist - .updateAppraiseMessage(obj) - .then((res) => { - setTimeout(() => { - console.log("修改成功", res); - message.success("修改成功"); - //重新获取列表 - getTask(); - }, 1000); - }) - .catch((err) => { - console.log("修改失败", err); - // state.createLoading = false; - }); - }; - + const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); state.selectedRowKeys = selectedRowKeys; @@ -1301,8 +1343,11 @@ export default { getTask, deleteLiveBroadcast, deleteDiscuss, + editDiscuss, deleteEvalText, + deleteExternalChain, deleteActivity, + editActivity, editEvalPath, deleteInvistText, editInvistPath,