diff --git a/h5/src/App.vue b/h5/src/App.vue index f0391b9..f808d9a 100644 --- a/h5/src/App.vue +++ b/h5/src/App.vue @@ -159,10 +159,10 @@ } /*获取 Url 参数 S*/ import parse from 'url-param-parser'; - let url = 'https://store.keliuyun.com/video/?userId=8840&atoken=d959778d-904f-468e-99dd-2193998ffda1&type=undefined&id=632&name=会议室门口01&mallId=9217&mallName=河南分公司&bookmark=false&channelNo=4&deviceSerial=F16423875&gateUnid=cf21f4a8-65c6-11ee-837e-00163e143ecd&ptzEnable=0&aiChannelId=&mallOrgName=办公室&accountId=337&terminalType=devtools&newLevel=' // 萤石 + // let url = 'https://store.keliuyun.com/video/?userId=8840&atoken=8eaf1373-654b-4cf2-a3c7-f90d42cba574&type=undefined&id=632&name=会议室门口&mallId=9217&mallName=河南分公司&bookmark=false&channelNo=4&deviceSerial=F16423875&gateUnid=cf21f4a8-65c6-11ee-837e-00163e143ecd&ptzEnable=0&aiChannelId=&mallOrgName=办公室&accountId=337&terminalType=devtools&newLevel=' // 萤石 - const paramObj = parse(url).search || {} - // const paramObj = parse(window.location.href).search || {} + // const paramObj = parse(url).search || {} + const paramObj = parse(window.location.href).search || {} /********************************/ paramObj.name = paramObj.name?decodeURIComponent(paramObj.name):''; paramObj.mallName = paramObj.mallName?decodeURIComponent(paramObj.mallName):''; diff --git a/h5/src/components/vionPlayer/index.vue b/h5/src/components/vionPlayer/index.vue index 050dc9f..71b7b39 100644 --- a/h5/src/components/vionPlayer/index.vue +++ b/h5/src/components/vionPlayer/index.vue @@ -82,14 +82,14 @@ export default { }, operateBtns: { play: !this.isXCXPage, - audio: !this.isXCXPage, + audio: true, ptz: this.showPtz, // 云台 - zoom: !this.isXCXPage,// 电子放大 + zoom: true,// 电子放大 performance: !this.isXCXPage, // 视频流信息展示 record: !this.isXCXPage, // 录制 scale: !this.isXCXPage, // 显示模式:拉伸、缩放、正常 }, - extendOperateBtns: this.isXCXPage?[]:[getRotateConfig.call(this), getMirrorRotate.call(this)], + extendOperateBtns: [getRotateConfig.call(this), getMirrorRotate.call(this)], }); console.log('init-options', options); @@ -290,7 +290,7 @@ export default { } // 电子放大 ::v-deep(.jessibuca-zoom-controls) { - display: none !important; + // display: none !important; } // 云台控制 &[data-player-type="playback"] {