From f93419b04605783462645a6ecc82f0d0150cf1c2 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 8 Dec 2022 12:37:35 +0800 Subject: [PATCH 01/18] =?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 25c220e84d6397063100ea0fb8b5712a4a5a0227 Mon Sep 17 00:00:00 2001 From: lixg Date: Thu, 8 Dec 2022 14:32:53 +0800 Subject: [PATCH 02/18] =?UTF-8?q?fix:=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/api/config.js | 4 +- src/components/vote/AddVote.vue | 115 +++++++++++++++++++++------ src/views/projectcenter/TaskPage.vue | 25 ++++-- 3 files changed, 111 insertions(+), 33 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index ad08a305..f8a5888a 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-08 08:48:26 + * @LastEditTime: 2022-12-08 08:49:37 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 04f452c2..fd8b4d9d 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -110,7 +110,7 @@ />
-
+
- 基础投票数： + 基础投票数设置
-
- + + +
+
+
参与数：
+
+
-
+
+
总票数：
+
+ +
+
+
+
浏览数：
+
+ +
+
+ +
投票说明： @@ -272,15 +327,23 @@ export default { fileList: [], voteCount: null, projectTemplateId: null, + + partakeNum: 0, //参与数 + totalVoteNum: 0, //总票数 + browseNum: 0, //浏览数 }); const closeDrawer = () => { - (state.inputV1 = ""), - (state.textV1 = ""), - (state.time = undefined), - (state.basevote = ""), - (state.ballotId = ""), - ctx.emit("update:addvoteVisible", false); + state.inputV1 = ""; + state.textV1 = ""; + state.time = undefined; + state.basevote = ""; + state.ballotId = ""; + ctx.emit("update:addvoteVisible", false); ctx.emit("update:edit", false); + + state.partakeNum = 0; //参与数 + state.totalVoteNum = 0; //总票数 + state.browseNum = 0; //浏览数 }; const afterVisibleChange = (bool) => { if (props.edit && bool) { @@ -337,6 +400,9 @@ export default { dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"), dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"), ]; + state.totalVoteNum = res.data.data.votesTotal; //总票数 + state.partakeNum = res.data.data.numberOfInvolved; //参与数 + state.browseNum = res.data.data.numberOfBrowse; //浏览数 }) .catch((err) => { console.log("获取投票信息失败", err); @@ -411,9 +477,9 @@ export default { message.destroy(); return message.warning("请输入直播时间"); } - if (!state.basevote) { - return message.warning("请上传投票基数"); - } + // if (!state.basevote) { + // return message.warning("请上传投票基数"); + // } if (state.time != undefined) { state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD"); state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD"); @@ -427,6 +493,9 @@ export default { ballotId: state.ballotId, baseVote: state.basevote, voteExplain: state.textV1, + votesTotal: state.totalVoteNum, //总票数 + numberOfInvolved: state.partakeNum, //参与数 + numberOfBrowse: state.browseNum, //浏览数 }; if (props.edit) { api @@ -469,7 +538,7 @@ export default { }; function downloadTemplate() { - window.open('/manageApi/投票基础数据模版.xlsx') + window.open("/manageApi/投票基础数据模版.xlsx"); } return { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index c17ff298..3b94f2cb 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -16,7 +16,16 @@ src="../../assets/images/leveladd/ma.png" @click="showCodeModel2()" /> -
+
@@ -46,8 +55,8 @@
{{ act }} @@ -55,7 +64,7 @@
@@ -73,7 +82,7 @@
@@ -5170,7 +5179,7 @@ export default { .img2 { width: 42px; height: 42px; - margin-right: 22px; + margin-right: 10px; } .pub { From ef10e097cb2de01fc6ae8c4333df76ee98c7bea7 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Thu, 8 Dec 2022 14:53:33 +0800 Subject: [PATCH 03/18] =?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; From ebacaecd9eb89d97bb961b38f6193469117aafc0 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 8 Dec 2022 14:55:08 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTaskadd.js | 2 ++ src/components/drawers/AddCase.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 0beb6673..f7598535 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -5,6 +5,8 @@ export const getTask = (obj) => http.get('/admin/project/detail', { params: obj //项目里的新建或编辑阶段任务 export const addTask = (obj) => http.post('/admin/project/editTask', obj) +//模板库项目里的新建或编辑阶段任务 +export const addTaskTemplate = (obj) => http.post('/admin/project/template/editTask', obj) //项目里的删除任务 export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { params: obj }) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index ba2d2951..2b1ac457 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -315,7 +315,7 @@ export default { } else if (props.isLevel == 3) { for (let i = 0; i < state.apiTaskList.length; i++) { apiTask - .addTask({ + .addTaskTemplate({ courseId: Number(state.apiTaskList[i].casesId), name: state.apiTaskList[i].title, projectTaskId: props.projectTaskId, From 16987a7d3e4c1254e034904c57f023b0a001fa9e Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Thu, 8 Dec 2022 14:59:49 +0800 Subject: [PATCH 05/18] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1432 +++++++++--------- src/views/courselibrary/courseModal.vue | 303 ++-- 2 files changed, 868 insertions(+), 867 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 52cb527f..b066e400 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -7,60 +7,60 @@
@@ -88,16 +88,16 @@
@@ -111,18 +111,18 @@
课程名称：
{{ xzinputV1.length }}/20 @@ -136,8 +136,8 @@
@@ -145,15 +145,15 @@
@@ -161,8 +161,8 @@
@@ -170,8 +170,8 @@
1、课程名称统一不加书名号。
@@ -187,8 +187,8 @@
授课形式 @@ -198,9 +198,9 @@
线上 @@ -209,9 +209,9 @@
面授 @@ -225,8 +225,8 @@
是否设置目录 @@ -235,18 +235,18 @@
是
否 @@ -270,33 +270,33 @@
查看面授课
@@ -310,8 +310,8 @@
课程名称 @@ -319,11 +319,11 @@
@@ -339,19 +339,19 @@ 课程命名规则
收起
展开
@@ -359,8 +359,8 @@
1、课程名称统一不加书名号。
@@ -376,32 +376,32 @@
封面图
{ return triggerNode.parentNode || document.body; } " - v-model:value="feng_mian_2" - dropdownClassName="dropdown-style" - style="width: 440px" - placeholder="请选择" - :options="optionsUrl" - allowClear - showSearch + v-model:value="feng_mian_2" + dropdownClassName="dropdown-style" + style="width: 440px" + placeholder="请选择" + :options="optionsUrl" + allowClear + showSearch > avatar