From 9b3e7c3c47dc27e531a7b954aa2b3ba500c84b78 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 10 八月 2023 16:33:18 +0800
Subject: [PATCH] 项目整体弹窗提示
---
src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue | 6
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue | 18
src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue | 7
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue | 24
src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue | 12
src/views/mdc/base/ProductionManager.vue | 42
src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue | 20
src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue | 18
src/views/mdc/base/modules/ProductionManager/ProductionModal.vue | 12
src/views/mdc/base/modules/deviceLog/LogInfo.vue | 36
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 19
src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue | 12
src/views/system/modules/DepartList/DepartDataruleModal.vue | 20
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 7
src/views/mdc/base/modules/shift/ShiftInfoModel.vue | 43
src/views/mdc/base/DeviceBaseInfo.vue | 12
src/views/mdc/base/modules/HourReports/ReportList.vue | 6
src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue | 13
src/views/system/RoleUserList.vue | 6
src/views/mdc/base/Torqueconfiguration.vue | 6
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue | 12
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue | 24
src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue | 68 +
src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 12
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue | 12
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 18
src/views/system/modules/DeptUserInfo.vue | 6
src/views/mdc/base/modules/DepartList/DepartAuthModal.vue | 12
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue | 12
src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue | 18
src/views/mdc/base/modules/DepartList/DepartListContent/TierModel.vue | 12
src/views/system/modules/QuartzJobModal.vue | 12
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue | 18
src/views/mdc/base/EfficiencyReport.vue | 6
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 7
src/mixins/JeecgListMixin.js | 36
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue | 18
src/views/system/DepartList1.vue | 59 +
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 42
src/components/jeecg/modal/JPopupOnlReport.vue | 12
src/views/mdc/base/modules/HolidayManagement/HolidayManagementForm.vue | 12
src/views/mdc/base/openRateFractionAnalysis.vue | 6
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 6
src/views/mdc/base/mdcStandardProcessDuration.vue | 6
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue | 12
src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue | 12
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue | 69 +
src/views/mdc/base/EquipmentList.vue | 19
src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue | 12
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue | 18
src/views/mdc/base/modules/shift/ShiftInfo.vue | 24
src/views/mdc/base/mdcProcessQuantity.vue | 7
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 26
src/views/mdc/base/ComparativeAnalysis.vue | 6
src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue | 49 +
src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue | 66 +
src/views/system/DepartList.vue | 43
src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue | 12
src/views/mdc/base/modules/deviceLog/WorkChartModel.vue | 14
src/views/mdc/base/EfficiencyPOReport.vue | 7
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 23
src/views/system/modules/DepartList/DepartAuthModal.vue | 31
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue | 12
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue | 19
src/views/mdc/base/modules/deviceManager/TierModel.vue | 12
src/views/mdc/base/DeviceRepair.vue | 7
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue | 18
src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue | 3
src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue | 14
src/components/jeecgbiz/modal/SelectUserListModal.vue | 12
src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue | 12
src/views/mdc/base/equipmentAvailCompare.vue | 6
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue | 20
src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue | 44
src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue | 53 +
src/views/mdc/base/openRateTrendAnalysis.vue | 6
src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue | 18
src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue | 6
src/views/mdc/base/modules/ProductionManager/ProductionEquipment.vue | 18
src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue | 7
src/views/mdc/base/modules/utilizationStatistics/UtilizationStatisticsList.vue | 18
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue | 67 +
src/views/mdc/base/DeviceCalendar.vue | 6
src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue | 12
src/views/mdc/base/UnplannedDowntimemManager.vue | 6
src/views/mdc/common/BaseTree.vue | 6
src/views/system/modules/DepartList/DepartModal.vue | 12
src/main.js | 12
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue | 18
src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue | 7
src/views/system/modules/ProductionManager/ProductionEquipment.vue | 36
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue | 12
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue | 12
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 24
src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue | 6
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue | 67 +
src/views/system/DepartListSync.vue | 10
src/views/mdc/base/mdcPassRate.vue | 6
src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue | 30
src/views/mdc/base/DepartList.vue | 6
src/views/system/modules/QuartzJobListModal.vue | 6
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue | 12
src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue | 12
src/views/mdc/base/modules/shift/ShiftSystemModel.vue | 12
src/views/system/DepartList2.vue | 31
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue | 18
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue | 13
src/components/table2excel/table2excel.js | 9
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 48 +
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 6
src/views/mdc/base/modules/deviceManager/DeviceList.vue | 41
src/views/system/ProductionManager.vue | 60 +
src/views/mdc/base/modules/deviceManager/DeviceModel.vue | 12
src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue | 6
src/views/mdc/base/RealTimeMonitoringEquipment.vue | 6
src/views/system/modules/ProductionManager/ProductionModal.vue | 12
src/views/system/UserList.vue | 6
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue | 66 +
src/views/mdc/base/HolidayManagement.vue | 6
src/views/mdc/base/equipmentDayAvail.vue | 6
src/views/mdc/base/EfficiencyShiftReport.vue | 6
src/views/mdc/base/modules/shift/ShiftSystem.vue | 24
122 files changed, 1,896 insertions(+), 417 deletions(-)
diff --git a/src/components/jeecg/modal/JPopupOnlReport.vue b/src/components/jeecg/modal/JPopupOnlReport.vue
index 5d14dc7..eb7b023 100644
--- a/src/components/jeecg/modal/JPopupOnlReport.vue
+++ b/src/components/jeecg/modal/JPopupOnlReport.vue
@@ -341,12 +341,20 @@
handleSubmit() {
if(!this.multi){
if(this.table.selectionRows && this.table.selectionRows.length>1){
- this.$message.warning("璇烽�夋嫨涓�鏉¤褰�")
+ // this.$message.warning("璇烽�夋嫨涓�鏉¤褰�")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return false
}
}
if(!this.table.selectionRows || this.table.selectionRows.length==0){
- this.$message.warning("璇烽�夋嫨涓�鏉¤褰�")
+ // this.$message.warning("璇烽�夋嫨涓�鏉¤褰�")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return false
}
this.$emit('ok', this.table.selectionRows);
diff --git a/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue b/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
index 059fe5f..beca2c5 100644
--- a/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
@@ -139,7 +139,12 @@
this.allTreeKeys = res.result
this.loadDepart()
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() => {
this.loading = false
diff --git a/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue b/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
index 8f725ff..b85d3b1 100644
--- a/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
@@ -106,7 +106,11 @@
this.allTreeKeys = res.result
this.loadDepart()
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/components/jeecgbiz/modal/SelectUserListModal.vue b/src/components/jeecgbiz/modal/SelectUserListModal.vue
index 1da0148..5882c4d 100644
--- a/src/components/jeecgbiz/modal/SelectUserListModal.vue
+++ b/src/components/jeecgbiz/modal/SelectUserListModal.vue
@@ -97,11 +97,19 @@
handleChange(info) {
let file = info.file;
if (file.response.success) {
- this.$message.success(file.response.message);
+ // this.$message.success(file.response.message);
+ this.$notification.success({
+ message:'娑堟伅',
+ description:file.response.message
+ });
this.$emit('ok');
this.close()
} else {
- this.$message.warn(file.response.message);
+ // this.$message.warn(file.response.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:file.response.message
+ });
this.close()
}
diff --git a/src/components/table2excel/table2excel.js b/src/components/table2excel/table2excel.js
index 101f74e..0767353 100644
--- a/src/components/table2excel/table2excel.js
+++ b/src/components/table2excel/table2excel.js
@@ -1,11 +1,4 @@
-/*
- * jQuery table2excel - v1.1.2
- * jQuery plugin to export an .xls file in browser from an HTML table
- * https://github.com/rainabba/jquery-table2excel
- *
- * Made by rainabba
- * Under MIT License
- */
+
//table2excel.js
import jQuery from 'jquery'
(function ( $, window, document, undefined ) {
diff --git a/src/main.js b/src/main.js
index 8bc9dcf..67396d3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -57,6 +57,18 @@
componentPrefix: 'vc',
});
+//娉ㄥ叆鍏ㄥ眬灞炴��$message
+import {message,notification } from 'ant-design-vue'
+Vue.prototype.$message = message
+Vue.prototype.$notification = notification
+message.config({
+})
+notification.config({
+ bottom:'20px',
+ right:'100px'
+})
+
+
// import 'echarts-liquidfill'
Vue.prototype.$echarts = echarts
Vue.prototype.$qs = qs
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index eb70391..8e4268d 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -175,7 +175,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -192,11 +196,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -215,10 +227,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -289,7 +309,11 @@
console.log("瀵煎嚭鍙傛暟",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) {
- this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ // this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"鏂囦欢涓嬭浇澶辫触"
+ });
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
diff --git a/src/views/mdc/base/ComparativeAnalysis.vue b/src/views/mdc/base/ComparativeAnalysis.vue
index aa781b7..669c233 100644
--- a/src/views/mdc/base/ComparativeAnalysis.vue
+++ b/src/views/mdc/base/ComparativeAnalysis.vue
@@ -56,7 +56,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/DepartList.vue b/src/views/mdc/base/DepartList.vue
index 0bc5eb9..6e11b6e 100644
--- a/src/views/mdc/base/DepartList.vue
+++ b/src/views/mdc/base/DepartList.vue
@@ -295,7 +295,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨涓�鏉¤褰�'
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index cefd37b..3c7ccf1 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -117,10 +117,18 @@
}
}
}else{
- this.$message.warning("姝よ溅闂翠笅闈㈡棤璁惧锛侊紒")
+ // this.$message.warning("姝よ溅闂翠笅闈㈡棤璁惧锛侊紒")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"姝よ溅闂翠笅闈㈡棤璁惧锛侊紒"
+ });
}
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
diff --git a/src/views/mdc/base/DeviceCalendar.vue b/src/views/mdc/base/DeviceCalendar.vue
index 792b2fd..1cbbdb8 100644
--- a/src/views/mdc/base/DeviceCalendar.vue
+++ b/src/views/mdc/base/DeviceCalendar.vue
@@ -65,7 +65,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/DeviceRepair.vue b/src/views/mdc/base/DeviceRepair.vue
index fc3ea7a..adc416c 100644
--- a/src/views/mdc/base/DeviceRepair.vue
+++ b/src/views/mdc/base/DeviceRepair.vue
@@ -68,7 +68,12 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/EfficiencyPOReport.vue b/src/views/mdc/base/EfficiencyPOReport.vue
index a3c60c7..6ff308f 100644
--- a/src/views/mdc/base/EfficiencyPOReport.vue
+++ b/src/views/mdc/base/EfficiencyPOReport.vue
@@ -66,7 +66,12 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/EfficiencyReport.vue b/src/views/mdc/base/EfficiencyReport.vue
index 692b34e..9b35e22 100644
--- a/src/views/mdc/base/EfficiencyReport.vue
+++ b/src/views/mdc/base/EfficiencyReport.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/EfficiencyShiftReport.vue b/src/views/mdc/base/EfficiencyShiftReport.vue
index bde51f6..1a72217 100644
--- a/src/views/mdc/base/EfficiencyShiftReport.vue
+++ b/src/views/mdc/base/EfficiencyShiftReport.vue
@@ -67,7 +67,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index c523877..02bd2c3 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -274,7 +274,11 @@
batchFrozen: function (status) {
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return false;
} else {
let ids = "";
@@ -298,11 +302,20 @@
onOk: function () {
frozenBatch({ids: ids, status: status}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
});
}
diff --git a/src/views/mdc/base/HolidayManagement.vue b/src/views/mdc/base/HolidayManagement.vue
index 9b3c858..e230736 100644
--- a/src/views/mdc/base/HolidayManagement.vue
+++ b/src/views/mdc/base/HolidayManagement.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/ProductionManager.vue b/src/views/mdc/base/ProductionManager.vue
index df6690b..c1ea8b7 100644
--- a/src/views/mdc/base/ProductionManager.vue
+++ b/src/views/mdc/base/ProductionManager.vue
@@ -293,7 +293,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -306,11 +310,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -328,7 +340,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -400,16 +416,28 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!'
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ // this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/RealTimeMonitoringEquipment.vue b/src/views/mdc/base/RealTimeMonitoringEquipment.vue
index 63b148b..d1a865a 100644
--- a/src/views/mdc/base/RealTimeMonitoringEquipment.vue
+++ b/src/views/mdc/base/RealTimeMonitoringEquipment.vue
@@ -172,7 +172,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/Torqueconfiguration.vue b/src/views/mdc/base/Torqueconfiguration.vue
index 012027d..2aa13cc 100644
--- a/src/views/mdc/base/Torqueconfiguration.vue
+++ b/src/views/mdc/base/Torqueconfiguration.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/UnplannedDowntimemManager.vue b/src/views/mdc/base/UnplannedDowntimemManager.vue
index 9bd289a..bfe20a2 100644
--- a/src/views/mdc/base/UnplannedDowntimemManager.vue
+++ b/src/views/mdc/base/UnplannedDowntimemManager.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/equipmentAvailCompare.vue b/src/views/mdc/base/equipmentAvailCompare.vue
index 4d2061c..6d1e9c5 100644
--- a/src/views/mdc/base/equipmentAvailCompare.vue
+++ b/src/views/mdc/base/equipmentAvailCompare.vue
@@ -56,7 +56,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/equipmentDayAvail.vue b/src/views/mdc/base/equipmentDayAvail.vue
index 9c8ae48..71e28f8 100644
--- a/src/views/mdc/base/equipmentDayAvail.vue
+++ b/src/views/mdc/base/equipmentDayAvail.vue
@@ -56,7 +56,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/mdcPassRate.vue b/src/views/mdc/base/mdcPassRate.vue
index c84a741..8d7feb0 100644
--- a/src/views/mdc/base/mdcPassRate.vue
+++ b/src/views/mdc/base/mdcPassRate.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/mdcProcessQuantity.vue b/src/views/mdc/base/mdcProcessQuantity.vue
index 939fe41..3dfdb35 100644
--- a/src/views/mdc/base/mdcProcessQuantity.vue
+++ b/src/views/mdc/base/mdcProcessQuantity.vue
@@ -66,7 +66,12 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/mdcStandardProcessDuration.vue b/src/views/mdc/base/mdcStandardProcessDuration.vue
index 8edc29e..7dc4fc9 100644
--- a/src/views/mdc/base/mdcStandardProcessDuration.vue
+++ b/src/views/mdc/base/mdcStandardProcessDuration.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/modules/DepartList/DepartAuthModal.vue b/src/views/mdc/base/modules/DepartList/DepartAuthModal.vue
index 92aedf0..d629a37 100644
--- a/src/views/mdc/base/modules/DepartList/DepartAuthModal.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartAuthModal.vue
@@ -136,11 +136,19 @@
that.loading = true;
saveDepartPermission(params).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
that.loadData();
}else {
- that.$message.error(res.message);
+ // that.$message.error(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
}
})
diff --git a/src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue b/src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue
index 77298ac..b43f9d0 100644
--- a/src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue
@@ -81,9 +81,17 @@
}
postAction(this.url.datarule,params).then(res=>{
if(res.success){
- this.$message.success(res.message)
+ // this.$message.success(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}else{
- this.$message.error(res.message)
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
index d37ed2c..b41aca0 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
@@ -334,7 +334,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -346,7 +350,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -363,12 +371,20 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
that.$emit('delectTree','')
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -387,12 +403,20 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
that.$emit('delectTree','')
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -406,12 +430,20 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData2();
// that.onClearSelected();
// that.$emit('delectTree','')
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -478,7 +510,6 @@
this.selectedRowKeys = []
},
handleEdit: function (record) {
- console.log(record)
if (record.id) {
this.$refs.modalForm.title = '缂栬緫'
this.$refs.modalForm.disableSubmit = false
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
index 78ca51f..78adfee 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
@@ -216,7 +216,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue
index 51415b8..e6a8da8 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue
@@ -155,11 +155,20 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/TierModel.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/TierModel.vue
index 898a87b..13d01c0 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/TierModel.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/TierModel.vue
@@ -159,11 +159,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("鎴愬姛")
+ // that.$message.success("鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
index 2941cbd..99dfe82 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
@@ -146,7 +146,11 @@
this.treeDataSource = res.result
this.generateList(res.result)
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
this.loading = false
@@ -247,12 +251,20 @@
},
batchDel: function(entity) {
if (!this.url.deleteBatch) {
- this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
+ // this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇疯缃畊rl.deletBatch灞炴�э紒"
+ });
return
}
let ids = entity.id
if (!ids) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return
} else {
var that = this
@@ -263,10 +275,18 @@
that.loading = true
deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.queryTreeData();
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false
diff --git a/src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue b/src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue
index 20cceff..acbee7b 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue
@@ -158,11 +158,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("缂栬緫鎴愬姛")
+ // that.$message.success("缂栬緫鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缂栬緫鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
index 729b0e6..3f6b53b 100644
--- a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
@@ -190,7 +190,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index e078ac0..69e57a1 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -264,7 +264,11 @@
// return { label: item.id, value: item.equipmentTypeName + '' }
// })
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -274,10 +278,10 @@
console.log(val)
if(val.equipmentid ){
this.model.equipmentId = val.equipmentid
- this.model.equipmentName = val.equipmentname,
- this.model.equipmentModel = val.equipmentmodel,
- this.model.equipmentIp = val.equipmentip,
- this.model.dataPort = val.dataport,
+ this.model.equipmentName = val.equipmentname
+ this.model.equipmentModel = val.equipmentmodel
+ this.model.equipmentIp = val.equipmentip
+ this.model.dataPort = val.dataport
this.model.driveType = val.drivetype
this.model.controlSystem = val.controlsystem
this.model.saveTableName = val.savetablename
@@ -453,10 +457,18 @@
}
obj.then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue b/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
index 37224d7..a51bb0c 100644
--- a/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
+++ b/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
@@ -101,16 +101,24 @@
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
})
}
-
+
})
},
}
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementForm.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementForm.vue
index 4973bac..37fe555 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementForm.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementForm.vue
@@ -107,10 +107,18 @@
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
index 00efb4a..a6e0c67 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -301,7 +301,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -346,7 +350,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -384,7 +392,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -426,7 +438,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -460,7 +476,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -482,10 +502,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -495,7 +523,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -512,11 +544,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -555,7 +595,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
index 7656871..17ef5f5 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
@@ -247,11 +247,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
index d74bfd8..4c9c229 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
@@ -255,11 +255,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇敼鎴愬姛")
+ // that.$message.success("淇敼鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/HourReports/ReportList.vue b/src/views/mdc/base/modules/HourReports/ReportList.vue
index 3b075bb..3ca86b0 100644
--- a/src/views/mdc/base/modules/HourReports/ReportList.vue
+++ b/src/views/mdc/base/modules/HourReports/ReportList.vue
@@ -247,7 +247,11 @@
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('gzl')
if (index < 0) {
- this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鏁呴殰鐜�')
+ // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鏁呴殰鐜�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶈兘鍙栨秷鏌ヨ鏁呴殰鐜�"
+ });
return false
}
this.checkedList = checkedList
diff --git a/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue b/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
index c06b3f2..f08e9d4 100644
--- a/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
+++ b/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
@@ -111,10 +111,18 @@
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/mdc/base/modules/ProductionManager/ProductionEquipment.vue b/src/views/mdc/base/modules/ProductionManager/ProductionEquipment.vue
index a719848..420ad8d 100644
--- a/src/views/mdc/base/modules/ProductionManager/ProductionEquipment.vue
+++ b/src/views/mdc/base/modules/ProductionManager/ProductionEquipment.vue
@@ -124,7 +124,11 @@
handleSubmit() {
let that = this;
if(!that.departId){
- this.$message.warning('璇风偣鍑婚�夋嫨涓�涓儴闂�!')
+ // this.$message.warning('璇风偣鍑婚�夋嫨涓�涓儴闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇风偣鍑婚�夋嫨涓�涓儴闂�"
+ });
}
let checkedKeys = [...that.checkedKeys, ...that.halfCheckedKeys]
const permissionIds = checkedKeys.join(",")
@@ -136,11 +140,19 @@
that.loading = true;
saveDepartPermission(params).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
that.loadData();
}else {
- that.$message.error(res.message);
+ // that.$message.error(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
}
})
diff --git a/src/views/mdc/base/modules/ProductionManager/ProductionModal.vue b/src/views/mdc/base/modules/ProductionManager/ProductionModal.vue
index bcf3c17..27dcb45 100644
--- a/src/views/mdc/base/modules/ProductionManager/ProductionModal.vue
+++ b/src/views/mdc/base/modules/ProductionManager/ProductionModal.vue
@@ -136,11 +136,19 @@
that.confirmLoading = true;
httpAction(this.url.add,this.model,"post").then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTreeData();
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index d9e79f6..fcfc498 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -420,7 +420,11 @@
_this.$set(this.queryParams, 'parentId', res.result[0].key)
_this.queryStatistical()
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index 4444581..d2406ed 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -588,7 +588,11 @@
// console.log(res.result[0].entity.tierName)
_this.$set(this.queryParam, 'tierName', res.result[0].title)
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
index d86c1d4..09a6ffe 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
@@ -306,7 +306,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -351,7 +355,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -389,7 +397,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -431,7 +443,12 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() => {
this.loading = false
@@ -500,7 +517,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -522,10 +543,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -535,7 +564,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -552,11 +585,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -595,7 +636,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index d4290eb..f286c0d 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -246,11 +246,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
index 587cde5..6ec8f44 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
@@ -254,11 +254,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇敼鎴愬姛")
+ // that.$message.success("淇敼鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
index e9e769d..16f8081 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
@@ -318,7 +318,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -363,7 +367,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -401,7 +409,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -443,7 +455,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -477,7 +493,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -499,10 +519,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -512,7 +540,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -529,11 +561,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -572,7 +612,12 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
+
}
}
})
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
index e311dc5..0ef247e 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
@@ -233,7 +233,11 @@
let startOne = start.replace(/:/g,'');
let endOne = end.replace(/:/g,'');
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -248,11 +252,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index fd2c967..3cd9d33 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -260,7 +260,12 @@
let startOne = start.replace(/:/g,'');
let endOne = end.replace(/:/g,'');
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
+
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -275,11 +280,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
index 4186f79..d2b30a5 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
@@ -157,11 +157,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
index 619644b..1edd5a3 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
@@ -172,10 +172,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.warning({
+ 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
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
index 06e4811..c889ccb 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
@@ -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.warning({
+ 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
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue b/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
index 36b9e09..f7c53a9 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
@@ -198,7 +198,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -239,7 +243,11 @@
if (res.success) {
this.sectionPData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -250,7 +258,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
index 00de61a..9060299 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
@@ -193,10 +193,12 @@
this.AnalysisBarList = res.result.graphics
this.AnalysisGauge = res.result.meters
this.AnalysisPie.push(res.result.pieCharts)
- console.log(res.result.pieCharts)
- console.log(this.AnalysisPie)
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -232,7 +234,11 @@
this.AnalysisGauge = res.result.meters
this.AnalysisPie.push(res.result.pieCharts)
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -262,7 +268,11 @@
this.AnalysisGauge = res.result.meters
this.AnalysisPie.push(res.result.pieCharts)
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
index 10e0b5c..77acc70 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
@@ -113,9 +113,7 @@
{value: 0, name: '鍏虫満鐜�'}]
}]
};
- console.log(this.RateList)
if(this.RateList != null){
- console.log(this.RateList)
this.closeRate =[]
this.openRate =[]
this.usedRate = []
@@ -127,7 +125,6 @@
this.waitRate=this.RateList[0].waitRate
pieCompChartOption1.series[0].data = [{value:this.openRate, name:'寮�鏈虹巼'},{value:this.closeRate, name:'鍏虫満鐜�'}];
pieCompChartOption2.series[0].data = [{value:(this.usedRate * 100).toFixed(2), name:'鍔犲伐鐜�'},{value:(this.waitRate * 100).toFixed(2), name:'寰呮満鐜�'},{value:(this.closeRate * 100).toFixed(2), name:'鍏虫満鐜�'}];
- console.log(pieCompChartOption1.series[0].data)
pieCompChart1.setOption(pieCompChartOption1);
pieCompChart2.setOption(pieCompChartOption2);
}else{
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index bca1e3b..c118060 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -12,7 +12,6 @@
</div>
</div>
<p style="margin-top: 5px;">
- <!--<span ref="message">{{item.equipmentName}}</span>-->
<span ref="message">{{item.equipmentName}}({{item.equipmentId}})</span>
</p>
</div>
@@ -60,7 +59,11 @@
},
openDetail(item) {
if(item.oporation == 0){
- this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璁惧澶勪簬鍏虫満鐘舵�侊紒"
+ });
return false;
}
console.log(item);
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
index fb27e33..a0b54c9 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
@@ -1378,7 +1378,6 @@
getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
if (res.success) {
_this.resultData = res.result
- console.log(_this.resultData)
_this.driverType = res.result.deviceType
_this.spindlebeilv = res.result.spindlebeilv
_this.feedbeilv = res.result.feedbeilv
@@ -1391,7 +1390,11 @@
})
// _this.initDeviceType(_this.resultData.deviceType)
} else {
- _this.$message.warn(res.message)
+ // _this.$message.warn(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
index d89b2b2..df84949 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
@@ -256,7 +256,11 @@
this.treeDataSource = res.result
this.generateList(res.result)
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -344,7 +348,11 @@
}
let ids = entity.id
if (!ids) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨涓�鏉¤褰�'
+ });
return
} else {
var that = this
@@ -355,10 +363,18 @@
that.loading = true
deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.queryTreeData();
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue
index 3f64575..6f62998 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue
@@ -216,10 +216,18 @@
let formData = Object.assign(this.model, values)
postAction(this.url.settingCalendar, formData).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ 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
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
index 2d6e8f6..fb238f0 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
@@ -104,7 +104,11 @@
this.treeDataSource = res.result
this.generateList(res.result)
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -189,16 +193,23 @@
lastpermissionIds:that.defaultCheckedKeys.join(","),
};
that.loading = true;
- console.log("璇锋眰鍙傛暟锛�",params);
saveRolePermission(params).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
if (exit) {
that.close()
}
}else {
- that.$message.error(res.message);
+ // that.$message.error(res.message);
+ that.$notification.error({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loading = false;
if (exit) {
that.close()
@@ -215,7 +226,6 @@
this.checkedKeys = [...res.result];
this.defaultCheckedKeys = [...res.result];
this.expandedKeysss = this.allTreeKeys;
- console.log(this.defaultCheckedKeys)
})
})
}
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
index 9febbda..6c88371 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
@@ -187,7 +187,6 @@
// this.onClearSelected()
//鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
//TODO 绛涢��
- console.log(pagination)
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field;
this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
@@ -236,7 +235,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -277,7 +280,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -288,7 +295,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index bb315ce..b92f440 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -152,10 +152,10 @@
// console.log(data); //閫変腑鏌愬ぉ
// },
changeDate(data) {
- console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
+ // console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
},
clickToday(data) {
- console.log(data); // 璺冲埌浜嗘湰鏈�
+ //console.log(data); // 璺冲埌浜嗘湰鏈�
},
// markChange(){
//
@@ -200,13 +200,10 @@
}
},
clickDay(today){//閫変腑鏃ユ湡
- // today = this.fun(today)
- console.log("褰撳墠閫変腑鏃ユ湡===>", today);
let existDate = this.selectDate;
let isExist = true;
for (var i = 0; i < existDate.length; i++) {
if (existDate[i].date === today) {
- console.log("褰撳墠鏃ユ湡瀛樺凡鍦�===>",today);
this.selectDate.splice(i,1);
this.shiData.splice(i,1);
this.sendDte.splice(i,1)
@@ -214,7 +211,6 @@
}
}
if (isExist) {//褰撳墠鏃ユ湡瀛樺湪绉婚櫎
- console.log("涓嶅瓨鍦�-娣诲姞===>");
let tempDate = {date: today, className: "mark1"}
// let ddd = this.fun(today)
let ddd = today
@@ -223,8 +219,6 @@
this.shiData.push(ddd)
this.sendDte.push(ccc)
}
- console.log("this.selectDate===>",JSON.stringify(this.selectDate));
- console.log(this.sendDte)
},
onSelect(value) {
console.log(value);
@@ -308,13 +302,20 @@
let formData = Object.assign(this.model, values)
formData.dateList = this.sendDte
- console.log(formData)
postAction(this.url.settingCalendar, formData).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ 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
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 3c48337..0321998 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -329,7 +329,11 @@
this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
this.queryChart()
}else{
- this.$message.warning("璇烽�夋嫨鏃堕棿")
+ // this.$message.warning("璇烽�夋嫨鏃堕棿")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
// this.queryList()
@@ -345,7 +349,11 @@
},
openWorkChart() {
if(!this.equipment.equipmentId){
- this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ // this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧杩涜鏌ヨ"
+ });
}else{
this.$refs.workChartModel.add(this.equipment)
this.$refs.workChartModel.title = '宸ヤ綔鏇茬嚎'
@@ -355,7 +363,11 @@
openHistoryChart() {
// console.log(this.equipment);
if(!this.equipment.equipmentId){
- this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ // this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧杩涜鏌ヨ"
+ });
// console.log(1111)
} else{
this.$refs.workHistoryModel.add(this.equipment)
@@ -369,7 +381,11 @@
},
dataAfter() {
if((this.queryParams.collectTime).format('YYYY-MM-DD') == moment().format('YYYY-MM-DD')){
- this.$message.warning("璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�")
+ // this.$message.warning("璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�'
+ });
}else{
this.queryParams.collectTime = moment(this.queryParams.collectTime.add(1, 'd'), 'YYYY-MM-DD')
this.searchQuery()
@@ -389,10 +405,18 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
index 50aa166..7ab489d 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
@@ -129,10 +129,8 @@
return current && current > moment().endOf("day");
},
initPlainOptions(param) {
- console.log(param)
let that = this
let equipment = param.equipmentId
- console.log(equipment)
getAction(this.url.initPlainOptions,{equipmentId:equipment}).then((res) => {
if (res.success) {
@@ -213,7 +211,11 @@
if (e.length <= 3) {
this.option = e
} else {
- this.$message.warn('鏈�澶氬彧鑳介�夋嫨3涓�')
+ // this.$message.warn('鏈�澶氬彧鑳介�夋嫨3涓�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'鏈�澶氬彧鑳介�夋嫨涓変釜'
+ });
return false
}
},
@@ -337,7 +339,11 @@
}
getAction(this.url.workChart, param).then((res) => {
if(JSON.stringify(res.result) == '[]' || res.result == null){
- this.$message.warning('鏃犳暟鎹紒')
+ // this.$message.warning('鏃犳暟鎹紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'鏃犳暟鎹�!'
+ });
this.spinning = false;
_this.workChart.setOption(option,true)
}else{
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceList.vue b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
index d4db87f..15ba2dc 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceList.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
@@ -244,7 +244,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -256,7 +260,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -273,12 +281,20 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
that.$emit('delectTree','')
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -322,21 +338,32 @@
// console.log(this.node);
if(this.node.entity.equipmentId != null){
// alert('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶�')
- this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒')
+ // this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒"
+ });
}else{
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板璁惧'
this.$refs.modalForm.disableSubmit = false
}
} else {
- this.$message.warning('璇烽�夋嫨鎵�灞炲眰绾э紒')
+ // this.$message.warning('璇烽�夋嫨鎵�灞炲眰绾э紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨鎵�灞炲眰绾э紒'
+ });
}
},
handleAddTier() {
if (this.node && JSON.stringify(this.node) != '{}') {
if(this.node.entity.equipmentId != null){
// alert('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犲眰绾�')
- this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犲眰绾э紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒"
+ });
}else{
this.$refs.tierModalForm.add(this.node)
this.$refs.tierModalForm.title = '鏂板灞傜骇'
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceModel.vue b/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
index eb2838e..ceff71c 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
@@ -246,11 +246,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/deviceManager/TierModel.vue b/src/views/mdc/base/modules/deviceManager/TierModel.vue
index cf45f9a..abb11e6 100644
--- a/src/views/mdc/base/modules/deviceManager/TierModel.vue
+++ b/src/views/mdc/base/modules/deviceManager/TierModel.vue
@@ -156,11 +156,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("鎴愬姛")
+ // that.$message.success("鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
index decbac8..4becb90 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
@@ -150,7 +150,11 @@
},
loadData(arg) {
if(!this.url.list){
- this.$message.error("璇疯缃畊rl.list灞炴��!")
+ // this.$message.error("璇疯缃畊rl.list灞炴��!")
+ this.$notification.error({
+ message:'娑堟伅',
+ description:"璇疯缃畊rl.list灞炴��!"
+ });
return
}
//鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
@@ -177,7 +181,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index dc99816..2359b22 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -279,7 +279,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -324,7 +328,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -362,7 +370,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -404,7 +416,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -438,7 +454,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -460,10 +480,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -497,7 +525,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽厤缃澶�!"
+ });
}
}
})
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index da74220..bad7281 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -260,11 +260,19 @@
let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
let dataStart = stertDate.replace(/:/g,'');
if(startOne < dataStart){
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -279,11 +287,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
index 04db0bc..e7fda73 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue
@@ -275,11 +275,19 @@
let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
let dataStart = stertDate.replace(/:/g,'');
if(startOne < dataStart) {
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -294,11 +302,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index 2e61fa6..32cf083 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -248,11 +248,19 @@
let dataStart = stertDate.replace(/:/g,'');
if(this.editStart != startOne){
if(startOne < dataStart) {
- that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�"
+ });
that.confirmLoading = false
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -272,10 +280,18 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ 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
@@ -285,7 +301,11 @@
}
}else{
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -305,10 +325,18 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ 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
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 02953eb..c49e432 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -285,7 +285,6 @@
let dictCode = 'mdc_equipmentType'
let items = []
items = getDictItemsFromCache(dictCode)
- console.log(items)
if (deviceList && items.length > 0) {
for (let a = 0; a < deviceList.length; a++) {
if (items && items.length > 0) {
@@ -334,7 +333,11 @@
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
if (index < 0) {
- this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�"
+ })
return false
}
this.checkedList = checkedList
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index a9bd0dc..4c8fd2f 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -340,7 +340,12 @@
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
if (index < 0) {
- this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼"
+ })
+
return false
}
this.checkedList = checkedList
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 56d0599..63ed876 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -410,7 +410,11 @@
efficiencyOptionsOnChange(checkedList) {
let index = checkedList.indexOf('lyl')
if (index < 0) {
- this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶈兘鍙栨秷鏌ヨ鐝鍒╃敤鐜�"
+ })
return false
}
this.checkedList = checkedList
diff --git a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
index c8e7a4f..32e1b5f 100644
--- a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
@@ -235,7 +235,7 @@
},
handleChange(value) {
this.queryParam.timeType = value
- console.log(this.queryParam.timeType)
+ // console.log(this.queryParam.timeType)
},
tabChange(val) {
this.activeKey = val
@@ -294,7 +294,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -329,7 +333,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -361,7 +369,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -383,10 +395,18 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -404,10 +424,18 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index 0c5a80c..a141162 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -237,7 +237,7 @@
},
handleChange(value) {
this.queryParam.timeType = value
- console.log(this.queryParam.timeType)
+ // console.log(this.queryParam.timeType)
},
tabChange(val) {
this.activeKey = val
@@ -255,10 +255,14 @@
for(var i = 0;i<res.result.dayRateDto.length;i++){
this.useingRates.push(res.result.dayRateDto[i].utilizationRate)
}
- console.log(this,spaceTime)
+ // console.log(this,spaceTime)
this.drawTu()
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -296,7 +300,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -331,7 +339,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -363,7 +375,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -385,10 +401,19 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
})
},
@@ -406,10 +431,18 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue b/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
index e186541..b7191fc 100644
--- a/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
+++ b/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
@@ -180,10 +180,18 @@
}
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
index 09dea20..18078ff 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
@@ -245,7 +245,11 @@
let stat = formData.processQuantity
let end = formData.unqualifiedQuantity
if(end>stat){
- that.$message.warning("涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�");
+ // that.$message.warning("涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�"
+ });
that.confirmLoading = false
}else{
let obj
@@ -258,11 +262,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
index 03de38d..6c32263 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
@@ -318,7 +318,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -363,7 +367,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -401,7 +409,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -443,7 +455,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -477,7 +493,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -499,10 +519,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -512,7 +540,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -529,11 +561,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -572,7 +612,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
@@ -591,7 +635,7 @@
param.equipmentId = this.queryParams.equipmentId;
param.startTime = this.queryParam.startTime;
param.endTime = this.queryParam.endTime;
- console.log("瀵煎嚭鍙傛暟",param)
+ // console.log("瀵煎嚭鍙傛暟",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) {
this.$message.warning("鏂囦欢涓嬭浇澶辫触")
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
index 70b2c9d..44e8c20 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
@@ -227,7 +227,11 @@
let stat = formData.processQuantity
let end = formData.unqualifiedQuantity
if(end>stat){
- that.$message.warning("涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�");
+ // that.$message.warning("涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅悎鏍兼暟閲忓繀椤诲皬浜庣瓑浜庡姞宸ユ暟閲�"
+ });
that.confirmLoading = false
}else{
let obj
@@ -240,11 +244,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
index ee36381..e88e80a 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
@@ -322,7 +322,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -367,7 +371,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -405,7 +413,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -447,7 +459,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -481,7 +497,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -503,10 +523,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -516,7 +544,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -533,11 +565,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -576,8 +616,13 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
+
}
})
},
@@ -595,7 +640,7 @@
param.equipmentId = this.queryParams.equipmentId;
param.startTime = this.queryParam.startTime;
param.endTime = this.queryParam.endTime;
- console.log("瀵煎嚭鍙傛暟",param)
+ // console.log("瀵煎嚭鍙傛暟",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) {
this.$message.warning("鏂囦欢涓嬭浇澶辫触")
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
index 6ea783e..a1f329b 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
@@ -274,11 +274,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
index c6a7d67..1e142d7 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
@@ -230,7 +230,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -268,7 +272,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -279,7 +287,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
index 837aebc..aba7dad 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
@@ -281,11 +281,20 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇敼鎴愬姛")
+
+ // that.$message.success("淇敼鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
index d595b85..d9e155e 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
@@ -263,11 +263,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇敼鎴愬姛")
+ // that.$message.success("淇敼鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
index be6a8f5..08aa784 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
@@ -312,7 +312,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -357,7 +361,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -395,7 +403,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -437,7 +449,11 @@
this.ipagination.total = 0;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -471,7 +487,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -493,10 +513,18 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.searchQuery();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -506,7 +534,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -523,11 +555,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -566,7 +606,11 @@
_this.equipment = res.result
_this.searchQuery()
} else {
- _this.$message.warning('璇烽厤缃澶囷紒')
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}
})
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
index 5473197..f599982 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
@@ -256,11 +256,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(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
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
index 270c9d8..c13d1e2 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
@@ -211,7 +211,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +253,11 @@
if (res.success) {
this.treeData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -260,7 +268,11 @@
if (res.success) {
this.sectionData = res.result
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
index 7150b82..9a6d8f9 100644
--- a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
+++ b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
@@ -114,10 +114,18 @@
id: this.model.id
}).then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success("淇濆瓨鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
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
diff --git a/src/views/mdc/base/modules/shift/ShiftInfo.vue b/src/views/mdc/base/modules/shift/ShiftInfo.vue
index c5634c4..7d80453 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfo.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfo.vue
@@ -153,10 +153,18 @@
var that = this;
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
@@ -164,10 +172,18 @@
let _this = this
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
- _this.$message.success('鎿嶄綔鎴愬姛锛�')
+ // _this.$message.success('鎿嶄綔鎴愬姛锛�')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:"鎿嶄綔鎴愬姛"
+ });
_this.loadData()
} else {
- that.$message.warning('鎿嶄綔澶辫触锛�')
+ // _this.$message.warning('鎿嶄綔澶辫触锛�')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:"鎿嶄綔澶辫触"
+ });
}
})
},
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index 8a7d69c..68407de 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
@@ -169,7 +169,11 @@
// }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -221,7 +225,6 @@
const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.form.validateFields((err, values) => {
- console.log(values);
if (!err) {
// debugger
that.confirmLoading = true
@@ -234,8 +237,16 @@
let startTimeOne = startTime.replace(/:/g,'');
let endTimeOne = endTime.replace(/:/g,'');
if(startTimeOne>endTimeOne){
- that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
- that.$message.success("淇濆瓨澶辫触")
+ // that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒"
+ });
+ // that.$message.success("淇濆瓨澶辫触")
+ that.$notification.error({
+ message:'娑堟伅',
+ description:"淇濆瓨澶辫触锛�"
+ });
that.close()
}else{
formData.shiftSubStatus = 1
@@ -249,10 +260,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success("淇濆瓨鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
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
@@ -271,10 +290,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
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
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index 2f14c72..c813c22 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -132,10 +132,18 @@
handleDefault:function(record){
postAction(this.url.changeDefaultShift,qs.stringify({id:record.id})).then((res) =>{
if(res.success){
- this.$message.success(res.message);
+ // this.$message.success(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
this.loadData()
}else{
- this.$message.success(res.message);
+ // this.$message.success(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
@@ -147,10 +155,18 @@
var that = this;
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
diff --git a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
index f92c9a3..83bce49 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
@@ -121,10 +121,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ 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
diff --git a/src/views/mdc/base/modules/utilizationStatistics/UtilizationStatisticsList.vue b/src/views/mdc/base/modules/utilizationStatistics/UtilizationStatisticsList.vue
index 322ef24..9bf2db1 100644
--- a/src/views/mdc/base/modules/utilizationStatistics/UtilizationStatisticsList.vue
+++ b/src/views/mdc/base/modules/utilizationStatistics/UtilizationStatisticsList.vue
@@ -330,7 +330,11 @@
this.onClearSelected1()
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -409,7 +413,11 @@
this.dataSource = res.result;
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -430,7 +438,11 @@
if(res.success){
this.loadData2()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/mdc/base/openRateFractionAnalysis.vue b/src/views/mdc/base/openRateFractionAnalysis.vue
index fc741c6..26d3ed1 100644
--- a/src/views/mdc/base/openRateFractionAnalysis.vue
+++ b/src/views/mdc/base/openRateFractionAnalysis.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/base/openRateTrendAnalysis.vue b/src/views/mdc/base/openRateTrendAnalysis.vue
index 4540346..027b1b4 100644
--- a/src/views/mdc/base/openRateTrendAnalysis.vue
+++ b/src/views/mdc/base/openRateTrendAnalysis.vue
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
diff --git a/src/views/mdc/common/BaseTree.vue b/src/views/mdc/common/BaseTree.vue
index 4582463..0aab780 100644
--- a/src/views/mdc/common/BaseTree.vue
+++ b/src/views/mdc/common/BaseTree.vue
@@ -255,7 +255,11 @@
}
let ids = entity.id
if (!ids) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return
} else {
var that = this
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 25b23eb..8ce57c7 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -293,9 +293,12 @@
this.$refs.nodeModal.add(this.currFlowId, '')
},
batchDel: function () {
- console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -308,11 +311,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -330,7 +341,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -402,16 +417,28 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�!')
+ // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�"
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ // this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
diff --git a/src/views/system/DepartList1.vue b/src/views/system/DepartList1.vue
index b6ce4d7..de37e4c 100644
--- a/src/views/system/DepartList1.vue
+++ b/src/views/system/DepartList1.vue
@@ -320,7 +320,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -333,11 +337,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -355,7 +367,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -427,16 +443,25 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇风偣鍑婚�夋嫨瑕佷慨鏀归儴闂�"
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -463,7 +488,11 @@
} else if (num == 2) {
let key = this.currSelected.key
if (!key) {
- this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�')
+ // this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇峰厛鐐瑰嚮閫変腑涓婄骇閮ㄩ棬锛�"
+ });
return false
}
this.$refs.departModal.add(this.selectedKeys)
@@ -483,7 +512,11 @@
if (resp.success) {
//鍒犻櫎鎴愬姛鍚庯紝鍘婚櫎宸查�変腑涓殑鏁版嵁
that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
- that.$message.success('鍒犻櫎鎴愬姛!')
+ // that.$message.success('鍒犻櫎鎴愬姛!')
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"鍒犻櫎鎴愬姛"
+ });
that.loadTree()
//鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
let orgCode=that.model.orgCode;
@@ -491,7 +524,11 @@
that.onClearSelected()
}
} else {
- that.$message.warning('鍒犻櫎澶辫触!')
+ // that.$message.warning('鍒犻櫎澶辫触!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"鍒犻櫎澶辫触"
+ });
}
})
}
@@ -550,7 +587,7 @@
}
}
//---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
-
+
},
created() {
this.currFlowId = this.$route.params.id
diff --git a/src/views/system/DepartList2.vue b/src/views/system/DepartList2.vue
index 09939ed..e08181f 100644
--- a/src/views/system/DepartList2.vue
+++ b/src/views/system/DepartList2.vue
@@ -190,10 +190,19 @@
var that = this;
deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
});
},
@@ -204,7 +213,11 @@
},
batchDel: function () {
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -218,11 +231,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
diff --git a/src/views/system/DepartListSync.vue b/src/views/system/DepartListSync.vue
index c412836..834b469 100644
--- a/src/views/system/DepartListSync.vue
+++ b/src/views/system/DepartListSync.vue
@@ -269,9 +269,9 @@
that.departTree = []
//鎵�鏈夌殑鏍戣妭鐐筴ey淇℃伅
that.allIds = []
-
+
that.iExpandedKeys = []
-
+
that.loading = false
queryDepartTreeSync().then((res) => {
if (res.success) {
@@ -356,7 +356,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
diff --git a/src/views/system/ProductionManager.vue b/src/views/system/ProductionManager.vue
index a0ac3eb..b60c346 100644
--- a/src/views/system/ProductionManager.vue
+++ b/src/views/system/ProductionManager.vue
@@ -293,7 +293,11 @@
batchDel: function () {
console.log(this.checkedKeys)
if (this.checkedKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
} else {
var ids = ''
for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -306,11 +310,19 @@
onOk: function () {
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTree()
that.onClearSelected()
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -328,7 +340,11 @@
that.departTree.push(temp)
}
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
} else {
@@ -400,16 +416,28 @@
this.$refs.form.validate(valid => {
if (valid) {
if (!this.currSelected.id) {
- this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂达紒"
+ });
return
}
httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
if (res.success) {
- this.$message.success('淇濆瓨鎴愬姛!')
+ // this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
this.loadTree()
} else {
- this.$message.error(res.message)
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
@@ -437,7 +465,11 @@
console.log(this.currSelected)
let key = this.currSelected.key
if (!key) {
- this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
+ // this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�"
+ });
return false
}
this.$refs.departModal.add(this.selectedKeys)
@@ -457,7 +489,11 @@
if (resp.success) {
//鍒犻櫎鎴愬姛鍚庯紝鍘婚櫎宸查�変腑涓殑鏁版嵁
that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
- that.$message.success('鍒犻櫎鎴愬姛!')
+ // that.$message.success('鍒犻櫎鎴愬姛!')
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"鍒犻櫎鎴愬姛"
+ });
that.loadTree()
//鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
// let orgCode=that.model.orgCode;
@@ -465,7 +501,11 @@
that.onClearSelected()
// }
} else {
- that.$message.warning('鍒犻櫎澶辫触!')
+ // that.$message.warning('鍒犻櫎澶辫触!')
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"鍒犻櫎澶辫触"
+ });
}
})
}
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 9e8c80d..cb70ae8 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -442,7 +442,11 @@
return
}
if (this.selectedRowKeys2.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return
} else {
var ids = ''
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 9ed704d..5f295b0 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -312,7 +312,11 @@
batchFrozen: function (status) {
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return false;
} else {
let ids = "";
diff --git a/src/views/system/modules/DepartList/DepartAuthModal.vue b/src/views/system/modules/DepartList/DepartAuthModal.vue
index 4b7d210..85b1a18 100644
--- a/src/views/system/modules/DepartList/DepartAuthModal.vue
+++ b/src/views/system/modules/DepartList/DepartAuthModal.vue
@@ -216,7 +216,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -251,7 +255,12 @@
this.$message.warning(res.message)
this.loadData(this.departId);
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
}).finally(() => {
@@ -268,7 +277,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -285,11 +298,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData(that.departId);
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
diff --git a/src/views/system/modules/DepartList/DepartDataruleModal.vue b/src/views/system/modules/DepartList/DepartDataruleModal.vue
index 77298ac..03db081 100644
--- a/src/views/system/modules/DepartList/DepartDataruleModal.vue
+++ b/src/views/system/modules/DepartList/DepartDataruleModal.vue
@@ -72,7 +72,11 @@
},
saveDataruleForRole(){
if(!this.dataruleChecked || this.dataruleChecked.length==0){
- this.$message.warning("璇锋敞鎰忥紝鐜版湭鍕鹃�変换浣曟暟鎹潈闄�!")
+ // this.$message.warning("璇锋敞鎰忥紝鐜版湭鍕鹃�変换浣曟暟鎹潈闄�!")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇锋敞鎰忥紝鐜版湭鍕鹃�変换浣曟暟鎹潈闄�!"
+ });
}
let params = {
permissionId:this.functionId,
@@ -81,9 +85,19 @@
}
postAction(this.url.datarule,params).then(res=>{
if(res.success){
- this.$message.success(res.message)
+ // this.$message.success(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}else{
- this.$message.error(res.message)
+
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
diff --git a/src/views/system/modules/DepartList/DepartModal.vue b/src/views/system/modules/DepartList/DepartModal.vue
index 0d280a6..697ec7c 100644
--- a/src/views/system/modules/DepartList/DepartModal.vue
+++ b/src/views/system/modules/DepartList/DepartModal.vue
@@ -189,11 +189,19 @@
that.confirmLoading = true;
httpAction(this.url.add,this.model,"post").then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTreeData();
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index bd80510..73976ff 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -199,7 +199,11 @@
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
diff --git a/src/views/system/modules/ProductionManager/ProductionEquipment.vue b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
index d4b06a3..975697a 100644
--- a/src/views/system/modules/ProductionManager/ProductionEquipment.vue
+++ b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
@@ -174,7 +174,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -214,7 +218,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -249,7 +257,11 @@
this.$message.warning(res.message)
this.loadData(this.productionId);
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
@@ -266,7 +278,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -283,11 +299,19 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData(that.productionId);
that.onClearSelected();
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
diff --git a/src/views/system/modules/ProductionManager/ProductionModal.vue b/src/views/system/modules/ProductionManager/ProductionModal.vue
index 9cd1124..e131e7e 100644
--- a/src/views/system/modules/ProductionManager/ProductionModal.vue
+++ b/src/views/system/modules/ProductionManager/ProductionModal.vue
@@ -136,11 +136,19 @@
that.confirmLoading = true;
httpAction(this.url.add,this.model,"post").then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadTreeData();
that.$emit('ok');
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/system/modules/QuartzJobListModal.vue b/src/views/system/modules/QuartzJobListModal.vue
index f98b07a..d695b19 100644
--- a/src/views/system/modules/QuartzJobListModal.vue
+++ b/src/views/system/modules/QuartzJobListModal.vue
@@ -338,7 +338,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue
index c27c6aa..d47d0e6 100644
--- a/src/views/system/modules/QuartzJobModal.vue
+++ b/src/views/system/modules/QuartzJobModal.vue
@@ -115,11 +115,19 @@
console.log('鎻愪氦鍙傛暟',this.model)
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok');
that.close();
}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