From d1da718e2a48bb023123023f16a5803a61945839 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 26 Aug 2021 19:56:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4visits=3D0=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA<0.01=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Login.vue              | 11 ++++++-----
 src/utils/constants.js     |  3 ++-
 src/utils/unit-convert.js  |  1 +
 src/views/charts/Chart.vue |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Login.vue b/src/Login.vue
index 63026f3f..a9dd2189 100644
--- a/src/Login.vue
+++ b/src/Login.vue
@@ -56,11 +56,12 @@ export default {
       if (!this.username || !this.pin) {
         return
       }
-      // if (!this.blockOperation.query) {
-      //   this.blockOperation.query = true
-      // } else {
-      //   return
-      // }
+      if (!this.blockOperation.query) {
+        this.blockOperation.query = true
+      } else {
+        return
+      }
+      this.loading = true
       post('sys/login', { username: this.username, pin: this.pin }).then(
         res => {
           if (res.code === 200) {
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 33f965fb..d0bd2aa4 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -77,7 +77,8 @@ export const unitTypes = {
   time: 'time',
   number: 'number',
   byte: 'byte',
-  string: 'string'
+  string: 'string',
+  percent: 'percent'
 }
 
 export const chartTableDefaultPageSize = 10 // table类型图表默认每页数据量
diff --git a/src/utils/unit-convert.js b/src/utils/unit-convert.js
index 8b2e873f..380c4b37 100644
--- a/src/utils/unit-convert.js
+++ b/src/utils/unit-convert.js
@@ -82,6 +82,7 @@ export default function unitConvert (value, unitType, sourceUnit, targetUnit, do
       case unitTypes.time: {
         return timeUnitFormatter(value, sourceUnit, targetUnit, dot)
       }
+      case unitTypes.percent:
       case unitTypes.number: {
         return numberUnitConvert(value, sourceUnit, targetUnit, dot)
       }
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index 8363a1ed..6b31c29f 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -110,7 +110,7 @@
     </template>
     <template #title><span :title="chartInfo.i18n ? $t(chartInfo.i18n) : chartInfo.name">{{chartInfo.i18n ? $t(chartInfo.i18n) : chartInfo.name}}</span></template>
     <template #data>
-      <span>{{handleSingleValue[0] ? handleSingleValue[0] : '-'}}</span>
+      <span>{{handleSingleValue[0] || handleSingleValue[0] === 0 ? handleSingleValue[0] : '-'}}</span>
       <span class="single-value__unit">{{handleSingleValue[1]}}</span>
     </template>
     <template #chart>
@@ -968,7 +968,7 @@ export default {
       const unitType = this.chartInfo.params.unitType
       const result = unitConvert(value, unitType)
       switch (unitType) {
-        case unitTypes.number: {
+        case unitTypes.percent: {
           result[0] = result[0] < 0.01 ? '< 0.01' : result[0]
           break
         }