From 9e70f97cba1336fdc5474ed1376d004e61124f1a Mon Sep 17 00:00:00 2001
From: "hongyuan.zhang" <hongyuan.zhang@gmail.com>
Date: Thu, 11 Mar 2021 20:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                |  2 +-
 src/views/device/Device.vue | 13 ++++++++++---
 src/views/login/Login.vue   |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b3a7207..f9e34b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dc3-web",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": true,
   "author": "pnoker",
   "description": "IOT DC3 Demo Application UI",
diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue
index cc30716..f64863e 100644
--- a/src/views/device/Device.vue
+++ b/src/views/device/Device.vue
@@ -18,7 +18,8 @@
                        @current-change="currentChange"
             >
                 <template slot="menuLeft">
-                    <el-button type="success" icon="el-icon-upload" size="small" @click="dialogFormVisible=true">批量导入</el-button>
+                    <el-button type="success" icon="el-icon-upload" size="small" @click="dialogFormVisible=true">批量导入
+                    </el-button>
                 </template>
 
                 <template slot="status" slot-scope="scope">
@@ -49,7 +50,13 @@
                     <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                     <div class="el-upload__tip" slot="tip">只能上传 json 格式文件，批量导入过程比较耗时，需要耐心等待，请勿切换其他页面！</div>
                 </el-upload>
-                <el-progress class="upload-progress" :percentage="loadProgress" :text-inside="true" :stroke-width="15" :status="progressStatus"></el-progress>
+                <el-progress class="upload-progress"
+                             :percentage="loadProgress.toFixed(2)"
+                             :text-inside="true"
+                             :stroke-width="15"
+                             :status="progressStatus"
+                >
+                </el-progress>
             </div>
         </el-dialog>
     </el-col>
@@ -315,7 +322,7 @@
                                 clearInterval(interval);
                                 return;
                             }
-                            that.loadProgress += +step.toFixed(2);
+                            that.loadProgress += step;
                         }, 500);
                     });
                 },
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index a124f96..316bb45 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -12,7 +12,7 @@
           <h4 class="login-title">
             Demo Application
           </h4>
-          <p style="text-align: center;">基于 DC3 1.2.2.SR 接口开发的 demo 应用<br/>仅供演示和测试用途!</p>
+          <p style="text-align: center;">基于 DC3 1.2.3.SR 接口开发的 demo 应用<br/>仅供演示和测试用途!</p>
           <el-form class="login-form"
                    status-icon
                    :rules="loginRules"