Commit c8f08414 by 李乾广

修改bug

1 parent a70a02cd
...@@ -10,10 +10,10 @@ const tourApi = { ...@@ -10,10 +10,10 @@ const tourApi = {
}, },
// 云控制 // 云控制
ptzStart(params,config) { ptzStart(params,config) {
return req('PUT', `/patrol/patrolDeviceChannel/ptzStart`, params, config) return req('PUT', `/patrol/through/ptzStart`, params, config)
}, },
ptzStop(params,config) { ptzStop(params,config) {
return req('PUT', `/patrol/patrolDeviceChannel/ptzStop`, params, config) return req('PUT', `/patrol/through/ptzStop`, params, config)
}, },
// 获取设备录像记录 // 获取设备录像记录
getThroughVideoRecord(params, config){ getThroughVideoRecord(params, config){
......
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
record: !this.isXCXPage, // 录制 record: !this.isXCXPage, // 录制
scale: !this.isXCXPage, // 显示模式:拉伸、缩放、正常 scale: !this.isXCXPage, // 显示模式:拉伸、缩放、正常
}, },
extendOperateBtns: [getRotateConfig.call(this), getMirrorRotate.call(this)], extendOperateBtns: this.isXCXPage?[]:[getRotateConfig.call(this), getMirrorRotate.call(this)],
}); });
console.log('init-options', options); console.log('init-options', options);
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<div class="extension-page"> <div class="extension-page">
<div class="j-player-wrapper"> <div class="j-player-wrapper">
<vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :hideControls="false" :showPtz="false" :isXCXPage="true" @magnificationChange="magnificationChange"/> <vion-player ref="vionPlayer" :watermarkText="params.watermarkText" :hideControls="false" :showPtz="false" :isXCXPage="true" @magnificationChange="magnificationChange"/>
<!-- <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEVHcEzMzMzMzMzMzMzMzMzNzc3MzMzMzMzNzc3Nzc3MzMzMzMwv5ahDAAAAC3RSTlMAW+8S2UGVwyyZnOTRhEMAAAEfSURBVDjLzZKxbsJADIYdBQpsSCyVMlXAdEuQYGKpWFk6dWHJgsQ7sMDSpUv3PgITAQT0f7ly57ucQ45KXRAZot+/89k+X4ju9KzL4XOhlm3pR0enYrWViSRPXQIQSASkRSkIJEFRimYCuQAHSW89IOv6SH5TCsuAj68Ab1wDzqkAzqoC7AUAPtgsABgkBBgkCJiNHehGok//KRVsHqd+3Dj1/vukt3AH/Jj05s5/AmyZhFVWXDls44iVvfQWkCvgxU6g9ZdJfCLvjJbYaT3GvjOY4mQSG3SJGjhr/Y1Xohp+TGKqqzexZ/1GVGdNCitt6R8zVvb9d+JmKdl8o5sPWbtxT6zFuJcDQtk92MNmYiXHquYlZlVt1j4P6cd7fgHFW7Nhqu29TwAAAABJRU5ErkJggg==" alt="" @click="screenshot" class="screen-shot-img"> -->
</div> </div>
<!-- 时间线组件 --> <!-- 时间线组件 -->
<div class="extension-time-box"> <div class="extension-time-box">
...@@ -44,6 +43,8 @@ export default { ...@@ -44,6 +43,8 @@ export default {
watermarkText: '', watermarkText: '',
appKey:'', appKey:'',
ptzEnable:'', ptzEnable:'',
gateName:'',
terminalType:'',
}, },
panTiltList:{ panTiltList:{
up:0, up:0,
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- 操作按钮 --> <!-- 操作按钮 -->
<div class="operating-box"> <div class="operating-box">
<van-button v-if="isNoBack&&ptzEnable==1" type="info" size="mini" @click="ptzControlChange">{{ptzControlShow?'隐藏云台':'打开云台'}}</van-button> <van-button v-if="isNoBack&&ptzEnable==1" type="info" size="mini" @click="ptzControlChange">{{ptzControlShow?'隐藏云台':'打开云台'}}</van-button>
<van-button v-else type="info" size="mini" @click="backRealTime">返回实时</van-button> <van-button v-else-if="!isNoBack" type="info" size="mini" @click="backRealTime">返回实时</van-button>
<!-- <div v-if="isNoBack" class="operating-btn" @click="ptzControlChange">{{ptzControlShow?'隐藏云台':'打开云台'}}</div> --> <!-- <div v-if="isNoBack" class="operating-btn" @click="ptzControlChange">{{ptzControlShow?'隐藏云台':'打开云台'}}</div> -->
<!-- <div v-else class="operating-btn" @click="backRealTime">返回实时</div> --> <!-- <div v-else class="operating-btn" @click="backRealTime">返回实时</div> -->
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!