guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into pet

2024-07-22新BI页面
liujun 2024-06-19 08:48:46 +08:00
parent ece4a3fe20 cfe9594a91
commit b0af6ab3fd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/map/index.vue
View File

@ -1385,11 +1385,8 @@ export default {
const point_type = pick.id._monitoItems.data.point_type const point_type = pick.id._monitoItems.data.point_type
const point_id = pick.id._monitoItems.data.id const point_id = pick.id._monitoItems.data.id
if (point_type == '标记点CAMERA'){ if (point_type == '标记点CAMERA'){
const { GATE_VIDEO_ID } = pick.id._monitoItems.data
alert(GATE_VIDEO_ID)
alert(pick.id._monitoItems.data)
console.log(pick.id._monitoItems.data) console.log(pick.id._monitoItems.data)
this.dialog.GATE_VIDEO_ID = GATE_VIDEO_ID this.dialog.GATE_VIDEO_ID = pick.id._monitoItems.data.GATE_VIDEO_ID
} }
if (point_type === '报警') { if (point_type === '报警') {
viewer.dataSources.remove(this.myEntityCollection[pick.id._monitoItems.data.id]) viewer.dataSources.remove(this.myEntityCollection[pick.id._monitoItems.data.id])
@ -2135,6 +2132,7 @@ export default {
point.position.y = +varList[i].LATITUDE point.position.y = +varList[i].LATITUDE
point.dialog_width = dialog_width point.dialog_width = dialog_width
point.MAP_POINT_NAME = varList[i].MAP_POINT_NAME point.MAP_POINT_NAME = varList[i].MAP_POINT_NAME
point.GATE_VIDEO_ID = varList[i].VIDEO_RESOURCE_ID
// 曹妃甸使用 // 曹妃甸使用
point.gangkou = this.gangkouActive point.gangkou = this.gangkouActive
// 闸机名称 // 闸机名称