Merge branch 'master' of http://192.168.1.7:3000/xsh1997/smScreen

src/views/monitor/monitor.vue

@@ -20,6 +20,7 @@
                             <div class="tab-title" v-show="isNone">{{item.name}}</div>
                             <div class="img-size">
                                 <div class="video">
+
                                   <iframe :class="activeClass == i ? 'actived' : ''"  :src="'static/index.html?'+'1'+'&' + item.wsUrl  +'&'+ item.rtspUrl + '&' + '100%' + '&' + i" frameborder="0"  style="height: 100%; width: 100%"></iframe>
                                 </div>
                             </div>