Merge branch 'master' into 'master'

收入量统计报表bug修复

See merge request lighter/vue-intergration-platform!54

src/views/operate-monitoring/IncomeStatistics.vue

@@ -85,7 +85,8 @@ const totalData = ref({
     mz_zfy: 0,
     mz_ypf: 0,
     mz_hcf: 0,
-    zy_zfy: 0,
+    yp_zfy: 0,
+    hc_zfy: 0,
     zy_ypf: 0,
     zy_hcf: 0,
 })
@@ -108,7 +109,15 @@ const query = async () => {
     await selectIncomeStatistics(queryTerm)
         .then((res) => {
             returnData.value = res.resultData
-
+            totalData.value = {
+                mz_zfy: 0,
+                mz_ypf: 0,
+                mz_hcf: 0,
+                yp_zfy: 0,
+                hc_zfy: 0,
+                zy_ypf: 0,
+                zy_hcf: 0,
+            }
             // 计算合计
             returnData.value.forEach((item) => {
                 if (item.mz_zfy) {
@@ -129,10 +138,16 @@ const query = async () => {
                         totalData.value.mz_hcf = Dig.add(totalData.value.mz_hcf, value)
                     }
                 }
-                if (item.zy_zfy) {
-                    const value = Number(item.zy_zfy)
+                if (item.yp_zfy) {
+                    const value = Number(item.yp_zfy)
+                    if (!isNaN(value)) {
+                        totalData.value.yp_zfy = Dig.add(totalData.value.yp_zfy, value)
+                    }
+                }
+                if (item.hc_zfy) {
+                    const value = Number(item.hc_zfy)
                     if (!isNaN(value)) {
-                        totalData.value.zy_zfy = Dig.add(totalData.value.zy_zfy, value)
+                        totalData.value.hc_zfy = Dig.add(totalData.value.hc_zfy, value)
                     }
                 }
                 if (item.zy_ypf) {
@@ -151,7 +166,8 @@ const query = async () => {
             totalData.value.mz_zfy = Number(totalData.value.mz_zfy.toFixed(2))
             totalData.value.mz_ypf = Number(totalData.value.mz_ypf.toFixed(2))
             totalData.value.mz_hcf = Number(totalData.value.mz_hcf.toFixed(2))
-            totalData.value.zy_zfy = Number(totalData.value.zy_zfy.toFixed(2))
+            totalData.value.yp_zfy = Number(totalData.value.yp_zfy.toFixed(2))
+            totalData.value.hc_zfy = Number(totalData.value.hc_zfy.toFixed(2))
             totalData.value.zy_ypf = Number(totalData.value.zy_ypf.toFixed(2))
             totalData.value.zy_hcf = Number(totalData.value.zy_hcf.toFixed(2))
         });
@@ -191,19 +207,19 @@ const getSummaries = (param) => {
             sums[index] = (Dig.division(totalData.value.mz_ypf, totalData.value.mz_zfy) * 100).toFixed(2)
             hjInfo.value.mz_yzb = sums[index]
         } else if (column.property === 'zy_yzb') {
-            sums[index] = (Dig.division(totalData.value.zy_ypf, totalData.value.zy_zfy) * 100).toFixed(2)
+            sums[index] = (Dig.division(totalData.value.zy_ypf, totalData.value.yp_zfy) * 100).toFixed(2)
             hjInfo.value.zy_yzb = sums[index]
         } else if (column.property === 'all_yzb') {
-            sums[index] = (Dig.division(Dig.add(totalData.value.mz_ypf, totalData.value.zy_ypf), Dig.add(totalData.value.mz_zfy, totalData.value.zy_zfy)) * 100).toFixed(2)
+            sums[index] = (Dig.division(Dig.add(totalData.value.mz_ypf, totalData.value.zy_ypf), Dig.add(totalData.value.mz_zfy, totalData.value.yp_zfy)) * 100).toFixed(2)
             hjInfo.value.all_yzb = sums[index]
         } else if (column.property === 'mz_hzb') {
             sums[index] = (Dig.division(totalData.value.mz_hcf, totalData.value.mz_zfy) * 100).toFixed(2)
             hjInfo.value.mz_hzb = sums[index]
         } else if (column.property === 'zy_hzb') {
-            sums[index] = (Dig.division(totalData.value.zy_hcf, totalData.value.zy_zfy) * 100).toFixed(2)
+            sums[index] = (Dig.division(totalData.value.zy_hcf, totalData.value.hc_zfy) * 100).toFixed(2)
             hjInfo.value.zy_hzb = sums[index]
         } else if (column.property === 'all_hzb') {
-            sums[index] = (Dig.division(Dig.add(totalData.value.mz_hcf, totalData.value.zy_hcf), Dig.add(totalData.value.mz_zfy, totalData.value.zy_zfy)) * 100).toFixed(2)
+            sums[index] = (Dig.division(Dig.add(totalData.value.mz_hcf, totalData.value.zy_hcf), Dig.add(totalData.value.mz_zfy, totalData.value.hc_zfy)) * 100).toFixed(2)
             hjInfo.value.all_hzb = sums[index]
         } else if (!values.every((value) => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -215,11 +231,11 @@ const getSummaries = (param) => {
                 }
             }, 0).toFixed(2)
 
-            if(column.property === 'all_sr'){
+            if (column.property === 'all_sr') {
                 hjInfo.value.all_sr = sums[index]
-            } else if(column.property === 'mz_sr'){
+            } else if (column.property === 'mz_sr') {
                 hjInfo.value.mz_sr = sums[index]
-            } else if(column.property === 'zy_sr'){
+            } else if (column.property === 'zy_sr') {
                 hjInfo.value.zy_sr = sums[index]
             }