Просмотр исходного кода

fix(qualityControlAnalysisReport): 修复参数处理和图表显示问题

删除YEAR类型查询时的chainRatio参数
移除部门排名的切片限制
为问题数量图表添加平滑效果
简化scopedType参数处理逻辑
huoyi дней назад: 3
Родитель
Сommit
00c01aa33b

+ 3 - 7
src/pages/qualityControlAnalysisReport/components/qualityControl.vue

@@ -531,6 +531,7 @@ export default {
531
           {
531
           {
532
             name: '问题数量',
532
             name: '问题数量',
533
             type: 'line',
533
             type: 'line',
534
+            smooth: true,
534
             data: [],
535
             data: [],
535
             itemStyle: {
536
             itemStyle: {
536
               color: '#fa541c'
537
               color: '#fa541c'
@@ -695,14 +696,9 @@ export default {
695
         let params = {
696
         let params = {
696
           ...this.queryForm,
697
           ...this.queryForm,
697
           userId: this.queryForm.scopedType == 'USER' ? this.queryForm.scopedId : "",
698
           userId: this.queryForm.scopedType == 'USER' ? this.queryForm.scopedId : "",
698
-          deptId: ["DEPARTMENT", "TEAMS", "MANAGER"].includes(this.queryForm.scopedType) ? this.queryForm.scopedId : ""
699
-        }
700
-        if (params.scopedType != 'TEAMS') {
701
-          delete params.deptId;
702
-        }
703
-        if (params.scopedType != 'USER') {
704
-          delete params.userId;
699
+          deptId: ["DEPARTMENT", "TEAMS", "MANAGER","BRIGADE"].includes(this.queryForm.scopedType) ? this.queryForm.scopedId : ""
705
         }
700
         }
701
+       
706
 
702
 
707
 
703
 
708
         // 加载质控活动分析数据
704
         // 加载质控活动分析数据

+ 2 - 1
src/pages/qualityControlAnalysisReport/components/riskHazard.vue

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