Browse Source

优化

master
陈裕财 4 years ago
parent
commit
e82c8b1eeb
  1. 4
      src/router/routes_xm.js
  2. 4
      src/views/datav/xm/branch1/cards.vue
  3. 27
      src/views/datav/xm/branch1/index.vue
  4. 38
      src/views/datav/xm/project1/index.vue

4
src/router/routes_xm.js

@ -87,9 +87,7 @@ export default {
children: [ children: [
{ path: 'reportIndex', component: _import('xm/rpt/reportIndex'), name: 'reportIndex', meta: { title: '指标分析' }}, { 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" }},
] ]
}, },
{ {

4
src/views/datav/xm/branch1/cards.vue

@ -38,10 +38,10 @@ export default {
var cards= this.data.map(i=>{ var cards= this.data.map(i=>{
var card=JSON.parse(JSON.stringify(this.cardConfig)) var card=JSON.parse(JSON.stringify(this.cardConfig))
card.title=i.productName card.title=i.productName
card.total.number=[i.planWorkload/8/20];//
card.total.number=[i.budgetWorkload/8/20];//
card.num.number=[i.finishRate];// 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 return card
}); });
if(cards.length<5){ if(cards.length<5){

27
src/views/datav/xm/branch1/index.vue

@ -9,7 +9,7 @@
<div class="middle"> <div class="middle">
<dv-decoration-8 class="dv-dec-8" :color="['#568aea', '#000000']" /> <dv-decoration-8 class="dv-dec-8" :color="['#568aea', '#000000']" />
<div class="title"> <div class="title">
<span class="title-text">唛盟项目管理综合数据监控</span>
<span class="title-text">机构综合数据监控</span>
<dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']"></dv-decoration-6> <dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']"></dv-decoration-6>
</div> </div>
<dv-decoration-8 class="dv-dec-8" :reverse="true" :color="['#568aea', '#000000']" /> <dv-decoration-8 class="dv-dec-8" :reverse="true" :color="['#568aea', '#000000']" />
@ -94,7 +94,7 @@ export default {
{ {
title: '累计金额', title: '累计金额',
number: { 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}', content: '{nt}',
textAlign: 'right', textAlign: 'right',
style: { style: {
@ -107,7 +107,7 @@ export default {
{ {
title: '发布总任务数', title: '发布总任务数',
number: { number: {
number: [this.xmBranchState.totalTaskCnt ],
number: [this.xmBranchState.taskCnt ],
content: '{nt}', content: '{nt}',
textAlign: 'right', textAlign: 'right',
style: { style: {
@ -133,7 +133,7 @@ export default {
{ {
title: '参与人数', title: '参与人数',
number: { number: {
number: [this.xmBranchState.totalStaffCnt],
number: [this.xmBranchState.planWorkerCnt],
content: '{nt}', content: '{nt}',
textAlign: 'right', textAlign: 'right',
style: { style: {
@ -216,7 +216,7 @@ export default {
return []; return [];
} }
var rankingBoardData=this.xmProjectStates.map(i=>{ var rankingBoardData=this.xmProjectStates.map(i=>{
return {name:i.projectName,value:i.totalProgress+'%'}
return {name:i.projectName,value:i.finishRate+'%'}
}) })
return rankingBoardData return rankingBoardData
}, },
@ -256,8 +256,8 @@ export default {
waterLevelChartData(){ waterLevelChartData(){
if(this.xmBranchState){ if(this.xmBranchState){
var data={} 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) data.finishPercent= parseFloat(data.finishNum/allAmount * 100).toFixed(0)
return data; return data;
}else{ }else{
@ -277,12 +277,13 @@ export default {
cardsData(){ cardsData(){
if(this.xmProductStates && this.xmProductStates.length>0){ 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 i;
}) })
return this.xmProductStates.slice(0, 5);
return xmProductStates.slice(0, 5);
}else{ }else{
return null; return null;
} }
@ -315,7 +316,7 @@ export default {
pageSize:20,// pageSize:20,//
count:false,// count:false,//
pageNum:1,//1 pageNum:1,//1
orderFields:["calc_time"],// ['sex','student_id']
orderFields:["budget_workload"],// ['sex','student_id']
orderDirs:["desc"]// asc,desc ['asc','desc'] orderDirs:["desc"]// asc,desc ['asc','desc']
}, },
@ -325,7 +326,7 @@ export default {
pageSize:20,// pageSize:20,//
count:false,// count:false,//
pageNum:1,//1 pageNum:1,//1
orderFields:["calc_time"],// ['sex','student_id']
orderFields:["budget_workload"],// ['sex','student_id']
orderDirs:["desc"]// asc,desc ['asc','desc'] orderDirs:["desc"]// asc,desc ['asc','desc']
}, },
} }

38
src/views/datav/xm/project1/index.vue

@ -9,7 +9,7 @@
<div class="middle"> <div class="middle">
<dv-decoration-8 class="dv-dec-8" :color="['#568aea', '#000000']" /> <dv-decoration-8 class="dv-dec-8" :color="['#568aea', '#000000']" />
<div class="title"> <div class="title">
<span class="title-text">综合数据监控</span>
<span class="title-text">项目综合数据监控</span>
<dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']"></dv-decoration-6> <dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']"></dv-decoration-6>
</div> </div>
<dv-decoration-8 class="dv-dec-8" :reverse="true" :color="['#568aea', '#000000']" /> <dv-decoration-8 class="dv-dec-8" :reverse="true" :color="['#568aea', '#000000']" />
@ -62,8 +62,7 @@ import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
import { listXmProjectState } from '@/api/xm/core/xmProjectState'; import { listXmProjectState } from '@/api/xm/core/xmProjectState';
import { listXmGroupState} from '@/api/xm/core/xmGroupState'; import { listXmGroupState} from '@/api/xm/core/xmGroupState';
import { listXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState'; 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 { mapGetters } from 'vuex'
import Vue from 'vue' import Vue from 'vue'
@ -407,30 +406,7 @@ export default {
}, },
// XmPhase , // XmPhase ,
getXmPhases() { 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<this.xmPhasePageInfo.orderFields.length;i++){
orderBys.push(this.xmPhasePageInfo.orderFields[i]+" "+this.xmPhasePageInfo.orderDirs[i])
}
params.orderBy= orderBys.join(",")
}
params.projectId=this.filters.projectId
listXmPhase(params).then((res) => {
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){ floatValue(value){
if(!value){ if(!value){
@ -442,9 +418,11 @@ export default {
}, },
mounted(){ 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.getXmProjectState();
this.getXmGroupStates(); this.getXmGroupStates();

Loading…
Cancel
Save