Browse Source

优化

master
陈裕财 4 years ago
parent
commit
e757e3e8be
  1. 17
      src/common/js/util.js
  2. 4
      src/views/xm/core/xmMenu/XmMenuMng.vue
  3. 4
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  4. 4
      src/views/xm/core/xmMenu/XmMenuWithPlan.vue
  5. 4
      src/views/xm/core/xmTask/XmTaskMng.vue

17
src/common/js/util.js

@ -13,25 +13,24 @@ function padding(s, len) {
export default { export default {
calcTableMaxHeight(cssSelector) {
debugger;
var table=document.querySelector(cssSelector);
calcTableMaxHeight(cssSelector) {
var table=cssSelector;
if(typeof cssSelector == 'string'){
table=document.querySelector(cssSelector);
}
var innerHeight=window.innerHeight var innerHeight=window.innerHeight
var defaultInnerHeight=913; var defaultInnerHeight=913;
var pageHeight=90/defaultInnerHeight*innerHeight; var pageHeight=90/defaultInnerHeight*innerHeight;
var top=100/defaultInnerHeight*innerHeight;
var top=200/defaultInnerHeight*innerHeight;
if(table!=null){ if(table!=null){
var rect=table.getBoundingClientRect() var rect=table.getBoundingClientRect()
if(rect && rect.top!=0){ if(rect && rect.top!=0){
top=rect.top; top=rect.top;
}
}else{
top=200/defaultInnerHeight*innerHeight;
}
} }
var maxTableHeight =innerHeight-top-pageHeight; var maxTableHeight =innerHeight-top-pageHeight;
return maxTableHeight; return maxTableHeight;
},
},
getPositionTop(node) { getPositionTop(node) {
if(!node){ if(!node){

4
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -91,7 +91,7 @@
</el-popover> </el-popover>
</el-row> </el-row>
<el-row class="padding-top"> <el-row class="padding-top">
<el-table lazy :load="loadMenusLazy" stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
<el-table lazy :load="loadMenusLazy" class="menu-mng-table" stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
<el-table-column sortable type="selection" width="40"></el-table-column> <el-table-column sortable type="selection" width="40"></el-table-column>
<el-table-column prop="menuName" label="需求名称" min-width="160"> <el-table-column prop="menuName" label="需求名称" min-width="160">
<template slot-scope="scope"> <template slot-scope="scope">
@ -930,7 +930,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.tableHeight = util.calcTableMaxHeight(".el-table");
this.tableHeight = util.calcTableMaxHeight(".menu-mng-table");
this.getXmMenus(); this.getXmMenus();
}); });
} }

4
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -76,7 +76,7 @@
<el-button type="primary" v-if="multi" v-on:click="multiSelectedConfirm">确认选择</el-button> <el-button type="primary" v-if="multi" v-on:click="multiSelectedConfirm">确认选择</el-button>
</el-row> </el-row>
<el-row style="padding-top:12px;"> <el-row style="padding-top:12px;">
<el-table ref="table" lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table ref="table" class="menu-table" lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column v-if="multi" type="selection" width="50"></el-table-column> <el-table-column v-if="multi" type="selection" width="50"></el-table-column>
<el-table-column prop="menuName" label="需求名称" min-width="140" > <el-table-column prop="menuName" label="需求名称" min-width="140" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -421,7 +421,7 @@
this.getXmMenus(); this.getXmMenus();
this.tableHeight = util.calcTableMaxHeight(".el-table");
this.tableHeight = util.calcTableMaxHeight(".menu-table");
}); });
} }
} }

4
src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@ -14,7 +14,7 @@
<el-button v-if=" batchEditVisible==true " @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button> <el-button v-if=" batchEditVisible==true " @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>
</el-row> </el-row>
<el-row class="page-main" v-show="!batchEditVisible"> <el-row class="page-main" v-show="!batchEditVisible">
<el-table ref="table" :height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table ref="table" class="menu-plan-table" :height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column sortable type="selection" width="40"></el-table-column> <el-table-column sortable type="selection" width="40"></el-table-column>
<el-table-column prop="menuName" label="需求名称" min-width="150" > <el-table-column prop="menuName" label="需求名称" min-width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -577,7 +577,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.tableHeight = util.calcTableMaxHeight(".el-table");
this.tableHeight = util.calcTableMaxHeight(".menu-plan-table");
this.getXmMenus(); this.getXmMenus();
}); });
listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{ listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{

4
src/views/xm/core/xmTask/XmTaskMng.vue

@ -361,7 +361,7 @@
:xmTasks="xmTasks" :xmTasks="xmTasks"
@submit="afterEditSubmit" @submit="afterEditSubmit"
></xm-task-agile-kanban> ></xm-task-agile-kanban>
<el-table
<el-table class="task-table"
v-else v-else
show-summary show-summary
lazy lazy
@ -2441,7 +2441,7 @@ export default {
} }
this.$nextTick(() => { this.$nextTick(() => {
this.getXmTasks(); this.getXmTasks();
this.tableHeight = util.calcTableMaxHeight(".el-table");
this.tableHeight = util.calcTableMaxHeight(".task-table");
listOption([ listOption([
{ categoryId: "all", itemCode: "planType" }, { categoryId: "all", itemCode: "planType" },
{ categoryId: "all", itemCode: "taskType" }, { categoryId: "all", itemCode: "taskType" },

Loading…
Cancel
Save