diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
index c12c71fe77..f1774b2c4d 100644
--- a/dbm-ui/frontend/src/locales/zh-cn.json
+++ b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -2060,9 +2060,6 @@
"所有检测均失败,无法执行": "所有检测均失败,无法执行",
"DB 不存在": "DB 不存在",
"必须小于等于m台": "必须小于等于{m}台",
- "监控告警": "监控告警",
- "告警组": "告警组",
- "轮值设置": "轮值设置",
"告警组名称": "告警组名称",
"通知对象": "通知对象",
"应用策略": "应用策略",
@@ -2227,4 +2224,4 @@
"失败的实例": "失败的实例",
"返回": "返回",
"这行勿动!新增翻译请在上一行添加!": ""
-}
+}
\ No newline at end of file
diff --git a/dbm-ui/frontend/src/views/monitor-alarm-db/monitor-strategy/components/content/Index.vue b/dbm-ui/frontend/src/views/monitor-alarm-db/monitor-strategy/components/content/Index.vue
index 4c01481a7a..5f5090c023 100644
--- a/dbm-ui/frontend/src/views/monitor-alarm-db/monitor-strategy/components/content/Index.vue
+++ b/dbm-ui/frontend/src/views/monitor-alarm-db/monitor-strategy/components/content/Index.vue
@@ -233,20 +233,24 @@
field: 'is_enabled',
showOverflowTooltip: true,
width: 120,
- render: ({ row }: {row: RowData}) => (
- handleClickConfirm(row)}
- onCancel={() => handleCancelConfirm(row)}
- >
- handleChangeSwitch(row)}/>
-
- ),
+ render: ({ row }: {row: RowData}) => {
+ const isInner = row.bk_biz_id === 0;
+ return (
+ handleClickConfirm(row)}
+ onCancel={() => handleCancelConfirm(row)}
+ >
+ handleChangeSwitch(row)}/>
+
+ );
+ },
},
{
label: t('更新时间'),
diff --git a/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopo.vue b/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopo.vue
index 316df6fa4f..19045a063d 100644
--- a/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopo.vue
+++ b/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopo.vue
@@ -141,7 +141,7 @@
},
],
}).then((data) => {
- const formatData = data.map((item: any) => ({ ...item, count: item.instance_count }));
+ const formatData = data.map((item: any) => ({ ...item, count: item.remote_db.length }));
treeData.value = [
{
name: currentBizInfo?.display_name || '--',
diff --git a/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopoHost.vue b/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopoHost.vue
index c863c48674..c42403ce50 100644
--- a/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopoHost.vue
+++ b/dbm-ui/frontend/src/views/spider-manage/common/spider-instance-selector/components/RenderTopoHost.vue
@@ -54,8 +54,6 @@
import { useGlobalBizs } from '@stores';
- import { TicketTypes } from '@common/const';
-
import DbStatus from '@components/db-status/index.vue';
import getSettings from '../common/tableSettings';
@@ -71,8 +69,7 @@
interface Props {
lastValues: InstanceSelectorValues,
clusterId?: number,
- role?: string
- ticketType?: string,
+ role?: string,
}
interface Emits {
@@ -252,10 +249,6 @@
getResourceInstances(params)
.then((data) => {
const ret = data;
- if (props.ticketType === TicketTypes.TENDBCLUSTER_MASTER_FAIL_OVER) {
- // 主库故障切换,限制过滤故障主机
- ret.results = data.results.filter(item => item.status !== 'running');
- }
tableData.value = ret.results;
pagination.count = ret.count;
isAnomalies.value = false;