Merge remote-tracking branch 'origin/master'

zhaowei

9 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 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