From cd94fe07d38fa9470a259f9bec24a21c458cf006 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 11 Dec 2022 14:47:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=BA=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/OpenPages.vue | 10 +++++----- src/components/drawers/AddActive.vue | 2 +- src/components/drawers/AddEval.vue | 4 ++-- src/components/drawers/AddHomework.vue | 6 +++--- src/components/drawers/AddLive.vue | 4 ++-- src/components/drawers/AddOnline.vue | 4 ++++ src/components/drawers/AddTest.vue | 6 +++--- src/views/courselibrary/CoursewareManage.vue | 2 +- src/views/courselibrary/CoursewareManage_Old.vue | 2 +- src/views/learningpath/LearningPath.vue | 2 +- src/views/learningpath/LevelAdd.vue | 9 +++++---- src/views/learningpath/LevelAddDetail.vue | 4 ++-- src/views/projectcenter/TaskAdd.vue | 2 +- src/views/projectcenter/TaskPage.vue | 4 +++- src/views/projectcenter/temTask.vue | 2 +- 15 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index e1a2f9f1..44077ee3 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -115,16 +115,16 @@ export default { } .close { - width: 16px; - height: 16px; - border-radius: 8px; + width: 50px; + height: 50px; + position: absolute; display: flex; align-items: center; justify-content: center; - top: 17px; - right: 27px; + top: 0px; + right: 0px; } .close:hover { diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index f23cd6a5..a23dde18 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -52,7 +52,7 @@
@@ -75,7 +75,7 @@ diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index e0582979..24ef538a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -109,7 +109,7 @@
- +
@@ -328,8 +328,8 @@ export default { // 新增任务 const updteHomeWork = () => { let obj = { - submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD hh:mm:ss"), - submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD hh:mm:ss"), + submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"), + submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"), workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "", diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 9321387f..a9ddda1d 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -517,8 +517,8 @@ export default { console.log("获取的数据", res); state.inputV1 = res.data.data.liveName; state.time = [ - dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"), - dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm:ss"), + dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"), ]; console.log(state.time); diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index e1f4f43e..0b09deaf 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -227,6 +227,10 @@ export default { type: Number, default: null, }, + projectTemplateId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 7e4a9e89..ac4f92fd 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -320,7 +320,7 @@
- +
@@ -483,8 +483,8 @@ export default { state.test.scoringModel =Number(state.test.scoringModel); state.test.questionArrangement =Number(state.test.questionArrangement); state.test.chooseTime = [ - dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"), - dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"), + dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"), + dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"), ]; state.paperName = state.test.examinationTestName; // state.paperId=dayjs diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 4464452a..3ccd1162 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1900,7 +1900,7 @@ - + diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 60f22527..03bfe99b 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -29,7 +29,7 @@
+ >
返回
@@ -441,7 +441,6 @@
-
+ +
@@ -206,7 +206,7 @@
返回
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 93406853..c54eddcf 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -828,7 +828,7 @@ >
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f134b2e0..0ab90d04 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -798,6 +798,8 @@ 批量删除 + +
From 53c5f4a9037c2163ad34db25d20944df2c0fd6e0 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 11 Dec 2022 17:07:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddGroupMembers.vue | 3 +- src/components/drawers/AddLevelAddStu.vue | 9 ++-- src/components/drawers/CourseOwner.vue | 1 + src/components/drawers/CourseView.vue | 3 +- src/components/drawers/FaceManage.vue | 1 + src/components/drawers/ManageRight.vue | 3 +- src/components/drawers/MemberList.vue | 1 + src/components/drawers/OwnPower.vue | 1 + src/components/drawers/Ownership.vue | 3 +- src/components/drawers/ProjCheckPower.vue | 1 + src/components/drawers/ProjManagePower.vue | 3 +- src/components/drawers/ProjectOwn.vue | 3 +- src/components/drawers/ProjectScore.vue | 3 +- src/components/drawers/QueryRight.vue | 1 + src/components/drawers/StuAdd.vue | 3 +- src/components/drawers/StuScoreDetail.vue | 1 + src/components/drawers/pathStuAdd.vue | 3 +- src/views/learningpath/LearningPath.vue | 2 + src/views/learningpath/LevelAdd.vue | 54 ++++++--------------- src/views/learningpath/LevelAddDetail.vue | 2 + src/views/projectcenter/LibraryAdd.vue | 3 ++ src/views/projectcenter/TaskPage.vue | 49 +++++++++++-------- src/views/projectcenter/TemplateLibrary.vue | 42 ++++++++-------- 23 files changed, 104 insertions(+), 91 deletions(-) diff --git a/src/components/drawers/AddGroupMembers.vue b/src/components/drawers/AddGroupMembers.vue index 898b3fa8..679b24a4 100644 --- a/src/components/drawers/AddGroupMembers.vue +++ b/src/components/drawers/AddGroupMembers.vue @@ -67,6 +67,7 @@ onChange: onSelectChange, }" /> +
-
+
diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index af0205b6..43fd28c1 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -82,6 +82,7 @@ onChange: onSelectChange, }" /> +
-
+
@@ -151,7 +152,7 @@
重置
-
+
+
+
-
+
diff --git a/src/components/drawers/CourseOwner.vue b/src/components/drawers/CourseOwner.vue index 73f39fb8..2512e96e 100644 --- a/src/components/drawers/CourseOwner.vue +++ b/src/components/drawers/CourseOwner.vue @@ -104,6 +104,7 @@ onChange: onSelectChange, }" /> +
+
-
+
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index e0941478..4d72b014 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -100,6 +100,7 @@ onChange: onSelectChange, }" /> +
+
-
+
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 5bfbbc90..161ce61f 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -81,6 +81,7 @@ onChange: onSelectChange, }" /> +
+
+
-
+
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index dd49bedc..da05b7fa 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -118,6 +118,7 @@ preserveSelectedRowKeys: true, }" /> +
+
-
+
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue index f6786bf5..63647d87 100644 --- a/src/components/drawers/ProjectOwn.vue +++ b/src/components/drawers/ProjectOwn.vue @@ -111,6 +111,7 @@ type: 'radio', }" /> +
-
+
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index be9a1e37..8d40641a 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -34,6 +34,7 @@ @expand="expandTable" :pagination="false" /> +
+
+
-
+
diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue index 5b08f984..a6607154 100644 --- a/src/components/drawers/StuScoreDetail.vue +++ b/src/components/drawers/StuScoreDetail.vue @@ -26,6 +26,7 @@ @expand="expandTable" :pagination="false" /> +
+
-
+
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 9bb65f9a..a5c64eaa 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1233,6 +1233,7 @@ export default { // ) } +
+
{text.record.state === "草稿" ? ( - +
@@ -626,10 +627,13 @@
+ + 预览其他关卡
@@ -696,13 +694,7 @@ :disabled="number" v-model:checked="studySelect" > - + 学习其他关卡
@@ -739,6 +731,7 @@
+
@@ -782,28 +775,8 @@ 支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip -
- + +
+ --> + +
+ + diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0ab90d04..7a838ddc 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -16,7 +16,7 @@ class="img1" src="../../assets/images/leveladd/ma.png" @click="showCodeModel2()" - /> --> + />
+ >--> +
+ />--> - +
复制
存为模板
- - + --> + + --> + +
--> +
@@ -838,6 +837,7 @@ +
-
+
+ - - + + --> + + + + --> + + @@ -1194,6 +1199,7 @@ + @@ -5850,7 +5857,7 @@ export default { .group { display: flex; - justify-content: space-between; + .groupleft { display: flex; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 37fdd50a..9dbd26f0 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -40,6 +40,7 @@
+
Date: Sun, 11 Dec 2022 18:10:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 2 +- src/views/projectcenter/ProjectManage.vue | 34 ++++++++++++++++----- src/views/projectcenter/TemplateLibrary.vue | 14 +++++++-- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 8e012c9b..cb312df2 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1177,7 +1177,7 @@ export default { key: "opacation", width: "20%", align: "center", - fixed: "right", + // fixed: "right", scopedSlots: { customRender: "action" }, //引入的插槽 customRender: (text) => { // console.log(text); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 6f865e48..e7ec3884 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -43,7 +43,8 @@ allowClear >
-
+
+
创建时间：
{ // console.log("value", value.record.type, value.record.status); return ( @@ -1895,7 +1896,26 @@ export default { margin-right: 20px; margin-bottom: 20px; } + .addTimeBox { + position: relative; + display: flex; + align-items: center; + .addTime { + position: absolute; + z-index: 10; + margin-left: 10px; + color: rgba(0, 0, 0, 0.4); + } + + .ant-picker { + padding-left: 85px; + } + + .ant-picker-range .ant-picker-active-bar { + margin-left: 85px; + } + } .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -2042,11 +2062,7 @@ export default { margin: 20px 38px 30px; .ant-table-thead > tr > th { - font-size: 14px; - font-weight: 400; - color: #999ba3; - line-height: 36px; - padding: 5px 16px; + background-color: #eff4fc; } } @@ -2073,6 +2089,8 @@ export default { font-size: 14px; font-weight: 400; color: #4ea6ff; + margin-right: -45px; + // line-height: 36px; .operation1 { margin-left: 21px; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 9dbd26f0..75a49326 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -36,7 +36,7 @@
-
+
@@ -136,7 +136,7 @@ export default defineComponent({ { //单层项目 value.operation = ( -
+
{value.status === "已发布" ? (
@@ -406,7 +406,7 @@ export default defineComponent({ .tmpl_body { padding: 0px 30px; - .tmpl_tabbox { + .tableBox { .operation { display: flex; justify-content: center; @@ -427,6 +427,14 @@ export default defineComponent({ } } } + .tableBox { + margin: 20px 38px 30px; + + .ant-table-thead > tr > th { + + background-color: #eff4fc; + } + } } }