From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 15:45:57 +0800
Subject: [PATCH] update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理

---
 ruoyi-ui/src/views/monitor/job/index.vue |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 7cbcd82..f73cfc8 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -97,7 +97,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="浠诲姟缂栧彿" align="center" prop="jobId" />
       <el-table-column label="浠诲姟鍚嶇О" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup" :formatter="jobGroupFormat" />
+      <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup">
+        <template slot-scope="scope">
+          <dict-tag :options="jobGroupOptions" :value="scope.row.jobGroup"/>
+        </template>
+      </el-table-column>
       <el-table-column label="璋冪敤鐩爣瀛楃涓�" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
       <el-table-column label="cron鎵ц琛ㄨ揪寮�" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
       <el-table-column label="鐘舵��" align="center">
@@ -316,6 +320,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        reasonable: true,
         jobName: undefined,
         jobGroup: undefined,
         status: undefined
@@ -358,10 +363,6 @@
     // 浠诲姟缁勫悕瀛楀吀缈昏瘧
     jobGroupFormat(row, column) {
       return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
-    },
-    // 鐘舵�佸瓧鍏哥炕璇�
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
     },
     // 鍙栨秷鎸夐挳
     cancel() {

--
Gitblit v1.9.3