Merge branch 'homepageLargeScreen' into dev

src/views/dataBigScreen/dashboard/components/pageItems/StandardExecution.vue

@@ -262,8 +262,11 @@ useTimeOut(() => {
     })
   }
   const portraitParams = {}
-  if (props.type === 'department') {
+ 
+   if (props.type === 'manager') {
     portraitParams.checkedDepartmentId = params.value.deptId
+  } else if (props.type === 'brigade') {
+    portraitParams.checkedBrigadeId = params.value.deptId
   } else if (props.type === 'team') {
     portraitParams.checkedTeamId = params.value.deptId
   } else if (props.type === 'personal') {

src/views/dataBigScreen/dashboard/components/pageItems/WorkOutput.vue

@@ -33,7 +33,7 @@
 
 <script setup>
 import ChartsContainer from '../ChartsContainer.vue';
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { getSiteStatistics, getModuleMetrics, getRankInfo } from '@/api/item/items'
 import { useTimeOut } from '../pageItems/useTimeOut'
 const props = defineProps({
@@ -50,49 +50,70 @@ const rowTableItem = ref({
 })
 const rank = ref({})
 const params = inject('provideParams')
-useTimeOut(() => {
-  !props.type && params.value.deptId && getSiteStatistics({ deptId: params.value.deptId }).then(res => {
-    tableData.value = res.data
-  })
+
+// 封装API请求函数
+const fetchData = () => {
+  // 站点统计请求（当没有type时）
+  if (!props.type && params.value.deptId) {
+    getSiteStatistics({ deptId: params.value.deptId }).then(res => {
+      tableData.value = res.data
+    })
+  }
+  
+  // 构建API参数
   let apiParams = {}
   if (props.type === 'personal') {
     apiParams = { userId: params.value.deptId }
   } else {
     apiParams = { deptId: params.value.deptId }
   }
-  props.type && params.value.deptId && getModuleMetrics({ ...apiParams, userTypeStr: props.type }).then(res => {
-    const { moduleResults } = res.data
-    if (!moduleResults || Object.keys(moduleResults).length === 0) {
-      moduleResults = {
-        item: {
-          effectiveSeizureCount: {},
-          referToPoliceCount: {},
-          willfulConcealmentCount: {},
+  
+  // 模块指标请求（当有type时）
+  if (props.type && params.value.deptId) {
+    getModuleMetrics({ ...apiParams, userTypeStr: props.type }).then(res => {
+      let { moduleResults } = res.data
+      if (!moduleResults || Object.keys(moduleResults).length === 0) {
+        moduleResults = {
+          item: {
+            effectiveSeizureCount: {},
+            referToPoliceCount: {},
+            willfulConcealmentCount: {},
+          }
         }
       }
-    }
 
-    if (props.type === 'personal') {
-      rowTableItem.value = {
-        effectiveSeizureCount: {
-          totalCount: moduleResults.item.effectiveSeizureCount
-        },
-        referToPoliceCount: {
-          count: moduleResults.item.referToPoliceCount
-        },
-        willfulConcealmentCount: {
-          count: moduleResults.item.willfulConcealmentCount
-        },
+      if (props.type === 'personal') {
+        rowTableItem.value = {
+          effectiveSeizureCount: {
+            totalCount: moduleResults.item.effectiveSeizureCount
+          },
+          referToPoliceCount: {
+            count: moduleResults.item.referToPoliceCount
+          },
+          willfulConcealmentCount: {
+            count: moduleResults.item.willfulConcealmentCount
+          },
+        }
+      } else {
+        rowTableItem.value = moduleResults.item
       }
-    } else {
-      rowTableItem.value = moduleResults.item
+    })
+    
+    // 排名信息请求
+    getRankInfo({ ...apiParams, level: 'station' }).then(res => {
+      rank.value = res.data || {};
+    })
+  }
+}
 
-    }
+// 监听props.type变化
+watch(() => props.type, () => {
+  fetchData()
+})
 
-  })
-  props.type && params.value.deptId && getRankInfo({ ...apiParams, level: 'station' }).then(res => {
-    rank.value = res.data || {};
-  })
+// 使用定时器调用fetchData
+useTimeOut(() => {
+  fetchData()
 }, [ params ])
 
 

src/views/dataBigScreen/dashboard/components/pageView/OrganizationalPortraitSectionLevel.vue

@@ -108,7 +108,10 @@ try {
     const appendItem = (list) => {
       list.forEach(attr => {
         let type = 'department'
-        if (attr.deptType === 'DEPARTMENT') {
+         if (attr.deptType === 'BRIGADE') {
+          type = 'brigade'
+        }
+        if (attr.deptType === 'MANAGER') {
           type = 'department'
         }
         if (attr.deptType === 'TEAMS') {
@@ -126,6 +129,7 @@ try {
         }
       })
     }
+    
     departments.value = res.data.reduce((cur, acc) => {
       acc.children && acc.children.length && cur.push(...acc.children)
       appendItem(acc.children)

src/views/dataBigScreen/dashboard/components/pageView/RealTimeStatus.vue

@@ -68,12 +68,12 @@ useTimeOut(() => {
 
     &>*:nth-child(1) {
       width: 100%;
-      height: 36%;
+      height: 50%;
     }
 
     &>*:nth-child(2) {
       width: 100%;
-      height: 32%;
+      height: 50%;
     }
 
     &>*:nth-child(3) {