From 633ec2d6bfc8876921323de49a235a73235315ca Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Tue, 15 Nov 2022 12:50:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=88=86=E6=8A=BD=E5=B1=89=E7=9A=84margintop=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 1 + src/components/drawers/AddCase.vue | 487 ++++++++++++++---------- src/components/drawers/AddDiscuss.vue | 1 + src/components/drawers/AddEval.vue | 1 + src/components/drawers/AddFaceteach.vue | 181 +++++---- src/components/drawers/AddHomework.vue | 1 + src/components/drawers/AddInvist.vue | 1 + src/components/drawers/AddLive.vue | 1 + src/components/drawers/AddOnline.vue | 18 +- src/components/drawers/AddTest.vue | 5 +- src/components/drawers/AddVote.vue | 1 + src/components/drawers/CreVote.vue | 1 + src/views/projectcenter/TaskAdd.vue | 10 +- 13 files changed, 418 insertions(+), 291 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index fb0719f1..41bcf8ed 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -509,6 +509,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { width: 120px; diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 93ad2825..4c06bb5d 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -1,210 +1,300 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index b2166686..357bd86f 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -300,6 +300,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { width: 120px; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 06daaada..9221e473 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -322,6 +322,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { width: 120px; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index cd42ca90..e8687d52 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -400,99 +400,116 @@ export default { .main_item { display: flex; align-items: center; - margin-bottom: 32px; - .signbox { - width: 120px; - display: flex; - justify-content: end; - align-items: center; - .sign { - margin-right: 5px; - } - } - .btnbox { - display: flex; - flex: 1; - align-items: center; - .xkbtn { - cursor: pointer; - width: 130px; - height: 40px; - background: #388be1; - border-radius: 8px; - border: 0; - margin-right: 8px; - color: #fff; - } - } - } - .main_item2 { - display: flex; - align-items: flex-start; - margin-bottom: 32px; - .signbox { - width: 120px; - display: flex; - justify-content: end; - align-items: center; - } - .kqszbox { - .qdqtbox { - margin-left: 5px; - cursor: pointer; - } - .qdbtn, - .qtbtn { - width: 75px; - height: 24px; - background: rgba(56, 139, 225, 0.16); - border-radius: 2px; - border: 1px solid #387df7; + margin-top: 32px; + margin-bottom: 32px; + + .signbox { + width: 120px; display: flex; + justify-content: end; align-items: center; - justify-content: center; - .btntext { - color: #387df7; + + .sign { + margin-right: 5px; } } - .setbox { + + .btnbox { display: flex; - flex-wrap: wrap; - margin-top: 10px; - margin-bottom: 24px; - .timerbox { - margin-top: 6px; - margin-right: 32px; + flex: 1; + align-items: center; + + .xkbtn { + cursor: pointer; + width: 130px; + height: 40px; + background: #388be1; + border-radius: 8px; + border: 0; + margin-right: 8px; + color: #fff; + } + } + } + + .main_item2 { + display: flex; + align-items: flex-start; + margin-bottom: 32px; + + .signbox { + width: 120px; + display: flex; + justify-content: end; + align-items: center; + } + + .kqszbox { + .qdqtbox { + margin-left: 5px; + cursor: pointer; + } + + .qdbtn, + .qtbtn { + width: 75px; + height: 24px; + background: rgba(56, 139, 225, 0.16); + border-radius: 2px; + border: 1px solid #387df7; display: flex; align-items: center; - flex-wrap: nowrap; + justify-content: center; + + .btntext { + color: #387df7; + } + } + + .setbox { + display: flex; + flex-wrap: wrap; + margin-top: 10px; + margin-bottom: 24px; + + .timerbox { + margin-top: 6px; + margin-right: 32px; + display: flex; + align-items: center; + flex-wrap: nowrap; + } + } + } + + .btnbox2 { + display: flex; + flex-direction: column; + justify-content: flex-start; + + .xkbtn { + cursor: pointer; + width: 130px; + height: 40px; + background: #388be1; + border-radius: 8px; + border: 0; + margin-right: 16px 8px 32px 0; + color: #fff; + margin-top: 16px; + margin-bottom: 60px; } } } - .btnbox2 { - display: flex; - flex-direction: column; - justify-content: flex-start; - .xkbtn { - cursor: pointer; - width: 130px; - height: 40px; - background: #388be1; - border-radius: 8px; - border: 0; - margin-right: 16px 8px 32px 0; - color: #fff; - margin-top: 16px; - margin-bottom: 60px; - } } - } - } - .main_right { - width: 337px; - .main_item { - display: flex; - align-items: center; + + .main_right { + width: 337px; + + .main_item { + display: flex; + align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { width: 120px; diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index c3c75f15..71990ad7 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -488,6 +488,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index dc7e3929..9d64ac8b 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -333,6 +333,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .fi_input { margin-right: 20px; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 43904a80..22c24f58 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -701,6 +701,7 @@ export default { .main_item { display: flex; align-items: center; + margin-top: 32px; margin-bottom: 32px; .signbox { width: 120px; diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index ec1fa777..34b6b274 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -49,7 +49,7 @@
搜索
-
+
重置
@@ -241,7 +241,7 @@ export default { const handelChangePage = (page, pageSize) => { state.currentPage = page; state.pageSize = pageSize; - getAllInvistText(); + getAllOnlineText(); }; const getTableDate = (tableData) => { let data = tableData; @@ -260,7 +260,7 @@ export default { state.tableData = array; }; //获取全部在线信息接口 - const getAllInvistText = () => { + const getAllOnlineText = () => { api .queryAssessmentDetailList({ assessmentName: "", @@ -323,13 +323,13 @@ export default { } } //重置在线信息 - const resetInvist = () => { + const resetOnline = () => { state.inputV1 = ""; - getAllInvistText(); + getAllOnlineText(); }; onMounted(() => { - // createInvist(); - getAllInvistText(); + // createOnline(); + getAllOnlineText(); }); return { ...toRefs(state), @@ -338,9 +338,10 @@ export default { tableDataFunc, rowSelection, handelChangePage, + getAllOnlineText, getTableDate, updateTask, - resetInvist, + resetOnline, }; }, }; @@ -371,6 +372,7 @@ export default { .main_items { display: flex; justify-content: space-between; + margin-top: 32px; margin-bottom: 12px; flex-wrap: wrap; .mi_ipts { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index a56544a7..536a3db6 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -200,7 +200,7 @@
- - diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 6a7c4608..cd27de75 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -419,23 +419,7 @@
二维码
@@ -1373,6 +1357,7 @@ + + + + +