Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

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

@@ -144,7 +144,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="matterRuleId" label="预警规则" width="260">
+          <el-table-column prop="matterRuleId" label="事项规则" width="260">
             <template slot-scope="scope">
               <el-form-item
                 :prop="'actionList.' + scope.$index + '.matterRuleId'"
@@ -180,13 +180,12 @@
                 :prop="'actionList.' + scope.$index + '.thresholdValue'"
                 label-width="0"
                 :rules="contentConfigFormRules.thresholdValue"
+
               >
                 <el-input
                   v-model="scope.row.thresholdValue"
                   placeholder="请输入"
-                  @input="
-                    handleInputByTable(scope.row.thresholdValue, scope.$index)
-                  "
+                  type="number"
                 ></el-input>
               </el-form-item>
             </template>

src/views/system/parmasManage/addOrEditDialog.vue

@@ -26,7 +26,7 @@
                 :value="item.value"
                 v-for="(item, index) in businessModule"
                 :key="index"
-                @click="getDictName(item)"
+                @click.native="getDictName(item)"
               >
               </el-option>
             </el-select>
@@ -119,7 +119,7 @@ export default {
       this.dialogForm = await parameterGetByIdAPI(id)
     },
     getDictName(item){
-      this.dialogForm[name] = item.label;
+      this.dialogForm['moduleName'] = item.label;
     },
     handelConfirm() {
       this.$refs.form.validate(async (valid) => {