Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

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