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" > - + {{item.label}} @@ -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"),