|
|
@@ -107,12 +107,12 @@ const typeDetailData = computed(() => {
|
|
107
|
107
|
dividerIndex: 0,
|
|
108
|
108
|
dataItems: getSeizeDataItems(),
|
|
109
|
109
|
// rankList: getSeizeRankList(),
|
|
110
|
|
- departmentRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.departmentRankings?.map(item => ({ ...item, passRate: item.seizureCount?.toFixed(2), name: item.departmentName })) || [],
|
|
111
|
|
- teamRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.topFiveTeamRankings?.map(item => ({ ...item, passRate: item.seizureCount?.toFixed(2), name: item.teamName })) || [],
|
|
|
110
|
+ departmentRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.brigadeRankings?.map(item => ({ ...item,passRate: item.seizureCount?.toFixed(2), name: item.brigadeName })) || [],
|
|
|
111
|
+ teamRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.topThreeTeamRankings?.map(item => ({ ...item, passRate: item.seizureCount?.toFixed(2), name: item.teamName })) || [],
|
|
112
|
112
|
bottomTeamRank: [{ passRate: 0, name: '无' }],
|
|
113
|
113
|
teamSortType: sortStates.value['查获上报'].teamSortType,
|
|
114
|
114
|
deptSortType: sortStates.value['查获上报'].deptSortType,
|
|
115
|
|
- bottomTeamRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.botomFiveTeamRankings.map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.teamName })),
|
|
|
115
|
+ bottomTeamRank: seizeData.value.stationMasterData && seizeData.value.stationMasterData.botomThreeTeamRankings.map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.teamName })),
|
|
116
|
116
|
},
|
|
117
|
117
|
{
|
|
118
|
118
|
title: '抽问抽答',
|
|
|
@@ -138,7 +138,7 @@ const typeDetailData = computed(() => {
|
|
138
|
138
|
completed: inspectionData.value.doneNumber,
|
|
139
|
139
|
pending: inspectionData.value.doingNumber,
|
|
140
|
140
|
// rankList: getRankList(),
|
|
141
|
|
- departmentRank: inspectionData.value.departmentRankingList && inspectionData.value.departmentRankingList?.map(item => ({ ...item, passRate: (item.passRate * 100)?.toFixed(2) })) || [],
|
|
|
141
|
+ departmentRank: inspectionData.value.brigadeRankingList && inspectionData.value.brigadeRankingList?.map(item => ({ ...item, passRate: (item.passRate * 100)?.toFixed(2) })) || [],
|
|
142
|
142
|
teamRank: inspectionData.value.teamRankingList && inspectionData.value.teamRankingList?.map(item => ({ ...item, passRate: (item.passRate * 100)?.toFixed(2) })) || [],
|
|
143
|
143
|
bottomTeamRank: [{ passRate: 0, name: '无' }],
|
|
144
|
144
|
teamSortType: sortStates.value['巡检'].teamSortType,
|
|
|
@@ -390,7 +390,7 @@ const getInspectionDataItems = () => {
|
|
390
|
390
|
// ];
|
|
391
|
391
|
// } else
|
|
392
|
392
|
if (isTestRole.value) {
|
|
393
|
|
- // test/zhijianke角色:全站、前三名的科室(isImage: true)
|
|
|
393
|
+ // test/zhijianke角色:全站、前三名的大队(isImage: true)
|
|
394
|
394
|
return [
|
|
395
|
395
|
{ label: '全站', value: ((stationPassRate || 0) * 100).toFixed(2) + '%', isImage: false },
|
|
396
|
396
|
{ label: getObjByRank(departmentRankingList, 1).name, value: oneIcon, isImage: true },
|
|
|
@@ -436,7 +436,7 @@ const getQuestionDataItems = () => {
|
|
436
|
436
|
// ];
|
|
437
|
437
|
// } else
|
|
438
|
438
|
if (isTestRole.value) {
|
|
439
|
|
- // test/zhijianke角色:全站、前三名的科室(isImage: true)
|
|
|
439
|
+ // test/zhijianke角色:全站、前三名的大队(isImage: true)
|
|
440
|
440
|
return [
|
|
441
|
441
|
{ label: '全站', value: (siteAvgAccuracy || 0) + '%', isImage: false },
|
|
442
|
442
|
{ label: getObjByRank(topDepts, 1).deptName, value: oneIcon, isImage: true },
|
|
|
@@ -453,6 +453,7 @@ const getQuestionDataItems = () => {
|
|
453
|
453
|
|
|
454
|
454
|
//根据角色获取查获数据项目组
|
|
455
|
455
|
const getSeizeDataItems = () => {
|
|
|
456
|
+
|
|
456
|
457
|
if (isIndividualView.value) {
|
|
457
|
458
|
// SecurityCheck角色:从securityCheckerData解构
|
|
458
|
459
|
const { securityCheckerData } = seizeData.value;
|
|
|
@@ -493,22 +494,22 @@ const getSeizeDataItems = () => {
|
|
493
|
494
|
if (isTestRole.value) {
|
|
494
|
495
|
// test/zhijianke角色:从securityCheckerData解构
|
|
495
|
496
|
const { stationMasterData } = seizeData.value;
|
|
496
|
|
- const { totalStationSeizure, departmentRankings } = stationMasterData || {}
|
|
|
497
|
+ const { totalStationSeizure, brigadeRankings } = stationMasterData || {}
|
|
497
|
498
|
|
|
498
|
499
|
// 对departmentRankings数组按照seizureCount由大到小排序
|
|
499
|
|
- const sortedDepartmentRankings = Array.isArray(departmentRankings)
|
|
500
|
|
- ? [...departmentRankings].sort((a, b) => (b.seizureCount || 0) - (a.seizureCount || 0))
|
|
|
500
|
+ const sortedDepartmentRankings = Array.isArray(brigadeRankings)
|
|
|
501
|
+ ? [...brigadeRankings].sort((a, b) => (b.seizureCount || 0) - (a.seizureCount || 0))
|
|
501
|
502
|
: [];
|
|
502
|
503
|
|
|
503
|
504
|
if (sortedDepartmentRankings.length == 0) {
|
|
504
|
505
|
return []
|
|
505
|
506
|
}
|
|
506
|
|
- // test/zhijianke角色:全站、前三名的科室(isImage: true)
|
|
|
507
|
+ // test/zhijianke角色:全站、前三名的大队(isImage: true)
|
|
507
|
508
|
return [
|
|
508
|
509
|
{ label: '全站', value: totalStationSeizure || 0, isImage: false },
|
|
509
|
|
- { label: sortedDepartmentRankings[0].departmentName, value: oneIcon, isImage: true },
|
|
510
|
|
- { label: sortedDepartmentRankings[1].departmentName, value: twoIcon, isImage: true },
|
|
511
|
|
- { label: sortedDepartmentRankings[2].departmentName, value: threeIcon, isImage: true }
|
|
|
510
|
+ { label: sortedDepartmentRankings[0].brigadeName, value: oneIcon, isImage: true },
|
|
|
511
|
+ { label: sortedDepartmentRankings[1].brigadeName, value: twoIcon, isImage: true },
|
|
|
512
|
+ { label: sortedDepartmentRankings[2].brigadeName, value: threeIcon, isImage: true }
|
|
512
|
513
|
];
|
|
513
|
514
|
} else {
|
|
514
|
515
|
// 默认角色:检查项、完成率
|