Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject into master

src/views/Statistics/index.vue

@@ -278,7 +278,7 @@ export default {
     },
     //自定义时间
     confirmtime() {
-      this.TimetoAhoose = 6;
+      this.TimetoAhoose = 7;
       this.fromobj.starttime = this.customtime[0];
       this.fromobj.endoftime = this.customtime[1];
       this.getorgCode();
@@ -297,7 +297,7 @@ export default {
       this.numlist = [];
       this.objlist = [];
       var dateType = "";
-      if (this.TimetoAhoose == 6) {
+      if (this.TimetoAhoose == 7) {
         dateType = "";
       } else {
         dateType = this.TimetoAhoose;