@@ -326,6 +326,8 @@
.app-container{
display: flex;
margin-top: -28px;
+ margin-left: 1px;
+ margin-right:1px;
padding: 2px;
background: #e8edf7;
}
@@ -423,7 +425,7 @@
font-weight: bold;
}
.project-info{
- width: 75%;
+ width: 100%;
flex-grow: 1;
/* height: 820px; */
background: #fff;
@@ -445,7 +447,9 @@
color: #409EFF !important;
border: 1px solid #409EFF;
}
-
+.info-detail{
+ max-height: 100%;
+}
/* 超过宽度则用...代替 */
.truncate{
overflow: hidden;
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 23fa886f..c70a26f4 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -71,6 +71,7 @@
},
editFormVisible: false,//编辑界面是否显示
+ tableHeight:500,
//编辑xmProject界面初始化数据
editForm: {
id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 3d24f951..703a7d9e 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -1,7 +1,7 @@
-
-
+
@@ -269,6 +269,7 @@
finishFlag: false,
xmRecordVisible: false,
productSelectVisible:false,
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -638,6 +639,7 @@
this.filters.productName=this.$route.params.productName;
}
this.$nextTick(() => {
+ this.tableHeight = window.innerHeight - 200;
this.showInfo = false;
this.getXmProjects();
});
@@ -779,4 +781,7 @@
margin-top: 5px;
margin-bottom: 5px;
}
+.right-btn{
+ margin-top: 12px;
+}
\ 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 7a7a7613..f80ffffd 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -280,6 +280,7 @@
valueChangeRows:[],
batchEditVisible:false,
menuVisible:false,//由故事自动创建阶段计划
+ tableHeight:500,
pickerOptions: util.pickerOptions('date'),
gstcVisible:false,
ganrrColumns: {
@@ -1209,6 +1210,7 @@
mounted() {
this.$nextTick(() => {
+ this.tableHeight = window.innerHeight - 250;
if(this.selProject){
this.getXmProjectPhases();
}
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index b05862f3..06ee3e42 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -50,7 +50,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -318,6 +318,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
valueChangeRows:[],
batchEditVisible:false,
menuVisible:false,//由故事自动创建阶段计划
+ tableHeight:500,
pickerOptions: util.pickerOptions('date'),
gstcVisible:false,
groupUserSelectVisible:false,//选择负责人
@@ -330,6 +331,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
endDate: 'endDate',
},
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -1066,8 +1068,8 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
var phaseActWorkload=this.phaseBudgetData.phaseActWorkload
var budgetCost=this.phaseBudgetData.phaseBudgetNouserAt+this.phaseBudgetData.phaseBudgetInnerUserAt+this.phaseBudgetData.phaseBudgetOutUserAt
var actCost=this.phaseBudgetData.actInnerUserAt+this.phaseBudgetData.actNouserAt+this.phaseBudgetData.actOutUserAt
- sums[5]='预算工作量:'+budgetWorkload+'人时,实际:'+phaseActWorkload+'人时'
- sums[6]='预算金额:'+budgetCost.toFixed(0)+'元,'+(budgetCost/10000).toFixed(2)+'万元,实际:'+actCost.toFixed(0)+'元,'+(actCost/10000).toFixed(2)+'万元'
+ sums[5]='预算:'+budgetWorkload+',实际:'+phaseActWorkload+''
+ sums[6]='预算:'+budgetCost.toFixed(0)+',实际:'+actCost.toFixed(0)+''
return sums;
},
@@ -1293,6 +1295,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
this.getXmProjectPhases();
}
+ this.tableHeight = window.innerHeight - 300;
listOption([
{categoryId:'all',itemCode:'xmPhaseStatus'}
]).then(res=>{
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 8c2f6d1c..898a76e2 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -1,17 +1,17 @@
-
+
- 阶段名称 {{editForm.seqNo}} {{editForm.phaseName}}
+ 阶段 {{editForm.phaseName}}
{{scope.row.seqNo}} {{scope.row.phaseName}}
-
+
@@ -108,6 +108,7 @@
menuVisible:false,//由故事自动创建阶段计划
pickerOptions: util.pickerOptions('date'),
gstcVisible:false,
+ tableHeight:500,
ganrrColumns: {
children: 'children',
name: 'phaseName',
@@ -416,6 +417,7 @@
mounted() {
this.$nextTick(() => {
+ this.tableHeight = window.innerHeight - 250;
if(this.selProject){
this.getXmProjectPhases();
}
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 7ccbdc57..00fa1c9c 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index aecd72de..72fe3c09 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -77,7 +77,7 @@
-
+
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 69f34350..6d53ff11 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -63,7 +63,7 @@
-
+
@@ -224,6 +224,7 @@
selectUserVisible:false,
selectProjectVisible:false,
nextAction:'',
+ tableHeight:500,
cloumns: [
{
key: 'name',
@@ -262,7 +263,9 @@
}
]
/**end 自定义属性请在上面加 请加备注**/
+
}
+
},//end data
methods: {
handleSizeChange(pageSize) {
@@ -679,6 +682,7 @@
this.filters.selProject=this.selProject
}
this.$nextTick(() => {
+ this.tableHeight = window.innerHeight-250;
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 c06e8ca8..799bff56 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -7,7 +7,7 @@
-
+
@@ -98,6 +98,7 @@
editForm: {
id:'',projectId:'',operUserid:'',operUsername:'',operTime:'',objType:'',action:'',oldValue:'',newValue:'',remarks:'',taskId:'',reqNo:'',branchId:'',ip:''
},
+ tableHeight:500,
/**begin 自定义属性请在下面加 请加备注**/
objTypeOptions: [{key:"all",name:"全部"},{key:"task",name:"任务"},{"key":"project" ,name:"项目"},{key:"budget",name:"预算"},{key:"cost",name:"成本"},{key:"phase",name:"阶段计划"},{"key":"group",name:"团队"}]
/**end 自定义属性请在上面加 请加备注**/
@@ -254,7 +255,7 @@
}
this.$nextTick(() => {
-
+ this.tableHeight = window.innerHeight - 250;
this.getXmRecords();
});
}
diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 84b62317..227d93ac 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -149,7 +149,7 @@
-
+
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 9ee40d20..cf8b5cf7 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -145,7 +145,7 @@
-
+
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index 262ed59d..19a0d181 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -29,7 +29,7 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="id"
- max-height="700"
+ :max-height="tableHeight"
>
@@ -147,6 +147,7 @@
projectPhase: null,
pickerOptions: util.pickerOptions(),
selectProjectVisible:false,
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -437,6 +438,7 @@
mounted() {
this.filters.selProject=this.selProject
this.$nextTick(()=>{
+ this.tableHeight = window.innerHeight - 250;
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 ee57be8b..8f9a5396 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -20,7 +20,7 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
row-key="id"
- max-height="450"
+ :max-height="tableHeight"
>
@@ -151,6 +151,7 @@
selkey: "all",
pickerOptions: util.pickerOptions(),
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -397,6 +398,7 @@
},
mounted() {
this.$nextTick(()=>{
+ this.tableHeight = window.innerHeight - 250;
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 0e5fa04b..ae8eae00 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -13,7 +13,7 @@
- {
+ this.tableHeight = window.innerHeight - 250;
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 631546f1..fea4042c 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -36,7 +36,7 @@
-
+
-
+
{{scope.row.sortLevel}} {{scope.row.name}}
@@ -164,7 +165,7 @@
-->
-
+
-
+
@@ -59,7 +59,7 @@
-
+
@@ -117,6 +117,7 @@
},
/**begin 自定义属性请在下面加 请加备注**/
menuVisible:false,
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -299,6 +300,7 @@
mounted() {
this.$nextTick(() => {
this.getXmTestCases();
+ this.tableHeight = window.innerHeight - 250;
});
/** 举例,
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 47ed46f8..9f333692 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -26,7 +26,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -241,6 +241,7 @@
endDate: 'endTime',
},
+ tableHeight:500,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -631,6 +632,7 @@
mounted() {
this.filters.selProject=this.selProject;
this.$nextTick(() => {
+ this.tableHeight = window.innerHeight - 250;
this.getXmTestCaseExecs();
});
/** 举例,