diff --git a/doc/sql/easy_retry.sql b/doc/sql/easy_retry.sql index 532c6a3f..2eeca5fe 100644 --- a/doc/sql/easy_retry.sql +++ b/doc/sql/easy_retry.sql @@ -118,7 +118,7 @@ CREATE TABLE `scene_config` `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`), - UNIQUE KEY `uk_name` (`scene_name`) + UNIQUE KEY `uk_group_name_scene_name` (`group_name`,`scene_name`) ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COMMENT='场景配置' ; diff --git a/frontend/src/views/task/RetryLogList.vue b/frontend/src/views/task/RetryLogList.vue index 7e3979c6..ecc43a30 100644 --- a/frontend/src/views/task/RetryLogList.vue +++ b/frontend/src/views/task/RetryLogList.vue @@ -117,6 +117,10 @@ export default { '2': { 'name': '最大次数', 'color': '#68a5d0' + }, + '3': { + 'name': '暂停', + 'color': '#f52d8e' } }, taskType: { @@ -201,8 +205,8 @@ export default { if (this.groupName !== '' && this.uniqueId !== '') { parameter['groupName'] = this.groupName parameter['uniqueId'] = this.uniqueId + parameter['sceneName'] = this.sceneName } - console.log('this.uniqueId', this.uniqueId) console.log('loadData.parameter', parameter) return getRetryTaskLogPage(Object.assign(parameter, this.queryParam)) .then(res => { @@ -224,7 +228,8 @@ export default { groupNameList: [], sceneList: [], groupName: '', - uniqueId: '' + uniqueId: '', + sceneName: '' } }, created () { @@ -238,6 +243,7 @@ export default { }, refreshTable (v) { this.groupName = v.groupName + this.sceneName = v.sceneName this.uniqueId = v.uniqueId this.$refs.table.refresh(true) }, diff --git a/frontend/src/views/task/RetryTaskInfo.vue b/frontend/src/views/task/RetryTaskInfo.vue index efdecc31..430135c1 100644 --- a/frontend/src/views/task/RetryTaskInfo.vue +++ b/frontend/src/views/task/RetryTaskInfo.vue @@ -51,7 +51,7 @@