diff --git a/src/components/CheckAction/index.vue b/src/components/CheckAction/index.vue index aa9ee94..e099ae3 100644 --- a/src/components/CheckAction/index.vue +++ b/src/components/CheckAction/index.vue @@ -106,7 +106,9 @@ export default class CheckAction extends Vue { try { const res = await this.updateSchedule({ id, params }) if (res?.msg === 'success') { - this.$t('schedules.updateSuccessMsg') + this.$message.success( + this.$t('schedules.updateSuccessMsg') + ) } if (this.checked) { await this.checkOnline() diff --git a/src/locale/zh.json b/src/locale/zh.json index d67e726..344956d 100644 --- a/src/locale/zh.json +++ b/src/locale/zh.json @@ -303,7 +303,7 @@ "editTaskTitle": "编辑任务", "remove_task": "移除任务", "onlineSchedule": "上线调度", - "actionSuccessMsg": "{action}调度任务成功。", + "actionSuccessMsg": "{action}调度任务成功", "updateSuccessMsg": "调度任务更新成功", "editTaskConfirmInfo": "确定{action}任务吗?当前任务所属调度为“上线”状态,在该调度上{action}任务会导致其“下线”。若需要重新上线该调度,请勾选左下角“上线调度”,或稍后前往「调度」进行设置。", "editTaskConfirmTitle": "{action}任务", diff --git a/src/page/Schedules/Instance/index.vue b/src/page/Schedules/Instance/index.vue index 4a53916..0826cef 100644 --- a/src/page/Schedules/Instance/index.vue +++ b/src/page/Schedules/Instance/index.vue @@ -112,7 +112,7 @@ v-if="!checkScope(['2', '5'], scope.row.state)" class="el-ksd-icon-pause_with_border_22 content-icon hasEvent" :class="{ 'setting-disabled': !checkScope(['0'], scope.row.state) }" - @click="handleAction(scope.row, 0)" + @click="handleAction(scope.row, 0, ['0'])" > @@ -132,7 +132,7 @@ @@ -142,7 +142,7 @@ @@ -304,7 +304,10 @@ export default class Instance extends Vue { * @param {*} index * @Date: 2022-03-17 10:58:13 */ - async handleAction ({ id, state }, index) { + async handleAction ({ id, state }, index, scopeList = []) { + if (scopeList.length > 0 && !this.checkScope(scopeList, state)) { + return + } if (this.cancelSearch) { this.cancelSearch('cancel') } diff --git a/src/page/Workspace/Notebook/CellList/index.vue b/src/page/Workspace/Notebook/CellList/index.vue index 4624fa3..daed4e9 100644 --- a/src/page/Workspace/Notebook/CellList/index.vue +++ b/src/page/Workspace/Notebook/CellList/index.vue @@ -62,25 +62,27 @@ {{ $t('schedules.addedToSchedule') }} - - - - - - {{ $t('schedules.updateScheduleTask') }} - - - + + + + + + + {{ $t('schedules.updateScheduleTask') }} + + + +