Explorar o código

差不多完成

yuanyiming %!s(int64=2) %!d(string=hai) anos
pai
achega
2bf57b2992

+ 55 - 62
src/views/ProjectManagement.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ProjectManagement core_dialogue">
+  <div class="ProjectManagement">
     <div class="pAHeader">
       <div class="pAHeader1">项目管理</div>
     </div>
@@ -79,7 +79,7 @@
 <!-- 循环展示框列表开始 -->
     <div class="projectBlock">
       <div class="classBlock" v-for="(item,index) in items" :key="index">
-        <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">
@@ -180,73 +180,66 @@
 
 <style lang="less">
 .ProjectManagement{
-
-  .operations{
-    display: flex;
-    flex-shrink: 0;
-    height:52px;
-    .btt{
-      flex-shrink: 0;
-    }
-  }
-  
-
-
   
-    .projectBlock{
+    .projectBlock{   //大框
       box-sizing: border-box;
       padding-top: 5px;
       width: 99%;
-      overflow: auto;
       display: flex;
-      height: 100%;
       flex-wrap: wrap;
-    .classBlock{
-        margin-top: 20px;
-        flex-shrink: 0;
-        margin: 0 10px 10px 0;
-        width: 270px;height: 260px;
-        background-color: rgb(255, 255, 255);
-        box-shadow: 1px 2px 3px #ccc;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-        overflow: hidden;
-        img{
-          width: 100%;height: 150px;
-        }
-        .classBlockBtn{
-          box-sizing: border-box;
-          padding:0 5px 0 5px;
-          display: flex;
-        }
-    }
-    }
-    .classBlock1{
-      margin-bottom: 12px;
-      box-sizing: border-box;
-      padding: 0 5px 0 5px;
-      .classBlock2{
-        // font-weight: 600;
-        margin-left: 5px;
-        margin-bottom: 5px;
-        text-align: left;
-        font-size: 18px;
-      }
-      .classBlock3{
-        box-sizing: border-box;
-        padding: 0 5px;
-        font-size: 16px;
-        width: 100%;
-        display: flex;
-        justify-content: space-between;
-      }
-      .classBlock4{
-        margin-top: 5px;
+      .classBlock{   //每个独立小框
+          flex-shrink: 0;
+          margin-right: 30px;
+          margin-bottom: 15px;
+          width: 300px;height: 280px;
+          background-color: rgb(255, 255, 255);
+          box-shadow: 1px 2px 3px #ccc;
+          border: 1px solid #ccc;
+          border-radius: 5px;
+          img{
+            width: 100%;height: 140px;
+          }
+
+          .classBlock1{   //中间栏
+            margin-bottom: 12px;
+            margin-top: 5px;
+            box-sizing: border-box;
+            padding: 0 5px;
+            .classBlock2{   //项目名称
+              margin-left: 5px;
+              margin-bottom: 5px;
+              text-align: left;
+              font-size: 18px;
+            }
+            .classBlock3{   //学校、姓名
+              box-sizing: border-box;
+              padding: 0 5px;
+              font-size: 16px;
+              width: 100%;
+              margin-top: 8px;
+              display: flex;
+              justify-content: space-between;
+            }
+            .classBlock4{  //博客、编号
+              margin-top: 5px;
+            }
+          }
+
+          .classBlockBtn{  //按钮栏
+            box-sizing: border-box;
+            padding:0 5px;
+            display: flex;
+            .bt1{
+              width: 100px;
+              height: 35px;
+              font-size: 14px;
+            }
+          }
       }
     }
-    .bt1{
-      width: 100px;
-      font-size: 14px;
-    }
+
+
+
+    
   }
 </style>

+ 59 - 59
src/views/ProjectManagement3_1.vue

@@ -200,22 +200,22 @@
           class="AddMember"
           :before-close="handleClose">
 
-            <div class="diaTit1">
-              <div class="spans1">姓名</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">姓名</div>
               <div>
                 <el-input v-model="Member.name"></el-input>
               </div>
             </div>
 
-            <div class="diaTit1">
-              <div class="spans1">班级</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">班级</div>
               <div>
                 <el-input v-model="Member.className"></el-input>
               </div>
             </div>
 
-            <div class="diaTit1">
-              <div class="spans1">电话</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">电话</div>
               <div>
                 <el-input v-model="Member.phone"></el-input>
               </div>
@@ -387,61 +387,61 @@
 
 
 
-    .el-dialog{
-    width: 700px;
-    border-radius: 5px;
-    overflow: hidden;
-  }
+  //   .el-dialog{
+  //   width: 700px;
+  //   border-radius: 5px;
+  //   overflow: hidden;
+  // }
 
-  .el-dialog__body{
-    padding:30px 25%;
-  }
+  // .el-dialog__body{
+  //   padding:30px 25%;
+  // }
   
-  .el-dialog__header{
-    background: #32455b;
-    text-align: center;
-  }
-  .el-dialog__title{
-    color: #fff;
-    position: relative;
-    top: -5px;
-    font-size: 18px;
-  }
-
-
-
-  .dialog-footer{
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      .diaBtn{
-        width: 180px;
-        height: 35px;
-        line-height: 5px;
-        font-size: 16px;
-      }
-  }
-    .AddMember{    //添加成员里的input框,防止与select里的input冲突
-      .el-input__inner{
-          width: 300px;
-      }
-    }
-
-    .diaTit1{   //添加对话框 label和input框
-      display: flex;
-      width: 70%;
-      margin-top: 20px;
-      .spans1{      //label
-        min-width: 40px;
-        font-size: 16px;
-        margin-right: 10px;
-        display: inline-block;
-        text-align: justify;
-        text-justify:distribute-all-lines;
-        text-align-last: justify;
-        transform: translate(0,22%);
-      }
-    }
+  // .el-dialog__header{
+  //   background: #32455b;
+  //   text-align: center;
+  // }
+  // .el-dialog__title{
+  //   color: #fff;
+  //   position: relative;
+  //   top: -5px;
+  //   font-size: 18px;
+  // }
+
+
+
+  // .dialog-footer{
+  //     width: 100%;
+  //     display: flex;
+  //     justify-content: center;
+  //     .diaBtn{
+  //       width: 180px;
+  //       height: 35px;
+  //       line-height: 5px;
+  //       font-size: 16px;
+  //     }
+  // }
+  //   // .AddMember{    //添加成员里的input框,防止与select里的input冲突
+  //   //   .el-input__inner{
+  //   //       width: 300px;
+  //   //   }
+  //   // }
+
+  //   .diaTit1{   //添加对话框 label和input框
+  //     display: flex;
+  //     width: 70%;
+  //     margin-top: 20px;
+  //     .spans1{      //label
+  //       min-width: 40px;
+  //       font-size: 16px;
+  //       margin-right: 10px;
+  //       display: inline-block;
+  //       text-align: justify;
+  //       text-justify:distribute-all-lines;
+  //       text-align-last: justify;
+  //       transform: translate(0,22%);
+  //     }
+  //   }
 
 
 

+ 1 - 1
src/views/home.vue

@@ -11,7 +11,7 @@
             </div>
         </el-aside>
 
-        <el-main class="main">
+        <el-main class="main  core_dialogue">
           <router-view></router-view>
         </el-main>
       </el-container>

+ 1 - 7
src/views/makerActvityApply.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="makerActvityApplyPAapply ">
+    <div class="makerActvityApplyPAapply">
       <div class="pAmid">
         <!-- 左边栏导航区开始 -->
         <div class="left">
@@ -253,12 +253,6 @@
   .makerActvityApplyPAapply{
       width: 100%;
       position: relative;
-
-     
-
-
-
-
     }
 
 

+ 0 - 1
src/views/makerActvityApplyMain.vue

@@ -2,7 +2,6 @@
   <div class="core_dialogue">
         <makerActvityApply :data="makerActvityApply" :next="next"  v-show="status==0" />
         <makerActvityApply2 :data="makerActvityApply2" :next="next" :back="back" v-show="status==1" />
-
   </div>
 </template>
 

+ 47 - 104
src/views/resultsShow.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="resultsShow core_dialogue">
+  <div class="resultsShow">
     <div class="pAHeader">
       <div class="pAHeader1">成果展示</div>
     </div>
@@ -97,7 +97,7 @@
         <div >
               <el-button type="primary" class="bt1" size="mini" @click="rsBtn">项目成果展示</el-button>
         </div>
-    </div>
+      </div>
     </div>
     <!-- 展示框列表结束 -->
 
@@ -167,22 +167,6 @@
               blogs:"个人创客",
               num:"JK006641123"
             },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
           ], //项目展示小方块
           options:[],
           options1:[],
@@ -209,63 +193,26 @@
 
 <style lang="less">
 .resultsShow{
-  // .selects{
-  //   display: flex;
-  //   flex-wrap: wrap;
-  //   width: 80%;
-  //   .selectsBlock{
-  //     display: flex;
-  //     margin-right: 30px;
-  //     margin-bottom: 20px;
-  //   }
-  //   .selectLabel{
-  //     width: 64px;
-  //     font-size: 16px;
-  //     margin-right: 10px;
-  //     display: inline-block;
-  //     font-weight:bolder;
-  //     text-align: justify;
-  //     text-justify:distribute-all-lines;
-  //     text-align-last: justify;
-  //     transform: translate(0,22%);
-  //   }
-  // }
 
-  
-  // .selectInp{   //搜索栏大框
-  //   display: flex;
-  //   margin-top: 20px;
-  //   position: relative;
-  //   .pmInp{   //查询框
-  //     display: flex;  
-  //     position: absolute;
-  //     right: 0;
-  //     .btn{  //查询框按钮
-  //       height: 40px;
-  //       background: #2268bc;
-  //       margin-left: 10px;
-  //       font-size: 16px;
-  //     }
-  //   }
-  // }
-  .classBlocks{   //循环列表
+  .classBlocks{   //循环列表大框
     width: 100%;
     display: flex;
-    // margin-top: 10px;
     flex-wrap: wrap;
-    .classBlock{
-      margin-top: 20px;
+
+    .classBlock{   //独立小框
       flex-shrink: 0;
       margin: 0 10px 10px 0;
-      width: 270px;
-      height: 260px;
+      width: 300px;
+      height: 280px;
+      margin-right: 30px;
+      margin-bottom: 15px;
       position: relative;
       background-color: rgb(255, 255, 255);
       box-shadow: 1px 2px 3px #ccc;
       border: 1px solid #ccc;
       border-radius: 5px;
-      overflow: hidden;
-      .projectBlockPosition{
+      
+      .projectBlockPosition{    //完成状态
         position: absolute;
         width: 100px;
         height: 40px;
@@ -280,50 +227,46 @@
       img{
         width: 100%;height: 150px;
       }
-    }
-  }
-  
-    .projectBlock{
-      box-sizing: border-box;
-      padding-left: 20px;
-      padding-top: 20px;
-      width: 100%;
-      overflow: auto;
-      display: flex;
-      height: 100%;
-      flex-wrap: wrap;
-      
-    }
-    .classBlock1{   //图片下面文字部分
-      margin-bottom: 10px;
-      box-sizing: border-box;
-      padding: 0 5px 0 5px;
-      .classBlock2{
-        box-sizing: border-box;
-        padding: 0 5px;
-        margin-bottom: 5px;
-        text-align: left;
-        font-size: 18px;
-        font-weight: bold;
-      }
-      .classBlock3{
+
+      .classBlock1{   //图片下面文字部分
+        margin-bottom: 10px;
         box-sizing: border-box;
-        padding: 0 5px;
-        font-size: 16px;
-        width: 100%;
-        display: flex;
-        justify-content: space-between;
+        padding: 0 5px 0 5px;
+        .classBlock2{   //项目名称
+          box-sizing: border-box;
+          padding: 0 5px;
+          margin-top: 5px;
+          margin-bottom: 5px;
+          text-align: left;
+          font-size: 18px;
+        }
+        .classBlock3{   //名字、学院
+          box-sizing: border-box;
+          padding: 0 5px;
+          font-size: 16px;
+          width: 100%;
+          margin-top: 8px;
+          display: flex;
+          justify-content: space-between;
+        }
+        .classBlock4{
+          margin-top: 5px;
+          margin-top: 8px;
+          letter-spacing: -1px;
+        }
       }
-      .classBlock4{
+      .bt1{   //项目成果展示按钮
+        width: 95%;
+        background: #5190fd;
+        height: 40px;
         margin-top: 5px;
-        letter-spacing: -1px;
+        font-size: 14px;
       }
     }
-    .bt1{   //项目成果展示按钮
-      width: 95%;
-      background: #5190fd;
-      height: 35px;
-      font-size: 14px;
-    }
+  }
+  
+   
+
+    
   }
 </style>