From caaa6f99ce0de7468419e2344ab630fd2eff1b5b Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 17 Aug 2020 11:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:asset=20id=E9=BB=98=E8=AE=A4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/elementSet.vue | 6 +++---
 nezha-fronted/src/components/page/asset/asset.vue  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue
index db3898206..0f1d31900 100644
--- a/nezha-fronted/src/components/common/elementSet.vue
+++ b/nezha-fronted/src/components/common/elementSet.vue
@@ -8,11 +8,11 @@
           v-for="(item,index) in custom"
           :key="index"
           class="custom-label"
-          :class="!allowedAll && (index==0 || index == 1 || item.NotSet) ? 'custom-label-disabled' : ''"
+          :class="!allowedAll&&!item.allowed && (index==0 || index == 1 || item.NotSet) ? 'custom-label-disabled' : ''"
           @click="handler(item,index)"
           :id="'element-set-el-'+index"
         >
-          <i class="el-icon-check" v-if="!allowedAll&&(index==0||index==1||item.visibility=='disabled')"></i>
+          <i class="el-icon-check" v-if="!allowedAll&&!item.allowed&&(index==0||index==1||item.visibility=='disabled')"></i>
           <i v-else class="el-icon-check" v-show="item.show"></i>
           <span>{{item.label}}</span>
         </div>
@@ -90,7 +90,7 @@ export default {
     },
     //单选
     handler(val, index) {
-      if (!this.allowedAll && (index == 0 || index == 1 || val.NotSet)) {
+      if (!this.allowedAll&&!val.allowed && (index == 0 || index == 1 || val.NotSet)) {
         this.custom[index].show = true;
       } else {
         this.custom[index].show = !this.custom[index].show;
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 8b6e61e57..6bb5de8e2 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -280,7 +280,8 @@
           {
             label: this.$t("asset.tableTitle.id"),
             prop: 'ID',
-            show: true,
+            show: false,
+            allowed:true,
             // width: 110
           }, {
             label: this.$t("asset.tableTitle.assetType"),