diff --git a/src/views/system/log/errorLog.vue b/src/views/system/log/errorLog.vue index cb2010a..e5f8b29 100644 --- a/src/views/system/log/errorLog.vue +++ b/src/views/system/log/errorLog.vue @@ -10,7 +10,7 @@ icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" - @click="confirmDelAll()" + @click="delVisible=true" > 清空 @@ -50,6 +50,17 @@ + + + + + + 确认清空所有操作日志吗? + + + @@ -70,7 +81,7 @@ export default { mixins: [presenter()], data() { return { - errorInfo: '', dialog: false + errorInfo: '', dialog: false, delVisible: false } }, created() { @@ -90,23 +101,24 @@ export default { }) }, confirmDelAll() { - this.$confirm(`确认清空所有异常日志吗?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.crud.delAllLoading = true - delAllError().then(res => { - this.crud.delAllLoading = false - this.crud.dleChangePage(1) - this.crud.delSuccessNotify() - this.crud.toQuery() - }).catch(err => { - this.crud.delAllLoading = false - console.log(err.response.data.message) - }) - }).catch(() => { + // this.$confirm(`确认清空所有异常日志吗?`, '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + this.crud.delAllLoading = true + delAllError().then(res => { + this.crud.delAllLoading = false + this.crud.dleChangePage(1) + this.crud.delSuccessNotify() + this.crud.toQuery() + this.delVisible = false + }).catch(err => { + this.crud.delAllLoading = false + console.log(err.response.data.message) }) + // }).catch(() => { + // }) } } } diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index 6505b8d..2c767c3 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -9,7 +9,7 @@ icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" - @click="confirmDelAll()" + @click="delVisible = true" > 清空 @@ -48,6 +48,17 @@ + + + + + + 确认清空所有操作日志吗? + + + @@ -67,6 +78,11 @@ export default { return CRUD({ title: '日志', url: 'api/logs' }) }, mixins: [presenter()], + data() { + return { + delVisible: false + } + }, created() { this.crud.optShow = { add: false, @@ -77,23 +93,23 @@ export default { }, methods: { confirmDelAll() { - this.$confirm(`确认清空所有操作日志吗?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.crud.delAllLoading = true - delAllInfo().then(res => { - this.crud.delAllLoading = false - this.crud.dleChangePage(1) - this.crud.delSuccessNotify() - this.crud.toQuery() - }).catch(err => { - this.crud.delAllLoading = false - console.log(err.response.data.message) - }) - }).catch(() => { + // this.$confirm(`确认清空所有操作日志吗?`, '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + this.crud.delAllLoading = true + delAllInfo().then(res => { + this.crud.delAllLoading = false + this.crud.dleChangePage(1) + this.crud.delSuccessNotify() + this.crud.toQuery() + this.delVisible = false + }).catch(err => { + this.crud.delAllLoading = false + console.log(err.response.data.message) }) + // }) } } } diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue index 1eff4aa..27aaf68 100644 --- a/src/views/system/timing/index.vue +++ b/src/views/system/timing/index.vue @@ -27,7 +27,7 @@ --> - + @@ -237,6 +237,9 @@ export default { .crud-opts{ display: flex; } +::v-deep .el-dialog{ + width: 730px; +} ::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{ position: absolute; right: -47px;
确认清空所有操作日志吗?