From 711d4fa3b83757eaba9cdd0c7e5a5eab7f8a7520 Mon Sep 17 00:00:00 2001 From: songwc Date: Thu, 3 Nov 2022 10:09:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E9=98=B6=E6=AE=B5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTaskadd.js | 7 ++++ src/components/drawers/AddLive.vue | 58 ++++++++++++++++++++++++----- src/views/projectcenter/TaskAdd.vue | 2 +- 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 8daf23a3..cd4a5115 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -5,4 +5,11 @@ export const getTask = (obj) => http.get('/admin/project/detail', { params: obj headers: { 'token': '123' } +}) + +//项目里的新建或编辑阶段任务 +export const addTask = (obj) => http.post('/admin/project/editTask', obj, { + headers: { + 'token': '123' + } }) \ No newline at end of file diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 041b0857..05430945 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -279,7 +279,7 @@
- +
@@ -288,6 +288,7 @@ import { reactive, toRefs, ref } from "vue"; import { message } from "ant-design-vue"; import * as api from "../../api/indexLiveBroadcast"; +import * as apiTask from "../../api/indexTaskadd"; import { toDate } from "@/api/method"; function getBase64(img, callback) { @@ -477,6 +478,7 @@ export default { checkedC1: "", checkedC2: true, playback: false, + obj: {}, //要传的obj数据 }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); @@ -545,15 +547,25 @@ export default { //创建直播 const createLiveBroadcast = () => { - if (!state.inputV1) return message.warning("请输入直播名称"); - if (!state.time) return message.warning("请输入直播时间"); - if (!state.inputV2) return message.warning("请输入直播时长"); + if (!state.inputV1) { + message.destroy(); + return message.warning("请输入直播名称"); + } + if (!state.time) { + message.destroy(); + return message.warning("请输入直播时间"); + } + if (!state.inputV2) { + message.destroy(); + return message.warning("请输入直播时长"); + } const regular = /^[+]{0,1}(\d+)$/; if (!regular.test(state.inputV2)) { + message.destroy(); return message.warning("直播时长需大于0"); } - // if (!state.inputV3) return message.info("请输入授课老师"); + if (!state.inputV3) return message.warning("请输入授课老师"); let check = state.checkedC2 * 1; // let startTime = state.time[0].$d; // let endTime = state.time[1].$d; @@ -567,7 +579,7 @@ export default { new Date(state.time[1].$d).getTime() / 1000, "Y-M-D" ); - let obj = { + state.obj = { afterSignIn: state.inputV6, beforeSignIn: state.inputV7, createTime: "", @@ -592,10 +604,10 @@ export default { updateUser: 0, }; api - .createLiveBroadcast(obj) + .createLiveBroadcast(state.obj) .then((res) => { - console.log(res.data.data, 1111); - console.log(state, 2222); + console.log("调用添加直播接口后", res.data.data); + // console.log(state, 2222); message.success("提交成功"); closeDrawer(); @@ -604,6 +616,33 @@ export default { .catch((err) => { console.log(err, 2222); }); + + apiTask + .addTask({ + courseId: 0, + duration: 0, + flag: true, + name: "", + projectId: 22, + projectTaskId: 0, + stageId: 0, + type: 0, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + }) + .catch((err) => { + console.log(err); + }); + }; + + //添加任务到数据库 + const addTask = () => {}; + + const done = () => { + createLiveBroadcast(); + addTask(); + // api.getLiveBroadcastInfor({}); }; return { @@ -618,6 +657,7 @@ export default { createLiveBroadcast, handleChange, beforeUpload, + done, }; }, }; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 12ded11e..23f3f026 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1055,7 +1055,7 @@ export default { console.log(err); }); }; - + //删除讨论 const deleteDiscuss = () => { let obj = { discussId: state.deleteDiscussID, From 059458ee2d3a98ab159a3f0bd5c71d6a3c547f7e Mon Sep 17 00:00:00 2001 From: dongwug Date: Thu, 3 Nov 2022 10:09:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddEval.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 61c9576c..c5efcd5a 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -217,7 +217,10 @@ export default { //创建测评信息 const createEvalText = () => { - if (!state.inputV1) return message.info("请输入测评名称"); + if (!state.inputV1) { + message.destroy(); + return message.info("请输入测评名称"); + } if ( state.time != undefined) { state.endTimes = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D") state.startTimes = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D") @@ -244,6 +247,7 @@ export default { setTimeout(() => { console.log("创建成功", res); message.success("创建成功"); + message.destroy(); // state.createLoading = false; router.push("/leveladd"); // getLearnPath(); From 560747af60bb4d051f93d4a8e08763ba456d2aeb Mon Sep 17 00:00:00 2001 From: dongwug Date: Thu, 3 Nov 2022 10:10:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fear=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=84=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddEval.vue | 6 +++ src/components/drawers/AddVote.vue | 66 ++++++++++++++++++++++++++++- src/views/projectcenter/TaskAdd.vue | 6 ++- 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index c5efcd5a..222b9676 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -90,6 +90,7 @@
Upload
+ 图片格式为 @@ -221,6 +222,10 @@ export default { message.destroy(); return message.info("请输入测评名称"); } + if (!state.inputV2) { + message.destroy(); + return message.info("请选择测评"); + } if ( state.time != undefined) { state.endTimes = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D") state.startTimes = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D") @@ -249,6 +254,7 @@ export default { message.success("创建成功"); message.destroy(); // state.createLoading = false; + // state.currentPage = 1; router.push("/leveladd"); // getLearnPath(); }, 1000); diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index b76a4ba7..343a88ce 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -98,7 +98,7 @@
- +
@@ -106,6 +106,11 @@