优化

README.md

@@ -274,8 +274,10 @@
 ### 人效趋势分析
 ![项目立项](/docs/images/xm-zs/xm-zs-16-rxfx-trend.png)
 
-### 人效排行榜
+### 人效排行榜-按产品分组
 ![项目立项](/docs/images/xm-zs/xm-zs-16-rxfx-sort.png)
+### 人效排行榜-按人分组
+![项目立项](/docs/images/xm-zs/xm-zs-16-rxfx-sort-userid.png)
 
 ### 燃尽图
 ![项目立项](/docs/images/xm-zs/xm-zs-17-rjt.png)

src/views/xm/core/xmWorkload/XmWorkloadEdit.vue

@@ -49,7 +49,7 @@
 
 			<el-col :span="12">
 				<el-form-item label="工时归属" prop="username">
-					<xm-user-select :xm-product="xmProductCpd" :sel-project="selProjectCpd" width="100%" label="工时归属" v-model="editForm.userid" :init-name="editForm.username" />
+					<xm-user-select :xm-product="xmProductCpd" :sel-project="selProjectCpd" width="100%" label="工时归属" v-model="editForm.userid" :init-name="editForm.username" @change2="onUserSelect"/>
 				</el-form-item>
 			</el-col>
 
@@ -398,6 +398,9 @@ export default {
 				}
 			});
 		},
+		onUserSelect(u){
+			this.editForm.username=u.username
+		}
 
 	},//end method
 	mounted() {

src/views/xm/pro/rpt/workload/HumanEffectSort.vue

@@ -83,7 +83,19 @@ import { listSumWorkloadHumanEffectSort } from '@/api/xm/core/xmWorkload';
 				}
 			},
 		 
+			standWeWorkloadCpd(){
+				if(this.rawDatas.length==0){
+					return []
+				}else{
+					let baseHeWorkload=this.calcBaseHeWorkload(this.params.dateType)
+					return this.rawDatas.map(i=>baseHeWorkload)
+				}
+			},
+			
 			legendCpd(){
+				return ['实际人效=工作量/总人数/周期','标准人效']
+			},
+			xDataCpd(){
 				if (this.rawDatas.length == 0) {
 					return []
 				} else {
@@ -170,6 +182,18 @@ import { listSumWorkloadHumanEffectSort } from '@/api/xm/core/xmWorkload';
 			}//end return
 		},//end data
 		methods: { 
+			
+			calcBaseHeWorkload(dateType){
+				if(dateType=='days'){
+					return 8
+				}else if(dateType=='months'){
+					return 8*22
+				}else if(dateType=='years'){
+					return 8*360
+				}else{
+					return 8
+				}
+			},
 			listSumWorkloadHumanEffectSort(){
 				if(this.rptDatas){
 					this.rawDatas=this.rptDatas   
@@ -261,22 +285,45 @@ import { listSumWorkloadHumanEffectSort } from '@/api/xm/core/xmWorkload';
 							}
 						},
 
+						legend: {
+							bottom: 'bottom',
+							data: this.legendCpd
+						},
 						calculable: true, 
 						xAxis: {
 							type: 'category',
-							data: this.legendCpd
+							data: this.xDataCpd
 						},
 						yAxis: {
 							type: 'value', 
 						},
 						series: [  
 							{
+								
+								name:'实际人效=工作量/总人数/周期',
 								data: this.heWorkloadCpd,
 								type: 'bar', 
 								label:{
 									show:true
 								}
-							} 
+							},
+							
+							{
+								name:'标准人效',
+								data: this.standWeWorkloadCpd,
+								type: 'line',
+								smooth: true,
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'green',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'green'
+										}
+									}
+								},
+							}, 
 						]
 					}
 				)

src/views/xm/pro/rpt/workload/HumanEffectTrend.vue

@@ -87,9 +87,17 @@ import { listSumWorkloadHumanEffectTrend } from '@/api/xm/core/xmWorkload';
 					return this.rawDatas.map(i=>i.baseHeWorkload||baseHeWorkload)
 				}
 			},
+			standWeWorkloadCpd(){
+				if(this.rawDatas.length==0){
+					return []
+				}else{
+					let baseHeWorkload=this.calcBaseHeWorkload(this.params.dateType)
+					return this.rawDatas.map(i=>baseHeWorkload)
+				}
+			},
 		 
 			legendCpd(){
-				return ['人均效能=工作量/总人数/周期','基准平均人效']
+				return ['实际人效=工作量/总人数/周期','部门人效','标准人效']
 			},
 			titleCpd(){
 				if(this.cfg?.title){
@@ -278,7 +286,7 @@ import { listSumWorkloadHumanEffectTrend } from '@/api/xm/core/xmWorkload';
 
 
 							{
-								name:'人均效能=工作量/总人数/周期',
+								name:'实际人效=工作量/总人数/周期',
 								data: this.heWorkloadCpd,
 								type: 'line',
 								smooth: true,
@@ -294,7 +302,7 @@ import { listSumWorkloadHumanEffectTrend } from '@/api/xm/core/xmWorkload';
 								},
 							}, 
 							{
-								name:'基准平均人效',
+								name:'部门人效',
 								data: this.baseWeWorkloadCpd,
 								type: 'line',
 								smooth: true,
@@ -308,6 +316,22 @@ import { listSumWorkloadHumanEffectTrend } from '@/api/xm/core/xmWorkload';
 										}
 									}
 								},
+							},
+							{
+								name:'标准人效',
+								data: this.standWeWorkloadCpd,
+								type: 'line',
+								smooth: true,
+								itemStyle: {
+									normal: {
+										// 折点颜色样式
+										color: 'green',
+										lineStyle: {
+											// 折线颜色样式
+											color: 'green'
+										}
+									}
+								},
 							}, 
 						]
 					}