diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index dc51f145..4788debd 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -87,9 +87,7 @@ export default { children: [ { path: 'reportIndex', component: _import('xm/rpt/reportIndex'), name: 'reportIndex', meta: { title: '指标分析' }}, - - { path: 'project/projectDatavFullScreen', name: 'projectDatavFullScreen', meta: { title: '项目效能',openTab:true,outUrl:"${curlDomain}/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/datav/xm/project/projectDatavFullScreen" }}, - { path: 'branch/branchDatavFullScreen', name: 'branchDatavFullScreen', meta: { title: '机构效能',openTab:true,outUrl:"${curlDomain}/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/datav/xm/branch/branchDatavFullScreen" }}, + { path: 'branch/branchDatavFullScreen', name: 'branchDatavFullScreen', meta: { title: '机构效能',openTab:true,outUrl:"${curlDomain}/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/datav/xm/branch/branchDatavFullScreen" }}, ] }, { diff --git a/src/views/datav/xm/branch1/cards.vue b/src/views/datav/xm/branch1/cards.vue index 7ce515c5..ee5c94e5 100644 --- a/src/views/datav/xm/branch1/cards.vue +++ b/src/views/datav/xm/branch1/cards.vue @@ -38,10 +38,10 @@ export default { var cards= this.data.map(i=>{ var card=JSON.parse(JSON.stringify(this.cardConfig)) card.title=i.productName - card.total.number=[i.planWorkload/8/20];//累计工作量 人月 + card.total.number=[i.budgetWorkload/8/20];//累计工作量 人月 card.num.number=[i.finishRate];//当前进度 //资金占比 - card.ring.series[0].data[0].value=(i.planWorkload/i.totalPlanWorkload) //工作量占比 + card.ring.series[0].data[0].value=parseInt(i.budgetWorkload/i.totalPlanWorkload*100) //工作量占比 return card }); if(cards.length<5){ diff --git a/src/views/datav/xm/branch1/index.vue b/src/views/datav/xm/branch1/index.vue index 384eec4d..ca14251d 100644 --- a/src/views/datav/xm/branch1/index.vue +++ b/src/views/datav/xm/branch1/index.vue @@ -9,7 +9,7 @@
- 唛盟项目管理综合数据监控 + 机构综合数据监控
@@ -94,7 +94,7 @@ export default { { title: '累计金额', number: { - number: [(this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetIuserAmount) + this.floatValue(this.xmBranchState.totalBudgetOuserAmount))/10000], + number: [(this.floatValue(this.xmBranchState.budgetNouserAt) + this.floatValue(this.xmBranchState.budgetIuserAt) + this.floatValue(this.xmBranchState.budgetOuserAt))/10000], content: '{nt}', textAlign: 'right', style: { @@ -107,7 +107,7 @@ export default { { title: '发布总任务数', number: { - number: [this.xmBranchState.totalTaskCnt ], + number: [this.xmBranchState.taskCnt ], content: '{nt}', textAlign: 'right', style: { @@ -133,7 +133,7 @@ export default { { title: '参与人数', number: { - number: [this.xmBranchState.totalStaffCnt], + number: [this.xmBranchState.planWorkerCnt], content: '{nt}', textAlign: 'right', style: { @@ -216,7 +216,7 @@ export default { return []; } var rankingBoardData=this.xmProjectStates.map(i=>{ - return {name:i.projectName,value:i.totalProgress+'%'} + return {name:i.projectName,value:i.finishRate+'%'} }) return rankingBoardData }, @@ -256,8 +256,8 @@ export default { waterLevelChartData(){ if(this.xmBranchState){ var data={} - var allAmount=this.floatValue(this.xmBranchState.totalBudgetNouserAmount) + this.floatValue(this.xmBranchState.totalBudgetIuserAmount) + this.floatValue(this.xmBranchState.totalBudgetOuserAmount); - data.finishNum= this.floatValue(this.xmBranchState.totalCostNouserAmount) + this.floatValue(this.xmBranchState.totalCostIuserAmount) +this.floatValue(this.xmBranchState.totalCostOuserAmount) + var allAmount=this.floatValue(this.xmBranchState.budgetNouserAt) + this.floatValue(this.xmBranchState.budgetIuserAt) + this.floatValue(this.xmBranchState.budgetOuserAt); + data.finishNum= this.floatValue(this.xmBranchState.actNouserAt) + this.floatValue(this.xmBranchState.actIuserAt) +this.floatValue(this.xmBranchState.actOuserAt) data.finishPercent= parseFloat(data.finishNum/allAmount * 100).toFixed(0) return data; }else{ @@ -277,12 +277,13 @@ export default { cardsData(){ if(this.xmProductStates && this.xmProductStates.length>0){ - var totalPlanWorkload=this.floatValue(this.xmBranchState.totalPlanWorkload) - this.xmProductStates.map(i=>{ - i.totalPlanWorkload=totalPlanWorkload + //var totalPlanWorkload=this.floatValue(this.xmBranchState.budgetWorkload) + var totalPlanWorkload=100000 + var xmProductStates=this.xmProductStates.map(i=>{ + i['totalPlanWorkload']=totalPlanWorkload return i; }) - return this.xmProductStates.slice(0, 5); + return xmProductStates.slice(0, 5); }else{ return null; } @@ -315,7 +316,7 @@ export default { pageSize:20,//每页数据 count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 - orderFields:["calc_time"],//排序列 如 ['sex','student_id']，必须为数据库字段 + orderFields:["budget_workload"],//排序列 如 ['sex','student_id']，必须为数据库字段 orderDirs:["desc"]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] }, @@ -325,7 +326,7 @@ export default { pageSize:20,//每页数据 count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 - orderFields:["calc_time"],//排序列 如 ['sex','student_id']，必须为数据库字段 + orderFields:["budget_workload"],//排序列 如 ['sex','student_id']，必须为数据库字段 orderDirs:["desc"]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] }, } diff --git a/src/views/datav/xm/project1/index.vue b/src/views/datav/xm/project1/index.vue index e2d72aef..fe8f7968 100644 --- a/src/views/datav/xm/project1/index.vue +++ b/src/views/datav/xm/project1/index.vue @@ -9,7 +9,7 @@
- 综合数据监控 + 项目综合数据监控
@@ -62,8 +62,7 @@ import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 import { listXmProjectState } from '@/api/xm/core/xmProjectState'; import { listXmGroupState} from '@/api/xm/core/xmGroupState'; import { listXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState'; -import { listXmRecord } from '@/api/xm/core/xmRecord'; -import { listXmPhase } from '@/api/xm/core/xmPhase'; +import { listXmRecord } from '@/api/xm/core/xmRecord'; import { mapGetters } from 'vuex' import Vue from 'vue' @@ -407,30 +406,7 @@ export default { }, //获取列表 XmPhase 功能状态表,无需前端维护，所有数据由汇总统计得出 getXmPhases() { - let params = { - pageSize: this.xmPhasePageInfo.pageSize, - pageNum: this.xmPhasePageInfo.pageNum, - total: this.xmPhasePageInfo.total, - count:this.xmPhasePageInfo.count - }; - if(this.xmPhasePageInfo.orderFields!=null && this.xmPhasePageInfo.orderFields.length>0){ - let orderBys=[]; - for(var i=0;i { - var tips=res.data.tips; - if(tips.isOk){ - this.xmPhasePageInfo.total = res.data.total; - this.xmPhasePageInfo.count=false; - this.xmPhases = res.data.data; - }else{ - } - }) ; + }, floatValue(value){ if(!value){ @@ -442,9 +418,11 @@ export default { }, mounted(){ - if(this.$route.params){ - this.filters.projectId=this.$route.params.projectId; - } + if(this.$route.query && this.$route.query.projectId){ + this.filters.projectId=this.$route.query.projectId; + }else{ + return; + } this.getXmProjectState(); this.getXmGroupStates();