Parcourir la source

[Fix 0000] 修复公司端没有报表数据引起的错误

houzekong il y a 2 mois
Parent
commit
b1a981441b
1 fichiers modifiés avec 21 ajouts et 9 suppressions
  1. 21 9
      src/views/vent/home/clique/index.vue

+ 21 - 9
src/views/vent/home/clique/index.vue

@@ -162,15 +162,27 @@
             ...arr,
             ...e.majorpath_data.map(({ majorpath, readData }) => {
               // 报表数据只有总数据,按实时数据计算比例然后乘以报表数据
-              return {
-                majorpath: {
-                  drag_1: Math.round((majorpath.drag_1 / majorpath.drag_total) * parseInt(readData.fy_merge?.value || majorpath.drag_total)),
-                  drag_2: Math.round((majorpath.drag_2 / majorpath.drag_total) * parseInt(readData.fy_merge?.value || majorpath.drag_total)),
-                  drag_3: Math.round((majorpath.drag_3 / majorpath.drag_total) * parseInt(readData.fy_merge?.value || majorpath.drag_total)),
-                  drag_total: readData.fy_merge?.value || majorpath.drag_total,
-                  m3_total: readData.retM3_merge?.value || majorpath.m3_total,
-                },
-              };
+              if (readData.fy_merge && readData.retM3_merge) {
+                return {
+                  majorpath: {
+                    drag_1: Math.round((majorpath.drag_1 / majorpath.drag_total) * parseInt(readData.fy_merge.value)),
+                    drag_2: Math.round((majorpath.drag_2 / majorpath.drag_total) * parseInt(readData.fy_merge.value)),
+                    drag_3: Math.round((majorpath.drag_3 / majorpath.drag_total) * parseInt(readData.fy_merge.value)),
+                    drag_total: readData.fy_merge.value,
+                    m3_total: readData.retM3_merge.value,
+                  },
+                };
+              } else {
+                return {
+                  majorpath: {
+                    drag_1: '-',
+                    drag_2: '-',
+                    drag_3: '-',
+                    drag_total: '-',
+                    m3_total: '-',
+                  },
+                };
+              }
             }),
           ];
         }