From 77aeb1b7373705d37d689dc1aaebcadb1d9db36c Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 4 Jul 2022 14:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Statistics/TheTeamCompared.vue |  8 ++---
 src/views/Statistics/index.vue           | 38 +++++++-----------------
 vue.config.js                            |  4 +--
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/views/Statistics/TheTeamCompared.vue b/src/views/Statistics/TheTeamCompared.vue
index adae460..d5d9863 100644
--- a/src/views/Statistics/TheTeamCompared.vue
+++ b/src/views/Statistics/TheTeamCompared.vue
@@ -39,13 +39,13 @@
         <div class="titel-text">筛选日期：</div>
         <div style="margin-left: 14px;">
           <el-button
-            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
-            @click="tabtimetap(4)"
+            :class="{ 'el-button--primary': TimetoAhoose == 0 }"
+            @click="tabtimetap(0)"
             >今天</el-button
           >
           <el-button
-            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
-            @click="tabtimetap(5)"
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
             >近7天</el-button
           >
           <el-button
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 3debb5f..7bb97c2 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -26,13 +26,13 @@
             近一周
           </div> -->
           <el-button
-            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
-            @click="tabtimetap(4)"
+            :class="{ 'el-button--primary': TimetoAhoose == 0 }"
+            @click="tabtimetap(0)"
             >今天</el-button
           >
           <el-button
-            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
-            @click="tabtimetap(5)"
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
             >近7天</el-button
           >
           <el-button
@@ -164,7 +164,7 @@ export default {
       orgType: localStorage.getItem("orgType"),
       houseId: "",
       buildingoptions: [],
-      TimetoAhoose: 5,
+      TimetoAhoose: 4,
       customtime: [],
       fromobj: {
         starttime: "",
@@ -180,30 +180,14 @@ export default {
     this.zkhousePage();
   },
   methods: {
-        //       <el-button
-        //     :class="{ 'el-button--primary': TimetoAhoose == 4 }"
-        //     @click="tabtimetap(4)"
-        //     >今天</el-button
-        //   >
-        //   <el-button
-        //     :class="{ 'el-button--primary': TimetoAhoose == 5 }"
-        //     @click="tabtimetap(5)"
-        //     >近7天</el-button
-        //   >
-        //   <el-button
-        //     :class="{ 'el-button--primary': TimetoAhoose == 6 }"
-        //     @click="tabtimetap(6)"
-        //     >近30天</el-button
-        //   >
-        // </div>
     goTo(i) {
       if (i == 1) {
         if (this.TimetoAhoose == 6) {
           Router.push(`/ReceivingRecords/index?validInvalid=0&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime} 23:59:59&houseId=${this.houseId}`)
         } else {
-          if (this.TimetoAhoose == 4) {
+          if (this.TimetoAhoose == 0) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&dateType=0&houseId=${this.houseId}`)
-          } else if (this.TimetoAhoose == 5) {
+          } else if (this.TimetoAhoose == 4) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&dateType=2&houseId=${this.houseId}`)
           } else {
             Router.push(`/ReceivingRecords/index?validInvalid=0&houseId=${this.houseId}`)
@@ -215,9 +199,9 @@ export default {
           Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=1&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime} 23:59:59&houseId=${this.houseId}`);
         } else {
           
-          if (this.TimetoAhoose == 4) {
+          if (this.TimetoAhoose == 0) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=1&dateType=0&houseId=${this.houseId}`)
-          } else if (this.TimetoAhoose == 5) {
+          } else if (this.TimetoAhoose == 4) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=1&dateType=2&houseId=${this.houseId}`)
           } else {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=1&houseId=${this.houseId}`)
@@ -228,9 +212,9 @@ export default {
         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}`);
         } else {
-          if (this.TimetoAhoose == 4) {
+          if (this.TimetoAhoose == 0) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=0&dateType=0&houseId=${this.houseId}`)
-          } else if (this.TimetoAhoose == 5) {
+          } else if (this.TimetoAhoose == 4) {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=0&dateType=2&houseId=${this.houseId}`)
           } else {
             Router.push(`/ReceivingRecords/index?validInvalid=0&markAdvisor=0&houseId=${this.houseId}`)
diff --git a/vue.config.js b/vue.config.js
index da15ae7..249c893 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,8 +8,8 @@
 // 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 = 'http://81.70.55.170:9999' // 新测试
+// const url = 'https://zanyong.hfju.com' // 正式域名
+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']