From fe9f8c2f1c21a2db600d9563aa7baa7ccc42715e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 16 八月 2023 09:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue | 2 +-
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue | 2 +-
src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index f286c0d..53648ff 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -247,7 +247,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("娣诲姞鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"娣诲姞鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
index 6ec8f44..683850e 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
@@ -255,7 +255,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇敼鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
index 6c32263..f5c23aa 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
@@ -195,8 +195,8 @@
delete: '/mdc/mdcPassRate/delete',
deleteBatch: '/mdc/mdcPassRate/deleteBatch',
getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
- exportXlsUrl: "/mdc/mdcStandardProcessDuration/exportXls",
- importExcelUrl: "/mdc/mdcStandardProcessDuration/importExcel",
+ exportXlsUrl: "/mdc/mdcPassRate/exportXls",
+ importExcelUrl: "/mdc/mdcPassRate/importExcel",
}
}
},
--
Gitblit v1.9.3