From fce3bc44a4d4960c06716353d7c0f329ce5f9e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 1 Mar 2022 20:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/js/util.js | 8 +++++--- src/views/xm/core/skill/skillMng.vue | 2 +- src/views/xm/core/xmAttachment/XmAttachmentAdd.vue | 2 +- src/views/xm/core/xmAttachment/XmAttachmentEdit.vue | 2 +- src/views/xm/core/xmAttachment/XmAttachmentMng.vue | 4 ++-- src/views/xm/core/xmBranchState/XmBranchStateAdd.vue | 2 +- src/views/xm/core/xmBranchState/XmBranchStateEdit.vue | 2 +- src/views/xm/core/xmBranchState/XmBranchStateMng.vue | 4 ++-- .../xmBranchTaskTypeState/XmBranchTaskTypeStateAdd.vue | 2 +- .../xmBranchTaskTypeState/XmBranchTaskTypeStateEdit.vue | 2 +- .../xmBranchTaskTypeState/XmBranchTaskTypeStateMng.vue | 4 ++-- src/views/xm/core/xmEnvList/XmEnvListAdd.vue | 2 +- src/views/xm/core/xmEnvList/XmEnvListEdit.vue | 2 +- src/views/xm/core/xmEnvList/XmEnvListMng.vue | 4 ++-- src/views/xm/core/xmExchange/XmExchangeAdd.vue | 2 +- src/views/xm/core/xmExchange/XmExchangeEdit.vue | 2 +- src/views/xm/core/xmExchange/XmExchangeMng.vue | 2 +- src/views/xm/core/xmFile/XmFileAdd.vue | 2 +- src/views/xm/core/xmFile/XmFileEdit.vue | 2 +- src/views/xm/core/xmIteration/XmIterationAdd.vue | 2 +- src/views/xm/core/xmIteration/XmIterationEdit.vue | 2 +- src/views/xm/core/xmIteration/XmIterationInfo.vue | 2 +- .../xm/core/xmIteration/XmIterationOverviewComplex.vue | 2 +- src/views/xm/core/xmIterationMenu/XmIterationMenuAdd.vue | 2 +- src/views/xm/core/xmIterationMenu/XmIterationMenuEdit.vue | 2 +- .../xm/core/xmIterationState/XmIterationStateAdd.vue | 2 +- .../xm/core/xmIterationState/XmIterationStateEdit.vue | 2 +- .../xm/core/xmIterationState/XmIterationStateMng.vue | 2 +- .../xm/core/xmIterationState/XmIterationStateShow.vue | 2 +- src/views/xm/core/xmMenu/XmMenuAdd.vue | 4 ++-- src/views/xm/core/xmMenu/XmMenuEdit.vue | 2 +- src/views/xm/core/xmMenu/XmMenuMngBatch.vue | 2 +- src/views/xm/core/xmMenu/XmMenuRichDetail.vue | 2 +- src/views/xm/core/xmMenu/XmMenuWithPlan.vue | 2 +- src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue | 2 +- src/views/xm/core/xmMenuState/XmMenuStateAdd.vue | 2 +- src/views/xm/core/xmMenuState/XmMenuStateEdit.vue | 2 +- src/views/xm/core/xmMenuState/XmMenuStateMng.vue | 2 +- src/views/xm/core/xmMenuTemplate/XmMenuTemplateAdd.vue | 2 +- src/views/xm/core/xmMenuTemplate/XmMenuTemplateEdit.vue | 2 +- src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue | 2 +- src/views/xm/core/xmMyFocus/XmMyFocusAdd.vue | 2 +- src/views/xm/core/xmMyFocus/XmMyFocusEdit.vue | 2 +- src/views/xm/core/xmMyFocus/XmMyFocusMng.vue | 4 ++-- src/views/xm/core/xmProduct/XmProductAdd.vue | 2 +- src/views/xm/core/xmProduct/XmProductInfo.vue | 2 +- src/views/xm/core/xmProduct/XmProductOverviewComplex.vue | 2 +- src/views/xm/core/xmProductState/XmProductStateAdd.vue | 2 +- src/views/xm/core/xmProductState/XmProductStateEdit.vue | 2 +- src/views/xm/core/xmProductState/XmProductStateMng.vue | 4 ++-- .../xm/core/xmProductTemplate/XmProductTemplateAdd.vue | 2 +- .../xm/core/xmProductTemplate/XmProductTemplateEdit.vue | 2 +- src/views/xm/core/xmProject/XmProjectAdd.vue | 2 +- src/views/xm/core/xmProject/XmProjectForLink.vue | 2 +- src/views/xm/core/xmProject/XmProjectInfo.vue | 2 +- src/views/xm/core/xmProject/XmProjectList.vue | 2 +- src/views/xm/core/xmProject/XmProjectOverviewComplex.vue | 2 +- .../xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue | 2 +- .../xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue | 2 +- .../xm/core/xmProjectBaseline/XmProjectBaselineMng.vue | 4 ++-- .../xm/core/xmProjectContract/XmProjectContractAdd.vue | 2 +- .../xm/core/xmProjectContract/XmProjectContractEdit.vue | 2 +- .../xm/core/xmProjectContract/XmProjectContractMng.vue | 4 ++-- .../xm/core/xmProjectEnvList/XmProjectEnvListAdd.vue | 2 +- .../xm/core/xmProjectEnvList/XmProjectEnvListEdit.vue | 2 +- .../xm/core/xmProjectEnvList/XmProjectEnvListMng.vue | 2 +- src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue | 2 +- .../core/xmProjectGroupState/XmProjectGroupStateMng.vue | 2 +- .../XmProjectGroupUserCandidateAdd.vue | 2 +- .../XmProjectGroupUserCandidateEdit.vue | 2 +- .../XmProjectGroupUserCandidateMng.vue | 4 ++-- src/views/xm/core/xmProjectKpi/XmProjectKpiAdd.vue | 2 +- src/views/xm/core/xmProjectKpi/XmProjectKpiEdit.vue | 2 +- src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisAdd.vue | 2 +- src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisEdit.vue | 2 +- src/views/xm/core/xmProjectKpiHis/XmProjectKpiHisMng.vue | 4 ++-- .../XmProjectMBudgetCostNouserAdd.vue | 2 +- .../XmProjectMBudgetCostNouserEdit.vue | 2 +- .../XmProjectMBudgetCostNouserMng.vue | 4 ++-- .../XmProjectMBudgetCostUserAdd.vue | 2 +- .../XmProjectMBudgetCostUserEdit.vue | 2 +- .../XmProjectMBudgetCostUserMng.vue | 4 ++-- .../core/xmProjectMCostNouser/XmProjectMCostNouserAdd.vue | 2 +- .../xmProjectMCostNouser/XmProjectMCostNouserEdit.vue | 2 +- .../core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue | 4 ++-- .../xm/core/xmProjectMCostUser/XmProjectMCostUserAdd.vue | 2 +- .../xm/core/xmProjectMCostUser/XmProjectMCostUserEdit.vue | 2 +- .../xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue | 4 ++-- .../xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue | 4 ++-- .../xm/core/xmProjectOptions/XmProjectOptionsAdd.vue | 2 +- .../xm/core/xmProjectOptions/XmProjectOptionsEdit.vue | 2 +- .../xm/core/xmProjectOptions/XmProjectOptionsMng.vue | 4 ++-- src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue | 2 +- src/views/xm/core/xmProjectPhase/XmProjectPhaseEdit.vue | 2 +- .../xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue | 2 +- .../xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue | 2 +- .../xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue | 4 ++-- .../xmProjectPhaseTemplate/XmProjectPhaseTemplateAdd.vue | 2 +- .../xmProjectPhaseTemplate/XmProjectPhaseTemplateEdit.vue | 2 +- src/views/xm/core/xmProjectState/XmCockpit.vue | 4 ++-- src/views/xm/core/xmProjectState/XmProjectStateAdd.vue | 2 +- src/views/xm/core/xmProjectState/XmProjectStateEdit.vue | 2 +- .../xm/core/xmProjectStateHis/XmProjectStateHisAdd.vue | 2 +- .../xm/core/xmProjectStateHis/XmProjectStateHisEdit.vue | 2 +- .../xm/core/xmProjectStateHis/XmProjectStateHisMng.vue | 4 ++-- .../xmProjectTaskTypeState/XmProjectTaskTypeStateAdd.vue | 2 +- .../xmProjectTaskTypeState/XmProjectTaskTypeStateEdit.vue | 2 +- .../xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue | 4 ++-- .../xm/core/xmProjectTemplate/XmProjectTemplateAdd.vue | 2 +- .../xm/core/xmProjectTemplate/XmProjectTemplateEdit.vue | 2 +- .../xm/core/xmProjectTemplate/XmProjectTemplateInfo.vue | 2 +- src/views/xm/core/xmQuestion/XmQuestionAdd.vue | 2 +- src/views/xm/core/xmQuestion/XmQuestionEdit.vue | 2 +- src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue | 2 +- src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue | 2 +- src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue | 4 ++-- src/views/xm/core/xmTask/XmTaskAdd.vue | 2 +- src/views/xm/core/xmTask/XmTaskList.vue | 2 +- src/views/xm/core/xmTaskExecuser/XmTaskExecuserAdd.vue | 2 +- src/views/xm/core/xmTaskExecuser/XmTaskExecuserEdit.vue | 2 +- src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue | 2 +- src/views/xm/core/xmTaskSkill/XmTaskSkillAdd.vue | 2 +- src/views/xm/core/xmTaskSkill/XmTaskSkillEdit.vue | 2 +- src/views/xm/core/xmTaskSkill/XmTaskSkillMng.vue | 4 ++-- src/views/xm/core/xmTaskTemplate/XmTaskTemplateAdd.vue | 2 +- src/views/xm/core/xmTaskTemplate/XmTaskTemplateEdit.vue | 2 +- src/views/xm/core/xmTestCase/XmTestCaseAdd.vue | 2 +- src/views/xm/core/xmTestCase/XmTestCaseEdit.vue | 2 +- src/views/xm/core/xmTestCase/XmTestCaseMng.vue | 4 ++-- src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue | 2 +- src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue | 2 +- src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue | 4 ++-- 132 files changed, 161 insertions(+), 159 deletions(-) diff --git a/src/common/js/util.js b/src/common/js/util.js index 2522d575..77de30c5 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -14,18 +14,20 @@ function padding(s, len) { export default { - calcTableMaxHeight(cssSelector) { + calcTableMaxHeight(cssSelector) { var table=document.querySelector(cssSelector); var innerHeight=window.innerHeight var defaultInnerHeight=913; - var pageHeight=80/defaultInnerHeight*innerHeight; + var pageHeight=90/defaultInnerHeight*innerHeight; var top=100/defaultInnerHeight*innerHeight; if(table!=null){ var rect=table.getBoundingClientRect() if(rect && rect.top!=0){ top=rect.top; } - } + }else{ + top=200/defaultInnerHeight*innerHeight; + } var maxTableHeight =innerHeight-top-pageHeight; return maxTableHeight; }, diff --git a/src/views/xm/core/skill/skillMng.vue b/src/views/xm/core/skill/skillMng.vue index 9e96ce78..baabcc1f 100644 --- a/src/views/xm/core/skill/skillMng.vue +++ b/src/views/xm/core/skill/skillMng.vue @@ -1,5 +1,5 @@