From 7c0438b0704daa065ed98082c2d17c3ef629b465 Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Thu, 4 Jul 2024 22:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug-=E5=B9=B8=E8=BF=90?=
 =?UTF-8?q?=E5=93=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../luckyTycoon/luckyTycoonListStatistics.vue | 19 +++++++++++--------
 .../luckyTycoon/luckyTycoonOnePlusOne.vue     |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/luckyTycoon/luckyTycoonListStatistics.vue b/src/views/luckyTycoon/luckyTycoonListStatistics.vue
index 9956f5a..10d9def 100644
--- a/src/views/luckyTycoon/luckyTycoonListStatistics.vue
+++ b/src/views/luckyTycoon/luckyTycoonListStatistics.vue
@@ -110,7 +110,7 @@
   />
 
   <!-- 筛选导出弹窗 -->
-  <el-dialog v-model="deriveDialog" title="编辑" width="28%" center>
+  <el-dialog v-model="deriveDialog" title="导出" width="28%" center>
     <!-- 榜单数据 -->
     <div style="margin-bottom: 25px; margin-top: 10px">
       <span
@@ -329,16 +329,18 @@ export default {
     deriveOut() {
       let startTime = "";
       let endTime = "";
-      if (this.inquire.time && this.inquire.time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      if (this.deriveObj.time && this.deriveObj.time.length > 0) {
+        startTime = dateFormat(this.deriveObj.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.deriveObj.time[1], "yyyy-MM-dd hh:mm:ss");
       }
-      exportList({
+      var obj = {
         startDate: startTime,
         endDate: endTime,
-        rankDateType: this.deriveObj.rankDateType,
+        rankDateType: this.inquire.rankDateType,
         partitionId: this.inquire.partitionId,
-      }).then((res) => {
+      };
+      console.log(obj);
+      exportList(obj).then((res) => {
         if (res.code == 200) {
           this.deriveDialog = false;
         } else {
@@ -349,6 +351,7 @@ export default {
           });
         }
       });
+      this.deriveDialog = false;
     },
     detialQuery() {
       luckyBagWeekRankListRank({
@@ -367,7 +370,7 @@ export default {
             arr[i].seqNo = i + 1;
           });
           this.detialObj.tableData = arr;
-          this.total2 = res.data.total
+          this.total2 = res.data.total;
         } else {
           ElMessage({
             showClose: true,
diff --git a/src/views/luckyTycoon/luckyTycoonOnePlusOne.vue b/src/views/luckyTycoon/luckyTycoonOnePlusOne.vue
index 1991196..49bee7b 100644
--- a/src/views/luckyTycoon/luckyTycoonOnePlusOne.vue
+++ b/src/views/luckyTycoon/luckyTycoonOnePlusOne.vue
@@ -189,7 +189,7 @@
     class="pub"
     v-model="controlsDialog"
     :title="controlsTitle"
-    width="28%"
+    width="36%"
     center
   >
     <!-- 地区选择 -->