Merge branch 'v_req_0831' into uat

src/pages/SchoolReport/SchoolReport.vue

@@ -1866,6 +1866,8 @@ export default {
       await this.getCateringAbnormalGroupList();
       let arr = this.cateringAbnormalGroupList;
       // arr = arr.sort((a,b) =>  Date.parse(b.statisticalDate) -  Date.parse(a.statisticalDate))
+      if(arr.length){
+        // arr = arr.map(x => (x.date = moment(x.date).format('MM-DD')))
         arr.sort((a, b) => a.statisticalDate.localeCompare(b.statisticalDate));
         let str = "";
         arr.forEach((x) => {
@@ -1874,6 +1876,7 @@ export default {
         });
         str = str.substring(0, str.length - 1);
         this.dateForStr = str;
+      }
       console.log(arr, "bbbbbbbbbbbbbbbbbbbbbbb");
       this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
       // 查询用户信息
@@ -1932,6 +1935,8 @@ export default {
             "ddddddddddddddddddddddddddddd"
           );
         let arr = this.cateringAbnormalGroupList;
+          if(arr.length){
+            // arr = arr.map(x => (x.date = moment(x.date).format('MM-DD')))
             arr.sort((a, b) => a.statisticalDate.localeCompare(b.statisticalDate));
             this.cateringAbnormalGroupList_ = arr.filter(
               (x) =>
@@ -1946,6 +1951,7 @@ export default {
             str = str.substring(0, str.length - 1);
             this.dateForStr = str;
           }
+        }
         this.diningSituations.diningSituationsRequestDate =
           this.dataRangeArr[this.dataRangeIndex].startDate;
         let tmpDate = this.formatDateTwo(this.minDate);