diff --git a/mayfly_go_web/src/components/pagetable/PageTable.vue b/mayfly_go_web/src/components/pagetable/PageTable.vue index 97a1e913..18f92500 100644 --- a/mayfly_go_web/src/components/pagetable/PageTable.vue +++ b/mayfly_go_web/src/components/pagetable/PageTable.vue @@ -360,6 +360,7 @@ const reset = () => { for (let qi of props.query) { state.queryForm[qi.prop] = null; } + console.log(state.queryForm); changePageNum(1); emit('update:queryForm', state.queryForm); execQuery(); diff --git a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue index e21af1eb..a67c0e37 100644 --- a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue +++ b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobEdit.vue @@ -154,7 +154,7 @@ watch(props, async (newValue: any) => { state.form = { ...newValue.data }; state.form.machineIds = await cronJobApi.relateMachineIds.request({ cronJobId: state.form.id }); } else { - state.form = {} as any; + state.form = { script: '', status: 1 } as any; state.chooseMachines = []; } }); diff --git a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue index 25ed24ec..2aab95f9 100644 --- a/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue +++ b/mayfly_go_web/src/views/ops/machine/cronjob/CronJobExecList.vue @@ -56,7 +56,7 @@ const props = defineProps({ const emit = defineEmits(['update:visible', 'update:data', 'cancel']); const queryConfig = [ - TableQuery.slot('machineSelect', '机器', 'machineSelect'), + TableQuery.slot('machineId', '机器', 'machineSelect'), TableQuery.select('status', '状态').setOptions(Object.values(CronJobExecStatusEnum)), ]; diff --git a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue index a33ebd70..07bf5b03 100644 --- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue +++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue @@ -176,7 +176,7 @@ watch(props, async (newValue: any) => { convertDb(state.form.db); } else { state.form = { db: '0' } as any; - state.dbList = []; + state.dbList = [0]; } }); diff --git a/mayfly_go_web/src/views/ops/redis/RedisList.vue b/mayfly_go_web/src/views/ops/redis/RedisList.vue index 11ae0ac2..8eacbc1a 100644 --- a/mayfly_go_web/src/views/ops/redis/RedisList.vue +++ b/mayfly_go_web/src/views/ops/redis/RedisList.vue @@ -20,7 +20,7 @@