fix: 2.0.0
1. 修复不同组相同场景添加失败问题 2. 优化任务详情页,重试日志只显示当前场景
This commit is contained in:
parent
33c5e891d1
commit
ba7f62c7d7
@ -118,7 +118,7 @@ CREATE TABLE `scene_config`
|
|||||||
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||||
`update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
|
`update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
|
||||||
PRIMARY KEY (`id`),
|
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='场景配置'
|
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COMMENT='场景配置'
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -117,6 +117,10 @@ export default {
|
|||||||
'2': {
|
'2': {
|
||||||
'name': '最大次数',
|
'name': '最大次数',
|
||||||
'color': '#68a5d0'
|
'color': '#68a5d0'
|
||||||
|
},
|
||||||
|
'3': {
|
||||||
|
'name': '暂停',
|
||||||
|
'color': '#f52d8e'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
taskType: {
|
taskType: {
|
||||||
@ -201,8 +205,8 @@ export default {
|
|||||||
if (this.groupName !== '' && this.uniqueId !== '') {
|
if (this.groupName !== '' && this.uniqueId !== '') {
|
||||||
parameter['groupName'] = this.groupName
|
parameter['groupName'] = this.groupName
|
||||||
parameter['uniqueId'] = this.uniqueId
|
parameter['uniqueId'] = this.uniqueId
|
||||||
|
parameter['sceneName'] = this.sceneName
|
||||||
}
|
}
|
||||||
console.log('this.uniqueId', this.uniqueId)
|
|
||||||
console.log('loadData.parameter', parameter)
|
console.log('loadData.parameter', parameter)
|
||||||
return getRetryTaskLogPage(Object.assign(parameter, this.queryParam))
|
return getRetryTaskLogPage(Object.assign(parameter, this.queryParam))
|
||||||
.then(res => {
|
.then(res => {
|
||||||
@ -224,7 +228,8 @@ export default {
|
|||||||
groupNameList: [],
|
groupNameList: [],
|
||||||
sceneList: [],
|
sceneList: [],
|
||||||
groupName: '',
|
groupName: '',
|
||||||
uniqueId: ''
|
uniqueId: '',
|
||||||
|
sceneName: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
@ -238,6 +243,7 @@ export default {
|
|||||||
},
|
},
|
||||||
refreshTable (v) {
|
refreshTable (v) {
|
||||||
this.groupName = v.groupName
|
this.groupName = v.groupName
|
||||||
|
this.sceneName = v.sceneName
|
||||||
this.uniqueId = v.uniqueId
|
this.uniqueId = v.uniqueId
|
||||||
this.$refs.table.refresh(true)
|
this.$refs.table.refresh(true)
|
||||||
},
|
},
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
</a-card>
|
</a-card>
|
||||||
<div style="margin: 20px"></div>
|
<div style="margin: 20px"></div>
|
||||||
<a-card title="日志列表" style="width: 100%">
|
<a-card title="日志列表" style="width: 100%">
|
||||||
<RetryLogList v-if="retryTaskInfo !== null" ref="retryLogListRef" :showSearch="false" :group-name="retryTaskInfo.groupName" :unique-id="retryTaskInfo.uniqueId"/>
|
<RetryLogList v-if="retryTaskInfo !== null" ref="retryLogListRef" :showSearch="false"/>
|
||||||
</a-card>
|
</a-card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -72,7 +72,8 @@ export default {
|
|||||||
retryStatus: {
|
retryStatus: {
|
||||||
'0': '处理中',
|
'0': '处理中',
|
||||||
'1': '处理成功',
|
'1': '处理成功',
|
||||||
'2': '最大次数'
|
'2': '最大次数',
|
||||||
|
'3': '暂停'
|
||||||
},
|
},
|
||||||
taskType: {
|
taskType: {
|
||||||
'1': {
|
'1': {
|
||||||
|
Loading…
Reference in New Issue
Block a user