Merge branch 'shenzhen-dev' into dev-cjw

This commit is contained in:
Vce 2024-03-27 16:46:53 +08:00
commit 1fe7366c1d
2 changed files with 6 additions and 11 deletions

View File

@ -405,7 +405,6 @@ export default {
//
closeWindow() {
if (this.oWebControl != null) {
this.oWebControl.JS_HideWnd(); //
this.oWebControl.JS_Disconnect().then(
() => {
@ -417,7 +416,6 @@ export default {
);
}
}
}
};
</script>
<style lang="less" scoped>

View File

@ -10,7 +10,6 @@ export default {
data() {
return {
videoType:"",
locationValue:1,
//
initCount: 0,
//
@ -204,7 +203,7 @@ export default {
var buttonIDs =
"0,16,256,257,258,259,260,512,513,514,515,516,517,768,769"; //
////////////////////////////////// ////////////////////////////////////
var toolBarButtonIDs = "2048,2049,2050,2304,2306,2307,2308,2309,4096,4608,4097,4099,4098,4609,4100"; //
this.oWebControl
.JS_RequestInterface({
//
@ -222,7 +221,8 @@ export default {
encryptedFields: encryptedFields, //
showToolbar: showToolbar, //
showSmart: showSmart, //
buttonIDs: buttonIDs //
buttonIDs: buttonIDs, //
toolBarButtonIDs: toolBarButtonIDs //
})
})
.then(oData => {
@ -327,7 +327,6 @@ export default {
//
startPlayback(){
console.log('点击查看',this.locationValue)
console.log('编号',this.pointCode)
console.log('开始时间', this.startTime )
console.log('开始时间', new Date(this.startTime).getTime() / 1000 )
@ -335,7 +334,7 @@ export default {
var cameraIndexCode = this.pointCode; //
var startTimeStamp = new Date(this.startTime).getTime(); //
var endTimeStamp = new Date(this.endTime).getTime(); //
var recordLocation = +this.locationValue; //0-1-
var recordLocation = 1; //0-1-
var transMode = 1; //0-UDP1-TCP
var gpuMode = 0; //GPU0-1-
var wndId = -1; //2x2
@ -388,7 +387,6 @@ export default {
//
closeWindow() {
if (this.oWebControl != null) {
this.oWebControl.JS_HideWnd(); //
this.oWebControl.JS_Disconnect().then(
() => {
@ -400,7 +398,6 @@ export default {
);
}
}
}
};
</script>
<style lang="less" scoped>