解决报警规则-》温湿度规则值为输入项

src/views/warnRule/addDialogCom.vue

@@ -68,7 +68,9 @@
             :value="operatorsItem.key">
           </el-option>
         </el-select>&nbsp;&nbsp;
-        <el-select v-model="item.value" placeholder="请选择操作" @change="valueChanged(item, item.value)">
+        <el-input-number v-if="item.sourceValues == undefined || item.sourceValues.length==0"
+         v-model="item.value" :precision="2" :step="0.1" @change="onInputChange" ></el-input-number>
+        <el-select v-else v-model="item.value" placeholder="请选择操作" @change="valueChanged(item, item.value)">
           <el-option v-for="sourceValueItem in item.sourceValues" :key="sourceValueItem.key"
             :label="sourceValueItem.value" :value="sourceValueItem.key"
             @click.native="sourceValueItemClick(sourceValueItem, item)">
@@ -196,6 +198,10 @@ export default {
     timeInput(value) {
       this.$forceUpdate();
     },
+    onInputChange()
+    {
+      this.$forceUpdate();
+    },
     removeClick(item, index) {
       if (this.datas[this.sourceType] == undefined) {
         this.datas[this.sourceType] = {};

src/views/warnRule/dialog.vue

@@ -48,7 +48,7 @@ export default {
     const params = this.$route.params;
     return {
       formData: {
-        id:"",
+        id: "",
         ruleName: "",
         ruleDesc: "",
         enabled: true,
@@ -77,7 +77,7 @@ export default {
       },
       id: params ? params.id : null,
       isShow: false,
-      title:"新增告警规则"
+      title: "新增告警规则"
     };
   },
   props: {},
@@ -95,22 +95,22 @@ export default {
         this.$message("获取初始化数据失败");
         return;
       }
-      
+
       this.sourceTypeList = initData.data.sourceTypeList;
       this.initSourceTypeDics();
       this.selectType = initData.data.sourceTypeList[0].sourceType + '';
       this.selectSystemFields = initData.data.sourceTypeList[0].systemFields;
-     
+
       if (isAdd) {
         this.title = "新增告警规则";
-        this.formData.ruleName="";
-        this.formData.ruleDesc="";
-        this.formData.enabled=true;
+        this.formData.ruleName = "";
+        this.formData.ruleDesc = "";
+        this.formData.enabled = true;
         this.formData.id = "";
         if (initData.data.sourceTypeList.length > 0) {
           this.ruleExpresses = {};
         }
-        
+
         this.isShow = true;
       }
       else {
@@ -119,7 +119,7 @@ export default {
           this.$message("未获取到报警规则");
           return;
         }
-        this.formData.id =ruleObj.iotAlarmRule.id; 
+        this.formData.id = ruleObj.iotAlarmRule.id;
         this.formData.ruleName = ruleObj.iotAlarmRule.name;
         this.formData.ruleDesc = ruleObj.iotAlarmRule.remark;
         this.formData.enabled = ruleObj.iotAlarmRule.enabled == 1 ? true : false;
@@ -159,12 +159,10 @@ export default {
         item.sourceValues = [];
       }
       else {
-        if(exist.systemFields!=undefined && exist.systemFields.length>0)
-        {
+        if (exist.systemFields != undefined && exist.systemFields.length > 0) {
 
-          let existField = exist.systemFields.find(fieldItem=>fieldItem.sysFieldCode == item.fieldcode);
-          if(existField!=undefined)
-          {
+          let existField = exist.systemFields.find(fieldItem => fieldItem.sysFieldCode == item.fieldcode);
+          if (existField != undefined) {
             item.operators = existField.operatorsList;
             item.sourceValues = existField.specsList;
           }
@@ -199,7 +197,7 @@ export default {
           })
         }
       });
-      
+
     },
     onTabClick(e) {
       this.selectSystemFields = this.sourceTypeList[new Number(e.index)].systemFields
@@ -208,8 +206,7 @@ export default {
     onHide() {
       this.isShow = false;
     },
-    onWindowClose()
-    {
+    onWindowClose() {
       this.$refs["form"].resetFields();
       this.$refs["form"].clearValidate();
     },
@@ -225,7 +222,7 @@ export default {
             submitData.isdeleted = 0;
             submitData.type = "alarm";
             submitData.iotAlarmRuleExpressDtoList = [];
-          
+
             for (let sourceTypeKey in this.ruleExpresses) {
               for (let weekDicKey in this.ruleExpresses[sourceTypeKey]) {
                 let weekDatas = this.ruleExpresses[sourceTypeKey][weekDicKey];
@@ -233,7 +230,13 @@ export default {
                   i.startTime = i.times[0];
                   i.endTime = i.times[1];
                   let specItem = `${i.sourceType}_${i.fieldcode}_${i.value}`
-                  i.valueText = this.sourceTypeDics[i.sourceType].specsListDic[specItem].value;
+                  if (this.sourceTypeDics[i.sourceType].specsListDic[specItem] == undefined) {
+                    i.valueText = i.value
+                  }
+                  else {
+                    i.valueText = this.sourceTypeDics[i.sourceType].specsListDic[specItem].value;
+                  }
+
                   submitData.iotAlarmRuleExpressDtoList.push(i);
                 })
               }
@@ -242,7 +245,7 @@ export default {
             if (rh.code != 200) {
               this.$message("添加失败");
             }
-           
+
             this.isShow = false;
             this.$emit("success");
           }