yuanyiming 2 лет назад
Родитель
Сommit
805f617130

+ 86 - 29
src/App.vue

@@ -37,6 +37,34 @@
     width: 100%;
     overflow:hidden ;
   }
+  .page{  //app最基础页面
+    height: 100%;
+    width: 100%;
+    background: #e6eaf0;
+    img{
+      height: 40px;
+    }
+    .el-header {    //顶部退出区域
+        background-color: #3d67bc;
+        color: #333;
+        text-align: center;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .homeExitContent{
+          color: #fff;
+          display: flex;
+          justify-content: space-between;
+          width: 150px;
+          .homeExit{
+            background: #ffffff;
+            color: #000;
+            cursor: pointer;
+            width: 90px;
+          }
+        }
+    }
+  }
   hr{   //hr横线
     border: none;
     height: 1px;
@@ -110,34 +138,7 @@
     }
 
 
-  .page{  //app最基础页面
-    height: 100%;
-    width: 100%;
-    background: #e6eaf0;
-    img{
-      height: 40px;
-    }
-    .el-header {    //顶部退出区域
-        background-color: #3d67bc;
-        color: #333;
-        text-align: center;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .homeExitContent{
-          color: #fff;
-          display: flex;
-          justify-content: space-between;
-          width: 150px;
-          .homeExit{
-            background: #ffffff;
-            color: #000;
-            cursor: pointer;
-            width: 90px;
-          }
-        }
-    }
-  }
+ 
 
   .operations{   //所有表格按钮栏
     // display: flex;
@@ -146,6 +147,7 @@
       font-size: 14px;
     }
   }
+
   .fontSize{   //所有表格字体大小
     margin-top: 15px;
     font-size: 16px !important;
@@ -283,9 +285,64 @@
     }  
   }
 
-  .twoStyle{  //左边两边对齐,右边靠右
+  .twoStyle{  //左边两边对齐,右边靠右的靠右样式
     display: flex !important;
     justify-content: flex-end;
   }
 
+  .AddMember{    //添加对话框
+      .el-input__inner{
+          width: 300px;
+      }
+      .el-dialog{
+          width: 600px;
+          border-radius: 5px;
+          overflow: hidden;
+        }
+
+        .el-dialog__body{
+          display: flex;
+          // justify-content: center;
+          align-items: center;
+          flex-direction: column;
+        }
+        
+        .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: 70px;
+              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%);
+            }
+          }
+        .footer{
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          [type="button"]{
+            width: 150px;
+            height: 35px;
+          }
+
+        }
+    }
+
+
 </style>

+ 128 - 5
src/views/ProjectManagement3_1.vue

@@ -30,9 +30,10 @@
                 </div>
                 <div class="selectMid">
                   <div class="selectLeft">
-                      <div class="inpBlock">
+                      <div class="inpBlock" style="position: relative;">
                           <div class="label">预算经费</div>
                           <el-input v-model="input" placeholder="请输入内容"></el-input>
+                          <div style="position: absolute;top: 8px;right: -30px;">(万)</div>
                       </div>
                       <div class="inpBlock">
                           <div class="label">负责人</div>
@@ -82,7 +83,7 @@
         <div class="MA1HeadTit">
           活动指导老师
         </div>
-        <el-button type="primary" class="backBtn" size="mini">添加教师</el-button>
+        <el-button type="primary" @click="addMember" size="mini">添加教师</el-button>
       </div>
       <hr>
       <el-table
@@ -100,7 +101,7 @@
          >
         </el-table-column>
         <el-table-column
-          prop="class"
+          prop="className"
           label="工作单位"
           align="center"
           >
@@ -189,6 +190,42 @@
       </div>
     <!-- 多行文本框区域结束 -->
 
+
+     <!--添加成员dialog对话框开始 -->
+      <el-dialog
+          title="添加成员"
+          :visible.sync="addMemberDialog"
+          :modal="false"
+          :close-on-click-modal="false"
+          class="AddMember"
+          :before-close="handleClose">
+
+            <div class="diaTit1">
+              <div class="spans1">姓名</div>
+              <div>
+                <el-input v-model="Member.name"></el-input>
+              </div>
+            </div>
+
+            <div class="diaTit1">
+              <div class="spans1">班级</div>
+              <div>
+                <el-input v-model="Member.className"></el-input>
+              </div>
+            </div>
+
+            <div class="diaTit1">
+              <div class="spans1">电话</div>
+              <div>
+                <el-input v-model="Member.phone"></el-input>
+              </div>
+            </div>
+            <div slot="footer" class="footer">
+              <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
+              <el-button @click="handleClose" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+            </div>
+      </el-dialog>
+      <!--添加成员dialog对话框结束 -->
     </div>
 </template>
 
@@ -196,21 +233,28 @@
       export default {
         data() {
           return {
+          addMemberDialog:false,
+          textarea:'',
             options: [{
               value: '选项1',
               label: '中德学院'
             }],
+            Member:{
+              name:'袁一鸣',
+              className:'21通信',
+              phone:'1234567898'
+          },
             value: '中德学院',
            input:'',
             tableData:[{
               Name:'徐晓慧',
-              class:'22电子通信G5',
+              className:'22电子通信G5',
               tel:'13751177411',
               score:'-',
             },
             {
               Name:'林凡文',
-              class:'22电子通信G5',
+              className:'22电子通信G5',
               tel:'13751177411',
               score:'-',
             },
@@ -218,6 +262,19 @@
           }
         },
         methods:{
+          handleClose(){
+          this.addMemberDialog=false
+        },
+        addMember(){
+          this.addMemberDialog=true
+         
+        },
+          commit(){
+          this.addMemberDialog=false;
+          let { name: Name, className: className, phone:tel } = this.Member;
+          let data={Name,className,tel};
+          this.tableData.push(data);
+        },
           content(){
             this.$router.push('/ProjectManagement1')
           },
@@ -327,6 +384,72 @@
       }
       
     }
+
+
+
+    .el-dialog{
+    width: 700px;
+    border-radius: 5px;
+    overflow: hidden;
+  }
+
+  .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%);
+      }
+    }
+
+
+
+
+
+
+
+
   }
 
   </style>

+ 12 - 1
src/views/ProjectManagementFund2.vue

@@ -388,6 +388,7 @@
     }
   }
   .projectApplicationfundAddDialog2{
+    font-size: 16px !important;
     .el-dialog__header{
       display: flex;
       font-weight: bold;
@@ -419,16 +420,21 @@
     .dagInpS{
       width: 100%;
       display: flex;
+      font-size: 16px;
+
       justify-content: space-between;
       .dagInpS1{
         display: flex;
         min-width: 23%;
         max-width: 23%;
+        font-size: 16px;
+
       }
       .dagInpS1:nth-child(1){
         min-width: 30%;
         max-width: 30%;
         .dagSpan{
+          font-size: 16px;
           display: inline-block;
           text-align: justify;
           text-justify:distribute-all-lines;
@@ -437,7 +443,8 @@
         }
       }
       .dagInpS1:nth-child(n+2) .dagSpan{
-        min-width: 45px;
+        font-size: 16px;
+        min-width: 50px;
         max-width: 45px;
 
       }
@@ -445,7 +452,11 @@
     .dagInpS2{
         margin:20px 0 20px 0;
         display: flex;
+        font-size: 16px;
+
         .dagSpan2{
+          font-size: 16px;
+
           max-width: 60px;
           min-width: 60px;
           margin-right: 10px;

+ 2 - 57
src/views/makerActvityDetails.vue

@@ -225,7 +225,7 @@
                         <el-input v-model="Member.takeCharge"></el-input>
                       </div>
                     </div>
-                    <div slot="footer" class="dialog-footer">
+                    <div slot="footer" class="footer">
                       <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
                       <el-button @click="handleClose" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
                     </div>
@@ -238,7 +238,7 @@
 export default {
   data() {
     return {
-      addMemberDialog:false,
+      addMemberDialog:true,
             options: [{
               value: '选项1',
               label: '中德学院'
@@ -289,61 +289,6 @@ export default {
 <style lang="less">
 .makerActvityDetails{
 
-  // 关于添加对话框的开始
-  .el-dialog{
-    width: 700px;
-    border-radius: 5px;
-    overflow: hidden;
-  }
-
-  .el-dialog__body{
-    padding:30px 22%;
-  }
-  
-  .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: 80px;
-        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%);
-      }
-    }
-    .AddMember{    //添加成员里的input框,防止与select里的input冲突
-      .el-input__inner{
-          width: 300px;
-      }
-    }
-  .dialog-footer{
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      .diaBtn{
-        width: 180px;
-        height: 35px;
-        line-height: 5px;
-        font-size: 16px;
-      }
-  }
-  // 关于添加对话框的结束
-
-
     
   .download{   //pdf下载
     margin: 20px 15px;

+ 1 - 62
src/views/projectApplicationApply.vue

@@ -217,7 +217,7 @@
               Class:'21通信',
               phone:'1234567898'
           },
-          addMemberDialog:false,
+          addMemberDialog:true,
 
           tableData:[{
               Name:'徐晓慧',
@@ -275,67 +275,6 @@
     display: flex;
     justify-content: center;
 
-  .el-dialog{
-    width: 700px;
-    border-radius: 5px;
-    overflow: hidden;
-  }
-
-  .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%);
-      }
-    }
-
-  
-
-    
 
     .right{
         width: 83%;