Skip to content

Commit

Permalink
feat:主机运维部门显示适配
Browse files Browse the repository at this point in the history
# Reviewed, transaction id: 15037
  • Loading branch information
hyunfa authored and wyyalt committed Aug 15, 2024
1 parent d7247a3 commit 85a5ce9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
1 change: 1 addition & 0 deletions frontend/src/i18n/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export default {
登录端口: 'Login port',
登录账号: 'Login account',
归属业务: 'Affiliated business',
运维部门: 'Operation department',
安装: 'Install',
上一步: 'Previous',
简单网络: 'Simple network',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/i18n/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export default {
登录端口: '登录端口',
登录账号: '登录账号',
归属业务: '归属业务',
运维部门: '运维部门',
安装: '安装',
上一步: '上一步',
简单网络: '简单网络',
Expand Down
21 changes: 20 additions & 1 deletion frontend/src/views/agent/agent-list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,17 @@
:min-width="columnMinWidth['bk_biz_name']"
v-if="filter['bk_biz_name'].mockChecked">
</NmColumn>
<NmColumn
key="dept"
:label="$t('运维部门')"
prop="dept_name"
:min-width="columnMinWidth['dept_name']"
:render-header="renderFilterHeader"
v-if="filter['dept_name'].mockChecked">
<template #default="{ row }">
{{ row.dept_name | filterEmpty }}
</template>
</NmColumn>
<NmColumn
key="cloudArea"
:label="$t('管控区域')"
Expand Down Expand Up @@ -740,6 +751,14 @@ export default class AgentList extends Mixins(pollMixin, TableHeaderMixins, auth
name: window.i18n.t('归属业务'),
id: 'bk_biz_name',
},
dept_name: {
checked: false,
disabled: false,
mockChecked: false,
name: window.i18n.t('运维部门'),
id: 'dept_name',
filter: true,
},
topology: {
checked: false,
disabled: false,
Expand Down Expand Up @@ -1069,7 +1088,7 @@ export default class AgentList extends Mixins(pollMixin, TableHeaderMixins, auth
if (this.selectedBiz.length) {
Object.assign(param, { bk_biz_ids: this.selectedBiz });
}
const optSearchKeys = ['version', 'bk_cloud_id'];
const optSearchKeys = ['version', 'bk_cloud_id', 'dept_name'];
const data = await AgentStore.getFilterCondition(param);
this.filterData.splice(0, this.filterData.length, ...data.map(item => (optSearchKeys.includes(item.id)
? ({ ...item, showCheckAll: true, showSearch: true })
Expand Down

0 comments on commit 85a5ce9

Please sign in to comment.