项目整体弹窗提示

zhuzhuanzhuan

2023-08-10 9b3e7c3c47dc27e531a7b954aa2b3ba500c84b78

项目整体弹窗提示

 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);

 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

 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

 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()
        }


 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 ) {

 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

 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') {

 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(() =>{
        })

 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++) {

 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
            });
          }
        })
      },

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
      })

 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(() =>{
      })

 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(() =>{
        })

 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
                  });

                }
              });
            }

 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(() =>{
        })

 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
                });
              }
            })
          }

 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

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
        })

 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(() =>{
        })

 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;
          }
        })

 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
            });
          }
        })
      },

 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

 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

 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

 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

 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('请设置url.deleteBatch属性!')
          // this.$message.error('请设置url.deleteBatch属性!')
          this.$notification.warning({
            message:'消息',
            description:"请设置url.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

 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

 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

 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;

 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;
            })
          }
         

        })
      },
    }

 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;

 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:'请联系管理员，开放设备权限！'
              });
            }
          }
        })

 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

 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

 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
            });
          }
        })
      }

 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

 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;

 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;
          }
        })

 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;

 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

 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

 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:'请联系管理员，开放设备权限！'
              });
            }
          }
        })

 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

 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

 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
            });
          }
        })
      }

 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:'请联系管理员，开放设备权限！'
              });

            }
          }
        })

 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

 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

 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
            });
          }
        })
      }

 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

 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

 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

 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
            });
          }
        })
      }

 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

 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{

 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);

 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
            });
          }
        })


 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

 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

 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)
          })
        })
      }

 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
            });
          }
        })
      }

 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

 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
            });
          }
        })
      }

 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{

 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 = '新增层级'

 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

 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

 src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue

@@ -150,7 +150,11 @@
      },
      loadData(arg) {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          // this.$message.error("请设置url.list属性!")
          this.$notification.error({
            message:'消息',
            description:"请设置url.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

 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:"请配置设备!"
              });
            }
          }
        })

 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
            });
          }
        })
      }

 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

 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

 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

 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

 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

 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

 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
            });
          }
        })
      }

 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
            });
          }
        })
      }

 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;

 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

 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("文件下载失败")

 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

 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
            });
          }
        })
      }

 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("文件下载失败")

 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

 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
            });
          }
        })
      }

 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

 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

 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:'请联系管理员，开放设备权限！'
              });
            }
          }
        })

 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

 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
            });
          }
        })
      }

 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

 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:"操作失败"
            });
          }
        })
      },

 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

 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
            });
          }
        });
      },

 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

 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

 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(() =>{
        })

 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(() =>{
        })

 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

 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
                });
              }
            })
          }

 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

 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
                  });
                }
              });
            }

 src/views/system/DepartListSync.vue

@@ -269,9 +269,9 @@
        that.departTree = []
        //所有的树节点key信息
        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++) {

 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:"删除失败"
                });
              }
            })
          }

 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 = ''

 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 = "";

 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;

 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
            });
          }
        })
      },

 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;

 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 = "";

 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;

 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;

 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

 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;