|
@@ -1764,7 +1764,7 @@ export default {
|
|
if (res.data[i].cameraCode != null) {
|
|
if (res.data[i].cameraCode != null) {
|
|
markersMap.click = 'preview'
|
|
markersMap.click = 'preview'
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
- markersMap.parameter = {code:res.data[i].cameraCode,
|
|
|
|
|
|
+ markersMap.parameter = {code:res.data[i].cameraCode,name:res.data[i].name,
|
|
type:res.data[i].cameraFactory?res.data[i].cameraFactory:1}
|
|
type:res.data[i].cameraFactory?res.data[i].cameraFactory:1}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2282,7 +2282,7 @@ export default {
|
|
icon: 'camera',
|
|
icon: 'camera',
|
|
bindPopupHtml: '',
|
|
bindPopupHtml: '',
|
|
click: 'preview',
|
|
click: 'preview',
|
|
- parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,name:res.data.centermonitorTCamera.cameraName,type:res.data.centermonitorTCamera.cameraFactory},
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: true,
|
|
isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
@@ -2373,7 +2373,7 @@ export default {
|
|
icon: 'camera',
|
|
icon: 'camera',
|
|
bindPopupHtml: '',
|
|
bindPopupHtml: '',
|
|
click: 'preview',
|
|
click: 'preview',
|
|
- parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,name:res.data.centermonitorTCamera.cameraName,type:res.data.centermonitorTCamera.cameraFactory},
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: true,
|
|
isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
@@ -2481,35 +2481,36 @@ export default {
|
|
/** 预览按钮操作 */
|
|
/** 预览按钮操作 */
|
|
preview(cameraParam) {
|
|
preview(cameraParam) {
|
|
if(cameraParam.type=='1'){
|
|
if(cameraParam.type=='1'){
|
|
- getDahuaVideoServer().then(newResponse => {
|
|
|
|
- console.log(newResponse)
|
|
|
|
- this.ws.detectConnectQt().then(res => {
|
|
|
|
- if (res) { // 连接客户端成功
|
|
|
|
- this.alertLogin()
|
|
|
|
- this.ws.login({
|
|
|
|
- loginIp: newResponse.loginIp,
|
|
|
|
- loginPort: newResponse.loginPort,
|
|
|
|
- userName: newResponse.userName,
|
|
|
|
- userPwd: newResponse.userPwd,
|
|
|
|
- token: '',
|
|
|
|
- https: 1
|
|
|
|
- })
|
|
|
|
- this.ws.on('loginState', (res) => {
|
|
|
|
- this.isLogin = res
|
|
|
|
- console.log('---res-----', res)
|
|
|
|
- if (res) {
|
|
|
|
- this.alertLoginSuccess()
|
|
|
|
- this.activePanel = 'key2'
|
|
|
|
- this.realTimeVideoDialog(cameraParam.code)
|
|
|
|
- } else {
|
|
|
|
- this.alertLoginFailed()
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- } else { // 连接客户端失败
|
|
|
|
- this.alertReinstall()
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- })
|
|
|
|
|
|
+ this.showTVWall(cameraParam.code, cameraParam.name);
|
|
|
|
+ // getDahuaVideoServer().then(newResponse => {
|
|
|
|
+ // console.log(newResponse)
|
|
|
|
+ // this.ws.detectConnectQt().then(res => {
|
|
|
|
+ // if (res) { // 连接客户端成功
|
|
|
|
+ // this.alertLogin()
|
|
|
|
+ // this.ws.login({
|
|
|
|
+ // loginIp: newResponse.loginIp,
|
|
|
|
+ // loginPort: newResponse.loginPort,
|
|
|
|
+ // userName: newResponse.userName,
|
|
|
|
+ // userPwd: newResponse.userPwd,
|
|
|
|
+ // token: '',
|
|
|
|
+ // https: 1
|
|
|
|
+ // })
|
|
|
|
+ // this.ws.on('loginState', (res) => {
|
|
|
|
+ // this.isLogin = res
|
|
|
|
+ // console.log('---res-----', res)
|
|
|
|
+ // if (res) {
|
|
|
|
+ // this.alertLoginSuccess()
|
|
|
|
+ // this.activePanel = 'key2'
|
|
|
|
+ // this.realTimeVideoDialog(cameraParam.code)
|
|
|
|
+ // } else {
|
|
|
|
+ // this.alertLoginFailed()
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // } else { // 连接客户端失败
|
|
|
|
+ // this.alertReinstall()
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // })
|
|
}else if(cameraParam.type=='0'){
|
|
}else if(cameraParam.type=='0'){
|
|
let that = this
|
|
let that = this
|
|
that.cameraVisible = true
|
|
that.cameraVisible = true
|