预警规则新增阈值

src/views/rulesManagement/earlyWarningRules/components/matter-add.vue

@@ -78,6 +78,16 @@
               </el-col>
             </el-form-item>
           </el-col>
+          <!-- 阈值 -->
+          <el-col :span="8">
+            <el-form-item label="阈值" prop="thresholdValue">
+              <el-input
+                v-model="formData.thresholdValue"
+                placeholder="请输入"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="状态" prop="enabled">
               <el-select
@@ -185,19 +195,27 @@
             width="240"
           >
             <template slot-scope="scope">
-              <el-select
-                placeholder="请选择"
-                v-model="scope.row.alertMessageTempateCode"
-                @change="changeTemplate(scope.row, scope.$index)"
+              <el-form-item
+                :prop="
+                  'actionList.' + scope.$index + '.alertMessageTempateCode'
+                "
+                label-width="0"
+                :rules="contentConfigFormRules.alertMessageTempateCode"
               >
-                <el-option
-                  v-for="item in templateData"
-                  :key="item.code"
-                  :label="item.name + '-' + item.code"
-                  :value="item.code"
+                <el-select
+                  placeholder="请选择"
+                  v-model="scope.row.alertMessageTempateCode"
+                  @change="changeTemplate(scope.row, scope.$index)"
                 >
-                </el-option>
-              </el-select>
+                  <el-option
+                    v-for="item in templateData"
+                    :key="item.code"
+                    :label="item.name + '-' + item.code"
+                    :value="item.code"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="content" label="内容" width="240">
@@ -270,8 +288,9 @@
           ruleCode: '',
           ruleName: '',
           ruleObjCode: '',
-          alertCycleValue: '',
+          alertCycleValue: '1',
           alertCycleUnit: '',
+          thresholdValue: '',
           enabled: 1,
           actionList: [
             {
@@ -285,6 +304,19 @@
           ]
         },
         contentConfigFormRules: {
+          ruleCode: [
+            { required: true, message: '请输入规则编码', trigger: 'blur' }
+          ],
+          ruleName: [
+            { required: true, message: '请输入规则名称', trigger: 'blur' }
+          ],
+          ruleObjCode: [
+            { required: true, message: '请选择预警对象', trigger: 'blur' }
+          ],
+          alertCycleValue: [
+            { required: true, message: '请输入周期', trigger: 'blur' }
+          ],
+
           targetAddressName: [
             { required: true, message: '请选择通知人', trigger: 'blur' }
           ],
@@ -454,22 +486,21 @@
       dataKeep() {
         let form = deepClone(this.formData);
         console.log(form, 'form');
-        if (form.actionList && form.actionList.length > 0) {
-          this.$refs.contentConfigForm.validate(async (valid) => {
-            if (valid) {
-              let res = await saveOrUpdate(form);
-              if (res) {
-                this.$message.success('操作成功！');
-                this.handleClose();
-                this.$emit('done');
-              }
-            } else {
-              this.$message.warning('请将信息补充完整！');
-            }
-          });
-        } else {
+        if (form.actionList.length < 1) {
           this.$message.error('请添加事项内容！');
         }
+        this.$refs.contentConfigForm.validate(async (valid) => {
+          if (valid) {
+            let res = await saveOrUpdate(form);
+            if (res) {
+              this.$message.success('操作成功！');
+              this.handleClose();
+              this.$emit('done');
+            }
+          } else {
+            this.$message.warning('请将信息补充完整！');
+          }
+        });
       }
     }
   };