Merge remote-tracking branch 'upstream/master'

Lawrence

2020-12-16 b2fa4608a2e0abb3d744f4f91bd423380e45f9c4

 web_src/src/components/videoList.vue

@@ -73,12 +73,10 @@
</template>

<script>
    import devicePlayer from './gb28181/devicePlayer.vue'
    import uiHeader from './UiHeader.vue'
   export default {
      name: 'app',
      components: {
         devicePlayer,
         uiHeader
      },
      data() {