From 945fb282dd5c4c677fb0c30fe24b7df04ad857b0 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 07 六月 2020 16:11:36 +0800
Subject: [PATCH] 代码生成模板调整，字段为String并且必填则加空串条件
---
ruoyi-ui/src/views/monitor/job/index.vue | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 7c01fd7..6f62271 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -132,7 +132,7 @@
/>
<!-- 添加或修改定时任务对话框 -->
- <el-dialog :title="title" :visible.sync="open" width="700px">
+ <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
@@ -210,7 +210,7 @@
</el-dialog>
<!-- 任务日志详细 -->
- <el-dialog title="任务详细" :visible.sync="openView" width="700px">
+ <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-row>
<el-col :span="12">
@@ -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">
@@ -397,7 +397,7 @@
type: "warning"
}).then(function() {
return runJob(row.jobId, row.jobGroup);
- }).then(function() {
+ }).then(() => {
this.msgSuccess("执行成功");
}).catch(function() {});
},
@@ -438,8 +438,6 @@
this.msgSuccess("修改成功");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
} else {
@@ -448,8 +446,6 @@
this.msgSuccess("新增成功");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
}
--
Gitblit v1.9.2