diff --git a/src/App.vue b/src/App.vue index 10b3b0a8..e75658e9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.5------------"); + console.log("版本0.9.6------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/config.js b/src/api/config.js index ad08a305..773efa21 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 15:47:05 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ 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/assets/images/coursewareManage/docpic.png b/src/assets/images/coursewareManage/docpic.png new file mode 100644 index 00000000..a9ead1c2 Binary files /dev/null and b/src/assets/images/coursewareManage/docpic.png differ diff --git a/src/assets/images/coursewareManage/pdfpic.png b/src/assets/images/coursewareManage/pdfpic.png new file mode 100644 index 00000000..0dac5b4c Binary files /dev/null and b/src/assets/images/coursewareManage/pdfpic.png differ diff --git a/src/assets/images/coursewareManage/pngpic.png b/src/assets/images/coursewareManage/pngpic.png new file mode 100644 index 00000000..45976d82 Binary files /dev/null and b/src/assets/images/coursewareManage/pngpic.png differ diff --git a/src/assets/images/coursewareManage/pptpic.png b/src/assets/images/coursewareManage/pptpic.png new file mode 100644 index 00000000..03257972 Binary files /dev/null and b/src/assets/images/coursewareManage/pptpic.png differ diff --git a/src/assets/images/coursewareManage/xlspic.png b/src/assets/images/coursewareManage/xlspic.png new file mode 100644 index 00000000..f09609a7 Binary files /dev/null and b/src/assets/images/coursewareManage/xlspic.png differ diff --git a/src/assets/images/coursewareManage/zippic.png b/src/assets/images/coursewareManage/zippic.png new file mode 100644 index 00000000..a15ebb88 Binary files /dev/null and b/src/assets/images/coursewareManage/zippic.png differ diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue index 681497fb..78ecfaed 100644 --- a/src/components/TwoDimensionalCode.vue +++ b/src/components/TwoDimensionalCode.vue @@ -7,7 +7,7 @@ :closable="closableQR" wrapClassName="codeModal" style="margin-top: 400px" - :zIndex="999" + :zIndex="9999" @cancel="qr_exit" >
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, diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 60d3756e..b98f3465 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -214,7 +214,7 @@ export default { await addTempTask({ courseId: Number(value.evaluationId), name: value.evaluationName, - projectTemplateId: props.projectTemplateId, + projectTemplateId: Number(localStorage.getItem("projectTemplateId")), projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 10, diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index 58f2bf68..ff637f60 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -103,7 +103,7 @@ export default { return message.warning("请输入公告内容"); } else { let obj = { - notice: state.noticeContent1, + notice: state.noticeContent, projectId: props.projectId, title: "", }; @@ -147,7 +147,7 @@ export default { .noticeTitle { margin-left: 32px; margin-right: 32px; - // padding-top: 20px; + margin-bottom: 100px; .notitle { height: 55px; border-bottom: 1px solid #ededed; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 19ffebf8..db80bbe0 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -116,7 +116,8 @@
审核意见:
- +
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/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 3854110a..87991333 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,10 +187,11 @@
+ 授课形式
@@ -198,9 +199,9 @@
线上 @@ -209,9 +210,9 @@
面授 @@ -220,33 +221,35 @@
+