Просмотр исходного кода

调整工时管家资源分配为全屏

Lijy 3 недель назад
Родитель
Сommit
772e2c0f43

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -113,7 +113,7 @@
                     <!-- <router-link to="/projectGantt"> -->
                         <el-link type="primary" :underline="false" @click="isganttshow = true">{{ $t('resourceallocation') }}</el-link>
                     <!-- </router-link> -->
-                    <el-dialog v-if="isganttshow" :visible.sync="isganttshow" width="90vw" top="3vh" style="height:96%" class="ganttdialog">
+                    <el-dialog v-if="isganttshow" :visible.sync="isganttshow" fullscreen width="100%" style="height:100%" class="ganttdialog">
                         <projectgantt ref="projectganttRef"></projectgantt>
                     </el-dialog>
                 </el-form-item>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -85,7 +85,7 @@
     :key="updatakey1" :tasks="tasks"></vueGantt>
 
   <div class="demand-container" v-if="!isDataLoaded">
-    <el-table height="55vh" :loading="demandListLoading" :data="demandList">
+    <el-table height="75vh" :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">
@@ -650,7 +650,7 @@ export default {
   .left-container {
     overflow: hidden;
     position: relative;
-    height: 60vh;
+    height: 80vh;
   }
   .demand-container{
     overflow: hidden;

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/vueGantt.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-     <el-table :data="treeDataList" height="490px" row-key="id" :key="'1'" show-overflow-tooltip :cell-style="TableCellStyle" size="mini" :span-method="arraySpanMethod" style="width: 100%;margin-bottom: 20px;" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+     <el-table :data="treeDataList" height="80vh" row-key="id" :key="'1'" show-overflow-tooltip :cell-style="TableCellStyle" size="mini" :span-method="arraySpanMethod" style="width: 100%;margin-bottom: 20px;" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
         <el-table-column prop="text" :label="$t('lable.name')" width="240" fixed="left" v-if="stafforpro != $t('an-xiang-mu-cha-kan')">
           <template slot-scope="scope">
               <!-- user.userNameNeedTranslate == 1 -->