提交

src/page/wel.vue

@@ -1560,10 +1560,12 @@ export default {
           }
           break;
         case 3:
-          if (this.TimetoAhoose == 1) {
+          if (this.TimetoAhoose == 0) {
+            str = `dateType,0`
+          } else if (this.TimetoAhoose == 1) {
             str = `dateType,4`
           } else {
-            str = ''
+            str = 'dateType,6'
           }
           break;
         case 4:

src/views/Statistics/ConsultantBrand.vue

@@ -960,18 +960,29 @@ export default {
     ...mapGetters(["permissions"]),
   },
   created() {
+    this.sta_men_downLoad = this.permissions["sta_men_downLoad"];
+    
     if (this.$route.query.types) {
       let arr = this.$route.query.types.split(",");
       this[arr[0]] = arr[1];
       console.log(arr);
     }
-    this.sta_men_downLoad = this.permissions["sta_men_downLoad"];
+    
+    if (this.$route.query.date) {
+      let time = this.$route.query.date.split(",");
+      this.statDateStart = time[0]
+      this.statDateEnd = time[1]
+      this.dateType = 7;
+      this.customtime = time
+      console.log("时间");
+    }
+    
   },
   mounted() {
     this.role = localStorage.getItem("orgType");
     if (this.role == 3) {
       this.houseId = localStorage.getItem("houseId");
-      this.tabtimetap(4);
+      this.tabtimetap(this.dateType);
       this.deptFindList();
       this.teamAllLeve();
     } else {

vue.config.js

@@ -8,9 +8,9 @@
 // const url = 'http://62.234.122.43:9999' //正式
 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP
 // const url = 'http://192.168.31.86:9999' // 胜浩
-const url = 'https://zanyong.hfju.com' // 正式域名
+// const url = 'https://zanyong.hfju.com' // 正式域名
 // const url = 'http://127.0.0.1:9999' // 本地
-// const url = 'http://81.70.55.170:9999' // 新测试
+const url = 'http://81.70.55.170:9999' // 新测试
 // const url = 'http://82.156.35.22:9999' // 新正式ip
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']