diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue index 73ab26ab..15903217 100644 --- a/src/views/xm/XmOverview.vue +++ b/src/views/xm/XmOverview.vue @@ -14,15 +14,10 @@ trigger="click" > - 计算企业汇总数据 + 计算企业汇总数据
将从项目任务及企业任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到企业统计表 -
- - 计算所有需求数据 -
- 将从项目任务汇总进度、预算工作量、实际工作量、预算金额、实际金额等数据到需求统计表 -
+ 统计 @@ -127,7 +122,7 @@
- 关联企业和迭代情况 + 产品、项目、迭代个数统计
@@ -294,7 +289,7 @@ import { mapGetters } from "vuex"; import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 import { listXmBranchState} from '@/api/xm/core/xmBranchState'; import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; - import { loadTasksToXmBranchState} from '@/api/xm/core/xmBranchState'; + import { loadProjectStateToXmBranchState} from '@/api/xm/core/xmBranchState'; import store from '@/store' export default { computed: { @@ -612,7 +607,7 @@ export default { center:['50%','40%'], data:[ - {name:'未开始',value:this.xmBranch.taskUnStartCnt, + {name:'未开始',value:this.xmBranch.taskUnstartCnt, itemStyle: { normal:{ color: '#FAC858' @@ -934,23 +929,18 @@ export default { }, - loadTasksToXmBranchState(){ + loadProjectStateToXmBranchState(){ var row=this.xmBranch; var params={id:row.id} this.load.calcProject=true; - loadTasksToXmBranchState(params).then((res1) => { + loadProjectStateToXmBranchState(params).then((res1) => { this.load.calcProject=false; this.load.list=true; listXmBranchState({id:row.id}).then(res=>{ this.load.list=false; var tips = res.data.tips; if(tips.isOk){ - var xmBranch=res.data.data[0] - if(this.xmBranch && this.xmBranch.id){ - store.dispatch('setXmBranch',xmBranch) - } - Object.assign(this.xmBranch,xmBranch) - this.$emit("edit-fields",xmBranch); + this.xmBranch=res.data.data[0] } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }) diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue index f605bcfe..0755212a 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverview.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue @@ -607,7 +607,7 @@ export default { center:['50%','40%'], data:[ - {name:'未开始',value:this.xmIteration.taskUnStartCnt, + {name:'未开始',value:this.xmIteration.taskUnstartCnt, itemStyle: { normal:{ color: '#FAC858' diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue index d7209899..66d7498d 100644 --- a/src/views/xm/core/xmProduct/XmProductOverview.vue +++ b/src/views/xm/core/xmProduct/XmProductOverview.vue @@ -612,7 +612,7 @@ export default { center:['50%','40%'], data:[ - {name:'未开始',value:this.xmProduct.taskUnStartCnt, + {name:'未开始',value:this.xmProduct.taskUnstartCnt, itemStyle: { normal:{ color: '#FAC858' diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue index c099fb66..dd3683b6 100644 --- a/src/views/xm/core/xmProject/XmProjectOverview.vue +++ b/src/views/xm/core/xmProject/XmProjectOverview.vue @@ -624,7 +624,7 @@ export default { center:['50%','40%'], data:[ - {name:'未开始',value:this.selProject.taskUnStartCnt, + {name:'未开始',value:this.selProject.taskUnstartCnt, itemStyle: { normal:{ color: '#FAC858'