From d9827baa701f7cc4a031bf922a93d48cdecbc176 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 16 Oct 2020 19:46:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=84=E7=90=86=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/exportXLSX.vue     | 10 +++++-----
 .../components/page/dashboard/overview/overview2.vue   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index 5f0873f86..70717bee7 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -70,13 +70,13 @@
             </div>
             <div>
               <div class="result-title">{{$t('overall.result.failedDetail')}}:</div>
-              <el-scrollbar style="height: 100%">
                 <div class="result-detail" v-if="importResult&&importResult.failDetail">
-                  <ul>
-                    <li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
-                  </ul>
+                  <el-scrollbar style="height: 100%">
+                    <ul>
+                      <li v-for="(item,index) in importResult.failDetail"><span>{{item.lineNo}}</span>:<span>{{item.errorMsg}}</span> </li>
+                    </ul>
+                  </el-scrollbar>
                 </div>
-              </el-scrollbar>
             </div>
           </div>
           <div slot="footer" class="footer">
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 71a799626..7e91084ff 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -329,7 +329,7 @@
               this.$refs.overviewLoading.endLoading();
             }
           })
-        },60*1000)
+        },5*60*1000)
       },
       querySystemState:function(){
         return new Promise(resolve => {