From 098357885c9c7124ddad0d14a7fecb5e987d20a7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 15:22:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
admin/src/views/timer/timer.vue | 104 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 912f85c..549e579 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -16,7 +16,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:quartz:create']">
- <li><el-button type="primary" @click="$refs.OperaTimerWindow.open('鏂板缓浠诲姟')" icon="el-icon-plus" v-permissions="['business:devices:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaTimerWindow.open('鏂板缓浠诲姟')" icon="el-icon-plus" v-permissions="['business:quartz:create']">鏂板缓</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -70,7 +70,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaTimerWindow from '@/views/timer/components/OperaTimerWindow'
-import {runOnceById} from "@/api/timer/timer";
+import {pauseById, resumeById, runOnceById} from '@/api/timer/timer'
export default {
name: 'Devices',
extends: BaseTable,
@@ -83,13 +83,13 @@
beanName: '',
module: ''
},
- pausing:false,
- running:false,
- resuming:false,
+ pausing: false,
+ running: false,
+ resuming: false,
room: []
}
},
- provide() {
+ provide () {
return {
room: () => this.room
}
@@ -107,61 +107,61 @@
pauseById (row) {
this.__checkApi()
this.$dialog.actionConfirm('纭鏆傚仠璇ヤ换鍔″悧?')
- .then(() => {
- this.pausing = true
- this.api.paustById(row.id)
- .then(() => {
- this.$message.info('鏆傚仠鎴愬姛')
- this.search()
- })
- .catch(e => {
- // this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.pausing = false
- })
- })
- .catch(() => {})
+ .then(() => {
+ this.pausing = true
+ this.api.pauseById(row.id)
+ .then(() => {
+ this.$message.info('鏆傚仠鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ // this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.pausing = false
+ })
+ })
+ .catch(() => {})
},
resumeById (row) {
this.__checkApi()
this.$dialog.actionConfirm('纭鎭㈠璇ヤ换鍔″悧?')
- .then(() => {
- this.resuming = true
- this.api.resumeById(row.id)
- .then(() => {
- this.$message.info('鎭㈠鎴愬姛')
- this.search()
- })
- .catch(e => {
- // this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.resuming = false
- })
- })
- .catch(() => {})
+ .then(() => {
+ this.resuming = true
+ this.api.resumeById(row.id)
+ .then(() => {
+ this.$message.info('鎭㈠鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ // this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.resuming = false
+ })
+ })
+ .catch(() => {})
},
runById (row) {
this.__checkApi()
this.$dialog.actionConfirm('纭鎵ц涓�娆¤浠诲姟鍚�?')
- .then(() => {
- this.running = true
- this.api.runOnceById(row.id)
- .then(() => {
- this.$message.info('鎵ц鎴愬姛')
- this.search()
- })
- .catch(e => {
- // this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.running = false
- })
- })
- .catch(() => {})
+ .then(() => {
+ this.running = true
+ this.api.runOnceById(row.id)
+ .then(() => {
+ this.$message.info('鎵ц鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ // this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.running = false
+ })
+ })
+ .catch(() => {})
}
- },
+ }
}
</script>
--
Gitblit v1.9.3