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/indexEval.js b/src/api/indexEval.js index b02e4875..9967452d 100644 --- a/src/api/indexEval.js +++ b/src/api/indexEval.js @@ -1,5 +1,5 @@ import http from "./config"; -// import qs from 'qs'; +import qs from 'qs'; /** @@ -33,15 +33,19 @@ import http from "./config"; * axios.post(`${this.$url}/test/testRequest`,data).then() * */ - +// , { +// header: { +// 'token': '123', +// } +// } // 接口-请求 //创建测评 -export const createEvaluation = (obj) => http.post('/evaluation/createEvaluation', obj,); +export const createEvaluation = (obj) => http.post('/evaluation/createEvaluation', obj); //上传组件 -export const fileUp = (obj) => http.post('/file/upload', obj,); +export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj })); //删除测评信息 export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvaluationById', { params: obj }) 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/api/indexVote.js b/src/api/indexVote.js index e69de29b..ce450782 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -0,0 +1,75 @@ +import http from "./config"; +import qs from 'qs'; + + +/** + * 接口传参数方式（get） + * axios.get('/user', { + * params: { + * id: 12345， + * name: user + * } + * }).then(res => console.log(res)) + * + * 接口传参三种方式（post/put/patch） + * + * 1.'Content-Type'= 'multipart/form-data'，传参格式为 formData。 + * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） + * （request的Header:'Content-Type'= 'multipart/form-data'） + * var formData=new FormData(); + * formData.append('user',123456);formData.append('pass',12345678); + * axios.post("/notice",formData).then() + * + * 2.'Content-Type'= 'application/x-www-form-urlencoded'，传参格式为 query 形式,使用$qs.stringify。 + * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） + * （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'） + * let data = {"code":"1234","name":"yyyy"}; + * axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then() + * + * 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。 + * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） + * （request的Header:'Content-Type'= 'application/json;charset=UTF-8'） + * let data = {"code":"1234","name":"yyyy"} + * axios.post(`${this.$url}/test/testRequest`,data).then() + * + */ +// , { +// header: { +// 'token': '123', +// } +// } + +// 接口-请求 + +//基础票数上传接口 +// export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj) + +//创建题干信息接口 +export const createOptionMessage = (obj) => http.post('/vote/createOptionMessage', obj) + +//投票信息创建接口 +export const createVote = (obj) => http.post('/vote/createVote', obj) + +//删除投票信息 +export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj }) + +//修改投票信息接口 +export const editVote = (obj) => http.post('/vote/editVote', obj) + +//根据题干ID获取题干信息 +export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj }) + +//修改题干信息接口 +export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); + +//上传组件 +export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj })); + + +// 测试方法 +// import * as api from '../../api/index' +// api.getLearnPath({}).then(res => { +// console.log(res) +// }).catch(err => { +// console.log(err) +// }) 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/AddEval.vue b/src/components/drawers/AddEval.vue index 16922bf3..61c9576c 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -120,8 +120,8 @@ export default { }, setup(props, ctx) { const state = reactive({ - inputV1: "", - inputV2: "", + inputV1: '', + inputV2: '', time: undefined, endTimes : "", startTimes: "", @@ -230,7 +230,7 @@ export default { evaluationEndTime: state.endTimes, evaluationFlag: "", evaluationId: "", - evaluationPictureAddress: state.picUrl, + evaluationPictureAddress: "", evaluationStartTime: state.startTimes, evaluationTag: "", evaluationTypeId: 0, diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index d3c43f77..4957fc70 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -18,70 +18,79 @@
- +
-
-
-
- +
+
+
+
+ +
+ 题干
- 题干： -
-
- -
-
-
-
-
- +
+
- 选项1：
-
- - + 上传图片 -
-
-
-
-
- +
+
+
+
+ +
+ {{ o.title }} +
+
+ + + 上传图片 + 删除 +
- 选项2：
-
- - + 上传图片 - 删除 -
-
-
-
-
-
添加选项
+
+
+
+
添加选项
+
- +
- + diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index b92a81fc..12ded11e 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -862,7 +862,7 @@ export default { deleteLiveID: null, //删除直播id deleteExternalID: null, //删除外链id deleteEvalID: null, //测评 - deleteInvistID: null, //评估 + deleteInvistID: 4, //评估 deleteDiscussID: null, //删除讨论id deleteActivityID: null, //删除活动id }); @@ -973,19 +973,26 @@ export default { // width: 100, align: "center", scopedSlots: { customRender: "action" }, - customRender: () => { + customRender: (text) => { return (
{ state.editonlinevisible = true; + console.log(text, "编辑text"); + editInvistPath(); }} style="color:#4EA6FF;margin-right:25px;cursor:pointer" > 编辑 - {}}> + { + showDelete(); + }} + > 删除
@@ -1006,7 +1013,7 @@ export default { .getTask(obj) .then((res) => { if (res.status == 200) { - console.log(res.data.data.stageList, 22222); + console.log("22222", res.data.data.stageList); } }) .catch((err) => { @@ -1066,6 +1073,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 = { @@ -1084,6 +1116,38 @@ 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 = { @@ -1104,9 +1168,6 @@ export default { //编辑测评信息 const editEvalPath = () => { - // if (!state.inputV1) return message.info("请输入测评名称"); - // if (!state.organizationSelectName) return message.warning("请选择归属组织"); - // state.createLoading = true; let obj = { createTime: "", createUser: 0, @@ -1128,15 +1189,13 @@ export default { setTimeout(() => { console.log("修改成功", res); message.success("修改成功"); - // state.createLoading = false; - // state.currentPage = 1; - // router.push("/leveladd"); - // getLearnPath(); }, 1000); }) .catch((err) => { console.log("修改失败", err); // state.createLoading = false; + //重新获取列表 + getTask(); }); }; @@ -1221,6 +1280,39 @@ export default { }); }; + //编辑评估信息 + 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("修改成功"); + }, 1000); + }) + .catch((err) => { + console.log("修改失败", err); + // state.createLoading = false; + //重新获取列表 + getTask(); + }); + }; + const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); state.selectedRowKeys = selectedRowKeys; @@ -1349,13 +1441,16 @@ export default { getTask, deleteLiveBroadcast, deleteDiscuss, + editDiscuss, deleteEvalText, deleteExternalChain, deleteActivity, + editActivity, editEvalPath, deleteInvistText, editLiveBroadcast, editExternal, + editInvistPath, }; }, };