Merge branch 'refs/heads/master' into dev/1078-newUI

web/src/main.js

@@ -16,7 +16,8 @@ import '@/icons' // icon
 import '@/permission' // permission control
 
 import VueClipboards from 'vue-clipboards'
-import Contextmenu from "vue-contextmenujs"
+import Contextmenu from 'vue-contextmenujs'
+import VueClipboard from 'vue-clipboard2'
 
 /**
  * If you don't want to use mock-server
@@ -34,6 +35,7 @@ if (process.env.NODE_ENV === 'production') {
 Vue.use(ElementUI)
 Vue.use(VueClipboards)
 Vue.use(Contextmenu)
+Vue.use(VueClipboard)
 
 Vue.config.productionTip = false
 

web/src/router/index.js

@@ -60,7 +60,7 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/live',
     children: [{
-      path: 'live',
+      path: '',
       name: 'Live',
       component: () => import('@/views/live/index'),
       meta: { title: '分屏监控', icon: 'live' }
@@ -264,6 +264,17 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/play/wasm/:url',
+    name: 'wasmPlayer',
+    hidden: true,
+    component: () => import('@/views/common/jessibuca.vue')
+  },
+  {
+    path: '/play/rtc/:url',
+    name: 'rtcPlayer',
+    component: () => import('@/views/common/rtcPlayer.vue')
+  },
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 ]

web/src/views/common/jessibuca.vue

@@ -116,9 +116,6 @@ export default {
         height = clientHeight
         width = (16 / 9) * height
       }
-
-      this.$refs.playerBox.style.width = width + 'px'
-      this.$refs.playerBox.style.height = height + 'px'
       this.playerWidth = width
       this.playerHeight = height
       if (this.playing) {

web/src/views/dialog/devicePlayer.vue

@@ -111,10 +111,10 @@
               <el-input v-model="getPlayerShared.sharedUrl" :disabled="true">
                 <template slot="append">
                   <i
-                    v-clipboard="getPlayerShared.sharedUrl"
                     class="cpoy-btn el-icon-document-copy"
                     title="点击拷贝"
-                    @success="$message({type:'success', message:'成功拷贝到粘贴板'})"
+                    style="cursor: pointer"
+                    @click="copyUrl(getPlayerShared.sharedUrl)"
                   />
                 </template>
               </el-input>
@@ -124,10 +124,10 @@
               <el-input v-model="getPlayerShared.sharedIframe" :disabled="true">
                 <template slot="append">
                   <i
-                    v-clipboard="getPlayerShared.sharedIframe"
                     class="cpoy-btn el-icon-document-copy"
                     title="点击拷贝"
-                    @success="$message({type:'success', message:'成功拷贝到粘贴板'})"
+                    style="cursor: pointer"
+                    @click="copyUrl(getPlayerShared.sharedIframe)"
                   />
                 </template>
               </el-input>
@@ -137,10 +137,10 @@
               <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true">
                 <el-button
                   slot="append"
-                  v-clipboard="getPlayerShared.sharedRtmp"
                   icon="el-icon-document-copy"
                   title="点击拷贝"
-                  @success="$message({type:'success', message:'成功拷贝到粘贴板'})"
+                  style="cursor: pointer"
+                  @click="copyUrl(getPlayerShared.sharedIframe)"
                 />
                 <el-dropdown v-if="streamInfo" slot="prepend" trigger="click" @command="copyUrl">
                   <el-button>
@@ -362,7 +362,7 @@
 <script>
 import elDragDialog from '@/directive/el-drag-dialog'
 import crypto from 'crypto'
-import rtcPlayer from '../dialog/rtcPlayer.vue'
+import rtcPlayer from '../common/rtcPlayer.vue'
 import jessibucaPlayer from '../common/jessibuca.vue'
 import PtzPreset from '../common/ptzPreset.vue'
 import PtzCruising from '../common/ptzCruising.vue'