|
@@ -485,8 +485,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>摄像头类型:' + res.data.visuForestCloudCameraBOList[i]
|
|
|
- .cameraFactory + '</h4>' +
|
|
|
+ ' <h4>摄像头类型:' + (res.data.visuForestCloudCameraBOList[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
@@ -578,8 +577,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>摄像头类型:' + res.data[i]
|
|
|
- .cameraFactory + '</h4>' +
|
|
|
+ ' <h4>摄像头类型:' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
@@ -658,7 +656,7 @@ export default {
|
|
|
},
|
|
|
/** 预览按钮操作 */
|
|
|
preview(cameraParam) {
|
|
|
- if(cameraParam.type=='大华'){
|
|
|
+ if(cameraParam.type=='1'){
|
|
|
getDahuaVideoServer().then(newResponse => {
|
|
|
console.log(newResponse)
|
|
|
this.ws.detectConnectQt().then(res => {
|
|
@@ -688,7 +686,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- }else if(cameraParam.type=='海康'){
|
|
|
+ }else if(cameraParam.type=='0'){
|
|
|
let that = this
|
|
|
that.cameraVisible = true
|
|
|
getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|