From 2e77870ab19aa2e54cbff4149399f3d0038dba39 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Thu, 4 Mar 2021 17:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E8=B6=85=E8=BF=87100%=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             | 2 +-
 src/layout/components/Sidebar/index.vue  | 7 +++++--
 src/permission.js                        | 6 ++++++
 src/views/setting/sys/cusomerInfo.vue    | 4 ++--
 src/views/setting/sys/cusomerManager.vue | 6 +++---
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7ba98c6..1504ded 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jmal-cloud-view",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "jmal cloud",
   "author": "Jmal <zhushilun084@163.com>",
   "license": "MIT",
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 554cd49..7a2e191 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -47,6 +47,7 @@ export default {
     return {
       percentage: 0,
       customColors: [
+        {color: '#f56c6c', percentage: 150},
         {color: '#f56c6c', percentage: 100},
         {color: '#e6a23c', percentage: 80},
         {color: '#5cb87a', percentage: 60},
@@ -115,7 +116,8 @@ export default {
       if (takeUpSpace) {
         this.takeUpSpace = takeUpSpace
         const space = takeUpSpace/1024/1024/1024
-        this.percentage = Number((space/this.userInfo.quota * 100).toFixed(1))
+        const percentage = Number((space/this.userInfo.quota * 100).toFixed(1))
+        this.percentage = percentage > 100 ? 100 : percentage
       }
     },
     copyWebDAVLink(className) {
@@ -142,7 +144,8 @@ export default {
       const quota = this.userInfo.quota
       const space = this.takeUpSpace/1024/1024/1024
       if(space && quota > 0){
-        this.percentage = Number((space/quota * 100).toFixed(1))
+        const percentage = Number((space/quota * 100).toFixed(1))
+        this.percentage = percentage > 100 ? 100 : percentage
         if(this.isCollapse){
           return `${formatSize(this.takeUpSpace)}`
         } else {
diff --git a/src/permission.js b/src/permission.js
index f46e006..c899ade 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,6 +40,9 @@ router.beforeEach(async(to, from, next) => {
         } catch {
           // 删除token，然后转到登录页面重新登录
           await store.dispatch('user/resetToken')
+          if (to.path === '/404') {
+            to.path = '/'
+          }
           next(`/login?redirect=${to.path}`)
           NProgress.done()
         }
@@ -52,6 +55,9 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // 其他没有token重定向到登录页面。
+      if (window.location.pathname === '/404') {
+        window.location.pathname = '/'
+      }
       next(`/login?redirect=${window.location.pathname}`)
       NProgress.done()
     }
diff --git a/src/views/setting/sys/cusomerInfo.vue b/src/views/setting/sys/cusomerInfo.vue
index 042857e..91ed689 100644
--- a/src/views/setting/sys/cusomerInfo.vue
+++ b/src/views/setting/sys/cusomerInfo.vue
@@ -247,9 +247,9 @@
         const space = this.userInfo.takeUpSpace/1024/1024/1024
         const quota = this.userInfo.quota
         if(space && quota > 0){
-          this.percentage = Number((space/quota * 100).toFixed(1))
+          const percentage = Number((space/quota * 100).toFixed(1))
+          this.percentage = percentage > 100 ? 100 : percentage
           return `${this.percentage}% (${formatSize(this.userInfo.takeUpSpace)}/${quota}GB)`;
-          // return `${this.percentage}%`;
         }
       },
       // 设置formData
diff --git a/src/views/setting/sys/cusomerManager.vue b/src/views/setting/sys/cusomerManager.vue
index c42f3d5..23910a2 100644
--- a/src/views/setting/sys/cusomerManager.vue
+++ b/src/views/setting/sys/cusomerManager.vue
@@ -28,8 +28,8 @@
             <el-form-item v-if="editMove===1" label="确认密码:" prop="checkPass">
               <el-input type="password" v-model="form.checkPass"/>
             </el-form-item>
-            <el-form-item label="配额:">
-              <el-input v-model="form.quota"/>
+            <el-form-item label="配额(GB):">
+              <el-input-number v-model="form.quota" controls-position="right" :min="1" :max="100"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -151,7 +151,7 @@ export default {
                 }
             }
           },
-          {prop: 'quota',label: '配额(G)',sortable: 'custom'},
+          {prop: 'quota',label: '配额(GB)',sortable: 'custom'},
           {prop: 'createTime',label: '创建时间',sortable: 'custom'},
           {label: '操作', minWidth: 130, active: [
               {name: '修改', icon: 'el-icon-edit', handle: (row) => this.handleEdit(row.id,row.username)},