Merge pull request #432 from wo10378931/develop

Develop
This commit is contained in:
Marvin Zhang
2020-01-07 13:46:59 +08:00
committed by GitHub
3 changed files with 13 additions and 12 deletions

View File

@@ -75,12 +75,12 @@ func AddScheduleTask(s model.Schedule) func() {
if err := AddTask(t); err != nil {
return
}
if err := AssignTask(t); err != nil {
log.Errorf(err.Error())
debug.PrintStack()
return
}
// AddTask 方法已执行AssignTask
//if err := AssignTask(t); err != nil {
// log.Errorf(err.Error())
// debug.PrintStack()
// return
//}
}
} else {
return

View File

@@ -130,9 +130,10 @@ export default {
refreshSelectedTag (view) {
this.$store.dispatch('delCachedView', view).then(() => {
const { fullPath } = view
console.log('fullPath', fullPath)
this.$nextTick(() => {
this.$router.replace({
path: '/redirect' + fullPath
path: fullPath
})
})
})

View File

@@ -117,7 +117,7 @@
<!--table list-->
<el-table :data="filteredTableData"
class="table"
class="table" height="500"
:header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
border>
<template v-for="col in columns">
@@ -172,7 +172,7 @@
</template>
</el-table-column>
</template>
<el-table-column :label="$t('Action')" align="left" width="auto" fixed="right">
<el-table-column :label="$t('Action')" align="left" width="130" fixed="right">
<template slot-scope="scope">
<!-- 编辑 -->
<el-tooltip :content="$t('Edit')" placement="top">
@@ -182,9 +182,9 @@
<el-tooltip :content="$t('Remove')" placement="top">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row)"></el-button>
</el-tooltip>
<el-tooltip :content="$t(getStatusTooltip(scope.row))" placement="top">
<el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>
</el-tooltip>
<!--<el-tooltip :content="$t(getStatusTooltip(scope.row))" placement="top">-->
<!--<el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>-->
<!--</el-tooltip>-->
</template>
</el-table-column>
</el-table>