feat(角色权限): 添加经理角色支持并优化部门选择逻辑

- 在eikonLevel模块中添加isJingLi状态及相关处理逻辑
- 支持BRIGADE部门类型的初始化处理
- 优化workProfile中的部门选择逻辑，支持递归查找
- 修复seizedReportedVoice中的位置信息处理逻辑

src/pages/eikonStatistics/index.vue

@@ -195,6 +195,9 @@ export default {
       if (deptType == 'TEAMS') {
         this.initLevel({ level: 'team', levelId: selectedDepartment.id })
       }
+      if (deptType == 'BRIGADE') {
+        this.initLevel({ level: 'brigade', levelId: selectedDepartment.id })
+      }
       if (!deptType) {
         this.initLevel({ level: 'personal', levelId: selectedDepartment.id })
       }

src/pages/seizedReportedVoice/index.vue

@@ -460,10 +460,10 @@ export default {
             createBy: user?.userName || '',
             seizureTime: data.createTime || '',
             inspectUserRoleName: user?.roles[0]?.roleName || '',
-            checkMethod: data.positionId === 0 ? '' : data.positionId || '',
-            checkMethodText: data.positionName == '未知岗位' ? '' : data.positionName,
+            checkMethod: data.postDictCode == 0 ? '' : data.postDictCode || '',
+            checkMethodText: data.postLabel == '未知岗位' ? '' : data.postLabel,
             reportTeam: data.teamId || '',
-            // securityLocation: data.channelId,
+            securityLocation: data.channelId || '',
             forbiddenName: data.name || '',
             isActiveConcealment: '0',
             handlingMethod: 'ABANDON',
@@ -478,8 +478,19 @@ export default {
             partType: data.checkPointId,
             partTypeText: data.checkPointName
           };
+          const locationResult = this.getParentLocation(data.channelId, 'id')
+          // 安全地处理可能为null的结果
+          if (locationResult) {
+            this.formData.terminlName = locationResult.grandParent?.text;
+            this.formData.terminlCode = locationResult.grandParent?.value;
+            this.formData.regionalName = locationResult.parent?.text;
+            this.formData.regionalCode = locationResult.parent?.value;
+            this.formData.channelName = locationResult.current?.text;
+            this.formData.channelCode = locationResult.current?.value;
+            this.formData.securityLocation = locationResult.current?.value;
+          }
 
-          console.log(this.formData, "parentNode")
+  
 
 
         } else {
@@ -907,47 +918,47 @@ export default {
         const curUserInfo = (res.data || []).find(item => {
           return item.userId === this.currentUser.id && (!item.checkOutTime || item.checkOutTime === '2000-01-01 00:00:00')
         }) || {}
-        console.log(curUserInfo, "curUserInfo")
-        this.formData.securityLocation = curUserInfo.channelCode || curUserInfo.regionalCode
-        this.formData.securityLocationText = curUserInfo.channelName || curUserInfo.regionalName
+        console.log(curUserInfo, "curUserInfo", this.formData)
+        // 修复：只有当打卡数据确实存在时才覆盖securityLocation
+        if (curUserInfo.channelCode) {
+
+          this.formData.securityLocation = curUserInfo.channelCode;
+          this.formData.securityLocationText = `${curUserInfo?.terminlName}/${curUserInfo?.regionalName}/${curUserInfo?.channelName}`;
+        }
+        console.log(this.formData.securityLocation, "this.formData.securityLocation");
 
-        this.formData.team = curUserInfo.attendanceTeamId
-        this.formData.reportTeam = curUserInfo.attendanceTeamId
+        this.formData.team = curUserInfo.attendanceTeamId;
+        //打卡的优先于语音，所以后请求打卡的数据，先请求语音的，但是如果打卡的数据没有，就不清空语音的数据
+        this.formData.reportTeam = curUserInfo.attendanceTeamId ?? this.formData.reportTeam;
         if (curUserInfo.attendanceStationName && curUserInfo.attendanceDepartmentName) {
           this.formData.teamName = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
-          this.formData.reportTeamText = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
+          this.formData.reportTeamText = curUserInfo.attendanceTeamName ? `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}` : this.formData.reportTeamText
         }
         console.log(this.formData);
         const locationResult = this.getParentLocation(this.formData.securityLocation)
         // 安全地处理可能为null的结果
         if (locationResult) {
-          this.formData.terminlName = locationResult.grandParent?.text || '';
-          this.formData.terminlCode = locationResult.grandParent?.value || '';
-          this.formData.regionalName = locationResult.parent?.text || '';
-          this.formData.regionalCode = locationResult.parent?.value || '';
-          this.formData.channelName = locationResult.current?.text || '';
-          this.formData.channelCode = locationResult.current?.value || '';
-        } else {
-          // 如果找不到位置信息，清空相关字段
-          this.formData.terminlName = '';
-          this.formData.terminlCode = '';
-          this.formData.regionalName = '';
-          this.formData.regionalCode = '';
-          this.formData.channelName = '';
-          this.formData.channelCode = '';
+          this.formData.terminlName = locationResult.grandParent?.text;
+          this.formData.terminlCode = locationResult.grandParent?.value;
+          this.formData.regionalName = locationResult.parent?.text;
+          this.formData.regionalCode = locationResult.parent?.value;
+          this.formData.channelName = locationResult.current?.text;
+          this.formData.channelCode = locationResult.current?.value;
         }
       })
     },
     //根据securityLocation,从this.position_options中向上找到前两级别的父级对象和当前级别对象
-    getParentLocation(securityLocation) {
+    getParentLocation(securityLocation, value) {
+
       if (!securityLocation || !this.position_options || !this.position_options.length) {
         return null;
       }
+      const getValue = value || 'value';
 
       // 递归查找节点及其父级
       const findNodeAndParents = (nodes, targetValue, parents = []) => {
         for (const node of nodes) {
-          if (node.value === targetValue) {
+          if (node[getValue] === targetValue) {
             return { node, parents };
           }
 
@@ -1023,6 +1034,7 @@ export default {
           list.map(node => ({
             text: node.label,
             value: node.code,
+            id: node.id,
             children: node.children ? convertTree(node.children) : null
           }))
 

src/pages/workProfile/index.vue

@@ -10,7 +10,7 @@
             </div>
 
             <!-- 总体概览 -->
-            <div class="overview-section" :style="{ marginTop:isSpecialUser || isJingLi? '80rpx':'0rpx' }">
+            <div class="overview-section" :style="{ marginTop: isSpecialUser || isJingLi ? '80rpx' : '0rpx' }">
                 <h2 class="section-title">总体概览</h2>
                 <div class="overview-cards">
                     <!-- 组织支撑 -->
@@ -163,9 +163,31 @@ export default {
 
     methods: {
         handleLevelChange(value) {
-            let targetObj = this.levelOptions.find(item => item.value == value)
-            this.selectedLevelId = targetObj.value
-            this.selectedLevelType = targetObj.deptType == 'STATION' ? 'station' : 'department'
+            console.log("value===", value, this.levelOptions)
+            let targetObj = {}
+            // 递归查找函数
+            const findInTree = (items, id) => {
+                for (let item of items) {
+                    if (item.id == id) {
+                        return item;
+                    }
+                    if (item.children && item.children.length > 0) {
+                        const found = findInTree(item.children, id);
+                        if (found) return found;
+                    }
+                }
+                return null;
+            };
+
+            targetObj = findInTree(this.levelOptions, value);
+            if (!targetObj) {
+                console.warn('未找到匹配的部门对象，id:', value);
+                return;
+            }
+            console.log("targetObj===", targetObj)
+
+            this.selectedLevelId = targetObj.id;
+            this.selectedLevelType = targetObj.deptType == 'STATION' ? 'station' : targetObj.deptType == 'BRIGADE' ? 'brigade' : 'department'
             this.loadData()
         },
         loadData() {
@@ -191,11 +213,11 @@ export default {
         },
         //获取抽问抽答完成率
         getLevelRateData() {
-            let params = {}
+            let params = {};
             let api = this.selectedLevelType == 'station' ? getStationLevelRate : getDepartmentLevelRate
             if (this.selectedLevelType == 'station') {
                 params.siteId = this.selectedLevelId
-            } else if (this.selectedLevelType == 'department') {
+            } else if (this.selectedLevelType == 'department' || this.selectedLevelType == 'brigade') {
                 params.deptId = this.selectedLevelId
             }
             api(params).then(res => {
@@ -203,7 +225,7 @@ export default {
             })
         },
         async getDept() {
-            if (this.isSpecialUser) {
+            if (this.isSpecialUser || this.isKeZhang) {
                 getDeptList().then(res => {
                     const { data } = res
                     let targetObj = data.find(item => item.id == '100' || item.label == '安检站');
@@ -221,11 +243,11 @@ export default {
                         this.selectedLevel = arr[0].id
                         this.handleLevelChange(arr[0].id)
                     }
-                    // if (this.isKeZhang) {
+                    if (this.isKeZhang) {
 
-                    //     this.selectedLevel = this.userInfo.departmentId
-                    //     this.handleLevelChange(this.userInfo.departmentId)
-                    // }
+                        this.selectedLevel = this.userInfo.departmentId
+                        this.handleLevelChange(this.userInfo.departmentId)
+                    }
 
                 })
             }
@@ -280,11 +302,16 @@ export default {
             let otherparams = {
                 deptId: this.selectedLevelId || ''
             }
+            console.log("params===", params, this.selectedLevelType)
             if (this.selectedLevelType == 'station') {
                 params.checkedSiteId = this.selectedLevelId
-            } else if (this.selectedLevelType == 'department') {
+            } 
+            if (this.selectedLevelType == 'department') {
                 params.checkedDepartmentId = this.selectedLevelId
             }
+            if (this.selectedLevelType == 'brigade') {
+                params.checkedBrigadeId = this.selectedLevelId
+            }
             getPortrait(params).then(res => {
                 this.portraitData = res.data || {};
             })

src/store/modules/eikonLevel.js

@@ -36,6 +36,7 @@ const eikonLevel = {
     isZhanZhang: false,
     isKeZhang: false,
     isBanZuZhang: false,
+    isJingLi: false,
     // 新增部门树数据
     departmentTree: [],
     // 当前部门的完整路径
@@ -75,11 +76,12 @@ const eikonLevel = {
       state.growthPortraitData = data
     },
     // 新增角色状态mutations
-    SET_ROLE_STATES: (state, { isPersonal, isZhanZhang, isKeZhang, isBanZuZhang }) => {
+    SET_ROLE_STATES: (state, { isPersonal, isZhanZhang, isKeZhang, isBanZuZhang, isJingLi }) => {
       state.isPersonal = isPersonal
       state.isZhanZhang = isZhanZhang
       state.isKeZhang = isKeZhang
       state.isBanZuZhang = isBanZuZhang
+      state.isJingLi = isJingLi
     },
     SET_OVERVIEW_DATA: (state, data) => {
       state.overviewData = data
@@ -190,6 +192,20 @@ const eikonLevel = {
           deptId: state.currentLevelId
         }
       }
+      if (getters.isJingLi) {
+        portraitParams = {
+          checkedBrigadeId: state.currentLevelId
+        }
+        detailParams = {
+          deptId: state.currentLevelId
+        }
+        growthParams = {
+          brigadeId: state.currentLevelId
+        }
+        overviewParams = {
+          deptId: state.currentLevelId
+        }
+      }
 
       try {
         //总体概览
@@ -210,7 +226,7 @@ const eikonLevel = {
         commit('SET_GROWTH_PORTRAIT_DATA', growthPortraitRes.data)
         //测试
         let profileRes = {}
-        if (getters.isKeZhang) {
+        if (getters.isKeZhang || getters.isJingLi) {
           profileRes = await getDeptProfile(overviewParams)
         } else if (getters.isZhanZhang) {
           profileRes = await getSiteProfile(overviewParams)
@@ -242,7 +258,7 @@ const eikonLevel = {
           commit('SET_STATION_ATTENDANCE_DATA', attendanceStatisticsRes)
         }
 
-    
+
       } catch (error) {
         console.error('加载数据失败:', error);
         throw error
@@ -270,6 +286,7 @@ const eikonLevel = {
         isBanZuZhang: level === 'team',
         isKeZhang: level === 'department',
         isZhanZhang: level === 'station' || level === 'zhijianke',
+        isJingLi: level === 'brigade'
       }
       commit('SET_ROLE_STATES', roleStates)
 
@@ -292,6 +309,7 @@ const eikonLevel = {
         isBanZuZhang: level === 'team',
         isKeZhang: level === 'department',
         isZhanZhang: level === 'station' || level === 'zhijianke',
+        isJingLi: level === 'brigade'
       }
       commit('SET_ROLE_STATES', roleStates)
 
@@ -307,7 +325,8 @@ const eikonLevel = {
         isPersonal: false,
         isZhanZhang: false,
         isKeZhang: false,
-        isBanZuZhang: false
+        isBanZuZhang: false,
+        isJingLi: false
       })
     },
     // 更新角色状态
@@ -464,7 +483,8 @@ const eikonLevel = {
     isPersonal: state => state.isPersonal,
     isZhanZhang: state => state.isZhanZhang,
     isKeZhang: state => state.isKeZhang,
-    isBanZuZhang: state => state.isBanZuZhang
+    isBanZuZhang: state => state.isBanZuZhang,
+    isJingLi: state => state.isJingLi
   }
 }