From 95af9160a7fd3abbc74274e15afe1c2e20bb66f6 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 9 Jul 2021 15:35:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=BB=9F=E4=B8=80=E5=8D=A0=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/asset/assetTable.vue        | 2 +-
 .../src/components/common/table/settings/modelTable.vue     | 3 ++-
 .../src/components/common/table/settings/moduleTable.vue    | 3 ++-
 .../components/common/table/settings/operationLogTable.vue  | 3 ++-
 .../src/components/common/table/settings/roleTable.vue      | 6 ++----
 .../components/common/table/settings/terminalLogTable.vue   | 3 ++-
 .../src/components/common/table/settings/userTable.vue      | 3 ++-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 9858daeea..ea43c1ccb 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -49,7 +49,7 @@
         <template v-else-if="item.prop === 'dc'">{{scope.row.dc ? scope.row.dc.name : '-'}}</template>
         <template v-else-if="item.prop === 'cabinet'">
           <span v-if="scope.row.cabinet && scope.row.cabinet !== '--'">{{scope.row.cabinet.name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
-          <span v-else >--</span>
+          <span v-else >-</span>
         </template>
         <template v-else-if="item.prop == 'pingInfo'">
           <div @mouseenter="showTableTooltip( formatPingTime(scope.row.pingInfo.lastUpdate), true, $event)" @mouseleave="hideTableTooltip" v-if="scope.row.pingInfo">
diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue
index 6154c9f1f..2559cee13 100644
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -51,7 +51,8 @@
           {{scope.row[item.prop]}}
           </span>
         </template>
-        <span v-else>{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
     <el-table-column
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index 4d8bbf1f0..aaa21cd06 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -56,7 +56,8 @@
             {{scope.row[item.prop]}}
           </span>
         </template>
-        <span v-else>{{scope.row[item.prop] ? scope.row[item.prop] : ''}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
     <el-table-column
diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
index a78cd1aba..ef473213a 100644
--- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue
@@ -40,7 +40,8 @@
               </span>
         <span v-else-if="item.prop === 'username'">{{formatUsername(scope.row)}}</span>
         <span v-else-if="item.prop === 'createDate'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
-        <span v-else>{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
   </el-table>
diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue
index ea3c87715..3625e2e46 100644
--- a/nezha-fronted/src/components/common/table/settings/roleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue
@@ -41,11 +41,9 @@
           <template v-else-if="scope.row.name">
             <span>{{scope.row.name}}</span>
           </template>
-          <template v-else>
-            <span>-</span>
-          </template>
         </template>
-        <span v-else>{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
     <el-table-column
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
index 78e52ad80..5509fb7ea 100644
--- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
@@ -66,7 +66,8 @@
           <span v-if="scope.row.authType == 1">{{$t('config.terminallog.pin')}}</span>
           <span v-else-if="scope.row.authType == 2">{{$t('config.terminallog.key')}}</span>
         </template>
-        <span v-else>{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
     <el-table-column
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index 3e498f97b..a7fd36aab 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -54,7 +54,8 @@
         </template>
         <span v-else-if="item.prop === 'createTime'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
         <span v-else-if="item.prop === 'lastLoginTime'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
-        <span v-else>{{scope.row[item.prop]}}</span>
+        <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+        <span v-else>-</span>
       </template>
     </el-table-column>
     <el-table-column