diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 7ed5bc4a11..8562b16e8f 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3597,5 +3597,6 @@ "确认后,将主机将清空已存在的资源归属设置,并设置为公共资源": "确认后,将主机将清空已存在的资源归属设置,并设置为公共资源", "确认批量将 {n} 台主机转入业务资源池?": "确认批量将 {n} 台主机转入业务资源池?", "确认转入待故障池?": "确认转入待故障池?", + "跳转管理页": "跳转管理页", "这行勿动!新增翻译请在上一行添加!": "" } diff --git a/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts b/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts index fc39570719..4535a9cc6e 100644 --- a/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts +++ b/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts @@ -38,7 +38,10 @@ export default class DbResource { bk_biz_name: string; }; ip: string; - label: string; + label: { + name: string; + id: number; + }[]; net_device_id: string; os_bit: string; os_type: string; diff --git a/dbm-ui/frontend/src/services/source/dbresourceResource.ts b/dbm-ui/frontend/src/services/source/dbresourceResource.ts index 6fe3fa7383..f91c80614c 100644 --- a/dbm-ui/frontend/src/services/source/dbresourceResource.ts +++ b/dbm-ui/frontend/src/services/source/dbresourceResource.ts @@ -166,7 +166,7 @@ export function getSpecResourceCount(params: { */ export function updateResource(params: { bk_host_ids: number[]; - labels?: string[]; + labels?: number[]; for_biz: number; rack_id: string; resource_type: string; diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue index ab37213adc..1a5b777f64 100644 --- a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue +++ b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue @@ -13,14 +13,18 @@ diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-config.ts b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-config.ts index bb728254d9..b807008e0c 100644 --- a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-config.ts +++ b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-config.ts @@ -135,6 +135,11 @@ export default { return true; }, }, + label: { + label: t('标签'), + component: 'label', + type: 'string', + }, disk: { label: t('磁盘(G)'), component: 'disk', diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-input/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-input/Index.vue index 695d77fde0..f4cb42b674 100644 --- a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-input/Index.vue +++ b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/search-box/components/field-input/Index.vue @@ -70,6 +70,11 @@ :model="localValueMemo" name="mem" @change="handleChange" /> +
@@ -159,6 +164,7 @@ os_type: true, cpu: true, mem: true, + label: true, mount_point: true, disk: true, disk_type: true, @@ -183,7 +189,7 @@ // 提交搜索,更新外部值 const handleSubmit = _.debounce( () => { - Promise.all(Object.values(inputRef.value).map((inputItem) => inputItem.getValue())).then(() => { + Promise.all(Object.values(inputRef.value).map((inputItem) => inputItem?.getValue())).then(() => { emits('update:modelValue', { ...localValueMemo.value, }); diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/tag-research/selector/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/tag-research/selector/Index.vue index b132d1c8d8..74fbcaaa9e 100644 --- a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/tag-research/selector/Index.vue +++ b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/components/tag-research/selector/Index.vue @@ -5,7 +5,7 @@ filterable multiple :scroll-height="200" - :scroll-loading="loading" + :scroll-loading="isFetchingTagsList" selected-style="checkbox" @scroll-end="loadMore">