diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index e77503b8a..004cecb17 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -184,7 +184,7 @@
- + @@ -829,11 +829,11 @@ } }, watch: { - tableData(){ + /*tableData(){ if(this.$refs.alertListTable&&this.$refs.alertListTable.bodyWrapper){ this.$refs.alertListTable.bodyWrapper.scrollTop = 0; } - }, + },*/ showSubList(n) { this.$bottomBoxWindow.showSubListWatch(vm, n); }, diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 2fd233374..33725232a 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -623,6 +623,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.alertMessageTable.$refs.alertListTable && this.$refs.alertMessageTable.$refs.alertListTable.bodyWrapper){ + this.$refs.alertMessageTable.$refs.alertListTable.bodyWrapper.scrollTop = 0; + } this.getAlertList(); }, // 数据排序 @@ -670,13 +673,6 @@ this.getAlertList(); } }, - tableData(){ - if(this.$refs.alertMessageTable&&this.$refs.alertMessageTable.bodyWrapper){ - this.$nextTick(()=>{ - this.$refs.alertMessageTable.bodyWrapper.scrollTop = 0; - }) - } - }, }, mounted() { //是否存在分页缓存 diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue index 022a5e2f4..51c9ef2d3 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue @@ -223,6 +223,9 @@ this.$set(this.searchLabel, item, searchObj[item]); } } + if(this.$refs.cabTable&&this.$refs.cabTable.bodyWrapper){ + this.$refs.cabTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, assetStatClassName(param) { @@ -260,11 +263,6 @@ } } }, - tableData(){ - if(this.$refs.cabTable&&this.$refs.cabTable.bodyWrapper){ - this.$refs.cabTable.bodyWrapper.scrollTop = 0; - } - }, }, mounted() { this.$nextTick(() => { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index e44ca7855..a60aacc2d 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -383,6 +383,9 @@ if(orderBy){ this.$set(this.endpointSearchLabel, 'orderBy', orderBy); } + if(this.$refs.endpointTable&& this.$refs.endpointTable.bodyWrapper){ + this.$refs.endpointTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, dateFormat(time) { @@ -477,11 +480,6 @@ } } }, - tableData(){ - if(this.$refs.endpointTable&& this.$refs.endpointTable.bodyWrapper){ - this.$refs.endpointTable.bodyWrapper.scrollTop = 0; - } - }, }, mounted() { //初始化表头 diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue index a5287591c..a0901cf56 100644 --- a/nezha-fronted/src/components/common/project/popData/alertTable.vue +++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue @@ -201,11 +201,6 @@ 'alertLabel':alertLabel, }, watch:{ - tableData(){ - if(this.$refs.alertListTable&&this.$refs.alertListTable.bodyWrapper){ - this.$refs.alertListTable.bodyWrapper.scrollTop = 0; - } - }, }, computed: { tagType() { @@ -478,6 +473,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.alertListTable&&this.$refs.alertListTable.bodyWrapper){ + this.$refs.alertListTable.bodyWrapper.scrollTop = 0; + } this.getAlertList(); }, diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue index 84ee6b544..287de450d 100644 --- a/nezha-fronted/src/components/common/project/popData/assetTable.vue +++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue @@ -124,11 +124,6 @@ 'alertLabel':alertLabel, }, watch:{ - tableData(){ - if(this.$refs.assetTable&& this.$refs.assetTable.bodyWrapper){ - this.$refs.assetTable.bodyWrapper.scrollTop = 0; - } - }, }, computed: { tagType() { @@ -340,6 +335,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.assetTable&& this.$refs.assetTable.bodyWrapper){ + this.$refs.assetTable.bodyWrapper.scrollTop = 0; + } this.getAssetList(); }, }, diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue index 0c35800a4..c0f7782e3 100644 --- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue +++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue @@ -115,11 +115,6 @@ 'alertLabel':alertLabel, }, watch:{ - tableData(){ - if(this.$refs.endpointTable){ - this.$refs.endpointTable.bodyWrapper.scrollTop = 0; - } - }, }, computed: { tagType() { @@ -330,6 +325,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.endpointTable){ + this.$refs.endpointTable.bodyWrapper.scrollTop = 0; + } this.getEndpointList(); }, }, diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue index 051b248cf..28696e70f 100644 --- a/nezha-fronted/src/components/common/project/visNetwork.vue +++ b/nezha-fronted/src/components/common/project/visNetwork.vue @@ -246,6 +246,7 @@ this.topologyLoading=false; return arr1 } + let promiseArr=[]; arr.forEach((item,index)=>{ item.shape='image'; item.id=item.moduleId; @@ -255,19 +256,6 @@ this.$get('/module/stat',{id:item.id}).then(res=>{ item.state=res.data; // if(index===arr.length-1){ - // setTimeout(()=>{ - // this.nodesArray=[...this.nodesArrayOther]; - // this.edgesArray=[...this.edgesArrayOther]; - // setTimeout(()=>{ - // this.topologyLoading=false; - // this.$refs['topology'].setData(); - // },500) - // }) - // } - }); - this.dealImg(`/project/topo/icon/${item.iconId}`).then((data)=>{ - item.image=data; - if(index===arr.length-1){ setTimeout(()=>{ this.nodesArray=[...this.nodesArrayOther]; this.edgesArray=[...this.edgesArrayOther]; @@ -276,7 +264,19 @@ this.$refs['topology'].setData(); },500) }) - } + // } + }); + promiseArr.push( this.dealImg(`/project/topo/icon/${item.iconId}`)) + }); + Promise.all(promiseArr).then(res2=>{ + res2.forEach((item,index)=>{ + arr[index].image=item; + }); + setTimeout(()=>{ + this.nodesArray=[...this.nodesArrayOther]; + this.edgesArray=[...this.edgesArrayOther]; + this.topologyLoading=false; + this.$refs['topology'].setData(); }) }); return arr diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index c4800d39c..d9b36baa7 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -408,6 +408,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.alertRuleTable && this.$refs.alertRuleTable.bodyWrapper){ + this.$refs.alertRuleTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, // 全屏 diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index e9bd7af2b..bbeb78f9e 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -613,6 +613,7 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + this.$refs.alertMessageTable.$refs.alertListTable.bodyWrapper.scrollTop = 0; this.getAlertList(); }, viewRule: function (id) { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 76305d2eb..65cadfec9 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -428,11 +428,6 @@ } } }, - tableData(){ - if(this.$refs.assetTable&&this.$refs.assetTable.bodyWrapper){ - this.$refs.assetTable.bodyWrapper.scrollTop = 0; - } - }, }, methods: { fullScreen() { @@ -631,6 +626,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.assetTable&&this.$refs.assetTable.bodyWrapper){ + this.$refs.assetTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, convertToDetail(obj) { diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 751b06cf3..2efe9ad8b 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -325,6 +325,9 @@ this.$set(this.searchLabel, item, searchObj[item]); } } + if(this.$refs.accountTable){ + this.$refs.accountTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, // 数据排序 @@ -358,11 +361,6 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, - tableData(n){ - if(this.$refs.accountTable){ - this.$refs.accountTable.bodyWrapper.scrollTop = 0; - } - }, }, mounted() { //初始化表头 diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 80a684852..94d69be71 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -441,6 +441,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.dcTable&&this.$refs.dcTable.bodyWrapper){ + this.$refs.dcTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, showCabinet(dc) { @@ -488,11 +491,6 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, - tableData(){ - if(this.$refs.dcTable&&this.$refs.dcTable.bodyWrapper){ - this.$refs.dcTable.bodyWrapper.scrollTop = 0; - } - }, }, destroyed() { window.onresize = null; diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index ce052a3d3..b1f0824bc 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -292,6 +292,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.mibTable&&this.$refs.mibTable.bodyWrapper){ + this.$refs.mibTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, downloadMib(mib) { diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index cdbde074a..7931780f0 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -315,6 +315,9 @@ if(orderBy) { this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.modelTable&&this.$refs.modelTable.bodyWrapper){ + this.$refs.modelTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, // 数据排序 @@ -368,11 +371,6 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, - tableData(){ - if(this.$refs.modelTable&&this.$refs.modelTable.bodyWrapper){ - this.$refs.modelTable.bodyWrapper.scrollTop = 0; - } - }, } } diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index a81d5830d..c9a37ea75 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -359,6 +359,9 @@ if(orderBy){ this.$set(this.searchLabel, 'orderBy', orderBy); } + if(this.$refs.promTable&&this.$refs.promTable.bodyWrapper){ + this.$refs.promTable.bodyWrapper.scrollTop = 0; + } this.getTableData(); }, //获取dc数据 @@ -444,11 +447,6 @@ let vm = this; this.$bottomBoxWindow.showSubListWatch(vm, n); }, - tableData(){ - if(this.$refs.promTable&&this.$refs.promTable.bodyWrapper){ - this.$refs.promTable.bodyWrapper.scrollTop = 0; - } - }, } } diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index 92e61a220..a0896bba0 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -285,11 +285,6 @@ }, }, watch:{ - tableData(){ - if(this.$refs.terminalLogTablethis.$refs.terminalLogTable.bodyWrapper){ - this.$refs.terminalLogTable.bodyWrapper.scrollTop = 0; - } - }, }, mounted() { //初始化表头 diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 3c9ba7735..ac207ca2d 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -578,6 +578,9 @@ if(orderBy){ this.$set(this.endpointSearchLabel,'orderBy',orderBy); } + if(this.$refs.endpointTable&&this.$refs.endpointTable.bodyWrapper){ + this.$refs.endpointTable.bodyWrapper.scrollTop = 0; + } this.getEndpointTableData(); }, @@ -837,11 +840,6 @@ }); } }, - endpointTableData(){ - if(this.$refs.endpointTable&&this.$refs.endpointTable.bodyWrapper){ - this.$refs.endpointTable.bodyWrapper.scrollTop = 0; - } - }, }, destroyed(){ window.onresize=null;