From f93419b04605783462645a6ecc82f0d0150cf1c2 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 8 Dec 2022 12:37:35 +0800 Subject: [PATCH 1/2] =?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 ef10e097cb2de01fc6ae8c4333df76ee98c7bea7 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 8 Dec 2022 14:53:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 20 ++++++++++++++------ src/views/courselibrary/courseModal.vue | 18 ++++++++++++++++-- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 52cb527f..e19d370a 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -191,6 +191,7 @@ alt="" />
+ 授课形式
@@ -220,6 +221,7 @@
+
取消
@@ -3381,7 +3384,7 @@ export default defineComponent({ value4: "", //选择线上还是面授 xzinputV1: "", - valueE1: "", + valueE1: 2, valueE2: "", //确定面授 ft_eidt: false, @@ -4187,20 +4190,25 @@ export default defineComponent({ } }; const createft = () => { - if (state.bs_hs == false && state.valueE1 != "") { + if(!state.valueE1 || !state.xzinputV1){ + message.destroy(); + return message.warning("请输入必填项"); + } + console.log(" state.valueE1", state.valueE1,!state.bs_hs && state.valueE1 == 2,state.bs_hs,state.valueE1 == 2); + if (state.bs_hs && state.valueE1 == 2) { state.of_hs = false; // state.ft_hs = true; CourseModalRef.value.visibleOpen(null); - - state.valueE1 = ""; state.teacher = ""; state.teacherName = ""; + state.qdms_inputV1 = state.xzinputV1; state.xzinputV1 = ""; + console.log("qdms_inputV1", state.qdms_inputV1 ); getDictList("faceclassPic"); getTea(); } - if (state.bs_hs && state.valueE1 != "") { + if (state.bs_hs && state.valueE1 == 1) { state.addOnlineCoursevisible = true; } }; diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 18a4ff18..e51ac903 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -31,7 +31,7 @@
审核意见： - - + {{auditDescription}}
@@ -372,7 +372,7 @@ import {Editor, Toolbar} from "@wangeditor/editor-for-vue"; import ProjectManager from "@/components/project/ProjectManagerNew"; import FJUpload from "@/components/common/FJUpload"; import * as moment from "moment"; - +import * as api2 from "../../api/indexAudit" export default defineComponent({ components: { Editor, @@ -401,6 +401,7 @@ export default defineComponent({ tags_val: [], qdms_inputV6: "", imgList: [], + auditDescription:"", }); const visibleOpen = (offcourseId) => { @@ -639,6 +640,19 @@ export default defineComponent({ if (Number(item.auditStatus) === 2 && Number(item.status) === 0) { state.statusTingQi = 0; } + if(Number(item.auditStatus) === -1 ){ + let obj ={ + offcourseId:offcourseId, + type:2, + pageNo: 1, + pageSize: 1, + } + api2.auditList(obj).then((res)=>{ + state.auditDescription = res.data.data.rows[0].description; + console.log("state.auditDescription",state.auditDescription); + }) + + } state.qdms_inputV1 = item.name; state.feng_mian_1 = item.picUrl;