diff --git a/src/common/js/util.js b/src/common/js/util.js index 77de30c5..87e8be84 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -14,7 +14,8 @@ function padding(s, len) { export default { - calcTableMaxHeight(cssSelector) { + calcTableMaxHeight(cssSelector) { + debugger; var table=document.querySelector(cssSelector); var innerHeight=window.innerHeight var defaultInnerHeight=913; diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue index 635f8792..f458a22b 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue @@ -257,7 +257,7 @@ }, mounted() { this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmEnvLists(); }); } diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue index d35ff368..594e343c 100644 --- a/src/views/xm/core/xmFile/XmFileMng.vue +++ b/src/views/xm/core/xmFile/XmFileMng.vue @@ -274,7 +274,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmFiles(); }); } diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 8080eb55..db340208 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -527,7 +527,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmIterations(); }); // console.log(this.dateRanger,this.dateRangerOnline); diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue index 1c757ab1..fe67f096 100644 --- a/src/views/xm/core/xmIteration/XmIterationSelect.vue +++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue @@ -353,7 +353,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmIterations(); }); diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue index b88bb182..cc4ea664 100644 --- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue +++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue @@ -332,7 +332,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmIterationMenus(); }); /** 举例， diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index cc68e1f2..4155ebac 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -930,7 +930,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmMenus(); }); } diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue index c33fb597..386d98ce 100644 --- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue +++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue @@ -1086,7 +1086,7 @@ if(this.selProject){ subHeight=110/1000 * window.innerHeight; } - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); }); diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue index cbf98cc1..083a3184 100644 --- a/src/views/xm/core/xmMenu/XmMenuSelect.vue +++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue @@ -421,7 +421,7 @@ this.getXmMenus(); - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); }); } } diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue index e9d36c84..ac90a8f0 100644 --- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue +++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue @@ -577,7 +577,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmMenus(); }); listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{ diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue index 051af5e8..e0989439 100644 --- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue +++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue @@ -483,7 +483,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmMenus(); }); listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{ diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index 37b44bf8..e95ae808 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -653,7 +653,7 @@ import XmProductSelect from './XmProductSelect.vue'; this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight('.el-table'); this.getXmProducts(); }); } diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue index 60580c6f..2c2e395d 100644 --- a/src/views/xm/core/xmProduct/XmProductSelect.vue +++ b/src/views/xm/core/xmProduct/XmProductSelect.vue @@ -307,7 +307,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProducts(); }); } diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue index bf28984c..fd911849 100644 --- a/src/views/xm/core/xmProductState/XmProductStateMng.vue +++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue @@ -227,7 +227,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProductStates(); }); /** 举例， diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue index 717d1330..ad1ab577 100644 --- a/src/views/xm/core/xmProject/XmProjectForLink.vue +++ b/src/views/xm/core/xmProject/XmProjectForLink.vue @@ -214,7 +214,7 @@ XmProjectList this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.showInfo = false; this.getXmProjects(); }); diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue index 1a57caf1..fbc69621 100644 --- a/src/views/xm/core/xmProject/XmProjectList.vue +++ b/src/views/xm/core/xmProject/XmProjectList.vue @@ -155,7 +155,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.showInfo = false; this.getXmProjects(); }); diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index 2ff61fd2..5b1f6e4e 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -78,7 +78,7 @@ - +
{{p.name}}
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue index 1c16c3c6..37b55481 100644 --- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue +++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue @@ -243,7 +243,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectContracts(); }); } diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue index 3d949a50..8523a8d2 100644 --- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue +++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue @@ -321,7 +321,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); console.log(this.currProject); this.getXmProjectEnvLists(); }); diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue index e4df234a..6688a1b6 100644 --- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue +++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue @@ -270,7 +270,7 @@ XmProjectGroupStateOverview - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectGroupStates(); }); /** 举例， diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue index 009a1a07..3f21402d 100644 --- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue +++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue @@ -230,7 +230,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectGroupUserCandidates(); }); } diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue index 42c86134..beec4163 100644 --- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue +++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue @@ -253,7 +253,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectKpis(); }); } diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue index 48072e96..0eb62039 100644 --- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue @@ -347,7 +347,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectMBudgetCostNousers(); }); diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue index 3fb84d46..fc7dfb48 100644 --- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue +++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue @@ -352,7 +352,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectMBudgetCostUsers(); }); diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue index 298d424a..ab896cbe 100644 --- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue +++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue @@ -348,7 +348,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectMCostNousers(); }); diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue index 63b8b5d8..95753295 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue @@ -242,7 +242,7 @@ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectMCostUsers(); }); diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue index 97c72f1d..24dbe32b 100644 --- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue +++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue @@ -352,7 +352,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmProjectMCostUsers(); }); diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue index 75bfc676..ae15d52a 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue @@ -1304,7 +1304,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue'; - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); if(this.selProject){ this.getXmProjectPhases(); } diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue index 403ea3b7..ee87cad0 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue @@ -943,7 +943,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmQuestions(); }); listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{ diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue index 0e77d490..4772118b 100644 --- a/src/views/xm/core/xmRecord/XmRecord.vue +++ b/src/views/xm/core/xmRecord/XmRecord.vue @@ -266,7 +266,7 @@ if(this.projectId){ subHeight=100/1000 * window.innerHeight; } - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmRecords(); }); } diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index 731777ed..104296ac 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -469,7 +469,7 @@ mounted() { this.filters.selProject=this.selProject this.$nextTick(()=>{ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); 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/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index 1903d811..ad81f791 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -402,7 +402,7 @@ }, mounted() { this.$nextTick(()=>{ - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); 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 25e7d92d..60080489 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -2441,7 +2441,7 @@ export default { } this.$nextTick(() => { this.getXmTasks(); - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); listOption([ { categoryId: "all", itemCode: "planType" }, { categoryId: "all", itemCode: "taskType" }, diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 03d1d749..a27b306e 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -1667,7 +1667,7 @@ export default { this.getXmTasks(); } this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); listOption([ { categoryId: "all", itemCode: "planType" }, { categoryId: "all", itemCode: "taskType" }, diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue index 14cda57c..0311cbd3 100644 --- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue +++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue @@ -819,7 +819,7 @@ this.$nextTick(() => { - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmTaskExecusers(); }); diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue index 2d8d8fd6..e22c9eb3 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue @@ -460,7 +460,7 @@ if(this.selProject){ subHeight=100/1000 * window.innerHeight; } - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); }); /** 举例， listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{ diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue index 294cbe0c..de5a5e0d 100644 --- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue +++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue @@ -768,7 +768,7 @@ if(this.selProject){ subHeight=100/1000 * window.innerHeight; } - this.tableHeight = util.calcTableMaxHeight('el-table'); + this.tableHeight = util.calcTableMaxHeight(".el-table"); this.getXmTestCaseExecs(); }); /** 举例，