From b7a2c0e3d951d1527f97471326597e8cc2787534 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 10 Aug 2022 14:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                    |  4 +---
 src/views/Statistics/Insightintothedetails.vue |  2 +-
 src/views/Statistics/index.vue                 |  8 +++++++-
 vue.config.js                                  | 13 ++++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 03e2ef2..bbae2af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,9 +30,7 @@ export default {
   background-color: #2671E2 !important;
   border-color: #2671E2 !important;
 }
-.el-scrollbar__wrap{
-  height: 100vh;
-}
+
 .el-table__row{
   font-size: 14px!important;
 }
diff --git a/src/views/Statistics/Insightintothedetails.vue b/src/views/Statistics/Insightintothedetails.vue
index fd28988..f5d2014 100644
--- a/src/views/Statistics/Insightintothedetails.vue
+++ b/src/views/Statistics/Insightintothedetails.vue
@@ -163,7 +163,7 @@ export default {
      // 权限
       this.sta_idx_download = this.permissions["sta_idx_download"];
       var isnull=this.$route.query.flag;
-      this.TimetoAhoose=isnull.TimetoAhoose;
+      if (isnull.TimetoAhoose) this.TimetoAhoose=isnull.TimetoAhoose;
       this.customtime=isnull.customtime;
       this.fromobj.starttime=isnull.starttime;
       this.fromobj.endoftime=isnull.endoftime;
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 0fd34ba..ff56188 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -335,13 +335,18 @@ export default {
     },
     Toview(item, index) {
       let Userrecord = {
-        TimetoAhoose: this.TimetoAhoose,
         keywordsId: item.matchKeywords[index].keywordsId,
         customtime: this.customtime,
         starttime: this.fromobj.starttime,
         endoftime: this.fromobj.endoftime,
         houseId: this.houseId,
       };
+      if (this.TimetoAhoose == 0) {
+        Userrecord.TimetoAhoose = this.TimetoAhoose
+      }
+      if (this.TimetoAhoose == 4) {
+        Userrecord.TimetoAhoose = 2
+      }
       this.$router.push({
         path: "/Statistics/Insightintothedetails",
         query: { flag: Userrecord },
@@ -413,6 +418,7 @@ export default {
       this.namelist = [];
       this.numlist = [];
       this.objlist = [];
+      this.alllist = [];
       var dateType = "";
       if (this.TimetoAhoose == 7) {
         dateType = "";
diff --git a/vue.config.js b/vue.config.js
index 9df20e2..33e6862 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,15 +3,14 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://192.168.31.161:9999' //长龙
-// const url = 'http://192.168.31.211:9999' // 泽明
-// const url = 'http://192.168.31.100:9999' //王笑
-// const url = 'http://62.234.122.43:9999' //正式
-// const url = 'http://81.70.55.170:9999' // 新测试服务器IP
 // const url = 'http://192.168.31.149: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://82.156.35.22:9999' // 新正式ip
+
+const url = 'http://81.70.55.170:9999' // 测试服务器
+
+// const url = 'http://62.234.122.43:9999' //正式服务器1
+// const url = 'http://82.156.35.22:9999' // 正式服务器2
+// const url = 'https://zanyong.hfju.com' // 正式域名
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {