Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -84,7 +84,7 @@
     :key="updatakey1" :tasks="tasks"></vueGantt>
 
   <div class="demand-container" v-if="!isDataLoaded">
-    <el-table height="90%" :loading="demandListLoading" :data="demandList">
+    <el-table height="55vh" :loading="demandListLoading" :data="demandList">
       <el-table-column :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" prop="projectCode" width="160"></el-table-column>
       <el-table-column :label="$t('headerTop.projectName')" prop="projectName" min-width="240"></el-table-column>
       <el-table-column :label="$t('jin-qi-ri-huo-yue-ren-yuan')" prop="activeUsers" min-width="240">
@@ -631,7 +631,7 @@ export default {
   .left-container {
     overflow: hidden;
     position: relative;
-    height: 90%;
+    height: 60vh;
   }
   .demand-container{
     overflow: hidden;