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

perf: 主页面滚动条会浮在侧滑上的问题等

Browse Source 
1.主页面滚动条会浮在侧滑上的问题
2.asset-detail中assetType和location重复的问题
This commit is contained in:
陈劲松
2020-04-28 11:48:13 +08:00
parent e5a8380d6c
commit 1106136fce
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/assets/stylus/main.scss
View File

@@ -1633,7 +1633,7 @@ li{
height: 11px; height: 11px;
} }
.ps__rail-x, .ps__rail-y { .ps__rail-x, .ps__rail-y {
z-index: 2999; z-index: 29;
} }
.ps__thumb-y { .ps__thumb-y {
right: 0; right: 0;
@@ -1658,7 +1658,7 @@ li{
right: 0 !important; right: 0 !important;
} }
.asset .ps__rail-y { .asset .ps__rail-y {
z-index: 2000; z-index: 29;
} }
.el-table__fixed-right-patch { .el-table__fixed-right-patch {
width: 0px !important; width: 0px !important;

2
nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
View File

@@ -911,7 +911,7 @@
font-size: 15px; font-size: 15px;
position: relative; position: relative;
overflow: auto; overflow: auto;
height: calc(100% - 34px); height: calc(100% - 37px);
} }
.endpoint-sub-table-body-dialog { .endpoint-sub-table-body-dialog {
width: 100%; width: 100%;

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

@@ -931,12 +931,10 @@
detail.push({label: this.$t("asset.tableTitle.alerts"), value: obj.alertNum}); detail.push({label: this.$t("asset.tableTitle.alerts"), value: obj.alertNum});
detail.push({label: this.$t("asset.createAssetTab.assetType"), value: obj.model.type.value}); detail.push({label: this.$t("asset.createAssetTab.assetType"), value: obj.model.type.value});
detail.push({label: this.$t("asset.createAssetTab.vendorModel"), value: obj.model.vendor.value + " " + obj.model.name}); detail.push({label: this.$t("asset.createAssetTab.vendorModel"), value: obj.model.vendor.value + " " + obj.model.name});
detail.push({label: this.$t("asset.createAssetTab.assetType"), value: obj.model.type.value});
detail.push({label: this.$t("asset.createAssetTab.purchaseDate"), value: obj.purchaseDate}); detail.push({label: this.$t("asset.createAssetTab.purchaseDate"), value: obj.purchaseDate});
detail.push({label: this.$t("asset.createAssetTab.dcName"), value: obj.idc ? obj.idc.name : ""}); detail.push({label: this.$t("asset.createAssetTab.dcName"), value: obj.idc ? obj.idc.name : ""});
detail.push({label: this.$t("asset.createAssetTab.location"), value: obj.idc ? obj.idc.location : ""}); detail.push({label: this.$t("asset.createAssetTab.location"), value: obj.idc ? obj.idc.location : ""});
detail.push({label: this.$t("asset.createAssetTab.principal"), value: obj.idc ? this.getPrincipalName(obj.idc.principal) : ""}); detail.push({label: this.$t("asset.createAssetTab.principal"), value: obj.idc ? this.getPrincipalName(obj.idc.principal) : ""});
detail.push({label: this.$t("asset.createAssetTab.location"), value: obj.idc ? obj.idc.location : ""});
detail.push({label: this.$t("asset.createAssetTab.tel"), value: obj.idc ? obj.idc.tel : ""}); detail.push({label: this.$t("asset.createAssetTab.tel"), value: obj.idc ? obj.idc.tel : ""});
detail.push({label: this.$t("asset.createAssetTab.cabinet"), value: obj.cabinet ? obj.cabinet.name : ""}); detail.push({label: this.$t("asset.createAssetTab.cabinet"), value: obj.cabinet ? obj.cabinet.name : ""});
detail.push({label: this.$t("asset.editAssetTab.uSize"), value: obj.cabinet ? obj.cabinet.uSize : ""}); detail.push({label: this.$t("asset.editAssetTab.uSize"), value: obj.cabinet ? obj.cabinet.uSize : ""});