feat(portraitManagement): 新增团队画像统计相关接口与页面功能

1.  新增站级/部门级团队画像统计API接口
2.  调整滚动表格默认时长与表格字段映射
3.  优化搜索树默认选中逻辑与数据查询
4.  重构各页面数据请求方法，支持动态传参并修复参数传递问题
5.  新增站点 profile 小时流量统计图表功能

src/api/portraitManagement/portraitManagement.js

@@ -84,4 +84,15 @@ export function countSeizureStatsType(data) {
 // 10.不安全事件岗位分布
 export function countSeizureStatsPost(data) {
     return request({ url: '/ledger/unsafeEvent/countSeizureStatsPost', method: 'post', data })
-}
+}
+
+//获取站级别下所有部门的团队画像统计
+export function countStationTeamStats(data) {
+    return request({ url: '/score/dept-portrait/station-team-stats', method: 'post', data })
+}
+
+//获取部门的团队画像统计
+export function countDeptTeamStats(data) {
+    return request({ url: '/score/dept-portrait/team-stats', method: 'post', data })
+}
+

src/views/portraitManagement/components/ProfileMembers.vue

@@ -1,7 +1,7 @@
 <template>
   <InfoCard title="团队成员">
     <div class="table-container">
-      <RollingTable :columns="columns" :data="data" :duration="20" />
+      <RollingTable :columns="columns" :data="data" :duration="200" />
     </div>
   </InfoCard>
 </template>

src/views/portraitManagement/components/SearchBar.vue

@@ -35,8 +35,8 @@
           <!-- <div class="primary" style="border-radius: 6px;" @click="() => searchHandler()">模糊搜索</div> -->
         </div>
         <div style="margin-top: 20px;">
-          <el-tree :data="departments" :default-expanded-keys="[100]" :props="{ value: 'id', showPrefix: false }"
-            accordion @node-click="handleNodeClick" />
+          <el-tree ref="treeRef" :data="departments" :default-expanded-keys="[100]" node-key="id"
+            :current-node-key="currentKey" :props="{ value: 'id', showPrefix: false }" accordion @node-click="handleNodeClick" />
         </div>
       </div>
     </el-popover>
@@ -45,7 +45,7 @@
 </template>
 
 <script setup>
-import { onMounted, onUnmounted } from 'vue'
+import { ref, nextTick, onMounted, onUnmounted } from 'vue'
 import { searchPortraitUsers } from '@/api/score/index'
 import { getDeptList,getDeptUserTree } from '@/api/item/items'
 import { listDept } from '@/api/system/dept'
@@ -63,6 +63,28 @@ const currentTime = ref('year')
 const personName = ref('')
 const departments = ref([])
 const dateRange = ref([])
+const treeRef = ref(null)
+const currentKey = ref(null)
+
+const defaultIdMap = {
+  user: 13,
+  BRIGADE: 103,
+  STATION: 103,
+  MANAGER: 104,
+  TEAMS: 110
+}
+
+const findNodeById = (nodes, id) => {
+  if (!nodes) return null
+  for (const node of nodes) {
+    if (node.id === id || node.deptId === id) return node
+    if (node.children) {
+      const found = findNodeById(node.children, id)
+      if (found) return found
+    }
+  }
+  return null
+}
 
 const queryUsers = async (query, cb) => {
   if (!query?.trim()) { cb([]); return }
@@ -215,11 +237,38 @@ onMounted(async () => {
   if (props.deptType === 'user') {
     const res = await getDeptUserTree()
     departments.value = res.data
-
   } else {
     const res = await getDeptList({ deptType: props.deptType })
     departments.value = filterDeptTree(res.data, props.deptType)
   }
+
+  const defaultId = defaultIdMap[props.deptType]
+  if (defaultId) {
+    const defaultNode = findNodeById(departments.value, defaultId)
+    if (defaultNode) {
+      currentKey.value = defaultId
+      if (props.deptType === 'user') {
+        personName.value = defaultNode.label
+        searchHandler({ personName: defaultNode.label })
+      } else {
+        personName.value = defaultNode.deptName || defaultNode.name || defaultNode.label
+        let obj = {}
+        if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
+          obj = { deptId: defaultNode.deptId || defaultNode.id }
+        }
+        if (props.deptType === 'MANAGER') {
+          obj = { teamId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
+        }
+        if (props.deptType === 'TEAMS') {
+          obj = { groupId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
+        }
+        searchHandler(obj)
+      }
+      nextTick(() => {
+        treeRef.value?.setCurrentKey(defaultId)
+      })
+    }
+  }
 })
 onUnmounted(() => {
   resetStyle()

src/views/portraitManagement/components/SeizedInfo.vue

@@ -78,7 +78,7 @@ const setChartsOptionsBar = computed(() => {
     grid: {
       top: 20,
       bottom: 40,
-      left: 35,
+      left: 45,
       right: 15
     },
     xAxis: {

src/views/portraitManagement/components/rollingTable.vue

@@ -29,7 +29,7 @@ const props = defineProps({
   },
   duration: {
     type: Number,
-    default: 20
+    default: 60
   }
 })
 

src/views/portraitManagement/deptProfile/component/runData.vue

@@ -97,18 +97,17 @@ const props = defineProps({
 })
 
 const channelCheckData = ref([])
-const invokerCountLanePeakThroughput = () => {
-  countLanePeakThroughput(props.queryParams).then(res => {
+const invokerCountLanePeakThroughput = (params) => {
+  countLanePeakThroughput(params).then(res => {
     if (res.code === 200 && res.data) {
       channelCheckData.value =  res.data || []
     }
-    
   })
 }
 
 const countSeizureInfoItemData = ref({ totalSeizeNum: 0, itemList: [] })
-const invokerCountSeizureInfoItem = () => {
-  countSeizureInfoItem(props.queryParams).then(res => {
+const invokerCountSeizureInfoItem = (params) => {
+  countSeizureInfoItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureInfoItemData.value = res.data || { totalSeizeNum: 0, itemList: [] }
     }
@@ -116,8 +115,8 @@ const invokerCountSeizureInfoItem = () => {
 }
 
 const countSeizeSubjectCategoryQuantityData = ref([])
-const invokerCountSeizeSubjectCategoryQuantity = () => {
-  countSeizeSubjectCategoryQuantity(props.queryParams).then(res => {
+const invokerCountSeizeSubjectCategoryQuantity = (params) => {
+  countSeizeSubjectCategoryQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeSubjectCategoryQuantityData.value = res.data || []
     }
@@ -125,8 +124,8 @@ const invokerCountSeizeSubjectCategoryQuantity = () => {
 }
 
 const countSeizureTotalQuantityData = ref([])
-const invokerCountSeizureTotalQuantity = () => {
-  countSeizureTotalQuantity(props.queryParams).then(res => {
+const invokerCountSeizureTotalQuantity = (params) => {
+  countSeizureTotalQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureTotalQuantityData.value = res.data || []
     }
@@ -134,8 +133,8 @@ const invokerCountSeizureTotalQuantity = () => {
 }
 
 const countSeizureSingleQuantityData = ref([])
-const invokerCountSeizureSingleQuantity = () => {
-  countSeizureSingleQuantity(props.queryParams).then(res => {
+const invokerCountSeizureSingleQuantity = (params) => {
+  countSeizureSingleQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureSingleQuantityData.value = res.data || []
     }
@@ -143,8 +142,8 @@ const invokerCountSeizureSingleQuantity = () => {
 }
 
 const countSeizeAreaQuantityData = ref([])
-const invokerCountSeizeAreaQuantity = () => {
-  countSeizeAreaQuantity(props.queryParams).then(res => {
+const invokerCountSeizeAreaQuantity = (params) => {
+  countSeizeAreaQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeAreaQuantityData.value = res.data || []
     }
@@ -152,24 +151,24 @@ const invokerCountSeizeAreaQuantity = () => {
 }
 
 const countSeizureStatsItemData = ref([])
-const invokerCountSeizureStatsItem = () => {
-  countSeizureStatsItem(props.queryParams).then(res => {
+const invokerCountSeizureStatsItem = (params) => {
+  countSeizureStatsItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsItemData.value = res.data || []
     }
   })
 }
 const countSeizureStatsTypeData = ref([])
-const invokerCountSeizureStatsType = () => {
-  countSeizureStatsType(props.queryParams).then(res => {
+const invokerCountSeizureStatsType = (params) => {
+  countSeizureStatsType(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsTypeData.value = res.data || []
     }
   })
 }
 const countSeizureStatsPostData = ref([])
-const invokerCountSeizureStatsPost = () => {
-  countSeizureStatsPost(props.queryParams).then(res => {
+const invokerCountSeizureStatsPost = (params) => {
+  countSeizureStatsPost(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsPostData.value = res.data || []
     }
@@ -177,8 +176,8 @@ const invokerCountSeizureStatsPost = () => {
 }
 
 const securityTestItemClassificationData = ref([])
-const invokerSecurityTestItemClassification = () => {
-  securityTestItemClassification(props.queryParams).then(res => {
+const invokerSecurityTestItemClassification = (params) => {
+  securityTestItemClassification(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestItemClassificationData.value = res.data || []
     }
@@ -186,16 +185,16 @@ const invokerSecurityTestItemClassification = () => {
 }
 
 const securityTestPassingStatusData = ref([])
-const invokerSecurityTestPassingStatus = () => {
-    securityTestPassingStatus(props.queryParams).then(res => {
+const invokerSecurityTestPassingStatus = (params) => {
+  securityTestPassingStatus(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestPassingStatusData.value = res.data || []
     }
   })
 }
 const securityTestRegionData = ref([])
-const invokerSecurityTestRegion = () => {
-    securityTestRegion(props.queryParams).then(res => {
+const invokerSecurityTestRegion = (params) => {
+  securityTestRegion(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestRegionData.value = res.data || []
     }
@@ -205,9 +204,9 @@ const invokerSecurityTestRegion = () => {
 
 
 const supervisionData = ref([])
-const fetchSupervisionData = async () => {
+const fetchSupervisionData = async (params) => {
   try {
-    const res = await supervisionProblemPosition(props.queryParams)
+    const res = await supervisionProblemPosition(params)
     if (res.code === 200 && res.data) {
       supervisionData.value = res.data.map(item => ({
         num: item.total,
@@ -219,10 +218,11 @@ const fetchSupervisionData = async () => {
   }
 }
 
+
 const interceptionData = ref([])
-const fetchInterceptionData = async () => {
+const fetchInterceptionData = async (params) => {
   try {
-    const res = await realtimeInterceptionItem(props.queryParams)
+    const res = await realtimeInterceptionItem(params)
     if (res.code === 200 && res.data) {
       interceptionData.value = res.data.map(item => ({
         num: item.total,
@@ -235,21 +235,29 @@ const fetchInterceptionData = async () => {
 }
 
 const fetchData = () => {
+  const params = {}
+  Object.keys(props.queryParams).forEach(key => {
+    const val = props.queryParams[key]
+    if (val !== null && val !== undefined && val !== '') {
+      params[key] = val
+    }
+  })
+ 
 
-  invokerCountLanePeakThroughput()
-  invokerCountSeizureInfoItem()
-  invokerCountSeizeSubjectCategoryQuantity()
-  invokerCountSeizureTotalQuantity()
-  invokerCountSeizureSingleQuantity()
-  invokerCountSeizeAreaQuantity()
-  invokerCountSeizureStatsItem()
-  invokerCountSeizureStatsType()
-  invokerCountSeizureStatsPost()
-  invokerSecurityTestItemClassification()
-  invokerSecurityTestPassingStatus()
-  invokerSecurityTestRegion()
-  fetchSupervisionData()
-  fetchInterceptionData()
+  invokerCountLanePeakThroughput(params)
+  invokerCountSeizureInfoItem(params)
+  invokerCountSeizeSubjectCategoryQuantity(params)
+  invokerCountSeizureTotalQuantity(params)
+  invokerCountSeizureSingleQuantity(params)
+  invokerCountSeizeAreaQuantity(params)
+  invokerCountSeizureStatsItem(params)
+  invokerCountSeizureStatsType(params)
+  invokerCountSeizureStatsPost(params)
+  invokerSecurityTestItemClassification(params)
+  invokerSecurityTestPassingStatus(params)
+  invokerSecurityTestRegion(params)
+  fetchSupervisionData(params)
+  fetchInterceptionData(params)
 }
 watch(() => props.queryParams, () => {
   fetchData()

src/views/portraitManagement/deptProfile/index.vue

@@ -11,12 +11,13 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import Page from '../components/page.vue'
 import SearchBar from '../components/SearchBar.vue'
 import Profile from './component/profile.vue'
 import RunData from './component/runData.vue'
 import PentagonGroup from '../components/PentagonGroup.vue'
+import { countDeptTeamStats } from '@/api/portraitManagement/portraitManagement'
 import zongheIcon from '@/assets/icons/portrait/zonghe_icon.png'
 import renyuanIcon from '@/assets/icons/portrait/renyuan_icon.png'
 import zu02Icon from '@/assets/icons/portrait/zu02_icon.png'
@@ -27,7 +28,11 @@ const activeTab = ref(0)
 const searchVisible = ref(false)
 const queryParams = ref({})
 
-const pentagonItems = ref([
+const teamStatsData = ref(null)
+const invokerCountDeptTeamStats = (params) => {
+  countDeptTeamStats(params).then(res => {
+    if (res.code === 200 && res.data) {
+      teamStatsData.value = [
   {
     value: '88',
     label: '综合得分',
@@ -154,10 +159,20 @@ const pentagonItems = ref([
     bgGradientStart: 'rgba(33,33,58,0.95)',
     bgGradientEnd: 'rgba(15,70,250,0.2)'
   }
+]
+    }
+  })
+}
+
+
+
+const pentagonItems = ref([
+  
 ])
 
 const handleSearch = (params) => {
   queryParams.value = params
+  invokerCountDeptTeamStats(params)
 }
 
 const handleTabChange = (index) => {
@@ -166,7 +181,9 @@ const handleTabChange = (index) => {
 
 const searchBar = ref(null)
 onMounted(() => {
-  queryParams.value = Object.assign({ deptId: '' }, searchBar.value.getDefQuery())
+  const defParams = Object.assign({ deptId: '' }, searchBar.value.getDefQuery())
+  queryParams.value = defParams
+  invokerCountDeptTeamStats(defParams)
 })
 
 </script>

src/views/portraitManagement/groupProfile/component/runData.vue

@@ -97,8 +97,8 @@ const props = defineProps({
 
 
 const channelCheckData = ref([])
-const invokerCountLanePeakThroughput = () => {
-  countLanePeakThroughput(props.queryParams).then(res => {
+const invokerCountLanePeakThroughput = (params) => {
+  countLanePeakThroughput(params).then(res => {
     if (res.code === 200 && res.data) {
       channelCheckData.value = res.data || []
     }
@@ -107,8 +107,8 @@ const invokerCountLanePeakThroughput = () => {
 }
 
 const countSeizureInfoItemData = ref({ totalSeizeNum: 0, itemList: [] })
-const invokerCountSeizureInfoItem = () => {
-  countSeizureInfoItem(props.queryParams).then(res => {
+const invokerCountSeizureInfoItem = (params) => {
+  countSeizureInfoItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureInfoItemData.value = res.data || { totalSeizeNum: 0, itemList: [] }
     }
@@ -116,8 +116,8 @@ const invokerCountSeizureInfoItem = () => {
 }
 
 const countSeizeSubjectCategoryQuantityData = ref([])
-const invokerCountSeizeSubjectCategoryQuantity = () => {
-  countSeizeSubjectCategoryQuantity(props.queryParams).then(res => {
+const invokerCountSeizeSubjectCategoryQuantity = (params) => {
+  countSeizeSubjectCategoryQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeSubjectCategoryQuantityData.value = res.data || []
     }
@@ -125,8 +125,8 @@ const invokerCountSeizeSubjectCategoryQuantity = () => {
 }
 
 const countSeizureTotalQuantityData = ref([])
-const invokerCountSeizureTotalQuantity = () => {
-  countSeizureTotalQuantity(props.queryParams).then(res => {
+const invokerCountSeizureTotalQuantity = (params) => {
+  countSeizureTotalQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureTotalQuantityData.value = res.data || []
     }
@@ -134,8 +134,8 @@ const invokerCountSeizureTotalQuantity = () => {
 }
 
 const countSeizureSingleQuantityData = ref([])
-const invokerCountSeizureSingleQuantity = () => {
-  countSeizureSingleQuantity(props.queryParams).then(res => {
+const invokerCountSeizureSingleQuantity = (params) => {
+  countSeizureSingleQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureSingleQuantityData.value = res.data || []
     }
@@ -143,8 +143,8 @@ const invokerCountSeizureSingleQuantity = () => {
 }
 
 const countSeizeAreaQuantityData = ref([])
-const invokerCountSeizeAreaQuantity = () => {
-  countSeizeAreaQuantity(props.queryParams).then(res => {
+const invokerCountSeizeAreaQuantity = (params) => {
+  countSeizeAreaQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeAreaQuantityData.value = res.data || []
     }
@@ -152,24 +152,24 @@ const invokerCountSeizeAreaQuantity = () => {
 }
 
 const countSeizureStatsItemData = ref([])
-const invokerCountSeizureStatsItem = () => {
-  countSeizureStatsItem(props.queryParams).then(res => {
+const invokerCountSeizureStatsItem = (params) => {
+  countSeizureStatsItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsItemData.value = res.data || []
     }
   })
 }
 const countSeizureStatsTypeData = ref([])
-const invokerCountSeizureStatsType = () => {
-  countSeizureStatsType(props.queryParams).then(res => {
+const invokerCountSeizureStatsType = (params) => {
+  countSeizureStatsType(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsTypeData.value = res.data || []
     }
   })
 }
 const countSeizureStatsPostData = ref([])
-const invokerCountSeizureStatsPost = () => {
-  countSeizureStatsPost(props.queryParams).then(res => {
+const invokerCountSeizureStatsPost = (params) => {
+  countSeizureStatsPost(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsPostData.value = res.data || []
     }
@@ -177,8 +177,8 @@ const invokerCountSeizureStatsPost = () => {
 }
 
 const securityTestItemClassificationData = ref([])
-const invokerSecurityTestItemClassification = () => {
-  securityTestItemClassification(props.queryParams).then(res => {
+const invokerSecurityTestItemClassification = (params) => {
+  securityTestItemClassification(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestItemClassificationData.value = res.data || []
     }
@@ -186,16 +186,16 @@ const invokerSecurityTestItemClassification = () => {
 }
 
 const securityTestPassingStatusData = ref([])
-const invokerSecurityTestPassingStatus = () => {
-  securityTestPassingStatus(props.queryParams).then(res => {
+const invokerSecurityTestPassingStatus = (params) => {
+  securityTestPassingStatus(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestPassingStatusData.value = res.data || []
     }
   })
 }
 const securityTestRegionData = ref([])
-const invokerSecurityTestRegion = () => {
-  securityTestRegion(props.queryParams).then(res => {
+const invokerSecurityTestRegion = (params) => {
+  securityTestRegion(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestRegionData.value = res.data || []
     }
@@ -205,9 +205,9 @@ const invokerSecurityTestRegion = () => {
 
 
 const supervisionData = ref([])
-const fetchSupervisionData = async () => {
+const fetchSupervisionData = async (params) => {
   try {
-    const res = await supervisionProblemPosition(props.queryParams)
+    const res = await supervisionProblemPosition(params)
     if (res.code === 200 && res.data) {
       supervisionData.value = res.data.map(item => ({
         num: item.total,
@@ -219,10 +219,11 @@ const fetchSupervisionData = async () => {
   }
 }
 
+
 const interceptionData = ref([])
-const fetchInterceptionData = async () => {
+const fetchInterceptionData = async (params) => {
   try {
-    const res = await realtimeInterceptionItem(props.queryParams)
+    const res = await realtimeInterceptionItem(params)
     if (res.code === 200 && res.data) {
       interceptionData.value = res.data.map(item => ({
         num: item.total,
@@ -235,22 +236,26 @@ const fetchInterceptionData = async () => {
 }
 
 const fetchData = () => {
+  const params = { ...props.queryParams }
+  delete params.deptId
 
-  invokerCountLanePeakThroughput()
-  invokerCountSeizureInfoItem()
-  invokerCountSeizeSubjectCategoryQuantity()
-  invokerCountSeizureTotalQuantity()
-  invokerCountSeizureSingleQuantity()
-  invokerCountSeizeAreaQuantity()
-  invokerCountSeizureStatsItem()
-  invokerCountSeizureStatsType()
-  invokerCountSeizureStatsPost()
-  invokerSecurityTestItemClassification()
-  invokerSecurityTestPassingStatus()
-  invokerSecurityTestRegion()
-  fetchSupervisionData()
-  fetchInterceptionData()
+  invokerCountLanePeakThroughput(params)
+  invokerCountSeizureInfoItem(params)
+  invokerCountSeizeAreaQuantity(params)
+  invokerCountSeizeSubjectCategoryQuantity(params)
+  invokerCountSeizureTotalQuantity(params)
+  invokerCountSeizureSingleQuantity(params)
+  invokerCountSeizureAreaQuantity(params)
+  invokerCountSeizureStatsItem(params)
+  invokerCountSeizureStatsType(params)
+  invokerCountSeizureStatsPost(params)
+  invokerSecurityTestItemClassification(params)
+  invokerSecurityTestPassingStatus(params)
+  invokerSecurityTestRegion(params)
+  fetchSupervisionData(params)
+  fetchInterceptionData(params)
 }
+
 watch(() => props.queryParams, () => {
   fetchData()
 }, { deep: true, immediate: true })

src/views/portraitManagement/stationProfile/component/profile.vue

@@ -27,7 +27,7 @@ import { ref, watch } from 'vue'
 import ProfileMembers from '../../components/ProfileMembers.vue'
 import ProfileBasicDistribution from '../../components/ProfileBasicDistribution.vue'
 import ProfilePositionDistribution from '../../components/ProfilePositionDistribution.vue'
-import { getDeptMembers, getDeptMemberDistribution, getDeptPositionDistribution } from '@/api/portraitManagement/portraitManagement'
+import { countStationTeamStats, getDeptMemberDistribution, getDeptPositionDistribution } from '@/api/portraitManagement/portraitManagement'
 
 
 
@@ -39,13 +39,13 @@ const props = defineProps({
 })
 
 const teamColumns = [
-  { label: '部门', prop: 'dept' },
-  { label: '员工数量', prop: 'empCount' },
-  { label: '党员数量', prop: 'partyCount' },
+  { label: '部门', prop: 'deptName' },
+  { label: '员工数量', prop: 'employeeCount' },
+  { label: '党员数量', prop: 'partyMemberCount' },
   { label: '平均年龄', prop: 'avgAge' },
   { label: '平均工龄', prop: 'avgWorkYears' },
-  { label: '职业资格等级证书数量', prop: 'certLevel' },
-  { label: '平均开机年龄', prop: 'avgUpgradeAge' },
+  { label: '职业资格等级证书数量', prop: 'qualificationLevel' },
+  { label: '平均开机年龄', prop: 'avgXrayOperatorYears' },
   { label: '综合得分', prop: 'totalScore' }
 ]
 
@@ -58,31 +58,19 @@ const nationData = ref([])
 const politicalData = ref([])
 
 const skillData = ref([
-  { name: '等级1', value: 3 },
-  { name: '等级2', value: 5 },
-  { name: '等级3', value: 7 },
-  { name: '等级4', value: 8 },
-  { name: '等级5', value: 4 }
+ 
 ])
 
 const operateData = ref([
-  { name: '0-3年', value: 4 },
-  { name: '4-7年', value: 2 },
-  { name: '8-11年', value: 3 },
-  { name: '12-15年', value: 5 },
-  { name: '15年以上', value: 8 }
+  
 ])
 
 const postData = ref([
-  { name: '前传', value: 4 },
-  { name: '人身', value: 5 },
-  { name: '验证', value: 6 },
-  { name: '开包', value: 7 },
-  { name: '开机', value: 8 }
+  
 ])
 const fetchTeamData = async (params) => {
   try {
-    const res = await getDeptMembers(params)
+    const res = await countStationTeamStats(params)
     if (res.code === 200 && res.data) {
       teamData.value = res.data
     }

src/views/portraitManagement/stationProfile/component/runData.vue

@@ -99,7 +99,7 @@ import {
   securityTestItemClassification,
   securityTestPassingStatus,
   securityTestRegion,
-
+countStationHourlyThroughput
 } from '@/api/portraitManagement/portraitManagement'
 
 const props = defineProps({
@@ -155,9 +155,19 @@ const seizedInfoData = [
 ]
 
 
+const channelCheckData = ref([])
+const invokerCountStationHourlyThroughput = (params) => {
+  countStationHourlyThroughput(params).then(res => {
+    if (res.code === 200 && res.data) {
+      channelCheckData.value = res.data || []
+      nextTick(() => initHourlyPassChart())
+    }
+  })
+}
+
 const countSeizureInfoItemData = ref({ totalSeizeNum: 0, itemList: [] })
-const invokerCountSeizureInfoItem = () => {
-  countSeizureInfoItem(props.queryParams).then(res => {
+const invokerCountSeizureInfoItem = (params) => {
+  countSeizureInfoItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureInfoItemData.value = res.data || { totalSeizeNum: 0, itemList: [] }
     }
@@ -165,8 +175,8 @@ const invokerCountSeizureInfoItem = () => {
 }
 
 const countSeizeSubjectCategoryQuantityData = ref([])
-const invokerCountSeizeSubjectCategoryQuantity = () => {
-  countSeizeSubjectCategoryQuantity(props.queryParams).then(res => {
+const invokerCountSeizeSubjectCategoryQuantity = (params) => {
+  countSeizeSubjectCategoryQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeSubjectCategoryQuantityData.value = res.data || []
     }
@@ -174,8 +184,8 @@ const invokerCountSeizeSubjectCategoryQuantity = () => {
 }
 
 const countSeizureTotalQuantityData = ref([])
-const invokerCountSeizureTotalQuantity = () => {
-  countSeizureTotalQuantity(props.queryParams).then(res => {
+const invokerCountSeizureTotalQuantity = (params) => {
+  countSeizureTotalQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureTotalQuantityData.value = res.data || []
     }
@@ -183,8 +193,8 @@ const invokerCountSeizureTotalQuantity = () => {
 }
 
 const countSeizureSingleQuantityData = ref([])
-const invokerCountSeizureSingleQuantity = () => {
-  countSeizureSingleQuantity(props.queryParams).then(res => {
+const invokerCountSeizureSingleQuantity = (params) => {
+  countSeizureSingleQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureSingleQuantityData.value = res.data || []
     }
@@ -192,8 +202,8 @@ const invokerCountSeizureSingleQuantity = () => {
 }
 
 const countSeizeAreaQuantityData = ref([])
-const invokerCountSeizeAreaQuantity = () => {
-  countSeizeAreaQuantity(props.queryParams).then(res => {
+const invokerCountSeizeAreaQuantity = (params) => {
+  countSeizeAreaQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeAreaQuantityData.value = res.data || []
     }
@@ -201,24 +211,24 @@ const invokerCountSeizeAreaQuantity = () => {
 }
 
 const countSeizureStatsItemData = ref([])
-const invokerCountSeizureStatsItem = () => {
-  countSeizureStatsItem(props.queryParams).then(res => {
+const invokerCountSeizureStatsItem = (params) => {
+  countSeizureStatsItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsItemData.value = res.data || []
     }
   })
 }
 const countSeizureStatsTypeData = ref([])
-const invokerCountSeizureStatsType = () => {
-  countSeizureStatsType(props.queryParams).then(res => {
+const invokerCountSeizureStatsType = (params) => {
+  countSeizureStatsType(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsTypeData.value = res.data || []
     }
   })
 }
 const countSeizureStatsPostData = ref([])
-const invokerCountSeizureStatsPost = () => {
-  countSeizureStatsPost(props.queryParams).then(res => {
+const invokerCountSeizureStatsPost = (params) => {
+  countSeizureStatsPost(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsPostData.value = res.data || []
     }
@@ -226,8 +236,8 @@ const invokerCountSeizureStatsPost = () => {
 }
 
 const securityTestItemClassificationData = ref([])
-const invokerSecurityTestItemClassification = () => {
-  securityTestItemClassification(props.queryParams).then(res => {
+const invokerSecurityTestItemClassification = (params) => {
+  securityTestItemClassification(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestItemClassificationData.value = res.data || []
     }
@@ -235,16 +245,16 @@ const invokerSecurityTestItemClassification = () => {
 }
 
 const securityTestPassingStatusData = ref([])
-const invokerSecurityTestPassingStatus = () => {
-    securityTestPassingStatus(props.queryParams).then(res => {
+const invokerSecurityTestPassingStatus = (params) => {
+  securityTestPassingStatus(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestPassingStatusData.value = res.data || []
     }
   })
 }
 const securityTestRegionData = ref([])
-const invokerSecurityTestRegion = () => {
-    securityTestRegion(props.queryParams).then(res => {
+const invokerSecurityTestRegion = (params) => {
+  securityTestRegion(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestRegionData.value = res.data || []
     }
@@ -254,70 +264,33 @@ const invokerSecurityTestRegion = () => {
 
 
 const fetchData = () => {
-  invokerCountSeizureInfoItem()
-  invokerCountSeizeSubjectCategoryQuantity()
-  invokerCountSeizureTotalQuantity()
-  invokerCountSeizureSingleQuantity()
-  invokerCountSeizeAreaQuantity()
-  invokerCountSeizureStatsItem()
-  invokerCountSeizureStatsType()
-  invokerCountSeizureStatsPost()
-  invokerSecurityTestItemClassification()
-  invokerSecurityTestPassingStatus()
-  invokerSecurityTestRegion()
+  const params = {}
+  Object.keys(props.queryParams).forEach(key => {
+    const val = props.queryParams[key]
+    if (val !== null && val !== undefined && val !== '') {
+      params[key] = val
+    }
+  })
+
+  invokerCountStationHourlyThroughput(params)
+  invokerCountSeizureInfoItem(params)
+  invokerCountSeizeSubjectCategoryQuantity(params)
+  invokerCountSeizureTotalQuantity(params)
+  invokerCountSeizureSingleQuantity(params)
+  invokerCountSeizeAreaQuantity(params)
+  invokerCountSeizureStatsItem(params)
+  invokerCountSeizureStatsType(params)
+  invokerCountSeizureStatsPost(params)
+  invokerSecurityTestItemClassification(params)
+  invokerSecurityTestPassingStatus(params)
+  invokerSecurityTestRegion(params)
 }
 
 watch(() => props.queryParams, () => {
-
   fetchData()
 }, { deep: true, immediate: true })
 
-const seizedNumAllData = [
-  { num: 150 }, { num: 160 }, { num: 145 }, { num: 180 }, { num: 170 },
-  { num: 190 }, { num: 155 }, { num: 140 }, { num: 165 }, { num: 185 },
-  { num: 175 }, { num: 200 }, { num: 180 }, { num: 195 }, { num: 170 },
-  { num: 160 }, { num: 185 }, { num: 175 }, { num: 190 }
-]
 
-const workAreaDistData = [
-  { num: 287, name: 'T3国内出发（4层）' },
-  { num: 250, name: 'T3（8层出发）' },
-  { num: 300, name: 'T3国际出发' },
-  { num: 290, name: 'T3国际转国内' },
-  { num: 240, name: '旅检A区' },
-  { num: 250, name: 'T3要客服务区东' },
-  { num: 260, name: 'T3要客服务区西' },
-  { num: 255, name: 'T1要客服务区东' },
-  { num: 245, name: 'T2要客服务区东' },
-  { num: 260, name: '旅检B区' },
-  { num: 280, name: '重检C区' }
-]
-
-const unsafeItemDistData = [
-  { num: 66, name: '打火机' },
-  { num: 174, name: '火柴' },
-  { num: 65, name: '其他' },
-  { num: 106, name: '危险物品' },
-  { num: 173, name: '危险品' },
-  { num: 48, name: '其他/危险品' }
-]
-
-const unsafeTypeDistData = [
-  { num: 6, name: '一般' },
-  { num: 6, name: '二级' },
-  { num: 174, name: '三级' },
-  { num: 48, name: '四级' },
-  { num: 454, name: '五级' }
-]
-
-const unsafePostDistData = [
-  { num: 100, name: '境外/非通道' },
-  { num: 213, name: '值机柜台' },
-  { num: 150, name: '验证/通道' },
-  { num: 300, name: '人身检查' },
-  { num: 187, name: 'X光/行李/开检' },
-  { num: 387, name: '开箱/货检' }
-]
 
 
 
@@ -331,11 +304,53 @@ let dailySeizedArea = null
 const initHourlyPassChart = () => {
   if (!hourlyPassChartRef.value) return
   hourlyPassChart = echarts.init(hourlyPassChartRef.value)
-  const hours = Array.from({ length: 24 }, (_, i) => `${i.toString().padStart(2, '0')}:00`)
-  const data1 = [450, 420, 380, 390, 410, 430, 460, 480, 520, 560, 600, 620, 650, 680, 700, 680, 650, 620, 580, 540, 500, 480, 450, 420]
-  const data2 = [320, 310, 290, 300, 310, 330, 350, 370, 400, 430, 460, 480, 500, 520, 530, 510, 490, 470, 440, 410, 380, 360, 340, 320]
-  const data3 = [250, 240, 220, 230, 240, 260, 280, 300, 330, 360, 390, 410, 430, 450, 460, 440, 420, 400, 370, 340, 310, 290, 270, 250]
-  const lineData = [5.2, 4.8, 4.5, 4.7, 5.0, 5.3, 5.6, 5.8, 6.2, 6.5, 6.8, 7.0, 7.2, 7.5, 7.3, 7.1, 6.8, 6.5, 6.2, 5.8, 5.5, 5.2, 5.0, 4.8]
+
+  const rawData = channelCheckData.value
+  if (!rawData || rawData.length === 0) return
+
+  const hours = rawData.map(item => item.hour)
+
+  const areaNameMap = {}
+  rawData.forEach(item => {
+    item.areaList.forEach(area => {
+      if (!areaNameMap[area.areaName]) {
+        areaNameMap[area.areaName] = []
+      }
+      areaNameMap[area.areaName].push(area.areaFlow)
+    })
+  })
+
+  const legendList = Object.keys(areaNameMap)
+  const areaNames = legendList
+
+  const seriesBars = areaNames.map((areaName, idx) => {
+    const colors = [
+      ['#4da6ff', '#0f46fa'],
+      ['#7eff7e', '#2ecc71'],
+      ['#bd03fb', '#8a06e8'],
+      ['#ffa500', '#ff6600'],
+      ['#00bfff', '#0077be']
+    ]
+    const [c1, c2] = colors[idx % colors.length]
+    return {
+      name: areaName,
+      type: 'bar',
+      yAxisIndex: 0,
+      data: areaNameMap[areaName],
+      itemStyle: {
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          { offset: 0, color: c1 },
+          { offset: 1, color: c2 }
+        ])
+      },
+      barWidth: '20%'
+    }
+  })
+
+  const lineData = rawData.map(item => item.totalHourFlow)
+  const maxBar = Math.max(...Object.values(areaNameMap).flat())
+  const maxLine = Math.max(...lineData)
+  const maxVal = Math.max(maxBar, maxLine)
 
   const option = {
     tooltip: {
@@ -345,7 +360,7 @@ const initHourlyPassChart = () => {
       textStyle: { color: '#fff' }
     },
     legend: {
-      data: ['T3国内出发（4层）', 'T3（8层出发）', 'T3国际出发', '人数均值'],
+      data: [...legendList, '人流总数'],
       textStyle: { color: '#a0c4ff' },
       top: 0
     },
@@ -366,63 +381,25 @@ const initHourlyPassChart = () => {
         type: 'value',
         name: '人数',
         position: 'left',
-        max: 800,
+        max: Math.ceil(maxVal * 1.2),
         axisLabel: { color: '#a0c4ff' },
         axisLine: { lineStyle: { color: 'rgba(15,70,250,0.3)' } },
         splitLine: { lineStyle: { color: 'rgba(15,70,250,0.2)' } }
       },
       {
         type: 'value',
-        name: '均值',
+        name: '人流总数',
         position: 'right',
-        max: 10,
+        max: Math.ceil(maxVal * 1.2),
         axisLabel: { color: '#a0c4ff' },
         axisLine: { lineStyle: { color: 'rgba(15,70,250,0.3)' } },
         splitLine: { show: false }
       }
     ],
     series: [
+      ...seriesBars,
       {
-        name: 'T3国内出发（4层）',
-        type: 'bar',
-        yAxisIndex: 0,
-        data: data1,
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#4da6ff' },
-            { offset: 1, color: '#0f46fa' }
-          ])
-        },
-        barWidth: '20%'
-      },
-      {
-        name: 'T3（8层出发）',
-        type: 'bar',
-        yAxisIndex: 0,
-        data: data2,
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#7eff7e' },
-            { offset: 1, color: '#2ecc71' }
-          ])
-        },
-        barWidth: '20%'
-      },
-      {
-        name: 'T3国际出发',
-        type: 'bar',
-        yAxisIndex: 0,
-        data: data3,
-        itemStyle: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            { offset: 0, color: '#bd03fb' },
-            { offset: 1, color: '#8a06e8' }
-          ])
-        },
-        barWidth: '20%'
-      },
-      {
-        name: '人数均值',
+        name: '人流总数',
         type: 'line',
         yAxisIndex: 1,
         data: lineData,

src/views/portraitManagement/teamProfile/component/runData.vue

@@ -98,18 +98,17 @@ const props = defineProps({
 
 
 const channelCheckData = ref([])
-const invokerCountLanePeakThroughput = () => {
-  countLanePeakThroughput(props.queryParams).then(res => {
+const invokerCountLanePeakThroughput = (params) => {
+  countLanePeakThroughput(params).then(res => {
     if (res.code === 200 && res.data) {
       channelCheckData.value = res.data || []
     }
-    
   })
 }
 
 const countSeizureInfoItemData = ref({ totalSeizeNum: 0, itemList: [] })
-const invokerCountSeizureInfoItem = () => {
-  countSeizureInfoItem(props.queryParams).then(res => {
+const invokerCountSeizureInfoItem = (params) => {
+  countSeizureInfoItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureInfoItemData.value = res.data || { totalSeizeNum: 0, itemList: [] }
     }
@@ -117,8 +116,8 @@ const invokerCountSeizureInfoItem = () => {
 }
 
 const countSeizeSubjectCategoryQuantityData = ref([])
-const invokerCountSeizeSubjectCategoryQuantity = () => {
-  countSeizeSubjectCategoryQuantity(props.queryParams).then(res => {
+const invokerCountSeizeSubjectCategoryQuantity = (params) => {
+  countSeizeSubjectCategoryQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeSubjectCategoryQuantityData.value = res.data || []
     }
@@ -126,8 +125,8 @@ const invokerCountSeizeSubjectCategoryQuantity = () => {
 }
 
 const countSeizureTotalQuantityData = ref([])
-const invokerCountSeizureTotalQuantity = () => {
-  countSeizureTotalQuantity(props.queryParams).then(res => {
+const invokerCountSeizureTotalQuantity = (params) => {
+  countSeizureTotalQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureTotalQuantityData.value = res.data || []
     }
@@ -135,8 +134,8 @@ const invokerCountSeizureTotalQuantity = () => {
 }
 
 const countSeizureSingleQuantityData = ref([])
-const invokerCountSeizureSingleQuantity = () => {
-  countSeizureSingleQuantity(props.queryParams).then(res => {
+const invokerCountSeizureSingleQuantity = (params) => {
+  countSeizureSingleQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureSingleQuantityData.value = res.data || []
     }
@@ -144,8 +143,8 @@ const invokerCountSeizureSingleQuantity = () => {
 }
 
 const countSeizeAreaQuantityData = ref([])
-const invokerCountSeizeAreaQuantity = () => {
-  countSeizeAreaQuantity(props.queryParams).then(res => {
+const invokerCountSeizeAreaQuantity = (params) => {
+  countSeizeAreaQuantity(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizeAreaQuantityData.value = res.data || []
     }
@@ -153,24 +152,24 @@ const invokerCountSeizeAreaQuantity = () => {
 }
 
 const countSeizureStatsItemData = ref([])
-const invokerCountSeizureStatsItem = () => {
-  countSeizureStatsItem(props.queryParams).then(res => {
+const invokerCountSeizureStatsItem = (params) => {
+  countSeizureStatsItem(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsItemData.value = res.data || []
     }
   })
 }
 const countSeizureStatsTypeData = ref([])
-const invokerCountSeizureStatsType = () => {
-  countSeizureStatsType(props.queryParams).then(res => {
+const invokerCountSeizureStatsType = (params) => {
+  countSeizureStatsType(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsTypeData.value = res.data || []
     }
   })
 }
 const countSeizureStatsPostData = ref([])
-const invokerCountSeizureStatsPost = () => {
-  countSeizureStatsPost(props.queryParams).then(res => {
+const invokerCountSeizureStatsPost = (params) => {
+  countSeizureStatsPost(params).then(res => {
     if (res.code === 200 && res.data) {
       countSeizureStatsPostData.value = res.data || []
     }
@@ -178,8 +177,8 @@ const invokerCountSeizureStatsPost = () => {
 }
 
 const securityTestItemClassificationData = ref([])
-const invokerSecurityTestItemClassification = () => {
-  securityTestItemClassification(props.queryParams).then(res => {
+const invokerSecurityTestItemClassification = (params) => {
+  securityTestItemClassification(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestItemClassificationData.value = res.data || []
     }
@@ -187,16 +186,16 @@ const invokerSecurityTestItemClassification = () => {
 }
 
 const securityTestPassingStatusData = ref([])
-const invokerSecurityTestPassingStatus = () => {
-  securityTestPassingStatus(props.queryParams).then(res => {
+const invokerSecurityTestPassingStatus = (params) => {
+  securityTestPassingStatus(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestPassingStatusData.value = res.data || []
     }
   })
 }
 const securityTestRegionData = ref([])
-const invokerSecurityTestRegion = () => {
-  securityTestRegion(props.queryParams).then(res => {
+const invokerSecurityTestRegion = (params) => {
+  securityTestRegion(params).then(res => {
     if (res.code === 200 && res.data) {
       securityTestRegionData.value = res.data || []
     }
@@ -206,9 +205,9 @@ const invokerSecurityTestRegion = () => {
 
 
 const supervisionData = ref([])
-const fetchSupervisionData = async () => {
+const fetchSupervisionData = async (params) => {
   try {
-    const res = await supervisionProblemPosition(props.queryParams)
+    const res = await supervisionProblemPosition(params)
     if (res.code === 200 && res.data) {
       supervisionData.value = res.data.map(item => ({
         num: item.total,
@@ -221,9 +220,9 @@ const fetchSupervisionData = async () => {
 }
 
 const interceptionData = ref([])
-const fetchInterceptionData = async () => {
+const fetchInterceptionData = async (params) => {
   try {
-    const res = await realtimeInterceptionItem(props.queryParams)
+    const res = await realtimeInterceptionItem(params)
     if (res.code === 200 && res.data) {
       interceptionData.value = res.data.map(item => ({
         num: item.total,
@@ -236,22 +235,25 @@ const fetchInterceptionData = async () => {
 }
 
 const fetchData = () => {
+  const params = { ...props.queryParams }
+  delete params.deptId
 
-  invokerCountLanePeakThroughput()
-  invokerCountSeizureInfoItem()
-  invokerCountSeizeSubjectCategoryQuantity()
-  invokerCountSeizureTotalQuantity()
-  invokerCountSeizureSingleQuantity()
-  invokerCountSeizeAreaQuantity()
-  invokerCountSeizureStatsItem()
-  invokerCountSeizureStatsType()
-  invokerCountSeizureStatsPost()
-  invokerSecurityTestItemClassification()
-  invokerSecurityTestPassingStatus()
-  invokerSecurityTestRegion()
-  fetchSupervisionData()
-  fetchInterceptionData()
+  invokerCountLanePeakThroughput(params)
+  invokerCountSeizureInfoItem(params)
+  invokerCountSeizeSubjectCategoryQuantity(params)
+  invokerCountSeizureTotalQuantity(params)
+  invokerCountSeizureSingleQuantity(params)
+  invokerCountSeizureAreaQuantity(params)
+  invokerCountSeizureStatsItem(params)
+  invokerCountSeizureStatsType(params)
+  invokerCountSeizureStatsPost(params)
+  invokerSecurityTestItemClassification(params)
+  invokerSecurityTestPassingStatus(params)
+  invokerSecurityTestRegion(params)
+  fetchSupervisionData(params)
+  fetchInterceptionData(params)
 }
+
 watch(() => props.queryParams, () => {
   fetchData()
 }, { deep: true, immediate: true })