|
|
@@ -177,26 +177,29 @@ const qualificationPieDescriptionPart2 = computed(() => {
|
|
177
|
177
|
}
|
|
178
|
178
|
|
|
179
|
179
|
// 从资质柱状图数据中找出"一级"人员最多的科室
|
|
180
|
|
- let topDeptForLevel1 = '旅检三科'
|
|
181
|
|
- let level1Count = 25
|
|
182
|
|
- let totalDeptCount = 395
|
|
|
180
|
+ let topDeptForLevel1 = ''
|
|
|
181
|
+ let level1Count = 0
|
|
|
182
|
+ let totalDeptCount = 0
|
|
|
183
|
+ let allDeptNames = []
|
|
183
|
184
|
|
|
184
|
185
|
if (qualificationBarData.value && Array.isArray(qualificationBarData.value)) {
|
|
185
|
186
|
const barData = qualificationBarData.value
|
|
186
|
187
|
|
|
187
|
188
|
// 找出"一级"人员最多的科室
|
|
188
|
189
|
let maxLevel1Count = 0
|
|
189
|
|
- let maxDeptName = '旅检三科'
|
|
190
|
|
- let totalCountForDept = 395
|
|
|
190
|
+ let maxDeptName = ''
|
|
|
191
|
+ let totalCountForDept = 0
|
|
|
192
|
+
|
|
191
|
193
|
|
|
192
|
194
|
barData.forEach(dept => {
|
|
|
195
|
+ allDeptNames.push(dept.deptName)
|
|
193
|
196
|
if (dept.levelCounts && Array.isArray(dept.levelCounts)) {
|
|
194
|
|
- const level1Data = dept.levelCounts.find(level => level.levelName === '一级')
|
|
|
197
|
+ const level1Data = dept.levelCounts.find(level => level.levelName === '高级')
|
|
195
|
198
|
const deptTotalCount = dept.levelCounts.reduce((sum, level) => sum + (level.count || 0), 0)
|
|
196
|
199
|
|
|
197
|
200
|
if (level1Data && level1Data.count > maxLevel1Count) {
|
|
198
|
201
|
maxLevel1Count = level1Data.count
|
|
199
|
|
- maxDeptName = dept.deptName || '未知科室'
|
|
|
202
|
+ maxDeptName = dept.deptName || ''
|
|
200
|
203
|
totalCountForDept = deptTotalCount
|
|
201
|
204
|
}
|
|
202
|
205
|
}
|
|
|
@@ -208,7 +211,7 @@ const qualificationPieDescriptionPart2 = computed(() => {
|
|
208
|
211
|
}
|
|
209
|
212
|
|
|
210
|
213
|
// 生成第二部分描述文字
|
|
211
|
|
- return `全站资质等级为"一级"的人员集中在${topDeptForLevel1}(${level1Count}人)${topDeptForLevel1}的人员规模(共${totalDeptCount}人)高于一科、二科`
|
|
|
214
|
+ return `全站资质等级为"一级"的人员集中在${topDeptForLevel1}(${level1Count}人)${topDeptForLevel1}的人员规模(共${totalDeptCount}人)高于${allDeptNames.filter(name => name !== topDeptForLevel1).join(', ')}`
|
|
212
|
215
|
})
|
|
213
|
216
|
|
|
214
|
217
|
|
|
|
@@ -658,7 +661,9 @@ const updateTrendBarChart = () => {
|
|
658
|
661
|
label: {
|
|
659
|
662
|
show: true,
|
|
660
|
663
|
position: 'top',
|
|
661
|
|
- formatter: '{c}人'
|
|
|
664
|
+ formatter: function(params) {
|
|
|
665
|
+ return params.value > 0 ? params.value + '人' : '';
|
|
|
666
|
+ }
|
|
662
|
667
|
},
|
|
663
|
668
|
data: levelCounts
|
|
664
|
669
|
})
|