From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
index 06e4811..951523b 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
+++ b/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
--
Gitblit v1.9.3