From 46b973e8af6a552c73eba69e0a255b2d452061c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 11 Jun 2021 16:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmIteration/XmIterationMng.vue | 2 +- .../xmIterationMenu/XmIterationMenuMng.vue | 2 +- src/views/xm/core/xmMenu/XmMenuMng.vue | 232 +++++++++--------- src/views/xm/core/xmMenu/XmMenuSelect.vue | 2 +- src/views/xm/core/xmMenu/XmMenuWithPlan.vue | 2 +- .../xm/core/xmMenuState/XmMenuStateMng.vue | 2 +- src/views/xm/core/xmProduct/XmProductMng.vue | 2 +- .../xm/core/xmProduct/XmProductSelect.vue | 2 +- src/views/xm/core/xmProject/XmProjectList.vue | 2 +- src/views/xm/core/xmProject/XmProjectMng.vue | 2 +- .../core/xmProjectPhase/XmProjectPhaseMng.vue | 2 +- .../xmProjectPhase/XmProjectPhaseSelect.vue | 2 +- .../xm/core/xmQuestion/XmQuestionMng.vue | 2 +- src/views/xm/core/xmRecord/XmRecord.vue | 2 +- .../xm/core/xmTask/XmTaskListForMenu.vue | 10 +- .../xm/core/xmTask/XmTaskListForProduct.vue | 9 +- src/views/xm/core/xmTask/XmTaskMng.vue | 4 +- src/views/xm/core/xmTask/XmTaskMngBatch.vue | 7 +- .../core/xmTestCaseExec/XmTestCaseExecMng.vue | 2 +- 19 files changed, 157 insertions(+), 133 deletions(-) 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 @@ - - - - - + + + + + @@ -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" > - +