Merge branch 'ai' into dev

src/views/assistant/components/dutyOrganization.vue

@@ -317,7 +317,7 @@ const fetchDutyOrganizationData = async (queryParams) => {
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
     delete processedParams.deptId
     let calculateParams = {
-      ...(['TEAMS', 'DEPARTMENT', 'BRIGADE'].includes(deptType) ? { deptId: id } : {}),
+      ...(['TEAMS', 'DEPARTMENT', 'BRIGADE','MANAGER'].includes(deptType) ? { deptId: id } : {}),
       ...(deptType == 'USER' ? { userId: id } : {})
     }
     // 获取出勤人次分析数据
@@ -877,13 +877,13 @@ const updateAttendanceBarOtherChart = () => {
     attendanceBarOtherOptions.series[0].data = allData
     attendanceBarOtherOptions.legend.show = !!isStationType.value
     // 重新设置图表选项
-    setAttendanceOption(attendanceBarOtherOptions)
+    setAttendanceOption(attendanceBarOtherOptions,true)
   } else {
     // 无数据时清空图表
     attendanceBarOtherOptions.xAxis.data = []
     attendanceBarOtherOptions.series[0].data = []
     attendanceBarOtherOptions.legend.show = !!isStationType.value
-    setAttendanceOption(attendanceBarOtherOptions)
+    setAttendanceOption(attendanceBarOtherOptions,true)
   }
 }
 
@@ -928,10 +928,11 @@ const updateAttendanceBarChart = () => {
 
 // 根据API数据更新图表和统计信息
 const updateChartsWithData = () => {
+  
   // 更新出勤人次柱状图
   if (isStationType.value) {
     updateAttendanceBarChart()
-  } {
+  } else{
     updateAttendanceBarOtherChart()
   }