Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/credit/credit1.vue

@@ -64,7 +64,6 @@
           tooltip-effect="dark"
           stripe
           class="fontSize"
-          height="320px"
           :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
           >
           <el-table-column

src/views/projectApply/projectApplicationApplyMain.vue

@@ -38,7 +38,7 @@
           <div class="deleteContent">确定提交“{{projectApplicationApply1.select.projectName}}”项目立项？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="init" size="AllDialogBtn">取消</el-button>
+            <el-button @click="init" class="AllDialogBtn">取消</el-button>
           </span>
         </el-dialog>
       <!-- 提交对话框结束 -->