From 10b7c169f6016b988d0d5e5bc27f72d15179b774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 24 Oct 2022 14:15:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/StuAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index b9f9ae7e..01ae2c16 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -1075,7 +1075,7 @@ export default { display: flex; // height: 80%; margin-bottom: 72px; - + overflow-y: auto; .left { // overflow-y: auto; width: 65%; From c8e65ef6bd09af77781e0c71e6c235d02298517a Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 24 Oct 2022 14:29:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?style=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9D=83=20=E6=9F=A5=E7=9C=8B=E6=9D=83=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8A=BD=E5=B1=89=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ActiveAttendance.vue | 18 +- src/components/drawers/AddLevelAddStu.vue | 8 +- src/components/drawers/FaceManage.vue | 16 +- src/components/drawers/ManageRight.vue | 1271 +++++++++++++++++++ src/components/drawers/Ownership.vue | 701 +++++++--- src/components/drawers/PowerList.vue | 12 +- src/components/drawers/QueryRight.vue | 1219 ++++++++++++++++++ src/components/drawers/TimeManage.vue | 24 +- src/components/drawers/WorkManage.vue | 10 +- src/views/learningpath/LearningPath.vue | 35 +- src/views/learningpath/LevelAdd.vue | 13 +- 11 files changed, 3141 insertions(+), 186 deletions(-) create mode 100644 src/components/drawers/ManageRight.vue create mode 100644 src/components/drawers/QueryRight.vue diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index f81985a1..2110c4fe 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -533,13 +533,15 @@ export default { width: 100%; height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow-y: auto; + .titl { display: flex; .endtime { font-size: 16px; font-weight: 500; color: #333333; + white-space: nowrap; } } .search { @@ -551,6 +553,7 @@ export default { .leftchoose { display: flex; margin-right: 20px; + flex-wrap: wrap; .namecon { display: flex; flex-wrap: nowrap; @@ -754,16 +757,17 @@ export default { // } } } - // .botm { - // width: 100%; - // height: 100%; - // background-color: red; - // // flex-shrink: 1; - // } + .botm { + width: 100%; + height: 90px; + // background-color: red; + // flex-shrink: 1; + } .btnn { height: 72px; width: 100%; position: absolute; + background-color: #fff; bottom: 0; left: 0; display: flex; diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 8256fea2..d325f8af 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -779,7 +779,7 @@ export default { .drawerMain { min-width: 600px; margin: 0px 32px 0px 32px; - overflow-y: scroll; + display: flex; flex-direction: column; @@ -804,8 +804,9 @@ export default { display: flex; // height: 80%; margin-bottom: 72px; + overflow-y: scroll; .left { - overflow-y: auto; + // overflow-y: auto; width: 65%; // height: 100%; border-right: 1px solid rgba(233, 233, 233, 1); @@ -1001,7 +1002,8 @@ export default { // bottom: 20px; .ant-pagination-item, .ant-pagination-prev, - .ant-pagination-next { + .ant-pagination-next, + .ant-pagination-options { margin-bottom: 10px; } } diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index f422311b..7d7c5936 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -482,8 +482,9 @@ export default { //面授管理弹窗 .FaceManage { + // overflow: auto; .drawerMain { - min-width: 600px; + min-width: 550px; margin: 0px 32px 0px 32px; overflow-x: scroll; display: flex; @@ -512,7 +513,7 @@ export default { height: 100%; // background-color: #bfa; - // overflow-y: auto; + overflow: auto; .endtime { font-size: 16px; font-weight: 500; @@ -694,7 +695,15 @@ export default { padding: 0px !important; // padding-left: 45px !important; } - + // .ant-pagination-prev { + // margin-bottom: 5px; + // } + .ant-pagination-item, + .ant-pagination-prev, + .ant-pagination-next, + .ant-pagination-options { + margin-bottom: 10px; + } .ant-table-thead > tr > th { background-color: rgba(239, 244, 252, 1) !important; } @@ -735,6 +744,7 @@ export default { height: 72px; width: 100%; position: absolute; + background-color: #fff; bottom: 0; left: 0; display: flex; diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue new file mode 100644 index 00000000..b978e012 --- /dev/null +++ b/src/components/drawers/ManageRight.vue @@ -0,0 +1,1271 @@ + + + + + + diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue index f0267f44..ef808712 100644 --- a/src/components/drawers/Ownership.vue +++ b/src/components/drawers/Ownership.vue @@ -1,3 +1,4 @@ +