diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index d784e6bc4..74297e05c 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1633,7 +1633,7 @@ li{ height: 11px; } .ps__rail-x, .ps__rail-y { - z-index: 2999; + z-index: 29; } .ps__thumb-y { right: 0; @@ -1658,7 +1658,7 @@ li{ right: 0 !important; } .asset .ps__rail-y { - z-index: 2000; + z-index: 29; } .el-table__fixed-right-patch { width: 0px !important; diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index bc3097ab0..3b1308efd 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -911,7 +911,7 @@ font-size: 15px; position: relative; overflow: auto; - height: calc(100% - 34px); + height: calc(100% - 37px); } .endpoint-sub-table-body-dialog { width: 100%; diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 09e006299..137a2f662 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -931,12 +931,10 @@ 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.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.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.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.cabinet"), value: obj.cabinet ? obj.cabinet.name : ""}); detail.push({label: this.$t("asset.editAssetTab.uSize"), value: obj.cabinet ? obj.cabinet.uSize : ""});