From 99cbab9113f62d0b6396fe11f9b8e9eb3ba1d5e7 Mon Sep 17 00:00:00 2001
From: monkeyWie <liwei2633@163.com>
Date: Thu, 1 Nov 2018 17:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E8=8A=82=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E6=98=AF1000=E8=BF=9B=E5=88=B6=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA1024=E8=BF=9B=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/Table/index.vue |  8 ++++----
 front/src/main.js                    | 10 ++++++++++
 front/src/views/About.vue            |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/front/src/components/Table/index.vue b/front/src/components/Table/index.vue
index 523d07a8..6d3da86a 100644
--- a/front/src/components/Table/index.vue
+++ b/front/src/components/Table/index.vue
@@ -32,9 +32,9 @@
                 @on-change="toggleAll"></Checkbox>
             </div>
             <div class="td">{{ task.response.fileName }}</div>
-            <div class="td">{{ task.response.totalSize?$numeral(task.response.totalSize).format('0.000 ib'):$t('tasks.unknowLeft') }}</div>
+            <div class="td">{{ task.response.totalSize?$numeral(task.response.totalSize).format('0.00 ib'):$t('tasks.unknowLeft') }}</div>
             <div class="td">{{ calcProgress(task) }}</div>
-            <div class="td">{{ $numeral(task.info.speed).format('0.000 ib') }}/S</div>
+            <div class="td">{{ $numeral(task.info.speed).format('0.00 ib') }}/S</div>
             <div class="td">{{ calcStatus(task) }}</div>
             <div class="td">
               <Icon v-if="task.info.status === 1"
@@ -75,7 +75,7 @@
                   </p>
                   <p>
                     <b>{{ $t('tasks.fileSize') }}：</b>
-                    <span>{{ $numeral(task.response.totalSize).format('0.000 ib') }}</span>
+                    <span>{{ $numeral(task.response.totalSize).format('0.00 ib') }}</span>
                   </p>
                   <p>
                     <b>{{ $t('tasks.connections') }}：</b>
@@ -83,7 +83,7 @@
                   </p>
                   <p>
                     <b>{{ $t('tasks.downloadSpeed') }}：</b>
-                    <span>{{ $numeral(task.info.speed).format('0.000 ib') }}/S</span>
+                    <span>{{ $numeral(task.info.speed).format('0.00 ib') }}/S</span>
                   </p>
                   <p>
                     <b>{{ $t('tasks.status') }}：</b>
diff --git a/front/src/main.js b/front/src/main.js
index a3f64f4c..95a1e203 100755
--- a/front/src/main.js
+++ b/front/src/main.js
@@ -59,7 +59,17 @@ Vue.prototype.$http.interceptors.response.use(
   }
 )
 
+//去除字节大小格式化后的i字符
+const format = numeral.prototype.constructor.fn.format
+numeral.prototype.constructor.fn.format = function(fmt) {
+  let result = format.call(this, fmt)
+  if (/^.*ib$/.test(fmt)) {
+    result = result.replace('i', '')
+  }
+  return result
+}
 Vue.prototype.$numeral = numeral
+
 Date.prototype.format = function(fmt) {
   var o = {
     'M+': this.getMonth() + 1, // Month
diff --git a/front/src/views/About.vue b/front/src/views/About.vue
index 03e1b052..9d0244d0 100644
--- a/front/src/views/About.vue
+++ b/front/src/views/About.vue
@@ -111,7 +111,7 @@
         <Circle :percent="updateInfo.progress"
           :size="150">
           <h1>{{ updateInfo.progress.toFixed(2) }}%</h1>
-          <p>{{ $numeral(updateInfo.speed).format('0.000 ib') }}/S</p>
+          <p>{{ $numeral(updateInfo.speed).format('0.00 ib') }}/S</p>
         </Circle>
       </Spin>