From 65ae60521f24846e08af96c5f67f9291ae2ca628 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Fri, 17 Apr 2020 23:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9showFile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EmptyFile/index.vue     | 2 +-
 src/components/ShowFile/ShowFile.vue   | 8 ++++----
 src/components/button/ButtonUpload.vue | 2 +-
 src/utils/number.js                    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/EmptyFile/index.vue b/src/components/EmptyFile/index.vue
index 8a0d99f..19529ce 100644
--- a/src/components/EmptyFile/index.vue
+++ b/src/components/EmptyFile/index.vue
@@ -45,7 +45,7 @@
 <style lang="scss" scoped>
   .container {
     width: 100%;
-    min-height: calc(100vh - 50px);
+    /*min-height: calc(100vh - 50px);*/
   }
   .share-empty {
     height: 30%;
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 75930d8..9ce9c7e 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -144,10 +144,10 @@
 
     <!--list布局-->
     <!--<div v-show="!grid && fileList.length > 0" :style="{'width':'100%','height': clientHeight+'px'}">-->
-    <div id="v-draw-rectangle" :style="{'width':'100%','height': clientHeight+'px'}">
+    <div v-show="fileList.length > 0" id="v-draw-rectangle" :style="{'width':'100%','height': clientHeight+'px'}">
       <pl-table
         ref="fileListTable"
-        v-show="!grid && fileList.length > 0"
+        v-show="!grid"
         v-loading="tableLoading"
         :max-height="clientHeight"
         :default-sort="sortable"
@@ -291,7 +291,7 @@
 
 
       <!--grid布局-->
-      <div v-show="grid && fileList.length > 0" v-loading="tableLoading"
+      <div v-show="grid" v-loading="tableLoading"
            element-loading-text="文件加载中"
            element-loading-spinner="el-icon-loading"
            element-loading-background="#f6f7fa88">
@@ -342,7 +342,7 @@
     </div>
 
     <empty-file
-      v-if="this.fileList.length < 1 && !tableLoading"
+      v-if="fileList.length < 1 && !tableLoading"
       :emptyStatus="emptyStatus"
     >
     </empty-file>
diff --git a/src/components/button/ButtonUpload.vue b/src/components/button/ButtonUpload.vue
index 1fe1374..0e99194 100644
--- a/src/components/button/ButtonUpload.vue
+++ b/src/components/button/ButtonUpload.vue
@@ -113,7 +113,7 @@
   }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
   .button {
     --background: #409EFF;
     --background-hover: #6bcbff;
diff --git a/src/utils/number.js b/src/utils/number.js
index bc51d2e..f33f85e 100644
--- a/src/utils/number.js
+++ b/src/utils/number.js
@@ -106,7 +106,7 @@ export function substring(str,n){
  */
 export function formatTime(agoTime) {
   const diff = agoTime / 1000
-  if (diff < 30) {
+  if (diff < 60) {
     return '刚刚'
   } else if (diff < 3600) {
     // less 1 hour