Browse Source

优化

master
陈裕财 4 years ago
parent
commit
3386cfd464
  1. 14
      src/common/js/util.js
  2. 6
      src/views/xm/core/xmTask/XmPhase.vue
  3. 6
      src/views/xm/core/xmTask/XmPlan.vue
  4. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

14
src/common/js/util.js

@ -77,19 +77,19 @@ export default {
var table=cssSelector; var table=cssSelector;
if(typeof cssSelector == 'string'){ if(typeof cssSelector == 'string'){
table=document.querySelector(cssSelector); table=document.querySelector(cssSelector);
}
debugger;
}
var innerHeight=window.innerHeight var innerHeight=window.innerHeight
var defaultInnerHeight=913;
var pageHeight=90/defaultInnerHeight*innerHeight
var top=200/defaultInnerHeight*innerHeight;
var defaultInnerHeight=616;
var pageHeight=32/defaultInnerHeight*innerHeight
var top=148/defaultInnerHeight*innerHeight;
var bottomHeight=32/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;
} }
} }
var maxTableHeight =innerHeight-top-pageHeight;
var maxTableHeight =innerHeight-top-pageHeight-bottomHeight;
return maxTableHeight; return maxTableHeight;
}, },
getPositionTop(node) { getPositionTop(node) {

6
src/views/xm/core/xmTask/XmPhase.vue

@ -152,12 +152,12 @@
> >
</el-col> </el-col>
</el-row> </el-row>
<el-button style="margin-top: 10px;" slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
<el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
</el-popover> </el-popover>
</span> </span>
</el-row> </el-row>
<el-row class="padding-top">
<el-row>
<el-table class="task-table" <el-table class="task-table"
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData" :data="tasksTreeData"
@ -263,7 +263,7 @@
:current-page="pageInfo.pageNum" :current-page="pageInfo.pageNum"
:page-size="pageInfo.pageSize" :page-size="pageInfo.pageSize"
:total="pageInfo.total" :total="pageInfo.total"
style="float: right; margin-top: 10px;"
style="float: right;"
></el-pagination> ></el-pagination>
</el-row> </el-row>
</el-col> </el-col>

6
src/views/xm/core/xmTask/XmPlan.vue

@ -56,9 +56,5 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.box{
.left{
background-color:#f4f5f8;
}
}
</style> </style>

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

@ -6,7 +6,7 @@
class="padding-left" class="padding-left"
:class="{ 'flex-box': displayType == 'agil' }" :class="{ 'flex-box': displayType == 'agil' }"
> >
<el-row class="padding-top">
<el-row>
<xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select> <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable class="hidden-md-and-down"> <el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable class="hidden-md-and-down">
@ -304,7 +304,7 @@
</span> </span>
</el-row> </el-row>
<el-row class="padding-top">
<el-row>
<template v-if="displayType != 'grant'"> <template v-if="displayType != 'grant'">
<xm-task-agile-kanban <xm-task-agile-kanban
:tableHeight="tableHeight" :tableHeight="tableHeight"
@ -539,7 +539,7 @@
:current-page="pageInfo.pageNum" :current-page="pageInfo.pageNum"
:page-size="pageInfo.pageSize" :page-size="pageInfo.pageSize"
:total="pageInfo.total" :total="pageInfo.total"
style="float: right; margin-top: 10px;"
style="float: right;"
></el-pagination> ></el-pagination>
</template> </template>
<xm-gantt <xm-gantt

Loading…
Cancel
Save