diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 5a8413eb..ca69e4aa 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -402,7 +402,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmIterations(); }); diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index 4d6b4f3c..c007d3df 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -324,7 +324,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmIterationMenus(); }); diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 503aa98c..1e93d2b8 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -41,116 +41,118 @@ - - - - - - + + + + + + + + + + + 成为顶级节点 + 删除当前行 + 增加子行 + + + + + + + + + + + + + + + + {{scope.row.mmUsername}} + 未配置 + 选人 + + + + + + + + + + + + + + + + + + {{scope.row.seqNo}} {{scope.row.menuName}} + + + + + + + {{scope.row.finishRate}}% + + + + - - - 成为顶级节点 - 删除当前行 - 增加子行 - - - - - - - - - - - - - - - - {{scope.row.mmUsername}} - 未配置 - 选人 - - - - - - - - - - - - - - - - - - {{scope.row.seqNo}} {{scope.row.menuName}} - - - - - - - {{scope.row.finishRate}}% - - - - - - - - {{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}} - - - - - - - - - - + trigger="click" > + + + {{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}} + + + + + + + - - - - 由模板快速导入 - - - - - - 查看任务 - 查看任务 - - - 查看迭代计划 - - + + + + + + + 由模板快速导入 + + + + + + 查看任务 + 查看任务 + + + 查看迭代计划 + + - - - - - - - + + + + + + + + @@ -258,9 +260,8 @@ return false; } }, - watch:{ - - }, + watch:{ + }, data() { return { filters: { @@ -1042,9 +1043,16 @@ }, mounted() { this.$nextTick(() => { - var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; - this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; + var subHeight=300/1000 * window.innerHeight + if(this.selProject){ + subHeight=400/1000 * window.innerHeight + } + this.tableHeight = window.innerHeight - subHeight + + let self = this; + window.onresize = function() { + self.tableHeight = window.innerHeight - subHeight; + } this.getXmMenus(); }); // 阻止默认行为 diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index 419eab8d..95403bef 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -268,7 +268,7 @@ this.$nextTick(() => { this.getXmMenus(); var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; }); } diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue index 844cdfd1..86cbc05b 100644 --- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue +++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue @@ -514,7 +514,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmMenus(); }); diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue index a2689a33..56887c97 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue @@ -482,7 +482,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=50; + var subHeight=50/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmMenus(); }); diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index aaf96349..6aea3144 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -338,7 +338,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmProducts(); }); diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue index b0ff02dc..049dd7f6 100644 --- a/src/views/xm/core/xmProduct/XmProductSelect.vue +++ b/src/views/xm/core/xmProduct/XmProductSelect.vue @@ -161,7 +161,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmProducts(); }); diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue index a3df7752..8e587cb0 100644 --- a/src/views/xm/core/xmProject/XmProjectList.vue +++ b/src/views/xm/core/xmProject/XmProjectList.vue @@ -157,7 +157,7 @@ mounted() { this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=50; + var subHeight=50/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.showInfo = false; this.getXmProjects(); diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 6e81156e..0c69e587 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -640,7 +640,7 @@ } this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.showInfo = false; this.getXmProjects(); diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index e26f9520..83226e00 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -1296,7 +1296,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; } var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; listOption([ {categoryId:'all',itemCode:'xmPhaseStatus'} diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue index ce355b6b..a13aa0be 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue @@ -418,7 +418,7 @@ this.$nextTick(() => { var clientRect=this.$refs.selectPhaseTable.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.selectPhaseTable.$el.offsetTop-subHeight; if(this.selProject){ this.getXmProjectPhases(); diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index b314349d..52cb25c2 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -680,7 +680,7 @@ } this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=65; + var subHeight=65/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmQuestions(); }); diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index 51c883d2..1ddee9f5 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -256,7 +256,7 @@ this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=50; + var subHeight=50/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmRecords(); }); diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index 8f9a5396..26a746fe 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -21,8 +21,9 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id" :max-height="tableHeight" + ref="table" > - + {{scope.row.sortLevel}} {{scope.row.name}} @@ -398,7 +399,12 @@ }, mounted() { this.$nextTick(()=>{ - this.tableHeight = window.innerHeight - 250; + var clientRect=this.$refs.table.$el.getBoundingClientRect(); + var subHeight=85/1000 * window.innerHeight; + if(this.isTaskCenter){ + subHeight=50/1000 * window.innerHeight; + } + this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmTasks(); }); listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{ diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue index ae8eae00..8752cacf 100644 --- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue +++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue @@ -28,7 +28,7 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id" > - + {{scope.row.sortLevel}} {{scope.row.name}} @@ -459,7 +459,12 @@ }, mounted() { this.$nextTick(()=>{ - this.tableHeight = window.innerHeight - 250; + var clientRect=this.$refs.taskTable.$el.getBoundingClientRect(); + var subHeight=85/1000 * window.innerHeight; + if(this.isTaskCenter){ + subHeight=50/1000 * window.innerHeight; + } + this.tableHeight = window.innerHeight -clientRect.y - this.$refs.taskTable.$el.offsetTop-subHeight; this.getXmTasks(); }); listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{ diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index b18821e3..9762a7f4 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1664,9 +1664,9 @@ XmProjectGroupSelect this.$nextTick(()=>{ this.getXmTasks(); var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=85; + var subHeight=85/1000 * window.innerHeight; if(this.isTaskCenter){ - subHeight=50; + subHeight=50/1000 * window.innerHeight; } this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; // 监听窗口大小变化 diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index faf35c20..262bd664 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -1271,7 +1271,12 @@ this.getXmTasks(); } this.$nextTick(()=>{ - this.tableHeight = window.innerHeight - 250; + var clientRect=this.$refs.table.$el.getBoundingClientRect(); + var subHeight=85/1000 * window.innerHeight; + if(this.isTaskCenter){ + subHeight=50/1000 * window.innerHeight; + } + this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; listOption([{categoryId:'all',itemCode:'planType'} ,{categoryId:'all',itemCode:'taskType'} ,{categoryId:'all',itemCode:'urgencyLevel'} diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue index febb48fb..b63252fd 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -633,7 +633,7 @@ this.filters.selProject=this.selProject; this.$nextTick(() => { var clientRect=this.$refs.table.$el.getBoundingClientRect(); - var subHeight=70; + var subHeight=70/1000 * window.innerHeight; this.tableHeight = window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; this.getXmTestCaseExecs(); });