diff --git a/admin/src/api/api_dtm.ts b/admin/src/api/api_dtm.ts index 0608fdd..349cc3b 100644 --- a/admin/src/api/api_dtm.ts +++ b/admin/src/api/api_dtm.ts @@ -92,6 +92,14 @@ export function getTransaction(payload: { }) } +export function resetNextCronTime(gid: string): Promise { + return request({ + url: '/api/dtmsvr/resetNextCronTime', + method: 'post', + data: { gid } + }) +} + export function getDtmVersion(): Promise> { return request({ url: '/api/dtmsvr/version', diff --git a/admin/src/components.d.ts b/admin/src/components.d.ts index df4993b..a034feb 100644 --- a/admin/src/components.d.ts +++ b/admin/src/components.d.ts @@ -1,6 +1,6 @@ // generated by unplugin-vue-components // We suggest you to commit this file into source control -// Read more: https://github.com/vuejs/core/pull/3399 +// Read more: https://github.com/vuejs/vue-next/pull/3399 import '@vue/runtime-core' declare module '@vue/runtime-core' { diff --git a/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue b/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue index 4816ced..e27f763 100644 --- a/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue +++ b/admin/src/views/Dashboard/GlobalTransactions/DialogTransactionDetail.vue @@ -17,7 +17,16 @@ > ForceStop - + + + + Reset next cron time + {{ transaction?.status }} @@ -31,6 +40,7 @@ {{ transaction?.update_time }} {{ transaction?.next_cron_interval }} {{ transaction?.next_cron_time }} + {{ transaction?.rollback_reason }}

Branches

@@ -51,7 +61,7 @@ import { getTransaction } from '/@/api/api_dtm' import screenfull from '/@/components/Screenfull/index.vue' import { useRoute } from 'vue-router'; import { string } from 'vue-types'; -import { forceStopTransaction} from '/@/api/api_dtm' +import { forceStopTransaction, resetNextCronTime } from '/@/api/api_dtm' // import VueJsonPretty from 'vue-json-pretty'; // import 'vue-json-pretty/lib/styles.css' const route = useRoute(); @@ -121,6 +131,12 @@ const handleTransactionStop = async(gid: string) => { refresh(); } + +const handleSetNextCronTimeToNow = async(gid: string) => { + await resetNextCronTime(gid); + refresh(); +} + type Data = { branches: { gid: string @@ -144,6 +160,7 @@ type Data = { next_cron_interval: number next_cron_time: string concurrent: boolean + rollback_reason: string } } @@ -160,6 +177,7 @@ interface Transaction { next_cron_interval: number next_cron_time: string concurrent: boolean + rollback_reason: string } interface Branches {