From f93419b04605783462645a6ecc82f0d0150cf1c2 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 8 Dec 2022 12:37:35 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/LibraryAdd.vue | 154 +++++++++++-------------- 1 file changed, 70 insertions(+), 84 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 652a32ee..39f36c2e 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -279,34 +279,43 @@
-
+
关闭
-
+
开启
-
-
公告内容
+
+
当前公告内容：
+
+ {{noticeContent==""?"暂无公告":noticeContent}} +
+
 
+
+ +
编辑
+
+
+ +
+ +
+
@@ -852,29 +863,25 @@ export default defineComponent({ ], isEdit: false, // 是否处于编辑状态 // 基本信息 - projectInfo: { - beginTime: null, - endTime: null, - name: null, - manager: null, - notice: null, - sourceBelongId: null, - remark: "", - courseSyncFlag: false, - level: null, - systemId: null, - boeFlag: false, - status: null, - picUrl: null, - noticeFlag: null, - }, + projectInfo: { }, + noticeContent:"", + editFlag:false, }); const value = ref(""); const textnum = "150"; const routered = useRouter(); const changeopclo = () => { - state.hideshow = !state.hideshow; + state.projectInfo.noticeFlag = state.checked?1:0; + api + .templateEdit( state.projectInfo) + .then((res) => { + console.log(res); + }) + .catch((err) => { + console.log(err); + }); }; + const changecheck2 = () => { state.checked2 = !state.checked2; }; @@ -906,6 +913,10 @@ export default defineComponent({ state.isEdit = false; getDetail(); }; + const editNotice =()=>{ + state.editFlag = true ; + } + const checkType = (type) => { let typeRules = [ "", @@ -933,29 +944,16 @@ export default defineComponent({ api .templateDetail(localStorage.getItem("projectTemplateId")) .then((res) => { - console.log("get model list ----->", res, res.data.data.stageList); + console.log("get model list ----->", res, res.data.data.stageList); state.taskSyllabus = []; console.log(res); - state.projectInfo.name = res.data.data.projectTemplateInfo.name; - state.projectInfo.beginTime = res.data.data.projectTemplateInfo.beginTime; - state.projectInfo.endTime = res.data.data.projectTemplateInfo.endTime; - state.projectInfo.manager = res.data.data.projectTemplateInfo.manager; - state.projectInfo.notice = res.data.data.projectTemplateInfo.notice; - state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId; - state.projectInfo.managerId = res.data.data.projectTemplateInfo.managerId; - state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; - state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag; - state.projectInfo.level = res.data.data.projectTemplateInfo.level; - state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId; - state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag; - state.projectInfo.noticeFlag = res.data.data.projectTemplateInfo.noticeFlag; - state.projectInfo.remark = res.data.data.projectTemplateInfo.remark; - state.projectInfo.status = res.data.data.projectTemplateInfo.status; - state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl; - state.picUrl = res.data.data.projectTemplateInfo.picUrl; - state.projectInfo.attach = res.data.data.projectTemplateInfo.attach; - state.projectInfo.category = res.data.data.projectTemplateInfo.category; + state.projectInfo = res.data.data.projectTemplateInfo; + + state.noticeContent = state.projectInfo.notice; + state.checked = state.projectInfo.noticeFlag==1?true:false; + console.log("res.data.data.projectTemplateInfo",res.data.data.projectTemplateInfo); + try{ state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); }catch{ @@ -986,31 +984,16 @@ export default defineComponent({ }); }; - // 发布公告 - const addNotice = () => { - console.log("ok====s"); - let obj = { - name: state.projectInfo.name, - category: state.projectInfo.category, - picUrl: state.projectInfo.picUrl, - manager: state.projectInfo.manager, - managerId: state.projectInfo.managerId || 0, - sourceBelongId: state.projectInfo.sourceBelongId, - level: state.projectInfo.level, - systemId: state.projectInfo.systemId, - boeFlag: state.projectInfo.boeFlag ? 1 : 0, - courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, - notice: state.projectInfo.notice, - noticeFlag: state.projectInfo.noticeFlag, - projectTemplateId: localStorage.getItem("projectTemplateId"), - remark: state.projectInfo.remark, - status: state.projectInfo.status, - attach: state.projectInfo.attach, - }; - console.log("obj======", obj); + // 发布公告 + const addNotice = () => { + // state.projectInfo.notice= + if(!state.projectInfo.notice){ + return message.warning("请输入公告内容"); + } api - .templateEdit(obj) + .templateEdit( state.projectInfo) .then((res) => { + state.noticeContent = state.projectInfo.notice; message.success("公告发布成功"); console.log(res); }) @@ -1018,7 +1001,9 @@ export default defineComponent({ message.error("公告发布失败" + err); console.log(err); }); + state.editFlag =false; }; + // 删除阶段 const stateDel = (id) => { api @@ -1050,12 +1035,12 @@ export default defineComponent({ routered.push({ path: "/templateAdd", query: { - projectId: state.projectId, - name: state.name, + projectTemplateId: state.projectInfo.projectTemplateId, }, }); }; + // 新建或编辑阶段 const stateEdit = () => { let obj = { @@ -1288,7 +1273,8 @@ export default defineComponent({ editRule, handleChange2, scoresum, - checkedClose + checkedClose, + editNotice }; }, }); From 2f073b259d99b59b45a5f4609e20542d533050ae Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Thu, 8 Dec 2022 12:44:53 +0800 Subject: [PATCH 02/19] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=98=B6=E6=AE=B5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 10 +++---- src/components/drawers/AddOnline.vue | 40 ++++++++++++++------------ src/views/projectcenter/LibraryAdd.vue | 3 +- src/views/projectcenter/temTask.vue | 20 ++++++++++++- 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index afe19c5e..ba2d2951 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -316,13 +316,11 @@ export default { for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTask({ - courseId: state.apiTaskList[i].caseid, - duration: 0, - flag: true, - name: state.apiTaskList[i].caseName, + courseId: Number(state.apiTaskList[i].casesId), + name: state.apiTaskList[i].title, projectTaskId: props.projectTaskId, - projectTemplateId: props.projectTemplateId, - stageId: props.chooseStageId || 0, + projectTemplateId: Number(localStorage.getItem("projectTemplateId")), + stageId: Number(props.chooseStageId) || 0, type: 3, }) .then(() => { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 465130b8..ee6c48d3 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -499,7 +499,7 @@ export default { .catch((err) => { console.log(err); }); - } else if (props.isLevel === 2) { + } else if (props.isLevel == 2) { console.log("我是要便利的数据2", state.addOnlineList); let p_data = state.addOnlineList; let p_data_id = []; @@ -556,24 +556,28 @@ export default { console.log(err); }); } else if (props.isLevel == 3) { - addTempTask({ - courseId: state.onlineClassesId, - name: state.onlineName, - projectTemplateId: props.projectTemplateId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId || 0, - type: 1, - }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`); - ctx.emit("changeData", false); - closeDrawer(); + state.addOnlineList.map((value) => { + console.log( props, props.projectTemplateId,props.projectTaskId) + addTempTask({ + courseId: value.num, + name: value.name, + projectTemplateId: localStorage.getItem("projectTemplateId"), + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 1, }) - .catch(() => { - message.destroy(); - message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); - }); + .then((res) => { + console.log('新增或者编辑在线课',res) + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); + }); + }) } //if(state.addOnlineList.Target==undefined){ // closeDrawer(); diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 652a32ee..1844e9bd 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -56,7 +56,7 @@
任务大纲
- + { + console.log(id, eleId) state.addonlinevisible = true; state.EditOnlineId = id; state.projectTaskId = eleId; From 88a59aa9d6a61b45d899f1cc13a5a4da6a962148 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 8 Dec 2022 12:48:57 +0800 Subject: [PATCH 03/19] =?UTF-8?q?--=20=E5=8F=96=E6=B6=88localstory?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 89 +++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7b16dfab..10b3b0a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,27 +1,27 @@