Merge branch 'ai' into dev

src/views/assistant/components/dutyOrganization.vue

@@ -18,16 +18,19 @@
           <div class="stat-content">
             {{ attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length -
               1]?.deptName : ''
-            }}出勤<span>{{ attendanceData && attendanceData.length > 3 ? attendanceData[3]?.currentValue : 0
+            }}出勤<span>{{ attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length -
+              1]?.currentValue : 0
             }}</span>人次，同比
             <span
-              :class="getTrendClass(attendanceData && attendanceData.length > 3 ? attendanceData[3]?.yearOnYearValue : 0)">{{
-                formatRate(attendanceData && attendanceData.length > 3 ? attendanceData[3]?.yearOnYearValue : 0) }}</span>
+              :class="getTrendClass(attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length - 1]?.yearOnYearValue : 0)">{{
+                formatRate(attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length -
+                  1]?.yearOnYearValue : 0) }}</span>
             <template v-if="props.queryForm.dateRangeQueryType !== 'YEAR'">
               ，环比
               <span
-                :class="getTrendClass(attendanceData && attendanceData.length > 3 ? attendanceData[3]?.chainRatioValue : 0)">{{
-                  formatRate(attendanceData && attendanceData.length > 3 ? attendanceData[3]?.chainRatioValue : 0)
+                :class="getTrendClass(attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length - 1]?.chainRatioValue : 0)">{{
+                  formatRate(attendanceData && attendanceData.length > 0 ? attendanceData[attendanceData.length -
+                    1]?.chainRatioValue : 0)
                 }}</span>
             </template>
           </div>
@@ -188,7 +191,7 @@ const isStationType = computed(() => {
   return selectedDeptType.value === 'STATION' || !selectedDeptType.value
 })
 const isDepartmentType = computed(() => {
-  return selectedDeptType.value === 'DEPARTMENT'
+  return selectedDeptType.value === 'MANAGER'
 })
 const isTeamsType = computed(() => {
   return selectedDeptType.value === 'TEAMS'

src/views/assistant/components/qualityControl.vue

@@ -156,7 +156,7 @@ const isStationType = computed(() => {
 
 // 计算属性：检查是否为DEPARTMENT类型
 const isDepartmentType = computed(() => {
-  return selectedDeptType.value === 'DEPARTMENT'
+  return selectedDeptType.value === 'MANAGER'
 })
 const isBrigadeType = computed(() => {
   return selectedDeptType.value === 'BRIGADE'
@@ -296,13 +296,20 @@ const fetchAnalysisData = async (queryParams) => {
     // 添加null检查，防止props.selectedDeptObject为null
     const selectedDept = props.selectedDeptObject
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
-
+    let progressParams = { ...queryParams }
+    if (progressParams.dateRangeQueryType === 'YEAR') {
+      progressParams.yearOnYear = true
+      delete progressParams.chainRatio
+    } else {
+      progressParams.chainRatio = true
+      progressParams.yearOnYear = true
+    }
     let rangParams = {
       userId: deptType == 'USER' ? id : "",
-      deptId: ["STATION", "DEPARTMENT", "TEAMS", "BRIGADE"].includes(deptType) ? id : ""
+      deptId: ["STATION", "MANAGER", "TEAMS", "BRIGADE"].includes(deptType) ? id : ""
     }
 
-    const response = await getAnalysisReport({ ...queryParams, ...rangParams })
+    const response = await getAnalysisReport({ ...progressParams, ...rangParams })
     console.log('质控分析数据:', response.data)
 
     // 解构赋值API返回的数据

src/views/assistant/components/riskHazard.vue

@@ -287,7 +287,7 @@ const isStationType = computed(() => {
 })
 // 计算属性：检查是否为STATION类型
 const isDepartmentType = computed(() => {
-  return selectedDeptType.value === 'DEPARTMENT'
+  return selectedDeptType.value === 'MANAGER'
 })
 
 const isBrigadeType = computed(() => {