Merge branch 'chengdu-move' into dev

src/pages/qualityControlAnalysisReport/components/qualityControl.vue

@@ -531,6 +531,7 @@ export default {
           {
             name: '问题数量',
             type: 'line',
+            smooth: true,
             data: [],
             itemStyle: {
               color: '#fa541c'
@@ -695,14 +696,9 @@ export default {
         let params = {
           ...this.queryForm,
           userId: this.queryForm.scopedType == 'USER' ? this.queryForm.scopedId : "",
-          deptId: ["DEPARTMENT", "TEAMS", "MANAGER"].includes(this.queryForm.scopedType) ? this.queryForm.scopedId : ""
-        }
-        if (params.scopedType != 'TEAMS') {
-          delete params.deptId;
-        }
-        if (params.scopedType != 'USER') {
-          delete params.userId;
+          deptId: ["DEPARTMENT", "TEAMS", "MANAGER","BRIGADE"].includes(this.queryForm.scopedType) ? this.queryForm.scopedId : ""
         }
+       
 
 
         // 加载质控活动分析数据

src/pages/qualityControlAnalysisReport/components/riskHazard.vue

@@ -786,6 +786,7 @@ export default {
       const processedParams = { ...queryParams }
       if (processedParams.dateRangeQueryType === 'YEAR') {
         processedParams.yearOnYear = true
+        delete processedParams.chainRatio
       } else {
         processedParams.chainRatio = true
         processedParams.yearOnYear = true
@@ -925,7 +926,7 @@ export default {
         ]
       }
 
-      return data.slice(0, 5).map((item, index) => ({
+      return data.map((item, index) => ({
         rank: index + 1,
         department: item.brigadeName || `部门${index + 1}`,
         percentage: `${item.currentRatio || 0}%`,