diff --git a/src/pages/node/list/node-layout/source/source_list.vue b/src/pages/node/list/node-layout/source/source_list.vue index c3b45f452bf9d91f83fee7233c44c76d7bb19c2a..fe42c2dcb704fe2b31a17c6b6e0cde630ed735ed 100644 --- a/src/pages/node/list/node-layout/source/source_list.vue +++ b/src/pages/node/list/node-layout/source/source_list.vue @@ -77,7 +77,7 @@ import SourceSetting from './source_setting.vue' import lockStatus from '../components/lock-status.vue' export default { components: { - lockStatus, + lockStatus, SourceSetting }, props: { @@ -271,7 +271,6 @@ export default { this.$notification.success({ message: '回滚节点软件源配置成功' }) this.getSource() } else { - this.$notification.error({ message: res.msg || '回滚节点软件源配置失败' }) } }).finally(() => { this.rollbackLoading = false diff --git a/src/pages/node/nodeGroupManager/components/all_node.vue b/src/pages/node/nodeGroupManager/components/all_node.vue index b510537c1d22faa5600ebd010d1be46fce804327..d2e0b6c4d303af852dc96106c14c38b4dd811a40 100644 --- a/src/pages/node/nodeGroupManager/components/all_node.vue +++ b/src/pages/node/nodeGroupManager/components/all_node.vue @@ -76,7 +76,6 @@ export default { getNodeList().then((res) => { if (res.code === 200) { const nodeList = res.data || [] - this.list = nodeList.filter((element) => { if (element.checkStatus) return element }) diff --git a/src/pages/node/nodeGroupManager/components/node_list.vue b/src/pages/node/nodeGroupManager/components/node_list.vue index 0e863ed3d7d59b132b80ec4d6ac3e532b6bc929b..eb5e59e985cc212c3fb56cb5ad77a9aa3fda2532 100644 --- a/src/pages/node/nodeGroupManager/components/node_list.vue +++ b/src/pages/node/nodeGroupManager/components/node_list.vue @@ -1,234 +1,234 @@ - - - - - + + + + + diff --git a/src/pages/script/components/execResult.vue b/src/pages/script/components/execResult.vue index fe9458c24c0181661507ea77c79dff517eb408c0..c514bfba8b657b99d2c3a4c42f4008b6c190e714 100644 --- a/src/pages/script/components/execResult.vue +++ b/src/pages/script/components/execResult.vue @@ -63,7 +63,7 @@ export default { mounted() { this.getRes() setTimeout(() => { - this.tableHeight = this.$refs.tableBox?.clientHeight ? this.$refs.tableBox?.clientHeight - 140 : 600 + this.computedTableHeight(); }) }, methods: { @@ -87,6 +87,9 @@ export default { this.listQuery.pageNum = pagination.current this.listQuery.pageSize = pagination.pageSize this.getRes() + }, + computedTableHeight() { + this.tableHeight = this.$refs.tableBox?.clientHeight ? this.$refs.tableBox?.clientHeight - 140 : 600 } } }