|
@@ -547,7 +547,7 @@ export default {
|
|
},
|
|
},
|
|
/** 预览按钮操作 */
|
|
/** 预览按钮操作 */
|
|
preview(cameraParam) {
|
|
preview(cameraParam) {
|
|
- if (cameraParam.type == '大华') {
|
|
|
|
|
|
+ if(cameraParam.type=='1'){
|
|
getDahuaVideoServer().then(newResponse => {
|
|
getDahuaVideoServer().then(newResponse => {
|
|
console.log(newResponse)
|
|
console.log(newResponse)
|
|
this.ws.detectConnectQt().then(res => {
|
|
this.ws.detectConnectQt().then(res => {
|
|
@@ -559,7 +559,7 @@ export default {
|
|
userName: newResponse.userName,
|
|
userName: newResponse.userName,
|
|
userPwd: newResponse.userPwd,
|
|
userPwd: newResponse.userPwd,
|
|
token: '',
|
|
token: '',
|
|
- https: 0
|
|
|
|
|
|
+ https: 1
|
|
})
|
|
})
|
|
this.ws.on('loginState', (res) => {
|
|
this.ws.on('loginState', (res) => {
|
|
this.isLogin = res
|
|
this.isLogin = res
|
|
@@ -577,12 +577,12 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
})
|
|
})
|
|
- } else if (cameraParam.type == '海康') {
|
|
|
|
|
|
+ }else if(cameraParam.type=='0'){
|
|
let that = this
|
|
let that = this
|
|
that.cameraVisible = true
|
|
that.cameraVisible = true
|
|
- getHaiKangVideoServer({ cameraCode: cameraParam.code }).then(newResponse => {
|
|
|
|
- that.cameraTitle = '摄像头-' + newResponse.data.cameraName
|
|
|
|
- that.initPlugin(newResponse.data.appkey, newResponse.data.loginIp, newResponse.data.secret, newResponse.data.loginPort)
|
|
|
|
|
|
+ getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|
|
|
|
+ that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
|
+ that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
setTimeout(function() {
|
|
setTimeout(function() {
|
|
that.playhk(newResponse.data.channelCode)
|
|
that.playhk(newResponse.data.channelCode)
|
|
}, 5000)
|
|
}, 5000)
|