【web】 触发条件修改

ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/rules/index.vue

@@ -72,18 +72,23 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="触发条件" prop="compareValue1">
+        <el-form-item label="触发条件" prop="paramName">
           <el-col :span="6">
+            <el-form-item label="" prop="paramName" label-width="0">
               <el-select v-model="form.paramName" placeholder="请选择" style="width: 100%" @change="byTableDataChange">
                 <el-option v-for="dict in byTableData" :key="dict.columnName" :label="dict.paramName" :value="dict.columnName"></el-option>
               </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="6">
+            
+            <el-form-item label="" prop="operator" label-width="0">
               <el-select v-model="form.operator" placeholder="请选择" style="width: 100%">
                 <el-option v-for="dict in dict.type.waming_rules" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
+            </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="5" v-if="form.operator != 'CHANGED'">
             <el-form-item label="" prop="compareValue1" label-width="0">
               <el-input v-model="form.compareValue1" placeholder="请输入" maxlength="30" />
             </el-form-item>
@@ -394,7 +399,7 @@ export default {
             enable:0
           }
           formData.alertRuleConditionList = [{
-            paramName: this.byTableItem.paramName,
+            paramName: this.byTableItem.columnName,
             compareValue: form.compareValue2?form.compareValue1+','+form.compareValue2:form.compareValue1,
             operator: form.operator,
             valueType: this.byTableItem.paramType