|
|
@@ -170,31 +170,31 @@ export default {
|
|
|
hoverClassAdd: 'm',
|
|
|
mergeData: [
|
|
|
{
|
|
|
- title: '在岗培训类别占比',
|
|
|
+ title: '内部培训类别占比',
|
|
|
numData: [],
|
|
|
total: 0
|
|
|
},
|
|
|
{
|
|
|
- title: '在岗培训计划',
|
|
|
+ title: '内部培训计划',
|
|
|
numData: data.jobPlanObjPie
|
|
|
},
|
|
|
{
|
|
|
- title: '在岗培训人员统计情况',
|
|
|
+ title: '内部培训人员统计情况',
|
|
|
numData: data.staffWeek,
|
|
|
perList: data.personList
|
|
|
},
|
|
|
{
|
|
|
- title: '在岗培训对象占比',
|
|
|
+ title: '内部培训对象占比',
|
|
|
numData: data.dataObj,
|
|
|
total: 0
|
|
|
},
|
|
|
{
|
|
|
- title: '岗前培训类别占比',
|
|
|
+ title: '外部培训类别占比',
|
|
|
numData: data.dataObj,
|
|
|
total: 0
|
|
|
},
|
|
|
{
|
|
|
- title: '岗前培训',
|
|
|
+ title: '外部培训',
|
|
|
numData: data.preData
|
|
|
}
|
|
|
]
|
|
|
@@ -296,7 +296,7 @@ export default {
|
|
|
this.nowWeekData = tData.weekDtoList || []
|
|
|
this.mergeData[1].numData = tData.planDto
|
|
|
this.mergeData[0].numData = tData.typeDto.typeDtoList || []
|
|
|
- this.mergeData[0].title = tData.typeDto.remark
|
|
|
+ // this.mergeData[0].title = tData.typeDto.remark
|
|
|
this.mergeData[0].total = tData.typeDto.typeTotal
|
|
|
this.mergeData[3].numData = tData.objectDto.objectDtoList || []
|
|
|
this.mergeData[3].total = tData.objectDto.objectTotal
|
cyy