|
@@ -370,38 +370,38 @@
|
|
that.sensorNum = res.data.length;
|
|
that.sensorNum = res.data.length;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- showTVWall(channelCode, channelName) {
|
|
|
|
|
|
+ showTVWall(cameraParam) {
|
|
let tvListJson = [{
|
|
let tvListJson = [{
|
|
- switchTab: "2",
|
|
|
|
- treeLabels: [{
|
|
|
|
- id: null,
|
|
|
|
- labelCode: "999",
|
|
|
|
- labelName: "电视墙",
|
|
|
|
- cameraType: null,
|
|
|
|
- parentLabelCode: "",
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- id: "spcamera00010",
|
|
|
|
- labelCode: channelCode,
|
|
|
|
- labelName: channelName,
|
|
|
|
- cameraType: "1",
|
|
|
|
- parentLabelCode: "999",
|
|
|
|
- },
|
|
|
|
- ],
|
|
|
|
- labelChannels: [{
|
|
|
|
- labelCode: channelCode,
|
|
|
|
- channelDates: [{
|
|
|
|
- channelCode: channelCode,
|
|
|
|
- channelName: channelName,
|
|
|
|
- channelSn: null,
|
|
|
|
- cameraType: "1",
|
|
|
|
- online: "1",
|
|
|
|
- cameraCode: "1",
|
|
|
|
- }, ],
|
|
|
|
- }, ],
|
|
|
|
- }, ];
|
|
|
|
|
|
+ "switchTab": "2",
|
|
|
|
+ "treeLabels": [{
|
|
|
|
+ "id": null,
|
|
|
|
+ "labelCode": "999",
|
|
|
|
+ "labelName": "电视墙",
|
|
|
|
+ "cameraType": null,
|
|
|
|
+ "parentLabelCode": ""
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "id": "spcamera00010",
|
|
|
|
+ "labelCode": cameraParam.cameraCode,
|
|
|
|
+ "labelName": cameraParam.cameraName,
|
|
|
|
+ "cameraType": cameraParam.cameraType,
|
|
|
|
+ "parentLabelCode": "999"
|
|
|
|
+ }
|
|
|
|
+ ],
|
|
|
|
+ "labelChannels": [{
|
|
|
|
+ "labelCode": cameraParam.cameraCode,
|
|
|
|
+ "channelDates": [{
|
|
|
|
+ "channelCode": cameraParam.cameraCode,
|
|
|
|
+ "channelName": cameraParam.cameraName,
|
|
|
|
+ "channelSn": null,
|
|
|
|
+ "cameraType": cameraParam.cameraType,
|
|
|
|
+ "online": "1",
|
|
|
|
+ "cameraCode": null
|
|
|
|
+ }]
|
|
|
|
+ }]
|
|
|
|
+ }]
|
|
this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
- channelId: channelCode,
|
|
|
|
|
|
+ channelId: cameraParam.channelCode,
|
|
}, ]);
|
|
}, ]);
|
|
this.$refs.bottomMenu.showMeasure = false;
|
|
this.$refs.bottomMenu.showMeasure = false;
|
|
this.$refs.bottomMenu.showChild = false;
|
|
this.$refs.bottomMenu.showChild = false;
|
|
@@ -1482,11 +1482,7 @@
|
|
isAggregation: false,
|
|
isAggregation: false,
|
|
};
|
|
};
|
|
if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
|
|
if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
|
|
- markersMap.parameter = {
|
|
|
|
- code: res.data.visuForestCloudCameraBOList[i].cameraCode,
|
|
|
|
- name: res.data.visuForestCloudCameraBOList[i].cameraName,
|
|
|
|
- type: res.data.visuForestCloudCameraBOList[i].cameraFactory,
|
|
|
|
- };
|
|
|
|
|
|
+ markersMap.parameter = res.data.visuForestCloudCameraBOList[i]
|
|
} else {
|
|
} else {
|
|
markersMap.parameter = [];
|
|
markersMap.parameter = [];
|
|
}
|
|
}
|
|
@@ -1589,11 +1585,7 @@
|
|
isAggregation: false,
|
|
isAggregation: false,
|
|
};
|
|
};
|
|
if (res.data[i].channelCode != null) {
|
|
if (res.data[i].channelCode != null) {
|
|
- markersMap.parameter = {
|
|
|
|
- code: res.data[i].cameraCode,
|
|
|
|
- name: res.data[i].cameraName,
|
|
|
|
- type: res.data[i].cameraFactory,
|
|
|
|
- };
|
|
|
|
|
|
+ markersMap.parameter = res.data[i]
|
|
} else {
|
|
} else {
|
|
markersMap.parameter = [];
|
|
markersMap.parameter = [];
|
|
}
|
|
}
|
|
@@ -1726,7 +1718,7 @@
|
|
},
|
|
},
|
|
/** 预览按钮操作 */
|
|
/** 预览按钮操作 */
|
|
preview(cameraParam) {
|
|
preview(cameraParam) {
|
|
- this.showTVWall(cameraParam.code, cameraParam.name);
|
|
|
|
|
|
+ this.showTVWall(cameraParam);
|
|
},
|
|
},
|
|
|
|
|
|
/** 预览按钮操作 */
|
|
/** 预览按钮操作 */
|