Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

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

@@ -11,15 +11,20 @@
              </a-form-item>
            </a-col>
            <a-col :span="24">
              <a-form-item label="报警描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-input placeholder="请输入报警描述" v-decorator="['alarmDescription', validatorRules.alarmDescription]"></a-input>
              <a-form-item label="报警内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-input placeholder="请输入报警内容" v-decorator="['alarmContent', validatorRules.alarmContent]"></a-input>
              </a-form-item>
            </a-col>
            <a-col :span='24'>
            <a-form-item label="驱动类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="请选择驱动类型"
                      :options="shiftList">
            </a-select>
            <!--<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"
                  />
            </a-form-item>
            </a-col>
            <a-col :span="24">
@@ -27,28 +32,28 @@
                <a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></a-switch>
              </a-form-item>
            </a-col>
            <a-col :span='24'>
              <a-form-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                label="新增方式"
                hidden>
                <a-input
                  v-decorator="[
                'addWay',
                { rules:
                      [
                          { required: true, message: '' }
                      ],
                  initialValue: '2'
                }
              ]"
                  placeholder="请输入新增方式"
                  allowClear
                >
                </a-input>
              </a-form-item>
            </a-col>
            <!--<a-col :span='24'>-->
              <!--<a-form-item-->
                <!--:labelCol="labelCol"-->
                <!--:wrapperCol="wrapperCol"-->
                <!--label="新增方式"-->
                <!--hidden>-->
                <!--<a-input-->
                  <!--v-decorator="[-->
                <!--'addWay',-->
                <!--{ rules:-->
                      <!--[-->
                          <!--{ required: true, message: '' }-->
                      <!--],-->
                  <!--initialValue: '2'-->
                <!--}-->
              <!--]"-->
                  <!--placeholder="请输入新增方式"-->
                  <!--allowClear-->
                <!--&gt;-->
                <!--</a-input>-->
              <!--</a-form-item>-->
            <!--</a-col>-->
          </a-row>
        </a-form>
      </a-spin>
@@ -100,11 +105,11 @@
        },
        confirmLoading: false,        form: this.$form.createForm(this),
        validatorRules: {
          driveType:{
            rules: [{
              required: true, message: '请选择驱动类型!',
            }],
          },
          // driveType:{
          //   rules: [{
          //     required: true, message: '请选择驱动类型!',
          //   }],
          // },
          // isUse:{
          //   rules: [{
          //     required: true, message: !',
@@ -117,12 +122,12 @@
          },
          alarmDescription:{
            rules: [{
              required: true, message: '请输入报警描述!',
              required: true, message: '请输入报警内容!',
            }],
          },
        },
        url: {
          add: '/mdc/alarmInfo/add',
          add: '/mdc/mdcAlarmInfo/add',
          // edit:'/mdc/alarmInfo/edit',
          //驱动类型
          initShiftList: '/mdc/mdcequipment/driveTypeSelected',
@@ -150,7 +155,7 @@
        this.visible = true
        this.form.resetFields()
        this.model = Object.assign({}, record)
        this.initShiftList()
        // this.initShiftList()
        this.$nextTick(() => {

        })
@@ -169,13 +174,21 @@
            let formData = Object.assign(this.model, values)
            // console.log(formData)
            // formData.isUse = formData.isUse ? "1" : "2"
            formData.isUse = formData.isUse == true || formData.isUse == undefined ? "1" : "2"
            putAction(this.url.add, formData).then((res) => {
            formData.isUse = formData.isUse == true || formData.isUse == undefined ? "0" : "-1"
            postAction(this.url.add, formData).then((res) => {
              if (res.success) {
                that.$message.success(res.message)
                // that.$message.success(res.message)
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok', res.result)
              } else {
                that.$message.warning(res.message)
                // that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false