diff --git a/dbm-ui/frontend/src/components/render-table/columns/input/index.vue b/dbm-ui/frontend/src/components/render-table/columns/input/index.vue index 89605fff0c..367d321e1a 100644 --- a/dbm-ui/frontend/src/components/render-table/columns/input/index.vue +++ b/dbm-ui/frontend/src/components/render-table/columns/input/index.vue @@ -72,7 +72,7 @@ pasteFn?: (value: string) => string; } - type ValueType = string | number; + export type ValueType = string | number; interface Emits { (e: 'blur', value: ValueType): void; diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 452d6be9a5..35b31b3b6c 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3773,5 +3773,8 @@ "批量处理": "批量处理", "新窗口打开": "新窗口打开", "重试后,单据将再次尝试申请资源": "重试后,单据将再次尝试申请资源", + "替换类型:": "替换类型:", + "目标Proxy实例": "目标 Proxy 实例", + "全局超时时间:": "全局超时时间:", "这行勿动!新增翻译请在上一行添加!": "" } diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts index 286b1a4a7e..dcf656f365 100644 --- a/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts +++ b/dbm-ui/frontend/src/services/model/ticket/details/mysql/haFullBackup.ts @@ -6,11 +6,9 @@ import type { DetailBase, DetailClusters } from '../common'; export interface HaFullBackup extends DetailBase { clusters: DetailClusters; infos: { - backup_type: string; - clusters: { - backup_local: string; - cluster_id: number; - }[]; - file_tag: string; - }; + cluster_id: number; + backup_local: 'master' | 'slave'; + }[]; + file_tag: 'DBFILE1M' | 'DBFILE6M' | 'DBFILE1Y' | 'DBFILE3Y'; + backup_type: 'logical' | 'physical'; } diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts index a87974a38f..b01d1cf266 100644 --- a/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts +++ b/dbm-ui/frontend/src/services/model/ticket/details/mysql/proxySwitch.ts @@ -9,6 +9,11 @@ export interface ProxySwitch extends DetailBase { force: boolean; infos: { cluster_ids: number[]; + display_info: { + type: 'INSTANCE_REPLACE' | 'HOST_REPLACE'; + related_clusters: string[]; + related_instances: string[]; + }; origin_proxy: { bk_biz_id: number; bk_cloud_id: number; diff --git a/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts b/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts index 3feea57616..a030b0c860 100644 --- a/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts +++ b/dbm-ui/frontend/src/services/model/ticket/details/mysql/restoreLocalSlave.ts @@ -5,7 +5,7 @@ import type { DetailBase, DetailClusters } from '../common'; */ export interface RestoreLocalSlave extends DetailBase { - backup_source: string; + backup_source: 'local' | 'remote'; clusters: DetailClusters; force: boolean; infos: { diff --git a/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts b/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts index 24c71a5d48..4e29d4740b 100644 --- a/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts +++ b/dbm-ui/frontend/src/services/model/ticket/details/tendbCluster/restoreSlave.ts @@ -3,9 +3,8 @@ import type { DetailBase, DetailClusters } from '../common'; /** * TenDB Cluster Slave重建 */ - export interface RestoreSlave extends DetailBase { - backup_source: string; + backup_source: 'local' | 'remote'; clusters: DetailClusters; infos: { cluster_id: number; diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue index 493c498652..01e2cfed66 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/Index.vue @@ -247,13 +247,12 @@ await createTicket({ bk_biz_id: currentBizId, - ticket_type: 'MYSQL_HA_FULL_BACKUP', + ticket_type: TicketTypes.MYSQL_HA_FULL_BACKUP, remark: formData.remark, details: { - infos: { - ...formData, - clusters: infos, - }, + backup_type: formData.backup_type, + file_tag: formData.file_tag, + infos, }, }).then((data) => { window.changeConfirm = false; diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue index 291c4e3d56..19e0f3c42a 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderBackupLocal.vue @@ -39,7 +39,9 @@ } interface Exposes { - getValue: () => Promise>; + getValue: () => Promise<{ + backup_local: string; + }>; } const props = defineProps(); @@ -97,7 +99,7 @@ () => { if (props.clusterData) { fetchClusterList({ - cluster_ids: props.clusterData.id, + cluster_ids: [props.clusterData.id], }); } }, diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue index 3b47e53273..b57c7d6fc0 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/RenderCluster.vue @@ -46,7 +46,9 @@ } interface Exposes { - getValue: () => Array; + getValue: () => Promise<{ + cluster_id: number; + }>; } const props = defineProps(); diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue index e72d614f08..f479b67fbf 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/db-backup/pages/page1/components/RenderData/Row.vue @@ -56,6 +56,8 @@ }); - - diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue index 9ecbe5846a..8ba872aed8 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/ClusterOperation.vue @@ -15,38 +15,12 @@ - + - - - - + @@ -80,14 +54,3 @@ type RowData = UnwrapRef[number]; - - diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue index b8e6ec2519..056526b0c9 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/common/mysql-rollback/components/RenderTableBase.vue @@ -15,7 +15,7 @@ - + diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Reboot.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Reboot.vue index 6cefe14222..d5a18fb017 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Reboot.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Reboot.vue @@ -12,82 +12,63 @@ --> diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/Checksum.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/Checksum.vue index c760560125..5e71bddfe0 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/Checksum.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/Checksum.vue @@ -19,7 +19,10 @@ {{ utcDisplayTime(ticketDetails?.details?.timing) || '--' }} - {{ isRepair }} + {{ ticketDetails?.details?.data_repair.is_repair ? t('是') : t('否') }} + + + {{ ticketDetails?.details?.runtime_hour || '--' }} (); + defineProps(); defineOptions({ name: TicketTypes.MYSQL_CHECKSUM, @@ -111,7 +114,4 @@ }); const { t } = useI18n(); - - // 修复数据 - const isRepair = computed(() => (props.ticketDetails?.details?.data_repair.is_repair ? t('是') : t('否'))); diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaDBTableBackup.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaDBTableBackup.vue index dc1a5d7a31..d72f9d0713 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaDBTableBackup.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaDBTableBackup.vue @@ -29,24 +29,24 @@ -- - + - + diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaFullBackup.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaFullBackup.vue index 5448be15f7..95299dd5a4 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaFullBackup.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/HaFullBackup.vue @@ -11,21 +11,7 @@ * the specific language governing permissions and limitations under the License. --> diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/ProxySwitch.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/ProxySwitch.vue index 0e18703ff6..e670f5678f 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/ProxySwitch.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/mysql/ProxySwitch.vue @@ -12,6 +12,11 @@ --> + + + + + +