Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

qushaowei

2024-03-14 e055d2d93b516985fbc2df0f6f5a135f3230cccf

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

@@ -22,7 +22,7 @@
              </a-form-item>
            </a-col>
            <a-col :span="24">
              <a-form-item label="是否过滤" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-form-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></a-switch>
              </a-form-item>
            </a-col>
@@ -219,10 +219,18 @@
            formData.isUse = formData.isUse == true || formData.isUse == undefined ? "1" : "2"
            putAction(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