Browse Source

Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

XMLWAN 4 years ago
parent
commit
d66de1848f

+ 10 - 11
src/xt_pages/workforce/appointment.vue View File

@@ -490,12 +490,13 @@
490 490
         }
491 491
         return isShow
492 492
       }, handleSuccess({ results, header }) {
493
-
493
+        let headers = []
494
+        for (let key in results[0]) {
495
+          headers.push(key)
496
+        }
497
+        console.log(headers)
494 498
         if (results.length > 0) {
495
-          let headers = []
496
-          for (let key in results[0]) {
497
-            headers.push(key)
498
-          }
499
+
499 500
 
500 501
           var isHas_1 = headers.includes('区号')
501 502
           console.log(isHas_1)
@@ -621,10 +622,13 @@
621 622
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
622 623
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
623 624
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
625
+            console.log("1111111")
624 626
             this.dialogVisible = true
625 627
             return
626 628
           }
627 629
         } else {
630
+          console.log("2222222222")
631
+
628 632
           this.dialogVisible = true
629 633
           return
630 634
         }
@@ -667,7 +671,6 @@
667 671
 
668 672
         for (let key in this.partitions) {
669 673
           var jihaos = this.partitions[key].jihaos
670
-          console.log(jihaos)
671 674
 
672 675
           for (let i = 0; i < jihaos.length; i++) {
673 676
             total_device_number.push(jihaos[i].number)
@@ -684,7 +687,6 @@
684 687
 
685 688
         for (let i = 0; i < deviceNumber.length; i++) {
686 689
           if (!total_device_number.includes(deviceNumber[i])) {
687
-            console.log(deviceNumber[i])
688 690
             is_device_number = false
689 691
           }
690 692
         }
@@ -819,11 +821,8 @@
819 821
           }
820 822
         }
821 823
 
822
-        console.log(header.length)
823
-        console.log(is_system_zone)
824
-        console.log(is_device_number)
825 824
 
826
-        if (header.length > 65 || !is_system_zone || !is_device_number) {
825
+        if (headers.length > 65 || !is_system_zone || !is_device_number) {
827 826
           this.dialogVisible = true
828 827
           return
829 828
         } else {

+ 1 - 2
src/xt_pages/workforce/components/tableData.vue View File

@@ -1020,8 +1020,7 @@ export default {
1020 1020
                 }
1021 1021
               });
1022 1022
             }
1023
-            console.log("hhhh", that.scheduleZone);
1024
-            console.log(theSchedules);
1023
+
1025 1024
           });
1026 1025
         } else {
1027 1026
           this.$message.error("网络错误");