#

src/App.vue

@@ -267,7 +267,6 @@
     .blockWidth{
       display: flex;
       justify-content:space-between;
-      width: 210px;
         [type='button']{
           background: #409eff !important;
           color: #fff !important;
@@ -275,6 +274,7 @@
           justify-content: center;
           font-size: 16px;
           width: 120px;
+          margin-left: 20px;
           height: 40px;
           align-items: center;
         }

src/views/ProjectManagement2.vue

@@ -77,8 +77,10 @@
         v-model="textarea">
         </el-input>
       </div>
-      <div class="footer">
-        <el-button type="primary" class="backBtn" @click="backBtn2">返回</el-button>
+      <div class="baseBtn">
+        <div class="blockWidth">
+          <el-button type="primary" class="backBtn" @click="backBtn2">返回</el-button>
+        </div>
       </div>
   
     </div>
@@ -162,34 +164,7 @@
   <style lang="less">
   .ProjectManagement2{
 
-   
-    .footer{
-        width: 100%;
-        height: 50px;
-        margin-top: 30px;
-        margin-bottom: 10px;
-        
-        .backBtn{
-            background: #169bd5;
-            float: right;
-            width: 100px;
-        }
-    }
-   
-    .pm1Tit{
-        display: flex;
-        margin-left: 20px;
-        div{
-          width: 130px;
-          cursor: pointer;
-          font-weight: 550;
-        }
-        .pr1TitBass{
-          height: 2px;
-          width: 100%;
-          background: #3D67BC;
-        }
-    }
+
     .PA2textArea{
         margin: 15px 0px;
         .PA2textAreaTit{
@@ -201,7 +176,6 @@
             color: #2387ff;
         }
         .PA2textAreaTit2{
-            // margin-left: 15px;
             font-size: 16px;
         }
     }

src/views/ProjectManagement5.vue

@@ -30,6 +30,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        height="500px"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >

src/views/credit1.vue

@@ -100,20 +100,20 @@
             label="操作"
             
             >
-            <!-- <template #default="scope"> -->
+            <template #default="scope">
                 <div class="operations">
-                    <!-- <el-button type="primary" > -->
-                        <el-button type="primary" size="mini" style="background: #477edd;font-size: 14px;">设置学分</el-button>
-                    <!-- </el-button> -->
+                        <el-button type="primary" @click="setCredit(scope)" size="mini">设置学分</el-button>
                 </div>
-            <!-- </template> -->
+            </template>
           </el-table-column>
         </el-table>
       <!-- 成员学分登记结束 -->
 
 
-      <div class="footer">
-        <el-button type="primary" class="backBtn" @click="backBtn">返回</el-button>
+      <div class="baseBtn">
+        <div class="blockWidth">
+          <el-button type="primary" @click="$route.back()">返回</el-button>
+        </div>
       </div>
 
     </div>
@@ -154,15 +154,16 @@
           }
         },
         methods:{
+          setCredit(){
+
+          },
           edit(){
   
           },
-          handleSelectionChange(val) {
-            this.multipleSelection = val;
-          },
-          backBtn(){
-            this.$router.push('/credit')
-          }
+          // handleSelectionChange(val) {
+          //   this.multipleSelection = val;
+          // },
+
         }
       }
   </script>
@@ -200,16 +201,6 @@
         display: flex;
         justify-content: space-between;
     }
-    .footer{
-        width: 100%;
-        margin-top: 5%;
-        margin-right: 20%;
-        .backBtn{
-            background: #169bd5;
-            float: right;
-            width: 100px;
-            font-size: 16px;
-        }
-    }
+
   }
   </style>

src/views/makerActvityDetails.vue

@@ -241,7 +241,7 @@ export default {
     return {
       addMemberDialog:false,
             options: [{
-              value: '选项1',
+              value: '1',
               label: '中德学院'
             }],
             Member:{

src/views/makerfundDetails.vue

@@ -94,7 +94,6 @@
            </div>
       </div>
       <div class="Apply1">
-        <!-- <div class="howMoney"> -->
           <span class="inpInterval">备注</span>
             <el-input
               type="textarea"
@@ -104,7 +103,6 @@
               placeholder="请输入内容"
               v-model="textarea">
             </el-input>
-          <!-- </div> -->
       </div>
       <!-- 其他经费结束 -->
 
@@ -135,30 +133,14 @@
               value: '',
               input:'',
               options: [{
-              value: '选项1',
-              label: '黄金糕'
-              },
-              {
-              value: '选项1',
-              label: '黄金糕'
-              },
-              {
-              value: '选项1',
-              label: '黄金糕'
-              },
-              {
-              value: '选项1',
-              label: '黄金糕'
-              },
-              {
-              value: '选项1',
-              label: '黄金糕'
-              },
-              {
-              value: '选项1',
-              label: '黄金糕'
-              },
-            ],
+                  value: '1',
+                  label: '黄金糕'
+                },
+                {
+                  value: '2',
+                  label: '黄金糕'
+                },
+              ],
               projectName:''
           }
       },

src/views/projectSettlement1.vue

@@ -87,6 +87,7 @@
           :data="tableData"
           tooltip-effect="dark"
           stripe
+          class="fontSize"
           :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
           >
          
@@ -112,6 +113,7 @@
   
           <el-table-column
             prop="operation"
+            align="center"
             label="操作"
             >
             <template #default="scope">
@@ -138,8 +140,10 @@
       </div>
         <!-- 项目简介区域结束 -->
 
-      <div class="pm1footer">
-         <el-button type="primary" class="backBtn" @click="back">返回</el-button>
+      <div class="baseBtn">
+        <div class="blockWidth">
+          <el-button type="primary" class="backBtn" @click="back">返回</el-button>
+        </div>
       </div>
   
     </div>
@@ -210,61 +214,8 @@
   <style lang="less">
   .projectSettlement1{
 
-    // .ps1Header{
-    //   width: 100%;
-    //   display: flex;
-    //   justify-content:space-between;
-    //   .pAHeader1STit{
-    //     font-size: 16px;
-    //     margin-top:10px ;
-    //   }
-    //   .pAHeader1{
-    //     width: 110px;
-    //     font-weight: 600;
-    //     font-size: 22px;
-    //     display: flex;
-    //     // flex-shrink: 0;
-    //   }
-    // }
-  
-    .selects{
-        width: 100%;
-        margin-top: 20px;
-        display: flex;
-        flex-wrap: wrap;
-      .inp1{
-        width: 35%;
-        display: flex;
-        margin-top: 10px;
-        margin-right: 20px;
-        .inpText{
-          margin-right: 10px;
-          min-width: 120px;
-          max-width: 120px;
-          display: inline-block;
-          text-align: justify;
-          text-justify:distribute-all-lines;
-          text-align-last: justify;
-          transform: translate(0,22%);
-          font-size: 16px;
-          // background: red;
-          // display: flex;
-          // justify-content: flex-end;
-          // box-sizing: border-box;
-          // padding-right: 15px;
-          // align-items: center;
-          // font-weight: 510;
-        }
-      }
-      
-    }
-    .operations{
-      display: flex;
-      flex-shrink: 0;
-      [type='button']{
-        font-size: 14px;
-      }
-    }
+
+
     .PS1tabTit{
         width: 100%;
         text-align: left;
@@ -273,17 +224,7 @@
         box-sizing: border-box;
         margin-top: 20px;
     }
-    .pm1footer{
-        width: 100%;
-        display: flex;
-        justify-content: flex-end;
-        margin: 30px 0px;
-        .backBtn{
-            background: #169bd5;
-            height: 40px;
-            width: 100px;
-        }
-    }
+
     .ps1textArea{
         width: 100%;
         display: flex;
@@ -292,33 +233,7 @@
           resize: none;
         }
       }
-    .pm1Tit{
-      display: flex;
-      // margin-left: 20px;
-      div{
-        cursor: pointer;
-        font-weight: 550;
-        position: relative;
-        font-size: 18px;
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        justify-content: center;
-        margin-right: 10px;
-      }
-      .pm1TitActive::after{
-        content: "";
-        display: block;
-        // left: 13px;
-        width: 100%;
-        left: 15px;
-        height: 2px;
-        position: absolute;
-        left: 0;
-        bottom: -2px;
-        background: #3d67bc;
-      }
-    }
+
     .psSmallTit{
         width: 100%;
         margin: 15px 0px 20px 0px;