yuanyiming 2 years ago
parent
commit
ac2b238a87
3 changed files with 720 additions and 339 deletions
  1. 591 215
      package-lock.json
  2. 46 0
      src/App.vue
  3. 83 124
      src/views/makerActvityDetails.vue

File diff suppressed because it is too large
+ 591 - 215
package-lock.json


+ 46 - 0
src/App.vue

@@ -238,4 +238,50 @@
       }
   }
 
+  .addMoneyBtn{     //自定义写的的添加框
+      width: 120px;
+      height: 40px;
+      border: #000 1px dashed;
+      border-radius: 5px;
+      margin: 18px 10px 30px;
+      display: flex;
+      justify-content: center;
+      line-height: 40px;
+      font-size: 16px;
+        .jia{
+            border-radius: 50%;
+            border: 1.5px #ccc solid;
+            font-size: 25px;
+            line-height: 26px;
+            font-weight: 10;
+            margin-top: 6px;
+            margin-right: 5px;
+            height: 27px;
+            width: 27px;
+            color: #ccc;
+        }
+      }
+  .baseBtn{     //所有页面底部按钮框
+    width: 98%;
+    display: flex;
+    justify-content: flex-end;
+    margin: 30px 0;
+    .blockWidth{
+      display: flex;
+      justify-content:space-between;
+      width: 210px;
+        [type='button']{
+          background: #409eff !important;
+          color: #fff !important;
+          display: flex;
+          justify-content: center;
+          font-size: 16px;
+          width: 120px;
+          height: 40px;
+          align-items: center;
+        }
+    }  
+  }
+
+
 </style>

+ 83 - 124
src/views/makerActvityDetails.vue

@@ -3,12 +3,12 @@
 
             <div class="pAHeader">
               <div class="pAHeader1">活动详情</div>
-              <!-- <el-button  @click="apply">项目立项申请</el-button> -->
-              <el-button type="primary" class="addTeacher" style="box-sizing: border-box;padding-left: 30px;" @click="backBtn" size="mini">返回</el-button>
+              <span @click="backBtn">返回</span>
+              <!-- <el-button type="primary" class="addTeacher" style="box-sizing: border-box;padding-left: 30px;" @click="backBtn" size="mini">返回</el-button> -->
             </div>
             <hr>
             <!-- 活动基本信息开始 -->
-            <div class="activityMessage">
+            <div class="tabTit">
               活动基本信息
             </div>
           <!-- 活动申请填写信息区域开始 -->
@@ -65,8 +65,8 @@
           </div>
              
             <!-- 活动完结报告开始 -->
-            <div class="MA1Head">
-                <div class="MA1HeadTit">活动完结报告</div>
+            <div class="tabTit">
+                <div>活动完结报告</div>
             </div>
             <div style="width: 85%;float: left;">
               <div style="display: flex;">
@@ -79,11 +79,11 @@
             <!-- 活动完结报告结束 -->
 
             <!-- 活动指导老师开始 -->
-              <div class="MA1Head">
-                <div class="MA1HeadTit">
+              <div class="tabTit">
+                <div>
                   活动指导老师
                 </div>
-                <el-button type="primary" class="addTeacher" @click="addTeacher" size="mini">添加教师</el-button>
+                <el-button type="primary" @click="addTeacher" size="mini">添加教师</el-button>
               </div>
               <hr>
               <el-table
@@ -132,7 +132,7 @@
             <!-- 活动指导老师结束 -->
 
             <!-- 多行文本框部分开始 -->
-            <div class="makerActvity1tabTit">
+            <div class="tabTit">
                  活动介绍
             </div>
             <div class=" MA1textArea">
@@ -143,7 +143,7 @@
                 v-model="textarea">
               </el-input>
             </div>
-            <div class="makerActvity1tabTit">
+            <div class="tabTit">
                  活动计划
             </div>
             <div class=" MA1textArea">
@@ -154,7 +154,7 @@
                 v-model="textarea">
               </el-input>
             </div>
-            <div class="makerActvity1tabTit">
+            <div class="tabTit">
                  预期目标
             </div>
             <div class=" MA1textArea">
@@ -165,7 +165,7 @@
                 v-model="textarea">
               </el-input>
             </div>
-            <div class="makerActvity1tabTit">
+            <div class="tabTit">
                  活动受面
             </div>
             <div class=" MA1textArea">
@@ -176,7 +176,7 @@
                 v-model="textarea">
               </el-input>
             </div>
-            <div class="makerActvity1tabTit">
+            <div class="tabTit">
                  经费支出计划
             </div>
             <div class=" MA1textArea">
@@ -189,8 +189,8 @@
             </div>
             <!-- 多行文本框部分结束 -->
 
-            <div class="makerActvity1footer">
-              <div>
+            <div class="baseBtn">
+              <div class="blockWidth">
                 <el-button type="primary" class="makerActvity1backBtn" @click="check" size:small>保存</el-button>
                 <el-button type="primary" class="makerActvity1backBtn" @click="check" size:small>立即审核</el-button>
               </div>
@@ -199,29 +199,29 @@
 
             <!--添加成员dialog对话框开始 -->
               <el-dialog
-                  title="添加成员"
+                  title="添加指导老师"
                   :visible.sync="addMemberDialog"
                   :modal="false"
                   :close-on-click-modal="false"
                   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.class"></el-input>
                       </div>
                     </div>
 
-                    <div class="diaTit1">
-                      <div class="spans1">电话</div>
+                    <div class="littleBlock">
+                      <div class="dialogLabel">电话</div>
                       <div>
                         <el-input v-model="Member.takeCharge"></el-input>
                       </div>
@@ -289,118 +289,77 @@ export default {
 
 <style lang="less">
 .makerActvityDetails{
-  .addTeacher{  //表格外按钮
-      font-size: 16px;
-      height: 32px;
-      width: 100px;
-  }
-  .activityMessage{
-    width: 100%;
-    height: 20px;
-    display: flex;
-    justify-content: flex-start;
-    font-size: 18px;
-    font-weight: 600;
-    margin: 20px 0;
 
+  // 关于添加对话框的开始
+  .el-dialog{
+    width: 700px;
+    border-radius: 5px;
+    overflow: hidden;
   }
 
-    .MA1Head{
-      width: 100%;
-      display: flex;   
-      justify-content:space-between;
-      margin-top: 15px;
-      .MA1HeadTit{
-        font-size: 18px;
-        font-weight: 550;
+  .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;
+  }
+  .littleBlock{   //添加对话框 label和input框
+      display: flex;
+      width: 70%;
+      margin-top: 20px;
+      .dialogLabel{      //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%);
       }
-      .backBtn{
-        height: 10px;
-        line-height: 0;
+    }
+    .AddMember{    //添加成员里的input框,防止与select里的input冲突
+      .el-input__inner{
+          width: 300px;
       }
     }
-    .addMoneyBtn{
-      width: 120px;
-      height: 40px;
-      border: #000 1px dashed;
-      border-radius: 5px;
-      margin: 18px 10px 30px;
+  .dialog-footer{
+      width: 100%;
       display: flex;
       justify-content: center;
-      line-height: 40px;
-      font-size: 16px;
-        .jia{
-            border-radius: 50%;
-            border: 1.5px #ccc solid;
-            font-size: 25px;
-            line-height: 26px;
-            font-weight: 10;
-            margin-top: 6px;
-            margin-right: 5px;
-            height: 27px;
-            width: 27px;
-            color: #ccc;
-        }
+      .diaBtn{
+        width: 180px;
+        height: 35px;
+        line-height: 5px;
+        font-size: 16px;
       }
-      .download{
-        margin: 20px 15px;
-        width: 230px;
-        line-height: 35px;
-        text-align: left;
-        font-size: 14px;
-        font-weight: bold;
-        color: #5391fd;
-      }
-.makerActvity1footer{
-  width: 100%;
-  display: flex;
-  justify-content: flex-end;
-  margin: 30px 0;
-  .makerActvity1backBtn{
-    font-size: 16px;
-      width: 100px;
-      height: 40px;
-    }
-}
+  }
+  // 关于添加对话框的结束
+
 
-    .MApplySelects{
-        width: 90%;
-        margin-top: 20px;
-        display: flex;
-        flex-wrap: wrap;
-      .inp1{
-        display: flex;
-        margin-right: 5%;
-        margin-top: 10px;
-        width: 450px;
-        .inpText{
-          min-width: 100px;
-          margin-right: 5px;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-          transform: translate(0,22%);
-          padding-right: 15px;
-          font-size: 16px;
-        }
-      }
-      
-    }
-      
     
-    .MA1textArea{
-      width: 100%;
-      textarea{
-        resize: none;
-      }
-    }
-    .makerActvity1tabTit{
-      margin: 20px 0 5px 0;
-      font-size: 18px;
-      font-weight:600 ;
-      width: 100%;
-      text-align: left;
-    }
+  .download{   //pdf下载
+    margin: 20px 15px;
+    width: 230px;
+    line-height: 35px;
+    text-align: left;
+    font-size: 14px;
+    font-weight: bold;
+    color: #5391fd;
+  }
+
+    
+  textarea{
+    resize: none;
+  }
+
   }
 </style>

Some files were not shown because too many files changed in this diff