Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-08 7e581e9d3a0e32be5e90e453f4283d70d895a634

 web_src/src/components/videoList.vue

@@ -182,6 +182,7 @@
                     type: 'success'
                  });
               }
               that.initData()
               that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
            }).catch(function(e) {
               console.error(e)