yuanyiming 2 年之前
父节点
当前提交
d2960768d1
共有 2 个文件被更改,包括 35 次插入45 次删除
  1. 16 13
      src/views/ProjectManagement.vue
  2. 19 32
      src/views/resultsShow.vue

+ 16 - 13
src/views/ProjectManagement.vue

@@ -99,7 +99,13 @@
       </div>
     </div>
 <!-- 循环展示框列表结束 -->
-    
+    <div style="display: flex;width: 90%;justify-content: flex-end;margin-top: 30px;">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="1">
+      </el-pagination>
+    </div>
     
   </div>
 </template>
@@ -110,13 +116,7 @@
         return {
           input:'',
           items:[
-              {
-                projectName:'疯狂星期四',
-                person:'袁一鸣',
-                school:'深技师',
-                blogs:'个人博客',
-                num:'JK123245679'
-              },
+             
               {
                 projectName:'疯狂星期四',
                 person:'袁一鸣',
@@ -183,20 +183,22 @@
   
     .projectBlock{   //大框
       box-sizing: border-box;
-      width: 99%;
+      width: 100%;
+      height: 350px;
       display: flex;
+      overflow: hidden;
       flex-wrap: wrap;
       .classBlock{   //每个独立小框
           flex-shrink: 0;
           margin-right: 30px;
           margin-bottom: 15px;
-          width: 300px;height: 280px;
+          width: 310px;height: 300px;
           background-color: rgb(255, 255, 255);
           box-shadow: 1px 2px 3px #ccc;
           border: 1px solid #ccc;
           border-radius: 5px;
           img{
-            width: 100%;height: 140px;
+            width: 100%;height: 150px;
           }
 
           .classBlock1{   //中间栏
@@ -207,6 +209,7 @@
             .classBlock2{   //项目名称
               margin-left: 5px;
               margin-bottom: 5px;
+              margin-top: 8px;
               text-align: left;
               font-size: 18px;
             }
@@ -215,12 +218,12 @@
               padding: 0 5px;
               font-size: 16px;
               width: 100%;
-              margin-top: 8px;
+              margin-top: 7px;
               display: flex;
               justify-content: space-between;
             }
             .classBlock4{  //博客、编号
-              margin-top: 5px;
+              margin-top: 6px;
             }
           }
 

+ 19 - 32
src/views/resultsShow.vue

@@ -82,7 +82,7 @@
         <div class="projectBlockPosition">
           {{ item.finish }}
         </div>
-        <img src='../assets/img/login-bg-autumn.jpg' style="width:100%;height: 130px;" alt="">
+        <img src='../assets/img/login-bg-autumn.jpg' alt="">
         <div class="classBlock1">
             <div class="classBlock2">{{ item.projectName }}</div>
             <div class="classBlock3">
@@ -100,7 +100,14 @@
       </div>
     </div>
     <!-- 展示框列表结束 -->
-
+    <div style="display: flex;width: 90%;justify-content: flex-end;margin-top: 30px;">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="1">
+      </el-pagination>
+    </div>
+    
 
   </div>
 </template>
@@ -111,30 +118,7 @@
         return {
           input:'',
           items:[
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
+           
             {
               finish:'已结题',
               projectName:'吃饭',
@@ -198,12 +182,14 @@
     width: 100%;
     display: flex;
     flex-wrap: wrap;
+    height: 350px;
+    overflow: hidden;
 
     .classBlock{   //独立小框
       flex-shrink: 0;
       margin: 0 10px 10px 0;
-      width: 300px;
-      height: 280px;
+      width: 310px;
+      height: 300px;
       margin-right: 30px;
       margin-bottom: 15px;
       position: relative;
@@ -231,11 +217,12 @@
       .classBlock1{   //图片下面文字部分
         margin-bottom: 10px;
         box-sizing: border-box;
-        padding: 0 5px 0 5px;
+        padding: 0 5px;
         .classBlock2{   //项目名称
           box-sizing: border-box;
           padding: 0 5px;
-          margin-top: 5px;
+          margin-top: 10px;
+          margin-top: 4px;
           margin-bottom: 5px;
           text-align: left;
           font-size: 18px;
@@ -245,7 +232,7 @@
           padding: 0 5px;
           font-size: 16px;
           width: 100%;
-          margin-top: 8px;
+          margin-top: 6px;
           display: flex;
           justify-content: space-between;
         }
@@ -259,7 +246,7 @@
         width: 95%;
         background: #5190fd;
         height: 40px;
-        margin-top: 5px;
+        // margin-top: 5px;
         font-size: 14px;
       }
     }