diff --git a/src/assets/images/projectadd/open.png b/src/assets/images/projectadd/open.png new file mode 100644 index 00000000..aab6f4d2 Binary files /dev/null and b/src/assets/images/projectadd/open.png differ diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f30e0755..914cd585 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -11,7 +11,7 @@
起止时间:2022-07-21 00:00至2020-10-21 00:00
-
+
结束项目 @@ -39,23 +39,23 @@
-
+
返回
-
+
-
+
- Content of Tab Pane 1 - - + :tabBarStyle="{ marginLeft: '10px',marginTop: '5px' }"> +
+ +
任务大纲
@@ -65,7 +65,7 @@
- + 阶段1腾飞班阶级1
@@ -333,21 +333,27 @@ } .content { //display: flex; - margin: 0 37px; + //margin: 0 37px; + .ant-tabs-nav-wrap { + margin-left: 30px; + } .onerow { - width: 100%; + //width: 100%; display: flex; height: 40px; position: relative; - //margin-top: 5xp; + margin-top: 15px; + margin-left: 38px; + //margin-right: 38px; .taskmain { font-size: 18px; + padding-top: 7px; color: #000000; } .btn { position: absolute; top: 0; - right: 110px; + right: 168px; background-color: #409EFF; width: 130px; height: 40px; @@ -358,7 +364,7 @@ } .edit { position: absolute; - right: 0; + right: 48px; top: 0; color: #409EFF; width: 100px; @@ -391,6 +397,8 @@ background-color: #EFF4FC; align-items: center; margin-top: 20px; + margin-left: 38px; + margin-right: 38px; .stageimg { margin-left: 31px; } @@ -402,11 +410,13 @@ } } .course { - width: 100%; + //width: 100%; display: flex; flex-wrap: wrap; align-items: center; padding: 10px; + margin-left: 38px; + margin-right: 38px; //margin: 0 12px; border: 1px solid #F2F6FC; .first { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 3b94a282..2f6b43e1 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -69,7 +69,9 @@ @expand="expandTable" :pagination="false" /> -
+ +
+
-
@@ -354,6 +355,7 @@ export default { height: 100%; display: flex; flex-direction: column; + //align-items: center; position: relative; // position: relative; .filter { @@ -451,6 +453,7 @@ export default { .tableBox { margin: 20px 38px 30px ; display: flex; + flex: 1; //position: relative; flex-direction: column; @@ -463,17 +466,20 @@ export default { > td { background: #f6f9fd; } - .pa { - left: 0; + + } + .pa { width: 100%; // height: 20px; // background-color: red; display: flex; justify-content: center; //position: absolute; - //bottom: 20px; + margin-bottom: 20px; + .pagination { + margin-bottom: 20px; + } } - } .out { display: block; position: absolute; @@ -540,7 +546,7 @@ export default { border-radius: 5px; // height: 120%; width: 100%; - height: 40px; + height: 30px; } } }