Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue

@@ -31,7 +31,7 @@
            <a-col :span="24">
              <a-form-item label="是否过滤" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <!--<j-switch  v-model="model.isUse"></j-switch>-->
                <a-switch v-model="isUse"/>
                <a-switch  v-model="isUse"/>
                <!--<a-radio-group v-model="model.isUse">-->
                  <!--<a-radio :value="1">-->
                    <!--是-->
@@ -103,6 +103,16 @@
          //     required: true, message: '请选择班制!',
          //   }],
          // },
          alarmCode:{
            rules: [{
              required: true, message: '请输入报警号!',
            }],
          },
          alarmContent:{
            rules: [{
              required: true, message: '请输入报警内容!',
            }],
          },
        },
        url: {
          // add: '/mdc/alarmInfo/add',
@@ -124,6 +134,7 @@
        this.model = Object.assign({}, record)
        this.visible = true
        this.$nextTick(() => {
          this.isUse=record.isUse===0?true:false
          this.form.setFieldsValue(pick(this.model, 'alarmCode', 'alarmContent','driveType'))
        })
      },
@@ -160,7 +171,7 @@
                // that.$message.success("添加成功")
                that.$notification.success({
                  message:'消息',
                  description:"添加成功"
                  description:"修改成功"
                });
                // that.$message.success(res.message)
                that.$emit('ok', res.result)