Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents b9f23950 209c7c8c
Showing 1 changed file with 8 additions and 3 deletions
yanshouban/src/views/analysis/statistics/index.vue
@@ -126,7 +126,7 @@ import {QuestionGetAll,excelToTicketTypeSalesSituation} from &#39;@/api/piaowu&#39;
 export default {
   data() {
     return {
-
+flag:false,
       total: 1,
       pageSize: 10,
       currentPage: 1,
@@ -241,11 +241,15 @@ export default {
             }
             if (['销售数量(张)', '客单价(元)', '销售金额(元)'].includes(column.label)) {
               const values = data.map(item => Number(item[column.property]))
+
               if (!values.every(value => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
                   const value = Number(curr);
+
                   if (!isNaN(value)) {
+
                     return prev + curr;
+
                   } else {
                     return prev;
                   }
@@ -259,8 +263,8 @@ export default {
           });
  
           return sums;
-        }
         },
+
         handleCurrentChange(val) {
           this.currentPage = val
         },
@@ -281,7 +285,8 @@ export default {
                     };
                   }
                 }
-              }
+              },
+                },
  }
 </script>