轮询管理

src/views/jobgroup/jobinfo/index.vue

@@ -169,9 +169,15 @@
       @close="handleClose"
       center
     >
-      <el-form class="add-form" :inline="true" :model="addFrom" ref="form">
+      <el-form
+        class="add-form"
+        :inline="true"
+        :model="addFrom"
+        :rules="rules"
+        ref="form"
+      >
         <div class="mini-title">基础配置</div>
-        <el-form-item label="执行器" class="both">
+        <el-form-item label="执行器" class="both" prop="jobGroup">
           <el-select v-model="addFrom.jobGroup" placeholder="请选择">
             <el-option
               v-for="item in resGroupList"
@@ -182,11 +188,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="任务描述" class="both">
+        <el-form-item label="任务描述" class="both" prop="jobDesc">
           <el-input placeholder="请输入任务描述" v-model="addFrom.jobDesc">
           </el-input>
         </el-form-item>
-        <el-form-item label="负责人" class="both">
+        <el-form-item label="负责人" class="both" prop="author">
           <el-input placeholder="请输入负责人" v-model="addFrom.author">
           </el-input>
         </el-form-item>
@@ -201,7 +207,11 @@
         <el-form-item label="调度类型" class="both">
           <!-- scheduleType 空：NONE 固定速度：FIX_RATE   CRON:CRON -->
 
-          <el-select v-model="addFrom.scheduleType" placeholder="请选择">
+          <el-select
+            disabled
+            v-model="addFrom.scheduleType"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in scheduleType"
               :key="item.value"
@@ -211,24 +221,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           v-if="addFrom.scheduleType == 'FIX_RATE'"
           label="固定速度"
           class="both"
         >
-          <!-- scheduleConf 固定速度的值  cronGen_display-->
-          <!-- schedule_conf_FIX_RATE 还有个这个 -->
           <el-input
             placeholder="请输入 （ Second ）"
             v-model="addFrom.scheduleConf"
           >
           </el-input>
-        </el-form-item>
-        <el-form-item
-          v-if="addFrom.scheduleType == 'CRON'"
-          label="CRON"
-          class="both"
-        >
+        </el-form-item> -->
+        <el-form-item prop="scheduleConf" label="CRON" class="both">
           <!-- scheduleConf 固定速度的值 -->
           <!-- schedule_conf_FIX_RATE 还有个这个 -->
           <el-popover
@@ -356,7 +360,7 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="任务设备" class="one">
+        <el-form-item label="任务设备及参数" class="one" prop="executorParam">
           <el-select
             v-model="addFrom.executorParam.equipId"
             placeholder="请选择"
@@ -370,11 +374,11 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="任务参数" class="one">
+          <div>
+          </div>
           <el-checkbox-group
             v-model="addFrom.executorParam.params"
-            :min="0"
+            :min="1"
             :max="100"
           >
             <el-checkbox
@@ -385,9 +389,13 @@
             >
           </el-checkbox-group>
         </el-form-item>
+        <!-- <el-form-item label="任务参数" class="one" prop="executorParam2"> -->
+
+        <!-- </el-form-item> -->
         <div class="mini-title">高级配置</div>
         <el-form-item label="路由策略" class="both">
           <el-select
+            disabled
             v-model="addFrom.executorRouteStrategy"
             placeholder="请选择"
           >
@@ -400,15 +408,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="子任务ID" class="both">
-          <el-input
-            placeholder="请输入子任务的任务ID,如存在多个则逗号分隔"
-            v-model="addFrom.childJobId"
-          >
-          </el-input>
-        </el-form-item>
+
         <el-form-item label="调度过期策略" class="both">
-          <el-select v-model="addFrom.misfireStrategy" placeholder="请选择">
+          <el-select
+            disabled
+            v-model="addFrom.misfireStrategy"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in misfireStrategy"
               :key="item.value"
@@ -420,6 +426,7 @@
         </el-form-item>
         <el-form-item label="阻塞处理策略" class="both">
           <el-select
+            disabled
             v-model="addFrom.executorBlockStrategy"
             placeholder="请选择"
           >
@@ -435,19 +442,28 @@
         <el-form-item label="任务超时时间" class="both">
           <el-input
             placeholder="任务超时时间，单位秒，大于零时生效"
+            disabled
             v-model="addFrom.executorTimeout"
           >
           </el-input>
         </el-form-item>
         <el-form-item label="失败重试次数" class="both">
           <el-input
+            disabled
             placeholder="失败重试次数，大于零时生效"
             v-model="addFrom.executorFailRetryCount"
           >
           </el-input>
         </el-form-item>
+        <el-form-item label="" class="both">
+          <!-- <el-input
+            placeholder="请输入子任务的任务ID,如存在多个则逗号分隔"
+            v-model="addFrom.childJobId"
+          >
+          </el-input> -->
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleAdd">确定</el-button>
+          <el-button type="primary" @click="submitForm('form')">确定</el-button>
           <el-button @click="handleClose()">取消</el-button>
         </el-form-item>
       </el-form>
@@ -472,7 +488,31 @@ import { monitorEquiplist } from "../../setting/api.js";
 import { successAlert, warningAlert } from "@/utils/alert";
 export default {
   data() {
+    var validatePass2 = (rule, value, callback) => {
+      console.log("value", value);
+      if (value.equipId === "") {
+        // equipId
+        callback(new Error("请选择设备"));
+      } else if (value.params.length < 1) {
+        callback(new Error("任务参数不能为空"));
+      } else {
+        callback();
+      }
+    };
     return {
+      rules: {
+        jobGroup: [
+          { required: true, message: "请选择执行器", trigger: "blur" },
+        ],
+        jobDesc: [{ required: true, message: "请填写描述", trigger: "blur" }],
+        author: [{ required: true, message: "请填写负责人", trigger: "blur" }],
+        scheduleConf: [
+          { required: true, message: "请填写CRON", trigger: "blur" },
+        ],
+        executorParam: [
+          { validator: validatePass2, required: true, trigger: "blur" },
+        ],
+      },
       visible: false,
       itemOptions: [
         "测量周期",
@@ -628,8 +668,14 @@ export default {
         author: "",
       },
       addFrom: {
+        scheduleType: "CRON",
+        executorRouteStrategy: "FIRST",
+        executorBlockStrategy: "SERIAL_EXECUTION",
+        misfireStrategy: "DO_NOTHING",
         glueType: "BEAN",
         executorHandler: "pollingHandler",
+        executorTimeout: "0",
+        executorFailRetryCount: "0",
         executorParam: {
           equipId: "",
           params: [],
@@ -688,6 +734,17 @@ export default {
         this.page.total = res.total;
       });
     },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.handleAdd();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+
     async handleAdd() {
       delete this.addFrom.addTime;
       delete this.addFrom.updateTime;
@@ -790,6 +847,12 @@ export default {
     },
     handleClose() {
       this.manageFrom = {};
+      this.addFrom = {
+        executorParam: {
+          equipId: "",
+          params: [],
+        },
+      };
       this.aDialogVisible = false;
       this.cDialogVisible = false;
       this.addDialogVisible = false;
@@ -909,7 +972,7 @@ export default {
         title: "全部",
       });
 
-      // this.form.jobGroup = res.data[0].id;
+      this.form.jobGroup = res.data[0].id;
       this.handleJobinfoList();
     },
   },