Merge remote-tracking branch 'origin/master'

zhaowei

2025-07-16 008245cbe95c63a80f9a255378a5ffbe25d15085

 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>
@@ -220,7 +220,7 @@
            putAction(this.url.add, formData).then((res) => {
              if (res.success) {
                // that.$message.success(res.message)
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });