diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index d730be26b0..c61787d54a 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -28,7 +28,7 @@ "@icon-cool/bk-icon-bk-biz-components": "^0.0.4", "@vueuse/core": "^12.0.0", "axios": "^1.7.9", - "bkui-vue": "2.0.1-beta.87", + "bkui-vue": "2.0.1-beta.89", "date-fns": "^4.1.0", "dayjs": "^1.11.13", "echarts": "^5.5.1", diff --git a/dbm-ui/frontend/src/common/const/clusterTypeInfos.ts b/dbm-ui/frontend/src/common/const/clusterTypeInfos.ts index 406b809d1b..d7fd4fa53d 100644 --- a/dbm-ui/frontend/src/common/const/clusterTypeInfos.ts +++ b/dbm-ui/frontend/src/common/const/clusterTypeInfos.ts @@ -9,6 +9,7 @@ import { MachineTypes } from './machineTypes'; export interface ClusterTypeInfoItem { id: ClusterTypes; name: string; + architectureName: string; // 部署架构名称 specClusterName: string; // 规格对应的集群名，磨平集群类型差异 dbType: DBTypes; moduleId: ExtractedControllerDataKeys; @@ -28,6 +29,7 @@ const mysql: InfoType = { [ClusterTypes.TENDBSINGLE]: { id: ClusterTypes.TENDBSINGLE, name: t('MySQL单节点'), + architectureName: t('MySQL单节点集群'), specClusterName: 'MySQL', dbType: DBTypes.MYSQL, moduleId: 'mysql', @@ -45,6 +47,7 @@ const mysql: InfoType = { [ClusterTypes.TENDBHA]: { id: ClusterTypes.TENDBHA, name: t('MySQL主从'), + architectureName: t('MySQL高可用集群'), specClusterName: 'MySQL', dbType: DBTypes.MYSQL, moduleId: 'mysql', @@ -65,6 +68,7 @@ const spider: InfoType = { [ClusterTypes.TENDBCLUSTER]: { id: ClusterTypes.TENDBCLUSTER, name: 'TenDBCluster', + architectureName: t('TendbCluster集群'), specClusterName: 'TenDBCluster', dbType: DBTypes.TENDBCLUSTER, moduleId: 'mysql', @@ -85,6 +89,7 @@ const redis: InfoType = { [ClusterTypes.TWEMPROXY_REDIS_INSTANCE]: { id: ClusterTypes.TWEMPROXY_REDIS_INSTANCE, name: 'TendisCache', + architectureName: t('TendisCache集群'), specClusterName: 'Redis', dbType: DBTypes.REDIS, moduleId: 'redis', @@ -102,6 +107,7 @@ const redis: InfoType = { [ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE]: { id: ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE, name: 'TendisSSD', + architectureName: t('TendisSSD集群'), specClusterName: 'Redis', dbType: DBTypes.REDIS, moduleId: 'redis', @@ -119,6 +125,7 @@ const redis: InfoType = { [ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER]: { id: ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER, name: 'Tendisplus', + architectureName: t('Tendisplus存储版集群'), specClusterName: 'Redis', dbType: DBTypes.REDIS, moduleId: 'redis', @@ -136,6 +143,7 @@ const redis: InfoType = { [ClusterTypes.PREDIXY_REDIS_CLUSTER]: { id: ClusterTypes.PREDIXY_REDIS_CLUSTER, name: 'RedisCluster', + architectureName: t('RedisCluster集群'), specClusterName: 'Redis', dbType: DBTypes.REDIS, moduleId: 'redis', @@ -153,6 +161,7 @@ const redis: InfoType = { [ClusterTypes.REDIS_INSTANCE]: { id: ClusterTypes.REDIS_INSTANCE, name: t('Redis主从'), + architectureName: t('RedisCache主从版'), specClusterName: 'Redis', dbType: DBTypes.REDIS, moduleId: 'redis', @@ -169,6 +178,7 @@ const bigdata: InfoType = { [ClusterTypes.ES]: { id: ClusterTypes.ES, name: 'ElasticSearch', + architectureName: t('ES集群'), specClusterName: 'ElasticSearch', dbType: DBTypes.ES, moduleId: 'bigdata', @@ -190,6 +200,7 @@ const bigdata: InfoType = { [ClusterTypes.KAFKA]: { id: ClusterTypes.KAFKA, name: 'Kafka', + architectureName: t('Kafka集群'), specClusterName: 'Kafka', dbType: DBTypes.KAFKA, moduleId: 'bigdata', @@ -207,6 +218,7 @@ const bigdata: InfoType = { [ClusterTypes.HDFS]: { id: ClusterTypes.HDFS, name: 'HDFS', + architectureName: t('Hdfs集群'), specClusterName: 'HDFS', dbType: DBTypes.HDFS, moduleId: 'bigdata', @@ -224,6 +236,7 @@ const bigdata: InfoType = { [ClusterTypes.INFLUXDB]: { id: ClusterTypes.INFLUXDB, name: 'InfuxDB', + architectureName: t('Influxdb实例'), specClusterName: 'InfuxDB', dbType: DBTypes.INFLUXDB, moduleId: 'bigdata', @@ -237,6 +250,7 @@ const bigdata: InfoType = { [ClusterTypes.PULSAR]: { id: ClusterTypes.PULSAR, name: 'Pulsar', + architectureName: t('Pulsar集群'), specClusterName: 'Pulsar', dbType: DBTypes.PULSAR, moduleId: 'bigdata', @@ -258,6 +272,7 @@ const bigdata: InfoType = { [ClusterTypes.DORIS]: { id: ClusterTypes.DORIS, name: 'Doris', + architectureName: t('Doris集群'), specClusterName: 'Doris', dbType: DBTypes.DORIS, moduleId: 'bigdata', @@ -279,6 +294,7 @@ const bigdata: InfoType = { [ClusterTypes.RIAK]: { id: ClusterTypes.RIAK, name: 'Riak', + architectureName: t('Riak集群'), specClusterName: 'Riak', dbType: DBTypes.RIAK, moduleId: 'bigdata', @@ -295,6 +311,7 @@ const mongodb: InfoType = { [ClusterTypes.MONGO_REPLICA_SET]: { id: ClusterTypes.MONGO_REPLICA_SET, name: t('Mongo副本集'), + architectureName: t('Mongo副本集'), specClusterName: 'MongoDB', dbType: DBTypes.MONGODB, moduleId: 'mongodb', @@ -307,7 +324,8 @@ const mongodb: InfoType = { }, [ClusterTypes.MONGO_SHARED_CLUSTER]: { id: ClusterTypes.MONGO_SHARED_CLUSTER, - name: t('Mongo 分片集群'), + name: t('Mongo分片集群'), + architectureName: t('Mongo分片集群'), specClusterName: 'MongoDB', dbType: DBTypes.MONGODB, moduleId: 'mongodb', @@ -318,7 +336,7 @@ const mongodb: InfoType = { }, { id: MachineTypes.MONGODB, - name: '副本集/ShardSvr', + name: t('副本集/ShardSvr'), }, { id: MachineTypes.MONGO_CONFIG, @@ -332,6 +350,7 @@ const sqlserver: InfoType = { [ClusterTypes.SQLSERVER_SINGLE]: { id: ClusterTypes.SQLSERVER_SINGLE, name: t('SQLServer单节点'), + architectureName: t('sqlserver单节点版'), specClusterName: 'SQLServer', dbType: DBTypes.SQLSERVER, moduleId: 'sqlserver', @@ -345,6 +364,7 @@ const sqlserver: InfoType = { [ClusterTypes.SQLSERVER_HA]: { id: ClusterTypes.SQLSERVER_HA, name: t('SQLServer主从'), + architectureName: t('sqlserver主从版'), specClusterName: 'SQLServer', dbType: DBTypes.SQLSERVER, moduleId: 'sqlserver', diff --git a/dbm-ui/frontend/src/locales/en.json b/dbm-ui/frontend/src/locales/en.json index ba68044f4a..b36c179bc5 100644 --- a/dbm-ui/frontend/src/locales/en.json +++ b/dbm-ui/frontend/src/locales/en.json @@ -1644,5 +1644,16 @@ "分片集群": "Sharded Cluster", "主从管理": "HA Management", "DB 重命名：database 重命名": "DB Rename：database rename", + "MySQL单节点集群": "", + "MySQL高可用集群": "", + "TendisCache集群": "", + "RedisCache主从版": "", + "Kafka集群": "", + "Hdfs集群": "", + "Pulsar集群": "", + "Riak集群": "", + "Mongo分片集群": "", + "sqlserver单节点版": "", + "sqlserver主从版": "", "这行勿动！新增翻译请在上一行添加！": "" } diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index a9a70733a9..c2317d4dfc 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3871,6 +3871,17 @@ "导出数据：": "导出数据：", "脚本来源：": "脚本来源：", "脚本执行内容：": "脚本执行内容：", + "MySQL单节点集群": "MySQL 单节点集群", + "MySQL高可用集群": "MySQL 高可用集群", + "TendisCache集群": "TendisCache集群", + "RedisCache主从版": "RedisCache主从版", + "Kafka集群": "Kafka 集群", + "Hdfs集群": "Hdfs 集群", + "Pulsar集群": "Pulsar 集群", + "Riak集群": "Riak 集群", + "Mongo分片集群": "Mongo 分片集群", + "sqlserver单节点版": "sqlserver 单节点版", + "sqlserver主从版": "sqlserver 主从版", "这行勿动！新增翻译请在上一行添加！": "" } diff --git a/dbm-ui/frontend/src/services/model/mongodb/mongodb-instance-detail.ts b/dbm-ui/frontend/src/services/model/mongodb/mongodb-instance-detail.ts index 7ee8dbfa11..7bb8e72c3d 100644 --- a/dbm-ui/frontend/src/services/model/mongodb/mongodb-instance-detail.ts +++ b/dbm-ui/frontend/src/services/model/mongodb/mongodb-instance-detail.ts @@ -1,3 +1,6 @@ +import { clusterTypeInfos } from '@common/const/clusterTypeInfos'; +import { ClusterTypes } from '@common/const/clusterTypes'; + export default class MongodbInstanceDetail { bk_agent_id: string; bk_cloud_id: number; @@ -6,8 +9,10 @@ export default class MongodbInstanceDetail { bk_disk: number; bk_host_id: number; bk_host_innerip: string; - bk_idc_id: string; + bk_idc_id: number; bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; bk_mem: number; bk_os_name: string; cluster_id: number; @@ -39,6 +44,8 @@ export default class MongodbInstanceDetail { this.bk_host_innerip = payload.bk_host_innerip; this.bk_idc_id = payload.bk_idc_id; this.bk_idc_name = payload.bk_idc_name; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.bk_mem = payload.bk_mem; this.bk_os_name = payload.bk_os_name; this.cluster_id = payload.cluster_id; @@ -60,4 +67,8 @@ export default class MongodbInstanceDetail { this.status = payload.status; this.version = payload.version; } + + get clusterTypeName() { + return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || ''; + } } diff --git a/dbm-ui/frontend/src/services/model/mysql/tendbha-instance.ts b/dbm-ui/frontend/src/services/model/mysql/tendbha-instance.ts index 253ebe2733..fad44d669a 100644 --- a/dbm-ui/frontend/src/services/model/mysql/tendbha-instance.ts +++ b/dbm-ui/frontend/src/services/model/mysql/tendbha-instance.ts @@ -13,6 +13,9 @@ import type { HostInfo, InstanceListSpecConfig, InstanceRelatedCluster } from '@services/types'; +import { clusterTypeInfos } from '@common/const/clusterTypeInfos'; +import { ClusterTypes } from '@common/const/clusterTypes'; + import { utcDisplayTime } from '@utils'; export default class TendbhaInstance { @@ -22,6 +25,11 @@ export default class TendbhaInstance { db_version: string; bk_disk: number; bk_host_id: number; + bk_host_innerip: string; + bk_idc_id: number; + bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; bk_mem: number; bk_sub_zone: string; cluster_id: number; @@ -53,6 +61,11 @@ export default class TendbhaInstance { this.bk_cpu = payload.bk_cpu || 0; this.bk_disk = payload.bk_disk || 0; this.bk_host_id = payload.bk_host_id || 0; + this.bk_host_innerip = payload.bk_host_innerip || ''; + this.bk_idc_id = payload.bk_idc_id || 0; + this.bk_idc_name = payload.bk_idc_name || ''; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.bk_mem = payload.bk_mem || 0; this.bk_sub_zone = payload.bk_sub_zone || ''; this.cluster_id = payload.cluster_id || 0; @@ -81,4 +94,8 @@ export default class TendbhaInstance { get createAtDisplay() { return utcDisplayTime(this.create_at); } + + get clusterTypeName() { + return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || ''; + } } diff --git a/dbm-ui/frontend/src/services/model/redis/redis-instance.ts b/dbm-ui/frontend/src/services/model/redis/redis-instance.ts index 9a2f71d3df..585b18292b 100644 --- a/dbm-ui/frontend/src/services/model/redis/redis-instance.ts +++ b/dbm-ui/frontend/src/services/model/redis/redis-instance.ts @@ -14,6 +14,8 @@ import type { HostInfo, InstanceListSpecConfig, InstanceRelatedCluster } from '@services/types'; import { type ClusterInstStatus, clusterInstStatus } from '@common/const'; +import { clusterTypeInfos } from '@common/const/clusterTypeInfos'; +import { ClusterTypes } from '@common/const/clusterTypes'; import { isRecentDays, utcDisplayTime } from '@utils'; @@ -23,6 +25,11 @@ export default class RedisInstance { bk_cpu: number; bk_disk: number; bk_host_id: number; + bk_host_innerip: string; + bk_idc_id: number; + bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; bk_mem: number; db_version: string; bk_sub_zone: string; @@ -53,6 +60,11 @@ export default class RedisInstance { this.bk_cpu = payload.bk_cpu || 0; this.bk_disk = payload.bk_disk || 0; this.bk_host_id = payload.bk_host_id || 0; + this.bk_host_innerip = payload.bk_host_innerip || ''; + this.bk_idc_id = payload.bk_idc_id || 0; + this.bk_idc_name = payload.bk_idc_name || ''; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.bk_mem = payload.bk_mem || 0; this.bk_sub_zone = payload.bk_sub_zone || ''; this.cluster_id = payload.cluster_id || 0; @@ -87,4 +99,8 @@ export default class RedisInstance { get getStatusInfo() { return clusterInstStatus[this.status] || clusterInstStatus.unavailable; } + + get clusterTypeName() { + return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || ''; + } } diff --git a/dbm-ui/frontend/src/services/model/riak/riak-instance.ts b/dbm-ui/frontend/src/services/model/riak/riak-instance.ts index 061e89d633..e9acb2b04d 100644 --- a/dbm-ui/frontend/src/services/model/riak/riak-instance.ts +++ b/dbm-ui/frontend/src/services/model/riak/riak-instance.ts @@ -4,6 +4,11 @@ export default class RiakInstance { bk_cloud_id: number; bk_cloud_name: string; bk_host_id: number; + bk_host_innerip: string; + bk_idc_id: number; + bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; cluster_id: number; cluster_name: string; cluster_type: string; @@ -27,6 +32,11 @@ export default class RiakInstance { this.bk_cloud_id = payload.bk_cloud_id; this.bk_cloud_name = payload.bk_cloud_name; this.bk_host_id = payload.bk_host_id; + this.bk_host_innerip = payload.bk_host_innerip || ''; + this.bk_idc_id = payload.bk_idc_id || 0; + this.bk_idc_name = payload.bk_idc_name || ''; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.cluster_id = payload.cluster_id; this.cluster_name = payload.cluster_name; this.cluster_type = payload.cluster_type; diff --git a/dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-instance.ts b/dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-instance.ts index b07dcc80a1..dc3c08d4a0 100644 --- a/dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-instance.ts +++ b/dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-instance.ts @@ -14,6 +14,8 @@ import type { HostInfo, InstanceListSpecConfig, InstanceRelatedCluster } from '@services/types'; import { clusterInstStatus, ClusterInstStatusKeys } from '@common/const'; +import { clusterTypeInfos } from '@common/const/clusterTypeInfos'; +import { ClusterTypes } from '@common/const/clusterTypes'; import { isRecentDays, utcDisplayTime } from '@utils'; @@ -23,6 +25,11 @@ export default class SqlServerHaInstance { bk_cpu: number; bk_disk: number; bk_host_id: number; + bk_host_innerip: string; + bk_idc_id: number; + bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; bk_mem: number; bk_sub_zone: string; cluster_id: number; @@ -54,6 +61,11 @@ export default class SqlServerHaInstance { this.bk_cpu = payload.bk_cpu; this.bk_disk = payload.bk_disk; this.bk_host_id = payload.bk_host_id; + this.bk_host_innerip = payload.bk_host_innerip || ''; + this.bk_idc_id = payload.bk_idc_id || 0; + this.bk_idc_name = payload.bk_idc_name || ''; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.bk_mem = payload.bk_mem; this.bk_sub_zone = payload.bk_sub_zone; this.cluster_id = payload.cluster_id; @@ -89,4 +101,8 @@ export default class SqlServerHaInstance { get statusInfo() { return clusterInstStatus[this.status] || clusterInstStatus.unavailable; } + + get clusterTypeName() { + return clusterTypeInfos[this.cluster_type as ClusterTypes].architectureName || ''; + } } diff --git a/dbm-ui/frontend/src/services/model/tendbcluster/tendbcluster-instance.ts b/dbm-ui/frontend/src/services/model/tendbcluster/tendbcluster-instance.ts index d2255183c5..b267c39c48 100644 --- a/dbm-ui/frontend/src/services/model/tendbcluster/tendbcluster-instance.ts +++ b/dbm-ui/frontend/src/services/model/tendbcluster/tendbcluster-instance.ts @@ -18,6 +18,11 @@ export default class TendbInstance { bk_cloud_id: number; bk_cloud_name: string; bk_host_id: number; + bk_host_innerip: string; + bk_idc_id: number; + bk_idc_name: string; + bk_idc_city_id: string; + bk_idc_city_name: string; bk_sub_zone: string; cluster_id: number; cluster_name: string; @@ -46,6 +51,11 @@ export default class TendbInstance { this.bk_cloud_id = payload.bk_cloud_id; this.bk_cloud_name = payload.bk_cloud_name; this.bk_host_id = payload.bk_host_id; + this.bk_host_innerip = payload.bk_host_innerip || ''; + this.bk_idc_id = payload.bk_idc_id || 0; + this.bk_idc_name = payload.bk_idc_name || ''; + this.bk_idc_city_id = payload.bk_idc_city_id || ''; + this.bk_idc_city_name = payload.bk_idc_city_name || ''; this.bk_sub_zone = payload.bk_sub_zone; this.cluster_id = payload.cluster_id; this.cluster_name = payload.cluster_name; diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue index b568617d4e..89f3533c9d 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-batch-opration/Index.vue @@ -113,7 +113,10 @@ }); const popoverOptions = computed(() => ({ + boundary: 'body', disableOutsideClick: sideSliderShow.value, + clickContentAutoHide: true, + renderDirective: 'show', })); watch(sideSliderShow, () => { @@ -133,6 +136,7 @@ padding: 0; .opration-button { + width: 100%; padding: 0 16px; } } diff --git a/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx b/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx index 0fba24465c..fcf163595c 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx +++ b/dbm-ui/frontend/src/views/db-manage/common/cluster-details/common/useRenderGraph.tsx @@ -59,8 +59,10 @@ interface InstanceDetails { bk_disk: number; bk_host_id: number; bk_host_innerip: string; + bk_idc_city_name: string; bk_mem: number; bk_os_name: string; + bk_sub_zone: string; cluster_id: number; cluster_type: string; create_at: string; @@ -136,12 +138,12 @@ export const detailColumns: DetailColumns = [ key: 'bk_host_innerip', }, { - label: t('所在机房'), - key: 'bk_idc_name', + label: t('地域'), + key: 'bk_idc_city_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('园区'), + key: 'bk_sub_zone', }, { label: 'CPU', diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue index c33f38d471..201d1e5be9 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/mongodb-instance/detail/components/BaseInfo.vue @@ -86,18 +86,22 @@ key: 'bk_cloud_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('地域'), + key: 'bk_idc_city_name', }, { label: t('所在园区'), - key: 'bk_idc_name', + key: 'bk_sub_zone', }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署架构'), - key: 'cluster_type_display', + key: 'clusterTypeName', }, { label: t('部署角色'), diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue index 0ad9f3472e..7671fc8ad8 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/ha-instance-list/components/detail/components/BaseInfo.vue @@ -98,8 +98,8 @@ key: 'bk_cloud_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('地域'), + key: 'bk_idc_city_name', }, { label: t('所在园区'), @@ -107,9 +107,13 @@ }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署架构'), - key: 'cluster_type_display', + key: 'clusterTypeName', }, { label: t('部署角色'), diff --git a/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue index d3f333e759..3aaacce74f 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/instance-list-ha/components/detail/components/BaseInfo.vue @@ -98,18 +98,22 @@ key: 'bk_cloud_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('地域'), + key: 'bk_idc_city_name', }, { - label: t('所在机房'), - key: 'bk_idc_name', + label: t('所在园区'), + key: 'bk_sub_zone', }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署架构'), - key: 'cluster_type_display', + key: 'clusterTypeName', }, { label: t('部署角色'), diff --git a/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue index 80bdfb0e75..ac0c21905c 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/redis/instance-list/components/detail/components/BaseInfo.vue @@ -98,8 +98,8 @@ key: 'bk_cloud_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('地域'), + key: 'bk_idc_city_name', }, { label: t('所在园区'), @@ -107,9 +107,13 @@ }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署架构'), - key: 'cluster_type_display', + key: 'clusterTypeName', }, { label: t('部署角色'), diff --git a/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue index 238001c8a1..d2549e7ea9 100644 --- a/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-instance-list/components/detail/components/BaseInfo.vue @@ -91,14 +91,22 @@ key: 'bk_cloud_name', }, { - label: t('所在城市'), - key: 'idc_city_name', + label: t('地域'), + key: 'bk_idc_city_name', + }, + { + label: t('所在园区'), + key: 'bk_sub_zone', }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署架构'), - key: 'cluster_type_display', + key: 'clusterTypeName', }, { label: t('部署角色'), diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue index ae8815e26c..6f6338f964 100644 --- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue +++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/list-instance/components/detail/components/BaseInfo.vue @@ -79,8 +79,20 @@ label: t('管控区域'), key: 'bk_cloud_name', }, + { + label: t('地域'), + key: 'bk_idc_city_name', + }, + { + label: t('所在园区'), + key: 'bk_sub_zone', + }, ], [ + { + label: t('版本'), + key: 'version', + }, { label: t('部署角色'), key: 'role', @@ -119,14 +131,6 @@ return `${props.data.bk_disk}GB`; }, }, - { - label: t('所在城市'), - key: 'idc_city_name', - }, - { - label: t('所在机房'), - key: 'bk_idc_name', - }, ], ];