gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:asset id默认不显示

Browse Source
This commit is contained in:
wangwenrui
2020-08-17 11:01:28 +08:00
parent 29ace6ddb2
commit caaa6f99ce
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/elementSet.vue
View File

@@ -8,11 +8,11 @@
v-for="(item,index) in custom" v-for="(item,index) in custom"
:key="index" :key="index"
class="custom-label" 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)" @click="handler(item,index)"
:id="'element-set-el-'+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> <i v-else class="el-icon-check" v-show="item.show"></i>
<span>{{item.label}}</span> <span>{{item.label}}</span>
</div> </div>
@@ -90,7 +90,7 @@ export default {
}, },
//单选 //单选
handler(val, index) { 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; this.custom[index].show = true;
} else { } else {
this.custom[index].show = !this.custom[index].show; this.custom[index].show = !this.custom[index].show;

3
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -280,7 +280,8 @@
{ {
label: this.$t("asset.tableTitle.id"), label: this.$t("asset.tableTitle.id"),
prop: 'ID', prop: 'ID',
show: true, show: false,
allowed:true,
// width: 110 // width: 110
}, { }, {
label: this.$t("asset.tableTitle.assetType"), label: this.$t("asset.tableTitle.assetType"),