Browse Source

优化

master
陈裕财 4 years ago
parent
commit
a967305754
  1. 72
      src/views/xm/XmOverview2.vue
  2. 2
      src/views/xm/core/components/xm-gantt.vue
  3. 6
      src/views/xm/core/xmGroupState/XmGroupStateMng.vue
  4. 4
      src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
  5. 4
      src/views/xm/core/xmIteration/XmIterationOverview.vue
  6. 6
      src/views/xm/core/xmIterationState/XmIterationStateAdd.vue
  7. 6
      src/views/xm/core/xmIterationState/XmIterationStateEdit.vue
  8. 6
      src/views/xm/core/xmIterationState/XmIterationStateMng.vue
  9. 6
      src/views/xm/core/xmIterationState/XmIterationStateShow.vue
  10. 6
      src/views/xm/core/xmIterationStateHis/XmIterationStateHisEdit.vue
  11. 6
      src/views/xm/core/xmIterationStateHis/XmIterationStateHisMng.vue
  12. 2
      src/views/xm/core/xmMenu/XmMenuMng.vue
  13. 4
      src/views/xm/core/xmMenu/XmMenuOverview.vue
  14. 6
      src/views/xm/core/xmMenuState/XmMenuStateAdd.vue
  15. 6
      src/views/xm/core/xmMenuState/XmMenuStateEdit.vue
  16. 4
      src/views/xm/core/xmPhase/XmPhaseOverview.vue
  17. 2
      src/views/xm/core/xmProduct/XmProductInfo.vue
  18. 4
      src/views/xm/core/xmProduct/XmProductMng.vue
  19. 18
      src/views/xm/core/xmProduct/XmProductOverview.vue
  20. 2
      src/views/xm/core/xmProduct/XmProductRecycle.vue
  21. 2
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  22. 6
      src/views/xm/core/xmProductState/XmProductStateAdd.vue
  23. 6
      src/views/xm/core/xmProductState/XmProductStateEdit.vue
  24. 6
      src/views/xm/core/xmProductState/XmProductStateMng.vue
  25. 6
      src/views/xm/core/xmProductStateHis/XmProductStateHisEdit.vue
  26. 6
      src/views/xm/core/xmProductStateHis/XmProductStateHisMng.vue
  27. 6
      src/views/xm/core/xmProjectState/XmProjectStateAdd.vue
  28. 4
      src/views/xm/rpt/product/productWorkItemDayList.vue
  29. 4
      src/views/xm/rpt/project/projectWorkItemDayList.vue

72
src/views/xm/XmOverview2.vue

@ -7,7 +7,7 @@
<p>项目数</p> <p>项目数</p>
</div> </div>
<div class="r r2"> <div class="r r2">
<span style="color: #4779F6">{{xmBranchState.totalPlanWorkload || 0}}</span>
<span style="color: #4779F6">{{xmBranchState.budgetWorkload || 0}}</span>
<p>项目总工时</p> <p>项目总工时</p>
</div> </div>
<div class="r r3"> <div class="r r3">
@ -19,7 +19,7 @@
<p>产品总工时</p> <p>产品总工时</p>
</div> </div>
<div class="r r5"> <div class="r r5">
<span style="color: #47CBF6">{{xmBranchState.totalPhaseCnt || 0}}</span>
<span style="color: #47CBF6">{{xmBranchState.phaseCnt || 0}}</span>
<p>计划数</p> <p>计划数</p>
</div> </div>
<div class="r r6"> <div class="r r6">
@ -31,7 +31,7 @@
<p>总人数</p> <p>总人数</p>
</div> </div>
<div class="r r8"> <div class="r r8">
<span style="color: #7D7D7D">{{xmBranchState.totalTaskCnt || 0}}</span>
<span style="color: #7D7D7D">{{xmBranchState.taskCnt || 0}}</span>
<p>任务数</p> <p>任务数</p>
</div> </div>
<div class="r r9"> <div class="r r9">
@ -49,7 +49,7 @@
<p>预估工时</p> <p>预估工时</p>
</div> </div>
<div> <div>
<span>{{this.xmBranchState.totalActWorkload || 0}}h</span>
<span>{{this.xmBranchState.actWorkload || 0}}h</span>
<p>登记工时</p> <p>登记工时</p>
</div> </div>
<div> <div>
@ -141,16 +141,16 @@ export default {
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(["userInfo"]),
finish: function (){ finish: function (){
return this.xmBranchState.totalCompleteTaskCnt;
return this.xmBranchState.taskFinishCnt;
}, },
notStart: function() { notStart: function() {
return this.xmBranchState.totalTaskCnt-this.xmBranchState.totalCompleteTaskCnt;
return this.xmBranchState.taskCnt-this.xmBranchState.taskFinishCnt;
}, },
totalTask: function() { totalTask: function() {
return this.xmBranchState.totalTaskCnt;
return this.xmBranchState.taskCnt;
}, },
taskProgress: function (){ taskProgress: function (){
return this.xmBranchState.totalProgress;
return this.xmBranchState.finishRate;
}, },
taskStartTime: function (){ taskStartTime: function (){
return this.xmBranchState.startTime.substring(0,10); return this.xmBranchState.startTime.substring(0,10);
@ -162,38 +162,38 @@ export default {
return this.xmBranchState.createUsername; return this.xmBranchState.createUsername;
}, },
workloadProgress:function (){ workloadProgress:function (){
if(!this.xmBranchState.totalPlanWorkload){
if(!this.xmBranchState.budgetWorkload){
return 0; return 0;
} }
if(this.xmBranchState.totalActWorkload < this.xmBranchState.totalPlanWorkload){
return Math.round(this.xmBranchState.totalActWorkload/this.xmBranchState.totalPlanWorkload*100)
if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
}else{ }else{
return 100; return 100;
} }
}, },
deviation:function (){ deviation:function (){
return Math.round(this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload);
return Math.round(this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload);
}, },
deviationRate:function (){ deviationRate:function (){
return Math.round((this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
return Math.round((this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
}, },
remainWorkload:function (){ remainWorkload:function (){
return this.xmBranchState.totalPlanWorkload - this.xmBranchState.totalActWorkload;
return this.xmBranchState.budgetWorkload - this.xmBranchState.actWorkload;
}, },
planProgress:function (){ planProgress:function (){
if(!this.xmBranchState.totalPlanWorkload){
if(!this.xmBranchState.budgetWorkload){
return 0; return 0;
} }
return Math.round( this.xmBranchState.estimateWorkload/this.xmBranchState.totalPlanWorkload*100)
return Math.round( this.xmBranchState.estimateWorkload/this.xmBranchState.budgetWorkload*100)
}, },
realProgress:function (){ realProgress:function (){
if(!this.xmBranchState.totalPlanWorkload){
if(!this.xmBranchState.budgetWorkload){
return 0; return 0;
} }
if(this.xmBranchState.totalActWorkload < this.xmBranchState.totalPlanWorkload){
return Math.round(this.xmBranchState.totalActWorkload/this.xmBranchState.totalPlanWorkload*100)
if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
}else{ }else{
return 100; return 100;
} }
@ -298,7 +298,7 @@ export default {
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
data: [0, this.xmBranchState.totalTaskCnt],
data: [0, this.xmBranchState.taskCnt],
markPoint: { markPoint: {
data: [{ data: [{
type: 'max', type: 'max',
@ -314,11 +314,11 @@ export default {
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
data: [0, 0, this.xmBranchState.totalBugCnt],
data: [0, 0, this.xmBranchState.bugCnt],
markPoint: { markPoint: {
data: [{ data: [{
name: '', name: '',
yAxis: this.xmBranchState.totalBugCnt, // yythis.trenddata[1]
yAxis: this.xmBranchState.bugCnt, // yythis.trenddata[1]
x: '95.55%'// x x: '95.55%'// x
}], }],
}, },
@ -523,7 +523,7 @@ export default {
} }
}, },
data: [ data: [
{value: this.xmBranchState.totalClosedBugCnt,
{value: this.xmBranchState.closedBugs,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#47CBF6' color: '#47CBF6'
@ -542,7 +542,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalResolvedBugCnt,
{value: this.xmBranchState.resolvedBugs,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#88B0BA' color: '#88B0BA'
@ -561,7 +561,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalActiveBugCnt,
{value: this.xmBranchState.activeBugs,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#F6AD48' color: '#F6AD48'
@ -580,7 +580,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalConfirmedBugCnt,
{value: this.xmBranchState.confirmedBugs,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#467AF6' color: '#467AF6'
@ -649,7 +649,7 @@ export default {
}, },
data: [ data: [
{ {
value: this.xmBranchState.totalBudgetNouserAmount,
value: this.xmBranchState.budgetNouserAt,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#46CBF6' color: '#46CBF6'
@ -668,7 +668,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalBudgetIuserAmount,
{value: this.xmBranchState.budgetIuserAt,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#F7AE48' color: '#F7AE48'
@ -687,7 +687,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalBudgetOuserAmount,
{value: this.xmBranchState.budgetOuserAt,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#4679F6' color: '#4679F6'
@ -754,18 +754,18 @@ export default {
}, },
formatter(params) { formatter(params) {
console.log(params); console.log(params);
let total = that.xmBranchState.totalPlanIuserWorkload + that.xmBranchState.totalPlanOuserWorkload;
let total = that.xmBranchState.budgetIuserWorkload + that.xmBranchState.budgetOuserWorkload;
if(params == '内部人力') { if(params == '内部人力') {
let p = ((that.xmBranchState.totalPlanIuserWorkload / total) * 100).toFixed(2)
let p = ((that.xmBranchState.budgetIuserWorkload / total) * 100).toFixed(2)
return [ return [
`{name|${that.xmBranchState.totalPlanIuserWorkload}}/{val|${p}%}`,
`{name|${that.xmBranchState.budgetIuserWorkload}}/{val|${p}%}`,
`{desc|${params}}` `{desc|${params}}`
].join('\n') ].join('\n')
} }
if(params == '外购人力') { if(params == '外购人力') {
let p = ((that.xmBranchState.totalPlanOuserWorkload / total) * 100).toFixed(2)
let p = ((that.xmBranchState.budgetOuserWorkload / total) * 100).toFixed(2)
return [ return [
`{name|${that.xmBranchState.totalPlanOuserWorkload}}/{val|${p}%}`,
`{name|${that.xmBranchState.budgetOuserWorkload}}/{val|${p}%}`,
`{desc|${params}}` `{desc|${params}}`
].join('\n') ].join('\n')
} }
@ -784,7 +784,7 @@ export default {
}, },
data: [ data: [
{ {
value: this.xmBranchState.totalPlanIuserWorkload,
value: this.xmBranchState.budgetIuserWorkload,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#3AC2ED' color: '#3AC2ED'
@ -804,7 +804,7 @@ export default {
} }
} }
}, },
{value: this.xmBranchState.totalPlanOuserWorkload,
{value: this.xmBranchState.budgetOuserWorkload,
itemStyle: { itemStyle: {
normal:{ normal:{
color: '#4072F5' color: '#4072F5'

2
src/views/xm/core/components/xm-gantt.vue

@ -6,7 +6,7 @@
:usePreColumn="true" :usePreColumn="true"
:checkSource="true" :checkSource="true"
:useRealTime="useRealTime" :useRealTime="useRealTime"
:treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentPhaseId', pre: 'finishTaskCnt'}"
:treeProps="{children: 'children', hasChildren: 'hasChildren',pid:'parentPhaseId', pre: 'taskFinishCnt'}"
:props="columns" :props="columns"
row-key="id"> row-key="id">
<!-- <el-table-column prop="name" label="计划名称" min-width="160" > <!-- <el-table-column prop="name" label="计划名称" min-width="160" >

6
src/views/xm/core/xmGroupState/XmGroupStateMng.vue

@ -21,7 +21,7 @@
<el-table-column prop="actCostAmount" label="实际成本" min-width="80" ></el-table-column> <el-table-column prop="actCostAmount" label="实际成本" min-width="80" ></el-table-column>
<el-table-column prop="iterationCnt" label="迭代数" min-width="80" ></el-table-column> <el-table-column prop="iterationCnt" label="迭代数" min-width="80" ></el-table-column>
<el-table-column prop="taskCnt" label="任务数" min-width="80" ></el-table-column> <el-table-column prop="taskCnt" label="任务数" min-width="80" ></el-table-column>
<el-table-column prop="finishTaskCnt" label="完成的任务数" min-width="80" ></el-table-column>
<el-table-column prop="taskFinishCnt" label="完成的任务数" min-width="80" ></el-table-column>
<el-table-column prop="planWorkerCnt" label="总人数" min-width="80" ></el-table-column> <el-table-column prop="planWorkerCnt" label="总人数" min-width="80" ></el-table-column>
<el-table-column prop="bugCnt" label="bug总数" min-width="80" ></el-table-column> <el-table-column prop="bugCnt" label="bug总数" min-width="80" ></el-table-column>
<el-table-column prop="closedBugs" label="总关闭bugs" min-width="80" ></el-table-column> <el-table-column prop="closedBugs" label="总关闭bugs" min-width="80" ></el-table-column>
@ -95,13 +95,13 @@ import XmGroupStateOverview from './XmGroupStateOverview.vue';
addFormVisible: false,//xmGroupState addFormVisible: false,//xmGroupState
//xmGroupState //xmGroupState
addForm: { addForm: {
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
}, },
editFormVisible: false,// editFormVisible: false,//
//xmGroupState //xmGroupState
editForm: { editForm: {
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',bugCnt:'',groupId:'',projectId:'',projectName:'',groupName:''
}, },
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/

4
src/views/xm/core/xmGroupState/XmGroupStateOverview.vue

@ -43,7 +43,7 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</div> </div>
<div class="info"> <div class="info">
<div v-text="this.xmGroupState.finishTaskCnt" >
<div v-text="this.xmGroupState.taskFinishCnt" >
</div> </div>
<div class="title">已完成</div> <div class="title">已完成</div>
</div> </div>
@ -218,7 +218,7 @@ export default {
return parseFloat(this.xmGroupState.finishRate); return parseFloat(this.xmGroupState.finishRate);
}, },
notStart: function() { notStart: function() {
return this.xmGroupState.taskCnt-this.xmGroupState.finishTaskCnt;
return this.xmGroupState.taskCnt-this.xmGroupState.taskFinishCnt;
}, },
planStartTime: function (){ planStartTime: function (){
if(this.xmGroupState.planStartTime){ if(this.xmGroupState.planStartTime){

4
src/views/xm/core/xmIteration/XmIterationOverview.vue

@ -53,7 +53,7 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</div> </div>
<div class="info"> <div class="info">
<div v-text="this.xmIteration.finishTaskCnt" >
<div v-text="this.xmIteration.taskFinishCnt" >
</div> </div>
<div class="title">已完成</div> <div class="title">已完成</div>
</div> </div>
@ -243,7 +243,7 @@ export default {
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(["userInfo"]),
notStart: function() { notStart: function() {
return this.xmIteration.taskCnt-this.xmIteration.finishTaskCnt;
return this.xmIteration.taskCnt-this.xmIteration.taskFinishCnt;
}, },
taskProgress: function (){ taskProgress: function (){
return this.xmIteration.finishRate||0; return this.xmIteration.finishRate||0;

6
src/views/xm/core/xmIterationState/XmIterationStateAdd.vue

@ -48,8 +48,8 @@
<el-form-item label="关联任务数" prop="taskCnt"> <el-form-item label="关联任务数" prop="taskCnt">
<el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="addForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="addForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="计算日期" prop="calcTime"> <el-form-item label="计算日期" prop="calcTime">
<el-date-picker type="date" placeholder="选择日期" v-model="addForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="addForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
@ -111,7 +111,7 @@
}, },
// //
addForm: { addForm: {
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

6
src/views/xm/core/xmIterationState/XmIterationStateEdit.vue

@ -47,8 +47,8 @@
<el-form-item label="关联任务数" prop="taskCnt"> <el-form-item label="关联任务数" prop="taskCnt">
<el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="editForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="editForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="计算日期" prop="calcTime"> <el-form-item label="计算日期" prop="calcTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
@ -144,7 +144,7 @@
] ]
}, },
editForm: { editForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
maxTableHeight:300, maxTableHeight:300,
}//end return }//end return

6
src/views/xm/core/xmIterationState/XmIterationStateMng.vue

@ -25,7 +25,7 @@
<el-table-column prop="productCnt" label="关联产品数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="productCnt" label="关联产品数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="menuCnt" label="关联故事数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="menuCnt" label="关联故事数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskCnt" label="关联任务数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="taskCnt" label="关联任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="finishTaskCnt" label="已完成的任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskFinishCnt" label="已完成的任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="calcTime" label="计算日期" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="calcTime" label="计算日期" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="iterationName" label="迭代名称" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="iterationName" label="迭代名称" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="budgetCost" label="预算成本" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="budgetCost" label="预算成本" min-width="80" show-overflow-tooltip></el-table-column>
@ -110,12 +110,12 @@
},// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]} },// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]}
addFormVisible: false,//xmIterationState addFormVisible: false,//xmIterationState
addForm: { addForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
editFormVisible: false,// editFormVisible: false,//
editForm: { editForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
maxTableHeight:300, maxTableHeight:300,
} }

6
src/views/xm/core/xmIterationState/XmIterationStateShow.vue

@ -30,7 +30,7 @@
<el-table-column prop="productCnt" label="关联产品数" min-width="80" ></el-table-column> <el-table-column prop="productCnt" label="关联产品数" min-width="80" ></el-table-column>
<el-table-column prop="menuCnt" label="关联需求数" min-width="80" ></el-table-column> <el-table-column prop="menuCnt" label="关联需求数" min-width="80" ></el-table-column>
<el-table-column prop="taskCnt" label="关联任务数" min-width="80" ></el-table-column> <el-table-column prop="taskCnt" label="关联任务数" min-width="80" ></el-table-column>
<el-table-column prop="finishTaskCnt" label="已完成的任务数" min-width="80" ></el-table-column>
<el-table-column prop="taskFinishCnt" label="已完成的任务数" min-width="80" ></el-table-column>
</el-table> </el-table>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination> <el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
@ -91,13 +91,13 @@
addFormVisible: false,//xmIterationState addFormVisible: false,//xmIterationState
//xmIterationState //xmIterationState
addForm: { addForm: {
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
}, },
editFormVisible: false,// editFormVisible: false,//
//xmIterationState //xmIterationState
editForm: { editForm: {
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
id:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:''
},maxTableHeight:300, },maxTableHeight:300,
/**begin 自定义属性请在下面加 请加备注**/ /**begin 自定义属性请在下面加 请加备注**/

6
src/views/xm/core/xmIterationStateHis/XmIterationStateHisEdit.vue

@ -47,8 +47,8 @@
<el-form-item label="关联任务数" prop="taskCnt"> <el-form-item label="关联任务数" prop="taskCnt">
<el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="editForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="editForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="计算日期" prop="calcTime"> <el-form-item label="计算日期" prop="calcTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.calcTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
@ -144,7 +144,7 @@
] ]
}, },
editForm: { editForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
maxTableHeight:300, maxTableHeight:300,
}//end return }//end return

6
src/views/xm/core/xmIterationStateHis/XmIterationStateHisMng.vue

@ -25,7 +25,7 @@
<el-table-column prop="productCnt" label="关联产品数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="productCnt" label="关联产品数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="menuCnt" label="关联故事数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="menuCnt" label="关联故事数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskCnt" label="关联任务数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="taskCnt" label="关联任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="finishTaskCnt" label="已完成的任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskFinishCnt" label="已完成的任务数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="calcTime" label="计算日期" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="calcTime" label="计算日期" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="iterationName" label="迭代名称" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="iterationName" label="迭代名称" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="budgetCost" label="预算成本" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="budgetCost" label="预算成本" min-width="80" show-overflow-tooltip></el-table-column>
@ -110,12 +110,12 @@
},// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]} },// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]}
addFormVisible: false,//xmIterationStateHis addFormVisible: false,//xmIterationStateHis
addForm: { addForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
editFormVisible: false,// editFormVisible: false,//
editForm: { editForm: {
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',finishRate:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:'',calcTime:'',iterationName:'',budgetCost:'',budgetWorkload:'',iterationId:'',bizDate:'',closedBugCnt:'',resolvedBugCnt:'',activeBugCnt:'',confirmedBugCnt:'',bugCnt:'',estimateWorkload:'',minStartTime:'',maxEndTime:''
}, },
maxTableHeight:300, maxTableHeight:300,
} }

2
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -285,7 +285,7 @@
<el-tooltip content="已完成 / 总数 注意:统计包括下级数据"><span>任务数</span></el-tooltip> <el-tooltip content="已完成 / 总数 注意:统计包括下级数据"><span>任务数</span></el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{scope.row.finishTaskCnt}}/{{scope.row.taskCnt}}</div>
<div>{{scope.row.taskFinishCnt}}/{{scope.row.taskCnt}}</div>
</template> </template>
</el-table-column> </el-table-column>

4
src/views/xm/core/xmMenu/XmMenuOverview.vue

@ -56,7 +56,7 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</div> </div>
<div class="info"> <div class="info">
<div v-text="this.xmMenu.finishTaskCnt" >
<div v-text="this.xmMenu.taskFinishCnt" >
</div> </div>
<div class="title">已完成</div> <div class="title">已完成</div>
</div> </div>
@ -238,7 +238,7 @@
computed: { computed: {
...mapGetters(['userInfo','roles']), ...mapGetters(['userInfo','roles']),
notStart: function() { notStart: function() {
return this.xmMenu.taskCnt-this.xmMenu.finishTaskCnt;
return this.xmMenu.taskCnt-this.xmMenu.taskFinishCnt;
}, },
taskProgress: function (){ taskProgress: function (){
return this.xmMenu.finishRate; return this.xmMenu.finishRate;

6
src/views/xm/core/xmMenuState/XmMenuStateAdd.vue

@ -132,8 +132,8 @@
<el-form-item label="任务数" prop="taskCnt"> <el-form-item label="任务数" prop="taskCnt">
<el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="addForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="addForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate"> <el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate">
<el-input v-model="addForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串" ></el-input> <el-input v-model="addForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串" ></el-input>
@ -186,7 +186,7 @@
}, },
// , // ,
addForm: { addForm: {
id:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:''
id:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',bugCnt:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

6
src/views/xm/core/xmMenuState/XmMenuStateEdit.vue

@ -132,8 +132,8 @@
<el-form-item label="任务数" prop="taskCnt"> <el-form-item label="任务数" prop="taskCnt">
<el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="editForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="editForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate"> <el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input> <el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input>
@ -186,7 +186,7 @@
}, },
// XmMenuState , // XmMenuState ,
editForm: { editForm: {
id:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',bugCnt:''
id:'',menuId:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',onlineStatus:'',onlineTime:'',planStatus:'',chargeUserid:'',chargeUsername:'',menuStatus:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',menuName:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',bugCnt:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

4
src/views/xm/core/xmPhase/XmPhaseOverview.vue

@ -62,7 +62,7 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</div> </div>
<div class="info"> <div class="info">
<div v-text="this.xmPhase.finishTaskCnt" >
<div v-text="this.xmPhase.taskFinishCnt" >
</div> </div>
<div class="title">已完成</div> <div class="title">已完成</div>
</div> </div>
@ -232,7 +232,7 @@ export default {
computed: { computed: {
...mapGetters(['userInfo','roles']), ...mapGetters(['userInfo','roles']),
notStart: function() { notStart: function() {
return this.xmPhase.taskCnt-this.xmPhase.finishTaskCnt;
return this.xmPhase.taskCnt-this.xmPhase.taskFinishCnt;
}, },
taskProgress: function (){ taskProgress: function (){
if(this.xmPhase.actRate){ if(this.xmPhase.actRate){

2
src/views/xm/core/xmProduct/XmProductInfo.vue

@ -314,7 +314,7 @@
} else if (this.infotype === '需求监控') { } else if (this.infotype === '需求监控') {
header = ['序号', '需求名称', '计划状态', '负责人', '上线时间', '计划开始时间', '实际开始时间', '计划结束时间', '实际结束时间', '计划工作量(人时)', '实际工作量(人时)', '计划成本(元)', '实际成本(元)', '总体完成比例%', '需求完成比例%', '设计完成比例%', '开发完成比例%', 'sit完成比例%', 'uat完成比例%', '上线状态']; header = ['序号', '需求名称', '计划状态', '负责人', '上线时间', '计划开始时间', '实际开始时间', '计划结束时间', '实际结束时间', '计划工作量(人时)', '实际工作量(人时)', '计划成本(元)', '实际成本(元)', '总体完成比例%', '需求完成比例%', '设计完成比例%', '开发完成比例%', 'sit完成比例%', 'uat完成比例%', '上线状态'];
keyList = ['seqNo', 'menuName', 'planStatus', 'chargeUsername', 'onlineTime', 'planStartTime', 'actStartTime', 'planEndTime', 'actEndTime', 'planWorkload', 'actWorkload', 'planCostAmount', 'actCostAmount', 'finishRate', 'demandRate', 'designRate', 'devRate', 'sitRate', 'uatRate', 'onlineStatus'];
keyList = ['seqNo', 'menuName', 'planStatus', 'chargeUsername', 'onlineTime', 'planStartTime', 'actStartTime', 'planEndTime', 'actEndTime', 'budgetWorkload', 'actWorkload', 'planCostAmount', 'actCostAmount', 'finishRate', 'demandRate', 'designRate', 'devRate', 'sitRate', 'uatRate', 'onlineStatus'];
list = this.$refs.xmMenuWithPlan.xmMenusTreeData; list = this.$refs.xmMenuWithPlan.xmMenusTreeData;
pageNum = this.$refs.xmMenuWithPlan.pageInfo.pageNum; pageNum = this.$refs.xmMenuWithPlan.pageInfo.pageNum;
} }

4
src/views/xm/core/xmProduct/XmProductMng.vue

@ -211,7 +211,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="taskCnt" label="任务数" width="120" sortable show-overflow-tooltip> <el-table-column prop="taskCnt" label="任务数" width="120" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span title=" 已完成 / 总任务数">{{scope.row.taskCnt>0?scope.row.finishTaskCnt+'&nbsp;/&nbsp;'+scope.row.taskCnt:''}}</span>
<span title=" 已完成 / 总任务数">{{scope.row.taskCnt>0?scope.row.taskFinishCnt+'&nbsp;/&nbsp;'+scope.row.taskCnt:''}}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -221,7 +221,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工作量(人时)" width="200"> <el-table-column label="工作量(人时)" width="200">
<el-table-column prop="planWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="budgetWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column>
</el-table-column> </el-table-column>

18
src/views/xm/core/xmProduct/XmProductOverview.vue

@ -55,7 +55,7 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</div> </div>
<div class="info"> <div class="info">
<div v-text="this.xmProduct.finishTaskCnt" >
<div v-text="this.xmProduct.taskFinishCnt" >
</div> </div>
<div class="title">已完成</div> <div class="title">已完成</div>
</div> </div>
@ -245,7 +245,7 @@ export default {
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(["userInfo"]),
notStart: function() { notStart: function() {
return this.xmProduct.taskCnt-this.xmProduct.finishTaskCnt;
return this.xmProduct.taskCnt-this.xmProduct.taskFinishCnt;
}, },
taskProgress: function (){ taskProgress: function (){
return this.xmProduct.finishRate?parseInt(this.xmProduct.finishRate):0; return this.xmProduct.finishRate?parseInt(this.xmProduct.finishRate):0;
@ -265,10 +265,10 @@ export default {
} }
}, },
workloadProgress:function (){ workloadProgress:function (){
return Math.round(this.xmProduct.actWorkload/this.xmProduct.planWorkload*100);
return Math.round(this.xmProduct.actWorkload/this.xmProduct.budgetWorkload*100);
}, },
remainWorkload:function (){ remainWorkload:function (){
return this.xmProduct.planWorkload - this.xmProduct.actWorkload;
return this.xmProduct.budgetWorkload - this.xmProduct.actWorkload;
}, },
deviation:function (){ deviation:function (){
let now = new Date(); let now = new Date();
@ -276,13 +276,13 @@ export default {
let productEndTime = new Date(this.xmProduct.planEndTime); let productEndTime = new Date(this.xmProduct.planEndTime);
if(now<=productEndTime){ if(now<=productEndTime){
let allDays=productEndTime-productStartTime; let allDays=productEndTime-productStartTime;
return this.xmProduct.planWorkload - Math.round((now-productStartTime)/allDays*this.xmProduct.planWorkload);
return this.xmProduct.budgetWorkload - Math.round((now-productStartTime)/allDays*this.xmProduct.budgetWorkload);
}else{ }else{
return this.xmProduct.actWorkload - this.xmProduct.planWorkload;
return this.xmProduct.actWorkload - this.xmProduct.budgetWorkload;
} }
}, },
deviationRate:function (){ deviationRate:function (){
return Math.round(this.deviation/this.xmProduct.planWorkload*100);
return Math.round(this.deviation/this.xmProduct.budgetWorkload*100);
}, },
planProgress:function (){ planProgress:function (){
let now = new Date(); let now = new Date();
@ -296,8 +296,8 @@ export default {
} }
}, },
realProgress:function (){ realProgress:function (){
if(this.xmProduct.actWorkload < this.xmProduct.planWorkload){
return Math.round(this.xmProduct.actWorkload/this.xmProduct.planWorkload*100)
if(this.xmProduct.actWorkload < this.xmProduct.budgetWorkload){
return Math.round(this.xmProduct.actWorkload/this.xmProduct.budgetWorkload*100)
}else{ }else{
return 100; return 100;
} }

2
src/views/xm/core/xmProduct/XmProductRecycle.vue

@ -109,7 +109,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工作量(人时)" width="200"> <el-table-column label="工作量(人时)" width="200">
<el-table-column prop="planWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="budgetWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" fixed="right" > <el-table-column label="操作" width="120" fixed="right" >

2
src/views/xm/core/xmProduct/XmProductTplMng.vue

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工作量(人时)" width="200"> <el-table-column label="工作量(人时)" width="200">
<el-table-column prop="planWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="budgetWorkload" label="预计" width="100" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="actWorkload" label="实际" width="100" show-overflow-tooltip sortable></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="" width="100" fixed="right"> <el-table-column label="" width="100" fixed="right">

6
src/views/xm/core/xmProductState/XmProductStateAdd.vue

@ -108,8 +108,8 @@
<el-form-item label="任务总数" prop="taskCnt"> <el-form-item label="任务总数" prop="taskCnt">
<el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务总数" prop="finishTaskCnt">
<el-input-number v-model="addForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务总数" prop="taskFinishCnt">
<el-input-number v-model="addForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-col :span="24" :offset="8"> <el-col :span="24" :offset="8">
@ -156,7 +156,7 @@
}, },
// , // ,
addForm: { addForm: {
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:''
id:'',planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

6
src/views/xm/core/xmProductState/XmProductStateEdit.vue

@ -107,8 +107,8 @@
<el-form-item label="任务总数" prop="taskCnt"> <el-form-item label="任务总数" prop="taskCnt">
<el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务总数" prop="finishTaskCnt">
<el-input-number v-model="editForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务总数" prop="taskFinishCnt">
<el-input-number v-model="editForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate"> <el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input> <el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input>
@ -180,7 +180,7 @@
] ]
}, },
editForm: { editForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
maxTableHeight:300, maxTableHeight:300,
}//end return }//end return

6
src/views/xm/core/xmProductState/XmProductStateMng.vue

@ -45,7 +45,7 @@
<el-table-column prop="projectCnt" label="关联项目数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="projectCnt" label="关联项目数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="iterationCnt" label="关联迭代数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="iterationCnt" label="关联迭代数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskCnt" label="任务总数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="taskCnt" label="任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="finishTaskCnt" label="已完成的任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskFinishCnt" label="已完成的任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd字符串" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="bizDate" label="业务日期yyyy-MM-dd字符串" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="branchId" label="机构号码" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="branchId" label="机构号码" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="bugCnt" label="bug总数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="bugCnt" label="bug总数" min-width="80" show-overflow-tooltip></el-table-column>
@ -122,12 +122,12 @@
},// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]} },// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]}
addFormVisible: false,//xmProductState addFormVisible: false,//xmProductState
addForm: { addForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
editFormVisible: false,// editFormVisible: false,//
editForm: { editForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
maxTableHeight:300, maxTableHeight:300,
} }

6
src/views/xm/core/xmProductStateHis/XmProductStateHisEdit.vue

@ -107,8 +107,8 @@
<el-form-item label="任务总数" prop="taskCnt"> <el-form-item label="任务总数" prop="taskCnt">
<el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="editForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="已完成的任务总数" prop="finishTaskCnt">
<el-input-number v-model="editForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="已完成的任务总数" prop="taskFinishCnt">
<el-input-number v-model="editForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate"> <el-form-item label="业务日期yyyy-MM-dd字符串" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input> <el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd字符串"></el-input>
@ -180,7 +180,7 @@
] ]
}, },
editForm: { editForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
maxTableHeight:300, maxTableHeight:300,
}//end return }//end return

6
src/views/xm/core/xmProductStateHis/XmProductStateHisMng.vue

@ -45,7 +45,7 @@
<el-table-column prop="projectCnt" label="关联项目数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="projectCnt" label="关联项目数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="iterationCnt" label="关联迭代数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="iterationCnt" label="关联迭代数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskCnt" label="任务总数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="taskCnt" label="任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="finishTaskCnt" label="已完成的任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskFinishCnt" label="已完成的任务总数" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd字符串" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="bizDate" label="业务日期yyyy-MM-dd字符串" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="branchId" label="机构号码" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="branchId" label="机构号码" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="bugCnt" label="bug总数" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="bugCnt" label="bug总数" min-width="80" show-overflow-tooltip></el-table-column>
@ -122,12 +122,12 @@
},// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]} },// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]}
addFormVisible: false,//xmProductStateHis addFormVisible: false,//xmProductStateHis
addForm: { addForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
editFormVisible: false,// editFormVisible: false,//
editForm: { editForm: {
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',finishTaskCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
planStartTime:'',planEndTime:'',actStartTime:'',actEndTime:'',planWorkload:'',actWorkload:'',planCostAmount:'',actCostAmount:'',finishRate:'',demandRate:'',designRate:'',devRate:'',uatRate:'',sitRate:'',ctime:'',ltime:'',cuserid:'',cusername:'',calcTime:'',planWorkhours:'',planWorkerCnt:'',closedBugs:'',activeBugs:'',confirmedBugs:'',resolvedBugs:'',productId:'',productName:'',testCases:'',execCases:'',designCases:'',finishCases:'',projectCnt:'',iterationCnt:'',taskCnt:'',taskFinishCnt:'',bizDate:'',branchId:'',bugCnt:'',menuCnt:'',menuFinishCnt:'',estimateWorkload:''
}, },
maxTableHeight:300, maxTableHeight:300,
} }

6
src/views/xm/core/xmProjectState/XmProjectStateAdd.vue

@ -168,8 +168,8 @@
<el-form-item label="任务数" prop="taskCnt"> <el-form-item label="任务数" prop="taskCnt">
<el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number> <el-input-number v-model="addForm.taskCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="完成的任务数" prop="finishTaskCnt">
<el-input-number v-model="addForm.finishTaskCnt" :min="0" :max="200"></el-input-number>
<el-form-item label="完成的任务数" prop="taskFinishCnt">
<el-input-number v-model="addForm.taskFinishCnt" :min="0" :max="200"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-col :span="24" :offset="8"> <el-col :span="24" :offset="8">
@ -216,7 +216,7 @@
}, },
// //
addForm: { addForm: {
projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',finishTaskCnt:''
projectId:'',bizDate:'',totalFileCnt:'',totalBugCnt:'',totalTaskCnt:'',totalBudgetNouserAmount:'',projectName:'',id:'',totalStaffCnt:'',calCtime:'',calStatus:'',totalCostNouserAmount:'',totalClosedBugCnt:'',totalResolvedBugCnt:'',totalCompleteTaskCnt:'',totalPhaseCnt:'',totalCompletePhaseCnt:'',totalNeedPayAmount:'',totalFinishPayAmount:'',totalNeedColAmount:'',totalFinishColAmount:'',totalCostUserAmount:'',totalBudgetIuserAmount:'',totalPlanWorkload:'',totalRiskCnt:'',totalCompleteRiskCnt:'',branchId:'',branchName:'',totalBudgetOuserAmount:'',totalCompleteWorkload:'',totalCostIuserAmount:'',totalCostOuserAmount:'',totalProgress:'',totalActiveBugCnt:'',totalConfirmedBugCnt:'',projectStatus:'',totalActWorkload:'',totalActOutWorkload:'',totalActInnerWorkload:'',totalTaskBudgetCostAt:'',totalTaskOutCnt:'',totalNeedPayCnt:'',totalFinishPayCnt:'',totalFinishPayUserCnt:'',totalNeedPayUserCnt:'',totalPlanIuserWorkload:'',totalPlanOuserWorkload:'',testCases:'',execCases:'',designCases:'',finishCases:'',iterationCnt:'',productCnt:'',menuCnt:'',taskCnt:'',taskFinishCnt:''
} }
/**begin 在下面加自定义属性,记得补上面的一个逗号**/ /**begin 在下面加自定义属性,记得补上面的一个逗号**/

4
src/views/xm/rpt/product/productWorkItemDayList.vue

@ -48,8 +48,8 @@
['日期',...this.xmProductStateHiss.map(i=>i.bizDate)], ['日期',...this.xmProductStateHiss.map(i=>i.bizDate)],
['未关故事',...this.xmProductStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)], ['未关故事',...this.xmProductStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)],
['已关故事',...this.xmProductStateHiss.map(i=>i.menuFinishCnt)], ['已关故事',...this.xmProductStateHiss.map(i=>i.menuFinishCnt)],
['未关任务',...this.xmProductStateHiss.map(i=>i.taskCnt-i.finishTaskCnt)],
['已关任务',...this.xmProductStateHiss.map(i=>i.finishTaskCnt)],
['未关任务',...this.xmProductStateHiss.map(i=>i.taskCnt-i.taskFinishCnt)],
['已关任务',...this.xmProductStateHiss.map(i=>i.taskFinishCnt)],
['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)], ['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)] ['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
] ]

4
src/views/xm/rpt/project/projectWorkItemDayList.vue

@ -48,8 +48,8 @@
['日期',...this.xmProjectStateHiss.map(i=>i.bizDate)], ['日期',...this.xmProjectStateHiss.map(i=>i.bizDate)],
['未关故事',...this.xmProjectStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)], ['未关故事',...this.xmProjectStateHiss.map(i=>i.menuCnt-i.menuFinishCnt)],
['已关故事',...this.xmProjectStateHiss.map(i=>i.menuFinishCnt)], ['已关故事',...this.xmProjectStateHiss.map(i=>i.menuFinishCnt)],
['未关任务',...this.xmProjectStateHiss.map(i=>i.taskCnt-i.finishTaskCnt)],
['已关任务',...this.xmProjectStateHiss.map(i=>i.finishTaskCnt)],
['未关任务',...this.xmProjectStateHiss.map(i=>i.taskCnt-i.taskFinishCnt)],
['已关任务',...this.xmProjectStateHiss.map(i=>i.taskFinishCnt)],
['未关缺陷',...this.xmProjectStateHiss.map(i=>i.bugCnt-i.closedBugs)], ['未关缺陷',...this.xmProjectStateHiss.map(i=>i.bugCnt-i.closedBugs)],
['已关缺陷',...this.xmProjectStateHiss.map(i=>i.closedBugs)] ['已关缺陷',...this.xmProjectStateHiss.map(i=>i.closedBugs)]
] ]

Loading…
Cancel
Save