feat(eikonStatistics): 添加大队级别支持并优化布局

- 在多个组件中添加对大队(brigade)级别的支持
- 调整顶部信息组件的padding布局
- 优化角色判断逻辑，增加经理(jingli)角色处理
- 统一switch选项的value类型为字符串
- 修复表格数据加载时的空数据问题

src/pages/eikonStatistics/components/MemberDetails.vue

@@ -37,7 +37,8 @@ export default {
           this.memberTableData = [];
           return;
         }
-        
+
+
         if (this.isBanZuZhang) {
           this.handlePersonalData(newVal)
         } else {
@@ -47,6 +48,7 @@ export default {
               avgWorkingHours: `${item.avgWorkingHours}H`
             }
           })
+          
         }
       },
     }
@@ -56,7 +58,7 @@ export default {
       currentLevel: state => state.eikonLevel.currentLevel,
       detailData: state => state.eikonLevel.detailData,
     }),
-    ...mapGetters('eikonLevel', ['isBanZuZhang', 'isKeZhang', 'isZhanZhang']),
+    ...mapGetters('eikonLevel', ['isBanZuZhang', 'isKeZhang', 'isZhanZhang','isJingLi']),
     title() {
       if (this.currentLevel === 'team') {
         return '成员明细'
@@ -67,6 +69,9 @@ export default {
       if (this.currentLevel === 'station') {
         return '科室明细'
       }
+      if (this.currentLevel === 'brigade') {
+        return '大队明细'
+      }
     },
     memberTableColumns() {
       if (this.currentLevel === 'team') {
@@ -102,6 +107,17 @@ export default {
           { props: 'testScore', title: '测试平均分' },
         ]
       }
+      if (this.currentLevel === 'brigade') {
+        return [
+          { props: 'name', title: '主管', slot: true },
+          { props: 'qualificationLevel', title: '资质等级1级' },
+          { props: 'avgWorkingDays', title: '人均出勤天数' },
+          { props: 'avgWorkingHours', title: '人均上岗时长' },
+          { props: 'avgSeizureCount', title: '人均查获数量' },
+          { props: 'checkCount', title: '人均巡检问题数' },
+          { props: 'testScore', title: '测试平均分' },
+        ]
+      }
     }
   },
   methods: {
@@ -113,7 +129,7 @@ export default {
         this.memberTableData = [];
         return;
       }
-      
+
       const res = [...newVal]
 
       // 批量获取资质等级字典数据
@@ -146,6 +162,9 @@ export default {
       if (this.isZhanZhang) {
         this.changeLevel({ level: 'department', levelId: row.id })
       }
+      if (this.isJingLi) {
+        this.changeLevel({ level: 'brigade', levelId: row.id })
+      }
       await this.loadData()
       this.$emit('nameClick', row)
     }

src/pages/eikonStatistics/components/WorkOutput.vue

@@ -16,7 +16,7 @@
                 <text class="progress-text">
                   <text class="progress-rank">第{{ extraData.rank || 0 }}名</text>
                   /
-                  <text class="progress-count">{{extraData.rankCount || 0 }}</text>
+                  <text class="progress-count">{{ extraData.rankCount || 0 }}</text>
                 </text>
               </h-rank-line>
             </div>
@@ -69,21 +69,29 @@ export default {
       currentLevel: state => state.eikonLevel.currentLevel,
       currentLevelId: state => state.eikonLevel.currentLevelId,
     }),
-    ...mapGetters('eikonLevel', ['isZhanZhang', 'isPersonal', 'isBanZuZhang']),
+    ...mapGetters('eikonLevel', ['isZhanZhang', 'isKeZhang', 'isPersonal', 'isBanZuZhang', 'isJingLi']),
     switchOptions() {
-      if (this.isPersonal) {
+      if (this.isKeZhang) {
         return [
           { value: 'station', label: '全站' },
-          { value: 'department', label: '本科' },
-          { value: 'team', label: '本班' }
+          { value: 'brigade', label: '本大队' },
         ]
       }
       if (this.isBanZuZhang) {
         return [
           { value: 'station', label: '全站' },
-          { value: 'department', label: '本科' },
+          { value: 'brigade', label: '本大队' },
+        ]
+      }
+      if (this.isPersonal) {
+        return [
+          { value: 'station', label: '全站' },
+          { value: 'brigade', label: '本大队' },
+          { value: 'department', label: '本主管' },
+          { value: 'team', label: '本班' }
         ]
       }
+
       return []
     },
   },
@@ -216,6 +224,7 @@ export default {
   color: #333333;
   line-height: 1.5;
 }
+
 .progress-count {
   font-size: 26rpx;
   font-weight: 500;

src/pages/eikonStatistics/components/standard-execution.vue

@@ -112,8 +112,8 @@ export default {
         rankCount: 0
       },
       // switch-tab配置
-      inspectionSwitchValue: 0,
-      testSwitchValue: 0,
+      inspectionSwitchValue: 'station',
+      testSwitchValue: 'station',
 
       // 测试排名数据
       testRanking: {
@@ -136,22 +136,29 @@ export default {
       isZhanZhang: state => state.eikonLevel.isZhanZhang,
       currentLevel: state => state.eikonLevel.currentLevel,
     }),
-    ...mapGetters('eikonLevel', ['isZhanZhang', 'isPersonal']),
+    ...mapGetters('eikonLevel', ['isZhanZhang', 'isPersonal', 'isJingLi', 'isKeZhang', 'isBanZuZhang']),
     switchOptions() {
-      if (this.isPersonal) {
+      if (this.isKeZhang) {
         return [
-          { value: 0, label: '全站' },
-          { value: 1, label: '本科' },
-          { value: 2, label: '本班' }
+          { value: 'station', label: '全站' },
+          { value: 'brigade', label: '本大队' },
         ]
       }
       if (this.isBanZuZhang) {
         return [
-          { value: 0, label: '全站' },
-          { value: 1, label: '本科' },
-
+          { value: 'station', label: '全站' },
+          { value: 'brigade', label: '本大队' },
+        ]
+      }
+      if (this.isPersonal) {
+        return [
+          { value: 'station', label: '全站' },
+          { value: 'brigade', label: '本大队' },
+          { value: 'department', label: '本主管' },
+          { value: 'team', label: '本班' }
         ]
       }
+
       return []
     },
     percentage() {
@@ -224,9 +231,9 @@ export default {
       ]
       this.rectificationTotal = onTimeCompletedCount + overTimeCompletedCount
     },
-    
 
-   
+
+
 
     // 初始化问题分布雷达图
     initIssueRadarChart() {
@@ -449,10 +456,10 @@ export default {
           return {
             value: values,
             name: dept.deptName,
-           
+
             // lineStyle: {
             //   color: color.line,
-           
+
             // },
             // itemStyle: {
             //   color: color.line
@@ -598,25 +605,30 @@ export default {
       const departmentTotal = portraitData.departmentTotal || 0;
       const teamRanking = portraitData.teamRanking || 0;
       const teamTotal = portraitData.teamTotal || 0;
-
-      if (this.inspectionSwitchValue == 0) {
+      const brigadeTotal = portraitData.brigadeTotal || 0;
+      const brigadeRanking = portraitData.brigadeRanking || 0;
+      console.log('portraitData:', this.portraitData);
+      if (this.inspectionSwitchValue == 'station') {
         this.rankData = {
           rank: stationRanking,
           rankCount: stationTotal
         }
-      } else if (this.inspectionSwitchValue == 1) {
+      } else if (this.inspectionSwitchValue == 'brigade') {
+        this.rankData = {
+          rank: brigadeRanking,
+          rankCount: brigadeTotal
+        }
+      } else if (this.inspectionSwitchValue == 'department') {
         this.rankData = {
           rank: departmentRanking,
           rankCount: departmentTotal
         }
-      } else if (this.inspectionSwitchValue == 2) {
+      } else if (this.inspectionSwitchValue == 'team') {
         this.rankData = {
           rank: teamRanking,
           rankCount: teamTotal
         }
       }
-
-
     },
 
     // 测试排名切换处理
@@ -626,27 +638,28 @@ export default {
       const { rankingStats } = this.profileData || {};
 
 
-      if (this.testSwitchValue == 0) {
+      if (this.testSwitchValue == 'station') {
         this.testRankData = {
           rank: rankingStats?.siteRanking || 0,
           rankCount: this.isKeZhang ? rankingStats?.siteTotalDepts || 0 : rankingStats?.siteTotalUsers || 0
         }
-      } else if (this.testSwitchValue == 1) {
+      } else if (this.testSwitchValue == 'brigade') {
+        this.testRankData = {
+          rank: rankingStats?.deptRanking || 0,
+          rankCount: rankingStats?.deptTotalTeams || 0
+        }
+      } else if (this.testSwitchValue == 'department') {
         this.testRankData = {
           rank: rankingStats?.deptRanking || 0,
           rankCount: rankingStats?.deptTotalUsers || 0
         }
-      } else if (this.testSwitchValue == 2) {
+      } else if (this.testSwitchValue == 'team') {
         this.testRankData = {
           rank: rankingStats?.teamRanking || 0,
           rankCount: rankingStats?.teamTotalUsers || 0
         }
       }
     },
-
-
-
-
   }
 }
 </script>

src/pages/eikonStatistics/components/topInfo.vue

@@ -256,7 +256,7 @@ export default {
 <style lang="scss" scoped>
 .top-info-wrapper {
     width: 100%;
-    padding: 40rpx;
+    padding: 40rpx 40rpx 0 40rpx ;
 }
 
 .top-info-container {

src/pages/eikonStatistics/index.vue

@@ -3,14 +3,15 @@
     @scroll-end="handleScrollEnd">
     <div class="eikon-statistics-container">
       <!-- 个人模式显示选项卡 -->
-      <h-tabs v-if="hasTabs" v-model="currentTab" :tabs="tabList" value-key="type" label-key="title"
+      <h-tabs v-if="hasTabs && !hasOldLevel" v-model="currentTab" :tabs="tabList" value-key="type" label-key="title"
         @change="handleTabChange" class="h-tabs-fixed" />
 
       <topInfo @department-change="handleDepartmentChange"
-        :class="['top-info-fixed', hasTabs ? 'with-tabs' : 'without-tabs']" :currentTab="currentTab" />
+        :class="['top-info-fixed', (hasTabs && !hasOldLevel) ? 'with-tabs' : 'without-tabs']"
+        :currentTab="currentTab" />
 
       <!-- 总体概览和详细内容区域 -->
-      <div class="content-section" :class="hasTabs ? 'with-tabs' : 'without-tabs'">
+      <div class="content-section" :class="(hasTabs && !hasOldLevel) ? 'with-tabs' : 'without-tabs'">
         <!-- 总体概览 -->
         <div class="overview-section">
           <div class="section-title">总体概览</div>
@@ -148,9 +149,11 @@ export default {
       let isZhanZhang = this.userRoles && this.userRoles.includes('test')
       let isKeZhang = this.userRoles && this.userRoles.includes('kezhang')
       let isZhiJian = this.userRoles && this.userRoles.includes('zhijianke')
-
-      if (isKeZhang || isZhanZhang ||isZhiJian) {
-        this.initLevel({ level: isKeZhang ? 'department' : 'station', levelId: isKeZhang ? this.userInfo.departmentId : this.userInfo.stationId })
+      let isJingLi = this.userRoles && this.userRoles.includes('jingli')
+      let level = isKeZhang ? 'department' : isJingLi ? 'brigade' : 'station';
+      let levelId = isKeZhang ? this.userInfo.departmentId : isJingLi ? this.userInfo.brigadeId : this.userInfo.stationId;
+      if (isKeZhang || isZhanZhang || isZhiJian || isJingLi) {
+        this.initLevel({ level: level, levelId: levelId })
       } else {
         this.initLevel({ level: 'personal', levelId: this.userInfo.userId })
       }
@@ -265,7 +268,7 @@ export default {
   right: 0;
   z-index: 998;
   background: #ffffff;
- 
+
 }
 
 // 当h-tabs显示时，topInfo的top位置
@@ -286,7 +289,7 @@ export default {
 
 // 当h-tabs显示时，content-section的margin-top
 .content-section.with-tabs {
-  margin-top: 290rpx;
+  margin-top: 320rpx;
 }
 
 // 当h-tabs不显示时，content-section的margin-top