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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

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

@@ -7,7 +7,7 @@
          <a-row :gutter="24">
            <a-col :span="24">
              <a-form-item label="报警号" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-input placeholder="请输入报警号" v-decorator="['alarmCode', validatorRules.alarmCode]"></a-input>
                <a-input placeholder="请输入报警号" v-decorator="['alarmCode', validatorRules.alarmCode]" ></a-input>
              </a-form-item>
            </a-col>
            <a-col :span="24">
@@ -20,16 +20,22 @@
            <!--<a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="请选择驱动类型"-->
                      <!--:options="shiftList">-->
            <!--</a-select>-->
                  <j-dict-select-tag
                    placeholder="请选择驱动类型"
                    v-decorator="['driveType', validatorRules.driveType]"
                    dictCode="mdc_driveType"
                  />
                  <!--<j-dict-select-tag-->
                    <!--placeholder="请选择驱动类型"-->
                    <!--v-decorator="['driveType', validatorRules.driveType]"-->
                    <!--dictCode="mdc_driveType"-->
                  <!--/>-->
              <a-auto-complete
                v-decorator="['driveType', validatorRules.driveType]"
                :data-source="driveTypeList"
                placeholder="请选择驱动类型"
                :filter-option="filterOption"
              />
            </a-form-item>
            </a-col>
            <a-col :span="24">
              <a-form-item label="是否过滤" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></a-switch>
                <a-switch :checked="isFilterChecked"  v-decorator="['isUse', validatorRules.isUse]" @change="isFilterChange"></a-switch>
              </a-form-item>
            </a-col>
            <!--<a-col :span='24'>-->
@@ -77,10 +83,17 @@
  export default {
    name: 'alarmManagerForm',
    // components: {AlarmManagerEqupment},
    props: {},
    props: {
      driveTypeList:{
        type:Array
      },
      filterOption:{
        type:Function
      }
    },
    data() {
      return {
        showM:true,
        isFilterChecked:true,
        isUse:true,
        title: '',
        visible: false,
@@ -103,24 +116,20 @@
            span: 18
          }
        },
        confirmLoading: false,        form: this.$form.createForm(this),
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          // driveType:{
          //   rules: [{
          //     required: true, message: '请选择驱动类型!',
          //   }],
          // },
          // isUse:{
          //   rules: [{
          //     required: true, message: !',
          //   }],
          // },
          driveType:{
            rules: [{
              required: true, message: '请选择驱动类型!',
            }],
          },
          alarmCode:{
            rules: [{
              required: true, message: '请输入报警号!',
            }],
          },
          alarmDescription:{
          alarmContent:{
            rules: [{
              required: true, message: '请输入报警内容!',
            }],
@@ -152,10 +161,11 @@
      },
      add(record) {
        let _this = this
        this.visible = true
        this.isFilterChecked=true
        this.form.resetFields()
        this.model = Object.assign({}, record)
        // this.initShiftList()
        this.visible = true
        this.$nextTick(() => {

        })
@@ -200,6 +210,13 @@
      handleCancel() {
        this.close()
      },
      /**
       * 是否过滤切换器change事件
       * @param checked 切换后的状态
       */
      isFilterChange(checked){
        this.isFilterChecked=checked
      }
    }
  }
</script>