diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index ec756661e..36827a927 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1936,6 +1936,7 @@ "False": "False", "NewCount": "New count", "UnSyncCount": "Unsync count", + "NewSyncCount": "New synced count", "SyncedCount": "Synced count", "ReleasedCount": "Released count", "DateSync": "Date sync", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 6747b3877..cb8bb30bb 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1932,6 +1932,7 @@ "False": "いいえ", "NewCount": "新規追加", "UnSyncCount": "同期されていない", + "NewSyncCount": "新しい同期", "SyncedCount": "同期済み", "ReleasedCount": "リリース済", "DateSync": "同期日", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index c2f514c88..1330aed11 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1854,6 +1854,7 @@ "NewCount": "新增", "UnSyncCount": "未同步", "SyncedCount": "已同步", + "NewSyncCount": "新同步", "ReleasedCount": "已释放", "DateSync": "同步日期", "Status": "状态", diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue index 4ae8fec42..69328fc90 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue @@ -45,17 +45,22 @@ export default { columns: [ 'instance_id', { - prop: 'asset_display', - label: this.$t('xpack.Asset') - }, - { - prop: 'asset_ip', + prop: 'asset', label: this.$t('xpack.ip') }, 'region', { - prop: 'status_display', - label: this.$t('xpack.Cloud.Status') + prop: 'status', + label: this.$t('xpack.Cloud.Status'), + formatter: row => { + const status = { + 0: this.$t('xpack.Cloud.UnSyncCount'), + 1: this.$t('xpack.Cloud.SyncedCount'), + 2: this.$t('xpack.Cloud.NewSyncCount'), + 3: this.$t('xpack.Cloud.ReleasedCount') + } + return {status[row.status]} + } }, { prop: 'date_sync', diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue index dd24a0c4f..fa2d5bcfa 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue @@ -48,8 +48,15 @@ export default { label: this.$t('xpack.Cloud.ReleasedCount') }, { - prop: 'status_display', - label: this.$t('xpack.Cloud.Status') + prop: 'status', + label: this.$t('xpack.Cloud.Status'), + formatter: row => { + if (row.status === 1) { + return {this.$t('common.Success')} + } else { + return {this.$t('common.Failed')} + } + } }, { prop: 'date_sync', diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue index 7b11abeac..44277bf0f 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue @@ -40,7 +40,7 @@ export default { account: { label: this.$t('xpack.Cloud.Account'), formatter: function(row) { - return { row.account.name } + return { row.account?.name } } }, periodic_display: {