Merge branch 'new-homePage' into dev

src/pages/home-new/components/type-detail.vue

@@ -69,6 +69,52 @@
 
                 <!-- test角色特殊显示：主管合格率排行和班组合格率排行 -->
                 <div class="rank-section" v-if="role && (role.includes('test') || role.includes('zhijianke'))">
+
+                    <!-- 大队合格率排行 -->
+                    <div class="rank-header">
+                        <div class="rank-title">{{ item.title === '查获上报' ? '大队查获总数排名' : item.title == '抽问抽答' ? '大队正确率排名'
+                            :
+                            '大队合格率排名' }}</div>
+                        <div class="sort-buttons">
+                            <div :class="['sort-btn', { 'active': item.brigadeSortType === 'asc' }]"
+                                @click="$emit('sort-change', item.title, 'brigade', 'asc')">正序</div>
+                            <div :class="['sort-btn', { 'active': item.brigadeSortType === 'desc' }]"
+                                @click="$emit('sort-change', item.title, 'brigade', 'desc')">倒序</div>
+                        </div>
+                    </div>
+
+                    <!-- 大队排名显示 -->
+                    <template v-if="item.brigadeSortType === 'asc'">
+                        <div v-for="(brigade, i) in (item.brigadeRank || []).slice(0, 5)" :key="'brigade-asc-' + i"
+                            class="rank-item">
+                            <div class="rank-label">{{ brigade.name }}</div>
+                            <div class="rank-progress">
+                                <h-rank-line
+                                    :percentage="item.title !== '查获上报' ? Number(brigade.passRate || 0) : getPercentage(brigade.passRate, item.brigadeRank)"
+                                    endType="round" :height="10" :color="['#A8E6CF', '#4CAF50']">
+                                    <div class="rank-info"><span style="color: #999999">{{ brigade.passRate || 0
+                                            }}</span>
+                                    </div>
+                                </h-rank-line>
+                            </div>
+                        </div>
+                    </template>
+                    <template v-else>
+                        <div v-for="(brigade, i) in (item.bottomBrigadeRank || []).slice(0, 5)"
+                            :key="'brigade-desc-' + i" class="rank-item">
+                            <div class="rank-label">{{ brigade.name }}</div>
+                            <div class="rank-progress">
+                                <h-rank-line
+                                    :percentage="item.title !== '查获上报' ? Number(brigade.passRate || 0) : getPercentage(brigade.passRate, item.bottomBrigadeRank)"
+                                    endType="round" :height="10" :color="['#A8E6CF', '#4CAF50']">
+                                    <div class="rank-info"><span style="color: #999999">{{ brigade.passRate || 0
+                                            }}</span>
+                                    </div>
+                                </h-rank-line>
+                            </div>
+                        </div>
+                    </template>
+
                     <!-- 主管合格率排行 -->
                     <div class="rank-header">
                         <div class="rank-title">{{ item.title === '查获上报' ? '主管查获总数排名' : item.title == '抽问抽答' ? '主管正确率排名'
@@ -153,6 +199,8 @@
                             </div>
                         </div>
                     </template>
+
+
                 </div>
 
             </div>

src/pages/home-new/index.vue

@@ -118,9 +118,9 @@ export default {
             ],
             // 排序状态管理
             sortStates: {
-                '查获上报': { teamSortType: 'asc', deptSortType: 'asc' },
-                '抽问抽答': { teamSortType: 'asc', deptSortType: 'asc' },
-                '巡检': { teamSortType: 'asc', deptSortType: 'asc' }
+                '查获上报': { teamSortType: 'asc', deptSortType: 'asc', brigadeSortType: 'asc' },
+                '抽问抽答': { teamSortType: 'asc', deptSortType: 'asc', brigadeSortType: 'asc' },
+                '巡检': { teamSortType: 'asc', deptSortType: 'asc', brigadeSortType: 'asc' }
             },
             // 排名数据
             rankData: {
@@ -211,13 +211,16 @@ export default {
                     statTitle: '查获数量',
                     teamSortType: this.sortStates['查获上报'].teamSortType,
                     deptSortType: this.sortStates['查获上报'].deptSortType,
+                    brigadeSortType: this.sortStates['查获上报'].brigadeSortType,
                     dividerIndex: this.isBrigade ? 1 : 0,
                     dataItems: this.getSeizeDataItems(),
                     rankList: this.getSeizeRankList(),
                     departmentRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.topThreeDepartmentRankings ? this.seizeData.stationMasterData.topThreeDepartmentRankings.map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.departmentName })) : [],
-                    bottomDepartmentRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.botomThreeDepartmentRankings && this.seizeData.stationMasterData.departmentRankings ? [...this.seizeData.stationMasterData.departmentRankings].sort((a, b) => (a.seizureCount || 0) - (b.seizureCount || 0)).slice(0, 3).map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.departmentName })) : [],
+                    bottomDepartmentRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.botomThreeDepartmentRankings ? [...this.seizeData.stationMasterData.botomThreeDepartmentRankings].sort((a, b) => (a.seizureCount || 0) - (b.seizureCount || 0)).slice(0, 3).map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.departmentName })) : [],
                     teamRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.topThreeTeamRankings ? this.seizeData.stationMasterData.topThreeTeamRankings.map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.teamName })) : [],
                     bottomTeamRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.botomThreeTeamRankings ? this.seizeData.stationMasterData.botomThreeTeamRankings.map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.teamName })) : [],
+                    brigadeRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.brigadeRankings ? [...this.seizeData.stationMasterData.brigadeRankings].sort((a, b) => (b.seizureCount || 0) - (a.seizureCount || 0)).slice(0, 5).map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.brigadeName })) : [],
+                    bottomBrigadeRank: this.seizeData.stationMasterData && this.seizeData.stationMasterData.brigadeRankings ? [...this.seizeData.stationMasterData.brigadeRankings].sort((a, b) => (a.seizureCount || 0) - (b.seizureCount || 0)).slice(0, 5).map(item => ({ ...item, passRate: item.seizureCount.toFixed(2), name: item.brigadeName })) : [],
                 },
                 {
                     title: '抽问抽答',
@@ -226,6 +229,7 @@ export default {
                     statTitle: '正确率（%）',
                     teamSortType: this.sortStates['抽问抽答'].teamSortType,
                     deptSortType: this.sortStates['抽问抽答'].deptSortType,
+                    brigadeSortType: this.sortStates['抽问抽答'].brigadeSortType,
                     dividerIndex: this.isBrigade ? 1 : 0,
                     dataItems: this.getQuestionDataItems(),
                     rankList: this.getQuestionRankList(),
@@ -233,6 +237,8 @@ export default {
                     bottomDepartmentRank: this.accuracyStatistics.bottomDepts && [...this.accuracyStatistics.topDepts].sort((a, b) => (a.accuracy || 0) - (b.accuracy || 0)).map(item => ({ ...item, passRate: item.accuracy.toFixed(2), name: item.name })),
                     teamRank: this.accuracyStatistics.topTeamsInSite && this.accuracyStatistics.topTeamsInSite.map(item => ({ ...item, passRate: item.accuracy.toFixed(2), name: item.name })),
                     bottomTeamRank: this.accuracyStatistics.bottomTeamsInSite && this.accuracyStatistics.bottomTeamsInSite.map(item => ({ ...item, passRate: item.accuracy.toFixed(2), name: item.name })),
+                    brigadeRank: this.accuracyStatistics.brigadeRankingList && [...this.accuracyStatistics.brigadeRankingList].sort((a, b) => (b.accuracy || 0) - (a.accuracy || 0)).slice(0, 5).map(item => ({ ...item, passRate: item.accuracy.toFixed(2), name: item.name })),
+                    bottomBrigadeRank: this.accuracyStatistics.brigadeRankingList && [...this.accuracyStatistics.brigadeRankingList].sort((a, b) => (a.accuracy || 0) - (b.accuracy || 0)).slice(0, 5).map(item => ({ ...item, passRate: item.accuracy.toFixed(2), name: item.name })),
                 },
                 {
                     title: '巡检',
@@ -241,6 +247,7 @@ export default {
                     statTitle: '合格率（%）',
                     teamSortType: this.sortStates['巡检'].teamSortType,
                     deptSortType: this.sortStates['巡检'].deptSortType,
+                    brigadeSortType: this.sortStates['巡检'].brigadeSortType,
                     dividerIndex: this.isBrigade ? 1 : 0,
                     dataItems: this.getInspectionDataItems(),
                     completed: this.inspectionData.doneNumber,
@@ -250,6 +257,8 @@ export default {
                     bottomDepartmentRank: this.inspectionData.reverseDepartmentRankingList && [...this.inspectionData.reverseDepartmentRankingList].sort((a, b) => (a.passRate || 0) - (b.passRate || 0)).slice(0, 5).map(item => ({ ...item, passRate: (item.passRate * 100).toFixed(2) })),
                     teamRank: this.inspectionData.teamRankingList && this.inspectionData.teamRankingList.map(item => ({ ...item, passRate: (item.passRate * 100).toFixed(2) })),
                     bottomTeamRank: this.inspectionData.reverseTeamRankingList && this.inspectionData.reverseTeamRankingList.map(item => ({ ...item, passRate: (item.passRate * 100).toFixed(2) })),
+                    brigadeRank: this.inspectionData.brigadeRankingList && [...this.inspectionData.brigadeRankingList].sort((a, b) => (a.rank || 0) - (b.rank || 0)).slice(0, 5).map(item => ({ ...item, passRate: (item.passRate * 100).toFixed(2), name: item.name })),
+                    bottomBrigadeRank: this.inspectionData.brigadeRankingList && [...this.inspectionData.brigadeRankingList].sort((a, b) => (b.rank || 0) - (a.rank || 0)).slice(0, 5).map(item => ({ ...item, passRate: (item.passRate * 100).toFixed(2), name: item.name })),
                 }
             ]
         },
@@ -523,13 +532,14 @@ export default {
                     startTime: startDate,
                     endTime: endDate,
                     sortField: 'totalScore',
-                    dimension: '3'
+                    dimension: '4'
                 };
 
                 getMetrics(params).then(res => {
 
                     if (res && res.data) {
                         this.performanceData = res.data;
+
                         resolve(res.data);
                     } else {
                         resolve([]);
@@ -900,6 +910,8 @@ export default {
                     this.sortStates[title].teamSortType = sortType;
                 } else if (type === 'dept') {
                     this.sortStates[title].deptSortType = sortType;
+                } else if (type === 'brigade') {
+                    this.sortStates[title].brigadeSortType = sortType;
                 }
             }
         },