From d45635ace1052fc08c35d539a8dc677a1411a9d8 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Mon, 5 Dec 2022 16:27:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=9A=E9=A2=98=E5=B9=B2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/vote/AddVote.vue | 6 +- src/components/vote/CreateVote.vue | 29 +- src/views/courselibrary/CoursewareManage.vue | 93 ++- .../courselibrary/components/seeModal.vue | 738 ++++++++++++++++++ src/views/examine/CourseReviewedN.vue | 349 ++++++--- 5 files changed, 1074 insertions(+), 141 deletions(-) create mode 100644 src/views/courselibrary/components/seeModal.vue diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index d3a03f3a..311ca8e9 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -53,7 +53,7 @@ {{ ballotId ? "编辑" : "创建" }}投票
- + 删除投票 @@ -438,7 +438,7 @@ export default { const closeStem = () => { state.addStemVisible = false; }; - const log = (e) => { + const handlelog = (e) => { state.ballotId = null; console.log(e); }; @@ -454,7 +454,7 @@ export default { closeStem, handleChange, beforeUpload, - log, + handlelog, }; }, }; diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index 68506912..989b98ff 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -90,17 +90,12 @@ + diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 782c5467..1e1953b4 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -14,23 +14,37 @@
- +
- + " + placeholder="请输入创建人" + />
- + " + placeholder="请输入名称" + />
@@ -47,20 +61,40 @@
- +
- +
- +
@@ -80,8 +114,14 @@
-
- +
+
审核意见:
@@ -101,15 +141,30 @@
- +
- + 预览
- +
@@ -120,17 +175,26 @@
- +
课程名称:
-
{{ faceDetailObj !== null ? faceDetailObj.name : "" }}
+
+ {{ faceDetailObj !== null ? faceDetailObj.name : "" }} +
-
+
@@ -138,23 +202,37 @@
- +
封面图:
- +
- +
目标人群:
-
{{ faceDetailObj !== null ? faceDetailObj.targetUser : "" }}
+
+ {{ + faceDetailObj !== null ? faceDetailObj.targetUser : "" + }} +
@@ -162,7 +240,9 @@ 课程价值:
-
{{ faceDetailObj !== null ? faceDetailObj.meaning : "" }}
+
+ {{ faceDetailObj !== null ? faceDetailObj.meaning : "" }} +
-
{{ faceDetailObj !== null ? contentList11.find(e => e.dictCode == - faceDetailObj.categoryId)?.dictValue : "" - }}
+
+ {{ + faceDetailObj !== null + ? contentList11.find( + (e) => e.dictCode == faceDetailObj.categoryId + )?.dictValue + : "" + }} +
@@ -196,29 +285,41 @@
-
{{ faceDetailObj !== null ? sceneist11.find(e => e.dictCode == - faceDetailObj.sceneId)?.dictValue - : "" - }}
+
+ {{ + faceDetailObj !== null + ? sceneist11.find( + (e) => e.dictCode == faceDetailObj.sceneId + )?.dictValue + : "" + }} +
内容标签:
-
{{ faceDetailObj !== null ? faceDetailObj.tips : "" }}
+
+ {{ faceDetailObj !== null ? faceDetailObj.tips : "" }} +
- asterisk + asterisk
授课教师:
-
{{ faceDetailObj !== null ? faceDetailObj.teacher : "" }}
+
+ {{ faceDetailObj !== null ? faceDetailObj.teacher : "" }} +
@@ -226,18 +327,35 @@ 课程简介:
-
{{ faceDetailObj !== null ? faceDetailObj.intro : "" }}
+
+ {{ faceDetailObj !== null ? faceDetailObj.intro : "" }} +
@@ -382,7 +525,8 @@ export default { dataIndex: "content", key: "content", align: "center", - customRender: ({ text }) => state.calssifyList.find(e => e.value == text)?.label, + customRender: ({ text }) => + state.calssifyList.find((e) => e.value == text)?.label, }, { title: "状态", @@ -434,9 +578,12 @@ export default { onClick={() => { state.lookCourseModal = true; getFaceDetail(value.record.offId); - console.log(value.record) + console.log(value.record); }} - style="cursor:pointer;color:#387DF7">预览 + style="cursor:pointer;color:#387DF7" + > + 预览 + ); }, @@ -451,14 +598,17 @@ export default { }); /* - * 获取字典列表 - * param faceclassPic | faceclassClass | faceclassScene - * */ - const getDictList = (param) => api1.getDict({ - pageNo: 1, - pageSize: 20, - setCode: param - }).then((res) => res.data.data.rows) + * 获取字典列表 + * param faceclassPic | faceclassClass | faceclassScene + * */ + const getDictList = (param) => + api1 + .getDict({ + pageNo: 1, + pageSize: 20, + setCode: param, + }) + .then((res) => res.data.data.rows); const getFaceList = () => { let objn = { @@ -468,7 +618,7 @@ export default { name: state.valuename, pageNo: state.currentPage, pageSize: 10, - projectName: "" + projectName: "", }; console.log(objn); @@ -503,20 +653,25 @@ export default { console.log("获取面授详情信息成功", res); let result = res.data.data; state.faceDetailObj = result; - heroImg.value.src = result.picUrl - valueHtml.value = result.outline - attachMap.value = result.attach==""?[]:result.attach.split(",") + heroImg.value.src = result.picUrl; + valueHtml.value = result.outline; + attachMap.value = result.attach == "" ? [] : result.attach.split(","); console.log(result, attachMap.value); }) .catch((err) => { console.log("获取面授详情信息失败", err); }); + }; - } - - // 内容分类 场景 -- 目前直接写死的 - const sceneist11 = [{ dictCode: "6", dictValue: "场景一" }, { dictCode: "7", dictValue: "场景二" }] - const contentList11 = [{ dictCode: "8", dictValue: "分类一" }, { dictCode: "5", dictValue: "分类二" }] + // 内容分类 场景 -- 目前直接写死的 + const sceneist11 = [ + { dictCode: "6", dictValue: "场景一" }, + { dictCode: "7", dictValue: "场景二" }, + ]; + const contentList11 = [ + { dictCode: "8", dictValue: "分类一" }, + { dictCode: "5", dictValue: "分类二" }, + ]; // contentList11.find(e => e.dictCode == text)?.dictValue @@ -528,7 +683,7 @@ export default { name: state.valuename, pageNo: state.currentPage, pageSize: 10, - projectName: "" + projectName: "", }; console.log(objn); @@ -547,22 +702,22 @@ export default { .catch((err) => { console.log("获取面授列表失败", err); }); - } + }; // 预览弹框 开启和关闭 const ft_exit = () => { state.lookCourseModal = false; - } + }; const handlePush = () => { state.lookCourseModal = false; - } + }; const setFaceData = (tableData) => { if (!tableData || !tableData.length) { - state.tableData1 = [] - return + state.tableData1 = []; + return; } let data = tableData; let array = []; @@ -576,12 +731,12 @@ export default { item.status == 0 ? "未提交" : item.status == 1 - ? "待审核" - : item.status == 2 - ? "通过" - : item.status == -1 - ? "拒绝" - : "-", + ? "待审核" + : item.status == 2 + ? "通过" + : item.status == -1 + ? "拒绝" + : "-", change: "-", creater: item.createName, time: item.createTime, @@ -593,7 +748,7 @@ export default { state.tableData1 = array; }; const reset = () => { - state.valueproj = ''; + state.valueproj = ""; state.valuecreater = null; state.valuename = null; getFaceList(); @@ -618,11 +773,15 @@ export default { state.chooseOffId = null; }; const sureCourAuditModal = () => { - console.log(state.valueSugg) - if (state.valueSugg == null || state.valueSugg == undefined || state.valueSugg == "") { + console.log(state.valueSugg); + if ( + state.valueSugg == null || + state.valueSugg == undefined || + state.valueSugg == "" + ) { message.destroy(); - message.error("请输入审核意见") - return + message.error("请输入审核意见"); + return; } courseAuditView({ @@ -638,7 +797,7 @@ export default { message.destroy(); message.success("审核提交成功"); state.valueSugg = null; - state.valuepass="1"; + state.valuepass = "1"; getFaceList(); }) .catch((err) => { @@ -646,19 +805,22 @@ export default { message.destroy(); message.warning("审核提交失败"); state.valueSugg = null; - state.valuepass="1"; + state.valuepass = "1"; }); }; onMounted(async () => { getFaceList(); //获取分类列表 - state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode })) + state.calssifyList = (await getDictList("faceclassClass")).map((e) => ({ + label: e.dictName, + value: e.dictCode, + })); }); // 禁止用户编辑文本框内容 const onEditorFocus = (event) => { event.enable(false); - } + }; return { ...toRefs(state), getFaceList, @@ -677,7 +839,7 @@ export default { attachMap, contentList11, sceneist11, - onEditorFocus + onEditorFocus, }; }, }; @@ -713,8 +875,10 @@ export default { position: absolute; width: calc(100%); height: 68px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); } .del_main { @@ -822,7 +986,6 @@ export default { .lookCourseModal { .ant-modal { .ant-modal-content { - // width:1358px !important; .ant-modal-body { .modalHeader { From b90ba25b68b798c233747e48facc3d671e731e07 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Mon, 5 Dec 2022 16:29:16 +0800 Subject: [PATCH 2/3] t --- src/components/vote/CreateVote.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index 989b98ff..c15ab7b7 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -166,8 +166,6 @@ export default { let renderArr = [...res.voteStemVoList]; sortBy(renderArr, "orderNumber"); //序号 state.allFormsData = parseData(renderArr); - console.log(67676767); - console.log(state.allFormsData); } }; From 6997f6e445057a0518f8ab221cccae6eda782563 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 5 Dec 2022 16:31:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index daf8bf36..d870e23d 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -3,7 +3,9 @@ placement="right" @after-visible-change="afterVisibleChange">
-
添加面授
+ +
编辑面授
+
添加面授