diff --git a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
index f7e92f8f..098a1fd3 100644
--- a/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
+++ b/src/views/xm/core/xmBranchState/XmBranchStateMng.vue
@@ -7,7 +7,7 @@
-
+
@@ -132,7 +132,8 @@
//编辑xmBranchState界面初始化数据
editForm: {
bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',id:'',totalStaffCnt:'',calcTime:'',calcStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetInnerUserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOutUserAmount:'',totalCompleteWorkload:'',totalCostInnerUserAmount:'',totalCostOutUserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanInnerUserWorkload:'',totalPlanOutUserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:''
- }
+ },
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -290,6 +291,7 @@
},
mounted() {
this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmBranchStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index f458a22b..8b03f654 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -101,7 +101,7 @@
/**begin 自定义属性请在下面加 请加备注**/
envStateList:["不可用","已启用","已过期"],
- tableHeight:300,
+ maxTableHeight:300,
// {
// value: "0",
// label: "不可用",
@@ -257,7 +257,7 @@
},
mounted() {
this.$nextTick(() => {
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmEnvLists();
});
}
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index db340208..4870f0f6 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -73,7 +73,7 @@
-
+
@@ -216,7 +216,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
iterationStateVisible:false,
iterationSelectVisible:false,
gstcVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
ganrrColumns: {
children: 'children',
name: 'iterationName',
@@ -525,9 +525,7 @@ import XmIterationSelect from './XmIterationSelect.vue';
},
mounted() {
this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
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 fe67f096..4d6885ef 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -2,7 +2,7 @@
-
+
迭代名称 {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmIterations();
});
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index cc4ea664..f7a67bfc 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -15,7 +15,7 @@
-
+
@@ -103,7 +103,7 @@
},
iteration:null,
menuVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -332,7 +332,7 @@
this.$nextTick(() => {
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmIterationMenus();
});
/** 举例，
diff --git a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
index 62105115..16c4e37e 100644
--- a/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
+++ b/src/views/xm/core/xmIterationProductLink/XmIterationProductLinkMng.vue
@@ -275,7 +275,7 @@ import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
mounted() {
this.$nextTick(() => {
this.getXmIterationProductLinks();
- this.maxTableHeight = util.calcTableMaxHeight(".el-table")
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmIterationProductLink.$el)
});
/** 举例，
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
index 418cc907..ba9e9b5e 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateMng.vue
@@ -6,7 +6,7 @@
-
+
@@ -98,7 +98,8 @@
//编辑xmIterationState界面初始化数据
editForm: {
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
- }
+ },
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -242,6 +243,7 @@
},
mounted() {
this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmIterationStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
index 418cc907..80345c89 100644
--- a/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
+++ b/src/views/xm/core/xmIterationState/XmIterationStateShow.vue
@@ -6,7 +6,7 @@
-
+
@@ -98,7 +98,7 @@
//编辑xmIterationState界面初始化数据
editForm: {
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
- }
+ },maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -243,6 +243,7 @@
mounted() {
this.$nextTick(() => {
this.getXmIterationStates();
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
/** 举例，
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index f572014a..1db4d788 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -91,7 +91,7 @@
-
-
+
@@ -297,7 +297,7 @@
iterationVisible:false,
userSelectVisible:false,
selectFiltersMmUserVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/
@@ -1080,13 +1080,8 @@
mounted() {
this.$nextTick(() => {
this.filters.product=this.product
- this.getXmMenus();
-
-
- if(this.selProject){
- subHeight=110/1000 * window.innerHeight;
- }
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.getXmMenus();
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 8b5fc362..6a674c35 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -76,7 +76,7 @@
确认选择
-
-
-
+
@@ -230,7 +230,7 @@
menuDetailVisible:false,
/**begin 自定义属性请在下面加 请加备注**/
gstcVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
ganrrColumns: {
children: 'children',
name: 'menuName',
@@ -574,10 +574,8 @@
XmGroupMng,XmTaskMng,XmMenuRichDetail,XmGantt
},
mounted() {
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".menu-plan-table");
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
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 e0989439..3827a2e8 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -9,7 +9,7 @@
返回
-
+
@@ -216,7 +216,7 @@
valueChangeRows:[],
selGroups:null,
menuDetailVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -480,10 +480,8 @@
XmGroupMng,XmTaskMng,XmMenuRichDetail
},
mounted() {
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenus();
});
listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index cbcf8ac9..60a1fffc 100644
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@@ -15,7 +15,7 @@
-
+
@@ -165,6 +165,7 @@
batchEditVisible:false,
valueChangeRows:[],
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -615,6 +616,7 @@
},
mounted() {
this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmMenuTemplates();
});
// 阻止默认行为
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index e95ae808..b631273b 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -126,7 +126,7 @@
-
+
@@ -309,7 +309,7 @@ import XmProductSelect from './XmProductSelect.vue';
iterationSelectVisible:false,
productStateVisible:false,
selectFiltersPmUserVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
dateRanger: [
],
pickerOptions: util.pickerOptions('datarange'),
@@ -650,10 +650,8 @@ import XmProductSelect from './XmProductSelect.vue';
this.options['xmProductPstatus']=res.data.data.xmProductPstatus
}
});
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight('.el-table');
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProducts();
});
}
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 2c2e395d..d5caf0a1 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -2,7 +2,7 @@
-
+
产品名称
@@ -151,7 +151,7 @@
iterationVisible:false,
productStateVisible:false,
selectFiltersPmUserVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
@@ -304,10 +304,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProducts();
});
}
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 69654815..5359e7d2 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -425,8 +425,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProducts();
});
}
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index fd911849..10b6b370 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(this.$refs.table.$$el);
this.getXmProductStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
index a44ea50b..11fc508a 100644
--- a/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
+++ b/src/views/xm/core/xmProductTemplate/XmProductTemplateMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -246,7 +246,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProductTemplates();
});
}
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index c70485c8..ddd9bde4 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -56,6 +56,7 @@
{
- //
- var subHeight=700/1000 * window.innerHeight;
- this.tableHeight = window.innerHeight-subHeight;
+ this.$nextTick(() => {
+
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
this.selProjectBudget=Object.assign({},this.selProject);
}
diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index a5c38e2b..85edf26f 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -27,7 +27,8 @@
:value="item">
-->
- {
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
+
this.selProjectBudget=Object.assign({},this.selProject);
}
}
diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue
index ad1ab577..f5c5db27 100644
--- a/src/views/xm/core/xmProject/XmProjectForLink.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLink.vue
@@ -211,10 +211,8 @@ XmProjectList
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index fbc69621..5ec5c4b1 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -152,10 +152,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 5b1f6e4e..abc9c3fd 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -744,7 +744,7 @@
this.filters.productName=this.$route.params.productName;
}
this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index f7f9f1e0..c2695773 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -156,10 +156,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
- this.maxTableHeight = window.innerHeight - top -100;
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index efa27fab..14925ce7 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -152,14 +152,13 @@
finishFlag: false,
xmRecordVisible: false,
productSelectVisible:false,
- tableHeight:300,
+ maxTableHeight:300,
dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
xmProjectCopy:{
id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGrup:'0'
},
- copyToVisible:false,
- maxTableHeight:300,
+ copyToVisible:false,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -550,11 +549,9 @@
this.filters.productId=this.$route.params.productId;
this.filters.productName=this.$route.params.productName;
}
- this.$nextTick(() => {
+ this.$nextTick(() => {
-
-
- this.maxTableHeight = window.innerHeight - top -100;
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.showInfo = false;
this.getXmProjects();
});
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
deleted file mode 100644
index a32998bc..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineAdd.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
deleted file mode 100644
index ff5f6691..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineEdit.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue b/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
deleted file mode 100644
index 15ddc57c..00000000
--- a/src/views/xm/core/xmProjectBaseline/XmProjectBaselineMng.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
-
-
- 查询
- +xm_project_baseline
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 改
- 删
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index 37b55481..32b91aaa 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -240,10 +240,7 @@
},
mounted() {
this.$nextTick(() => {
-
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProjectContracts();
});
}
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index 8523a8d2..96a826ab 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -317,11 +317,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
-
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
console.log(this.currProject);
this.getXmProjectEnvLists();
});
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
deleted file mode 100644
index 895f9ca8..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsAdd.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
deleted file mode 100644
index 7ef880ed..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsEdit.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue b/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
deleted file mode 100644
index 5f9a59c1..00000000
--- a/src/views/xm/core/xmProjectOptions/XmProjectOptionsMng.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
- 查询
- +xm_project_options
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
- 改
- 删
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index dd486660..5f98b631 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -1769,7 +1769,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
- this.tableHeight = util.calcTableMaxHeight(this.$refs.selectPhaseTable.$el)
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
if (this.selProject) {
this.getXmProjectPhases();
}
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
deleted file mode 100644
index 08130fcb..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineAdd.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
deleted file mode 100644
index 7be86f4b..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineEdit.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue b/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
deleted file mode 100644
index 93ffd7d3..00000000
--- a/src/views/xm/core/xmProjectPhaseBaseline/XmProjectPhaseBaselineMng.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-
-
-
-
- 查询
- +xm_project_phase_baseline
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 改
- 删
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index e7bec999..7993d22f 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -9,7 +9,7 @@
-
+
@@ -297,11 +297,8 @@
if(this.selProjectTemplate){
this.filters.projectTemplate=this.selProjectTemplate
}
- this.$nextTick(() => {
-
-
-
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProjectPhases();
});
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 07ee98dc..777c3c0a 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -432,8 +432,8 @@
this.options['projectStatus']=res.data.data.projectStatus
//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
}
- });
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ });
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
});
/** 举例，
listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
index ec17748f..1bab1068 100644
--- a/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
+++ b/src/views/xm/core/xmProjectTaskTypeState/XmProjectTaskTypeStateMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -99,7 +99,8 @@
//编辑xmProjectTaskTypeState界面初始化数据
editForm: {
projectId:'',projectName:'',taskType:'',planWorkload:'',planAmount:'',actWorkload:'',actAmount:'',branchId:'',bizDate:'',calcTime:'',planOutUserAt:'',planInnerUserAt:'',actOutUserAt:'',actInnerUserAt:'',planOutUserWorkload:'',planInnerUserWorkload:'',actOutUserWorkload:'',actInnerUserWorkload:'',planNouserAt:'',actNouserAt:'',id:''
- }
+ },
+ maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -240,6 +241,8 @@
},
mounted() {
this.$nextTick(() => {
+
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProjectTaskTypeStates();
});
/** 举例，
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index 7f7a3af6..f18179a1 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -9,7 +9,7 @@
-
+
@@ -211,11 +211,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
-
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProjectTemplates();
listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
if(res.data.tips.isOk){
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index c8184537..be8b174e 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -12,7 +12,7 @@
-
+
@@ -257,11 +257,8 @@
//在下面添加其它组件
},
mounted() {
- this.$nextTick(() => {
-
-
-
- this.maxTableHeight = util.calcTableMaxHeight('.el-table');
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmProjectTemplates();
listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
if(res.data.tips.isOk){
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index ee87cad0..1f9264de 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(this.$refs.table.$el);
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/xmQuestionHandle/XmQuestionHandleMng.vue b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
index 55e7b5c9..19da4a0a 100644
--- a/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
+++ b/src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue
@@ -2,7 +2,7 @@
-
+
@@ -85,7 +85,8 @@
//编辑xmQuestionHandle界面初始化数据
editForm: {
id:'',handlerUserid:'',handlerUsername:'',handleSolution:'',receiptMessage:'',receiptTime:'',handleStatus:'',bizProcInstId:'',bizFlowState:'',questionId:'',lastUpdateTime:'',createTime:'',actWorkload:'',actCostAmount:'',urls:'',targetUserid:'',targetUsername:''
- }
+ },
+ tableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@@ -228,6 +229,8 @@
},
mounted() {
this.$nextTick(() => {
+
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmQuestionHandles();
});
}
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
deleted file mode 100644
index cfc99142..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
deleted file mode 100644
index 99db7a4a..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 提交
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue b/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
deleted file mode 100644
index 35807bf8..00000000
--- a/src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
- 查询
- +缺陷标签关联表
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
-
- 改
- 删
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 4772118b..63d2c646 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -259,14 +259,8 @@
this.filters.objType=this.objType
}
- this.$nextTick(() => {
-
-
-
- if(this.projectId){
- subHeight=100/1000 * window.innerHeight;
- }
- this.tableHeight = util.calcTableMaxHeight(".el-table");
+ this.$nextTick(() => {
+ this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
this.getXmRecords();
});
}
diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
index 5282697f..8c88efce 100644
--- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
+++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
@@ -1,6 +1,7 @@