From dd689508d4e8aaf856aff8794ff42822a1e2dacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Fri, 13 Mar 2020 16:56:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=90=84=E5=88=97=E8=A1=A8=E6=9C=89?=
 =?UTF-8?q?=E4=BA=9B=E6=B2=A1=E5=86=85=E5=AE=B9=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=94=A8=E2=80=98-=E2=80=99=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/alert/config.vue      | 3 ++-
 nezha-fronted/src/components/page/alert/list.vue        | 3 ++-
 nezha-fronted/src/components/page/config/promServer.vue | 5 +++--
 nezha-fronted/src/components/page/project/project.vue   | 8 ++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index b32017198..88d92e1c6 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -73,7 +73,8 @@
               <span v-else>-</span>
             </template>
             <template v-else-if="item.prop == 'alertName'">{{scope.row.alertName}}</template>
-            <span v-else>{{scope.row[item.prop]}}</span>
+            <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+            <template v-else>-</template>
           </template>
         </el-table-column>
         <el-table-column width="28">
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index cc6a03dd0..b81b0ae72 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -80,7 +80,8 @@
                 {{scope.row['state'] == 2 ? "Expired" : ""}}
               </span>
             </div>
-            <span v-else>{{scope.row[item.prop]}}</span>
+            <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+            <template v-else>-</template>
           </template>
         </el-table-column>
         <el-table-column width="28">
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index b9003be72..2548ed981 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -53,7 +53,7 @@
             <span v-else-if="item.prop == 'status'">
               <el-popover placement="right" width="50" trigger="hover" :content="(scope.row[item.prop] == '1'?$t('overall.available'):$t('overall.unavailable'))+'['+(scope.row.checkTime&&scope.row.checkTime!=''?(new Date(scope.row.checkTime).getHours()+':'+new Date(scope.row.checkTime).getMinutes()):'--')+']'">
                 <div slot="reference" style="width: 20px">
-                  <div :class="{'active-icon green':scope.row[item.prop] == '1','active-icon red':scope.row[item.prop] == '0'}"></div>
+                  <div :class="{'active-icon green':scope.row[item.prop] == '1','active-icon red':scope.row[item.prop] == '0' || scope.row[item.prop] == '-1' || scope.row[item.prop] == '-2'}"></div>
                 </div>
               </el-popover>
 <!--                {{scope.row[item.prop] == '1' ? $t('overall.available') : ''}}-->
@@ -66,7 +66,8 @@
               &nbsp;
               <span :title="$t('overall.delete')" @click="del(scope.row)" class="content-right-option" :id="'prom-del-'+scope.row.id"><i class="el-icon-delete"></i></span>
             </div>
-            <span v-else>{{scope.row[item.prop]}}</span>
+            <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+            <template v-else>-</template>
           </template>
         </el-table-column>
         <el-table-column width="28">
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 962763e89..ec190d0ff 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -139,7 +139,10 @@
           <template slot-scope="scope" :column="item">
             <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="viewAsset(scope.row[item.prop].id)">{{scope.row[item.prop].host}}</span>
             <span v-else-if="item.prop == 'param'">
-              <span v-for="(p,i) in scope.row.paramObj">{{p.key}}={{p.value}}<span v-if="i < scope.row.paramObj.length-1">，</span></span>
+              <template v-if="scope.row.paramObj">
+                <span v-for="(p,i) in scope.row.paramObj">{{p.key}}={{p.value}}<span v-if="i < scope.row.paramObj.length-1">，</span></span>
+              </template>
+              <template v-else>-</template>
             </span>
             <div v-else-if="item.prop == 'option'" class="content-right-options">
               <span :title="$t('overall.query')" @click="showEndpoint(scope.row)" class="content-right-option" :id="'edp-query-'+scope.row.id"><i class="el-icon-search"></i></span>
@@ -157,7 +160,8 @@
               </el-popover>
 <!--              {{ scope.row.state == 1 ? 'up' : ''}}{{scope.row.state == 0 ? 'down' : ''}}-->
             </span>
-            <span v-else>{{scope.row[item.prop]}}</span>
+            <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
+            <template v-else>-</template>
           </template>
         </el-table-column>
         <el-table-column width="28">