主分支合并

src/views/Statistics/index.vue

@@ -298,7 +298,7 @@ export default {
       } else {
         if (this.TimetoAhoose == 6) {
           Router.push(
-            `/ReceivingRecords/index?validInvalid=0&markAdvisor=0&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime} 23:59:5'&houseId=${this.houseId}`
+            `/ReceivingRecords/index?validInvalid=0&markAdvisor=0&staDate=${this.customtime[0]}&endDate=${this.customtime[1]} 23:59:5'&houseId=${this.houseId}`
           );
         } else {
           if (this.TimetoAhoose == 0) {

vue.config.js

@@ -6,10 +6,10 @@
 // const url = 'http://192.168.31.152:9999' // 泽明
 // const url = 'http://62.234.122.43:9999' //正式
 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP
-// const url = 'http://192.168.31.101:9999' // 胜浩
+const url = 'http://192.168.31.101:9999' // 胜浩
 // 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']