huoyi дней назад: 3
Родитель
Сommit
99e70ae971
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      src/views/assistant/components/dutyOrganization.vue

+ 5 - 4
src/views/assistant/components/dutyOrganization.vue

@@ -317,7 +317,7 @@ const fetchDutyOrganizationData = async (queryParams) => {
317
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
317
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
318
     delete processedParams.deptId
318
     delete processedParams.deptId
319
     let calculateParams = {
319
     let calculateParams = {
320
-      ...(['TEAMS', 'DEPARTMENT', 'BRIGADE'].includes(deptType) ? { deptId: id } : {}),
320
+      ...(['TEAMS', 'DEPARTMENT', 'BRIGADE','MANAGER'].includes(deptType) ? { deptId: id } : {}),
321
       ...(deptType == 'USER' ? { userId: id } : {})
321
       ...(deptType == 'USER' ? { userId: id } : {})
322
     }
322
     }
323
     // 获取出勤人次分析数据
323
     // 获取出勤人次分析数据
@@ -877,13 +877,13 @@ const updateAttendanceBarOtherChart = () => {
877
     attendanceBarOtherOptions.series[0].data = allData
877
     attendanceBarOtherOptions.series[0].data = allData
878
     attendanceBarOtherOptions.legend.show = !!isStationType.value
878
     attendanceBarOtherOptions.legend.show = !!isStationType.value
879
     // 重新设置图表选项
879
     // 重新设置图表选项
880
-    setAttendanceOption(attendanceBarOtherOptions)
880
+    setAttendanceOption(attendanceBarOtherOptions,true)
881
   } else {
881
   } else {
882
     // 无数据时清空图表
882
     // 无数据时清空图表
883
     attendanceBarOtherOptions.xAxis.data = []
883
     attendanceBarOtherOptions.xAxis.data = []
884
     attendanceBarOtherOptions.series[0].data = []
884
     attendanceBarOtherOptions.series[0].data = []
885
     attendanceBarOtherOptions.legend.show = !!isStationType.value
885
     attendanceBarOtherOptions.legend.show = !!isStationType.value
886
-    setAttendanceOption(attendanceBarOtherOptions)
886
+    setAttendanceOption(attendanceBarOtherOptions,true)
887
   }
887
   }
888
 }
888
 }
889
 
889
 
@@ -928,10 +928,11 @@ const updateAttendanceBarChart = () => {
928
 
928
 
929
 // 根据API数据更新图表和统计信息
929
 // 根据API数据更新图表和统计信息
930
 const updateChartsWithData = () => {
930
 const updateChartsWithData = () => {
931
+  
931
   // 更新出勤人次柱状图
932
   // 更新出勤人次柱状图
932
   if (isStationType.value) {
933
   if (isStationType.value) {
933
     updateAttendanceBarChart()
934
     updateAttendanceBarChart()
934
-  } {
935
+  } else{
935
     updateAttendanceBarOtherChart()
936
     updateAttendanceBarOtherChart()
936
   }
937
   }
937
 
938