From af18d027ea397132b22af86851609df0bf2914fa Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 25 Oct 2022 15:54:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectScore.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 6ba17b26..9d7d77bc 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -647,7 +647,7 @@ export default { } .pjcb_content { border: 1px solid #409eff; - padding: 32px; + padding: 20px; margin-top: 10px; .ant-input{ width: 46px; @@ -664,7 +664,9 @@ export default { margin-bottom: 0px; } .content { - margin-bottom: 24px; + align-items: center; + height: 50px; + display: flex; } margin-bottom: 130px; } From 949892dc9fe162ecac27f3ea752507b09a9108bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Tue, 25 Oct 2022 15:56:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE,=E8=B0=83=E7=A0=94=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 27 +++++++++++-- src/views/projectcenter/ProjectManage.vue | 48 +++++++++++++---------- src/views/projectcenter/TaskPage.vue | 2 + src/views/research/ResearchManage.vue | 8 +--- 4 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index c83ddd74..9032fd8a 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -19,7 +19,8 @@
项目名称
- +
@@ -75,6 +76,7 @@
@@ -120,7 +122,8 @@
@@ -395,12 +398,25 @@ export default { flex: 1; // .ant-radio-wrapper { // } + .ant-input-textarea-show-count { + position: relative; + height: 88px; + } + .ant-input-textarea-show-count::after { + position: absolute; + right: 10px; + bottom: 0px; + } .ant-input { - border-radius: 5px; + border-radius: 8px; // height: 120%; width: 100%; height: 40px; } + .ant-input-affix-wrapper { + padding: 0 11px; + border-radius: 8px; + } .ant-select-selector { border-radius: 5px; // height: 120%; @@ -435,6 +451,11 @@ export default { .name2 { display: flex; align-items: flex-start; + .ant-input-textarea { + .ant-input { + height: 88px; + } + } } } .template { diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index bffcaf1a..e32aefe4 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -142,11 +142,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -228,11 +223,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -324,11 +314,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -437,11 +422,6 @@ display: flex; align-items: center; justify-content: space-between; - background: linear-gradient( - 0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100% - ); " >
@@ -2535,6 +2515,13 @@ export default { .doublesonpro { .ant-modal { .ant-modal-body { + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } padding: 0; .modalMain { display: flex; @@ -2617,6 +2604,13 @@ export default { .doublepro { .ant-modal { .ant-modal-body { + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } padding: 0; .modalMain { display: flex; @@ -2699,6 +2693,13 @@ export default { .ant-modal { .ant-modal-body { padding: 0 !important; + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } .modalMain { display: flex; justify-content: center; @@ -2750,6 +2751,13 @@ export default { .ant-modal { .ant-modal-body { padding: 0 !important; + .modalHeader { + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); + } .modalMain { display: flex; flex-direction: column; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 45eb1d2a..1d169846 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1039,6 +1039,7 @@ @ok="closeModal" :footer="null" :closable="false" + :centered="true" wrapClassName="pubproject" width="679px" height="437px" @@ -1114,6 +1115,7 @@ @ok="closeModal2" :footer="null" :closable="false" + :centered="true" wrapClassName="doublepro" width="624px" height="332px" diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 6debe957..2f34de7d 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -37,7 +37,7 @@
@@ -101,12 +101,6 @@
-
- -
调研名称
Date: Tue, 25 Oct 2022 16:05:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E8=B0=83=E7=A0=94=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A1=86=E6=A0=B7=E5=BC=8F=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=A0=B7=E5=BC=8F=20=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=88=A0=E9=99=A4=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=20=E5=BC=80=E8=AF=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 38 ++++++++++++-------- src/views/research/ResearchAdd.vue | 2 +- src/views/research/ResearchManage.vue | 25 ++----------- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 3d1a37e9..8bdff2ff 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -121,7 +121,7 @@
-
课程命名规则
+
课程命名规则
-
课程命名规则
+
课程命名规则
+
批量录入成绩
- 批量结业 + 批量结业
- 批量通过 + 批量通过
- 批量拒绝 + 批量拒绝
+
@@ -4977,6 +4979,7 @@ export default defineComponent({ } .btn4 { display: flex; + width: 130px; flex-direction: column; position: relative; .btn4_sub { @@ -4998,21 +5001,26 @@ export default defineComponent({ } .btn4_sup { width: 100%; - display: flex; - flex-direction: column; background-color: #ffffff; box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); position: absolute; top: 40px; z-index: 999; - .btn4_tit { - margin-top: 8px; - margin-left: 8px; - } - .btn4_op1, - .btn4_op2, - .btn4_op3 { - margin-left: 20px; + .btnsbox{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + .btn4_tit { + margin: 10px auto; + white-space: nowrap; + } + .btn4_op1, + .btn4_op2, + .btn4_op3 { + margin-bottom:10px; + white-space: nowrap; + } } } } diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 1384fded..a59b2e1e 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -440,7 +440,7 @@ export default { cursor: pointer; margin-top: 32px; margin-left: 20px; - float: right; + // float: right; color: #4ea6ff; font-size: 14px; } diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 6debe957..42749d9d 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -37,7 +37,7 @@
@@ -65,7 +65,7 @@ :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" - :scroll="{ x: 1500, y: 800 }" + :scroll="{ x: 1500 }" @expand="expandTable" :pagination="false" /> @@ -102,10 +102,6 @@
-
调研名称
@@ -287,12 +283,6 @@ export default { width: 100, align: "center", className: "h", - // ellipsis: true, - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text, record) => { - // console.log(text, record); - // return {text.text}; - // }, }, { title: "名称", @@ -487,10 +477,9 @@ export default { width: 680px; // height: 525px; background-color: #fff; - box-shadow: 0 0 10px rgba(118, 136, 166, 0.21); left: 50%; - top: 20%; + top: 50%; transform: translate(-50%, -50%); .top { width: 100%; @@ -587,9 +576,7 @@ export default { height: 100%; display: flex; flex-direction: column; - //align-items: center; position: relative; - // position: relative; .filter { margin-left: 38px; margin-right: 38px; @@ -607,7 +594,6 @@ export default { } .btns { display: flex; - // flex-wrap: wrap; .btn { padding: 0px 26px 0px 26px; height: 38px; @@ -686,7 +672,6 @@ export default { margin: 20px 38px 30px; display: flex; flex: 1; - //position: relative; flex-direction: column; th.h { @@ -701,11 +686,8 @@ export default { } .pa { width: 100%; - // height: 20px; - // background-color: red; display: flex; justify-content: center; - //position: absolute; margin-bottom: 20px; .pagination { margin-bottom: 20px; @@ -770,7 +752,6 @@ export default { height: 16px; position: relative; margin-right: 10px; - // background-image: url(@/assets/images/coursewareManage/notice.png); img{ width: 100%; height: 100%;