v1.5 beta版发布,详细查看发行版说明

This commit is contained in:
郑杰
2019-01-20 19:34:40 +08:00
parent 5bb9c0a156
commit 45655e2bec
37 changed files with 634 additions and 293 deletions

View File

@@ -28,15 +28,15 @@
</el-button>
<el-popover
v-if="checkPermission(['ADMIN','JOB_ALL','JOB_DELETE'])"
v-model="scope.row.delPopover"
:ref="scope.row.id"
placement="top"
width="200">
<p>确定停止并删除该任务吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.delPopover = false">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row)">确定</el-button>
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="text" size="mini" @click="scope.row.delPopover = true">删除</el-button>
<el-button slot="reference" type="text" size="mini">删除</el-button>
</el-popover>
</template>
</el-table-column>
@@ -53,7 +53,7 @@
<script>
import checkPermission from '@/utils/permission'
import initData from '../../../mixins/initData'
import initData from '@/mixins/initData'
import { del, updateIsPause, execution } from '@/api/timing'
import { parseTime } from '@/utils/index'
import eHeader from './module/header'
@@ -106,11 +106,11 @@ export default {
console.log(err.response.data.message)
})
},
subDelete(index, row) {
subDelete(id) {
this.delLoading = true
del(row.id).then(res => {
del(id).then(res => {
this.delLoading = false
row.delPopover = false
this.$refs[id].doClose()
this.init()
this.$notify({
title: '删除成功',
@@ -119,7 +119,7 @@ export default {
})
}).catch(err => {
this.delLoading = false
row.delPopover = false
this.$refs[id].doClose()
console.log(err.response.data.message)
})
}