From 39d87231599a2d0a1a34019d3cb2ead845b89680 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 24 三月 2020 15:29:45 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/monitor/job/index.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 01b90c5..52ef7b7 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -238,8 +238,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏄惁骞跺彂锛�">
- <div v-if="form.status == 0">鍏佽</div>
- <div v-else-if="form.status == 1">绂佹</div>
+ <div v-if="form.concurrent == 0">鍏佽</div>
+ <div v-else-if="form.concurrent == 1">绂佹</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -258,7 +258,6 @@
</el-dialog>
</div>
</template>
-
<script>
import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
@@ -486,4 +485,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3