From 3ed69fc04c4a05c3fdf41f9b12fab9e1968bdc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 24 Oct 2022 17:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectFront/lifter/liveDataTable.vue  | 9 +--------
 src/views/projectFront/lifter/reportForm.vue     | 4 +++-
 src/views/projectFront/lifter/workCycleTable.vue | 6 ++++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/views/projectFront/lifter/liveDataTable.vue b/src/views/projectFront/lifter/liveDataTable.vue
index 8074b450..4d24d7b4 100644
--- a/src/views/projectFront/lifter/liveDataTable.vue
+++ b/src/views/projectFront/lifter/liveDataTable.vue
@@ -440,19 +440,12 @@ export default {
             this.selectLifterCurrentData()
         },
         exportExcel(){
-            console.log('点击this.valueTime',this.valueTime)
-            const loading = this.$loading({
-                lock: true,
-                text: 'Loading',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            });
+            // console.log('点击this.valueTime',this.valueTime)
             if(this.valueTime){
                 window.location.href =
                     this.$http.defaults.baseURL +
                     "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +
                     "&devSn=" + this.devSn + "&startTime=" + this.valueTime[0] + "&endTime=" + this.valueTime[1];
-                    loading.close();
             }else {
                 window.location.href =
                     this.$http.defaults.baseURL +
diff --git a/src/views/projectFront/lifter/reportForm.vue b/src/views/projectFront/lifter/reportForm.vue
index 7eb71cab..caa2e30f 100644
--- a/src/views/projectFront/lifter/reportForm.vue
+++ b/src/views/projectFront/lifter/reportForm.vue
@@ -13,7 +13,9 @@
             </div>
         </div>
         <div class="right">
-            <component :is="componentName"></component>
+            <!-- <component :is="componentName"></component> -->
+            <workCycleTable v-if="activeNav == 1"></workCycleTable>
+            <liveDataTable v-else></liveDataTable>
         </div>
     </div>
 </template>
diff --git a/src/views/projectFront/lifter/workCycleTable.vue b/src/views/projectFront/lifter/workCycleTable.vue
index 8e171f44..7cad43d3 100644
--- a/src/views/projectFront/lifter/workCycleTable.vue
+++ b/src/views/projectFront/lifter/workCycleTable.vue
@@ -311,12 +311,14 @@ export default {
             this.selectLifterWorkCycle()
         },
         exportExcel(){
+            // console.log('this.valueTime',this.valueTime)
             if(this.valueTime){
                 window.location.href =
                     this.$http.defaults.baseURL +
                     "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +
-                    "&devSn=" + this.devSn?this.devSn:"" + "&startTime=" + this.transformTimestamp2(this.valueTime[0]) + "&endTime=" + this.transformTimestamp2(this.valueTime[1]);
-            }else {
+                    "&devSn=" + this.devSn + "&startTime=" + this.valueTime[0] + "&endTime=" + this.valueTime[1];
+            }
+            else {
                 window.location.href =
                     this.$http.defaults.baseURL +
                     "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +