diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index f70154cc7..d4b8ddc47 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -491,10 +491,11 @@ li{ } .sidebar-info-item-txt { display: inline-block; - width: 120px; + width: 100px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + vertical-align: middle; } .side-bar-menu-edit { line-height: 20px; @@ -871,8 +872,8 @@ li{ transform: scaleX(1); opacity: 1; transition: transform .5s - cubic-bezier(.23, 1, .32, 1), opacity .5s - cubic-bezier(.23, 1, .32, 1); + cubic-bezier(.23, 1, .32, 1), opacity .5s + cubic-bezier(.23, 1, .32, 1); transform-origin: right center; } .right-box-enter, .right-box-leave-active { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index a624f64cd..cc7813f29 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -11,11 +11,12 @@ + @@ -23,11 +24,12 @@ + @@ -35,11 +37,12 @@ + @@ -52,6 +55,7 @@ {{item.label}} + @@ -464,7 +468,7 @@ getFlushData: { handler(newVal, oldVal) { if (newVal === true) { - this.getIDCOptionData(); + this.getLeftMenuList(); this.getAssetData() } } @@ -601,28 +605,15 @@ this.$refs.assetEditUnit.getIDCOptionData(); } }, - getIDCOptionData() { - this.$get('idc').then(response => { - if (response.code === 200) { - this.checkListData = this.IDCOptionData = response.data.list; - this.markOptionData(this.IDCOptionData) - } - }) - }, - getAssetTypeData:function(){ - this.$get('sys/dict/all?type=assetType').then(response => { - if (response.code === 200) { - this.assetTypeCheckListData = response.data - } - }) - }, - getVendorData:function(){ - this.$get('sys/dict/all?type=vendor').then(response => { - if (response.code === 200) { - this.vendorCheckListData = response.data - } - }) - }, + // getIDCOptionData() { + // this.$get('idc').then(response => { + // if (response.code === 200) { + // // console.log(response.data); + // // this.checkListData = this.IDCOptionData = response.data.list; + // // this.markOptionData(this.IDCOptionData) + // } + // }) + // }, getPingData:function(){ this.pingCheckListData=[ {label:'up',value:1}, @@ -665,7 +656,7 @@ if (res.code === 200) { const h = this.$createElement; this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")}); - this.getIDCOptionData() + this.getLeftMenuList() this.getAssetData() } else { this.$message.error(res.msg); @@ -683,7 +674,7 @@ if (response.code === 200) { this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); this.getAssetData(); - this.getIDCOptionData(); + this.getLeftMenuList(); } else { this.$message.error(response.msg); } @@ -855,9 +846,6 @@ flushData() { this.getSingleAsset(); this.getAssetData(); - this.getIDCOptionData(); - this.getAssetTypeData(); - this.getVendorData(); }, closeAllPop:function(){ this.$refs.idcConfigBox.forEach((item)=>{ @@ -993,7 +981,28 @@ } this.$set(this.searchLabel, "orderBy", orderBy); this.getAssetData(); - } + }, + // 获取左侧菜单数据 + getLeftMenuList(){ + this.$get('asset/filter').then(response => { + if (response.code === 200) { + console.log(response.data); + //dc + this.checkListData = this.IDCOptionData = response.data.dc; + this.markOptionData(this.IDCOptionData); + // AssetType + this.assetTypeCheckListData = response.data.assetType; + // vendor + this.vendorCheckListData = response.data.vendor; + // ping + this.pingCheckListData= response.data.ping.map(item=>{ + item.label=item.name; + item.value=item.status; + return item + }) + } + }) + }, }, created() { this.getUserData(); @@ -1001,6 +1010,7 @@ this.getPingData(); }, mounted() { + this.getLeftMenuList()//获取左侧菜单列表 //是否存在分页缓存 let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); if (pageSize != 'undefined' && pageSize != null) { @@ -1086,4 +1096,15 @@ .link{ position: relative; } + /deep/ .el-badge__content{ + width: 15px; + } + .mark{ + vertical-align: middle; + display: inline-flex; + } + /*/deep/ .sidebar-info-item .el-checkbox__label{*/ + /*padding-right: 15px;*/ + /*width: calc(100% - 32px);*/ + /*}*/