diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 8851b63..bd25c6e 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -47,6 +47,7 @@ + @@ -95,6 +96,7 @@ import cutroadCfdD from './cutroadCfdD.vue' import breakgroundCfdD from './breakgroundCfdD.vue' import hoistingCfdD from './hoistingCfdD.vue' import peoplePositionCfdD from './peoplePositionCfdD.vue' +import peoplePositionCzks from './peoplePositionCzks.vue' import peoplePositionCmt from './peoplePositionCmt.vue' import carPositionCfdD from './carPositionCfdD.vue' import peoplePositionOne from './peoplePositionOne.vue' @@ -135,6 +137,7 @@ export default { breakgroundCfdD, hoistingCfdD, MkGateMachineCfd, + peoplePositionCzks, peoplePositionCfdD, peoplePositionCmt, carPositionCfdD, diff --git a/src/views/map/dialog/peoplePositionCzks.vue b/src/views/map/dialog/peoplePositionCzks.vue new file mode 100644 index 0000000..92255ff --- /dev/null +++ b/src/views/map/dialog/peoplePositionCzks.vue @@ -0,0 +1,80 @@ + + + + 人员信息 + + + + 照片 + + + 姓名 + {{ info ? info.NAME : '' }} + + + 部门 + {{ info ? info.DEPARTMENT_NAME : '' }} + 岗位 + {{ info ? info.POST_NAME : '' }} + + + 人员类型 + {{ info ? info.PERSON_TYPE : '' }} + 是否为隐患确认人 + {{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }} + + + + + + + diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 2aff97e..9472b3d 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -1386,6 +1386,16 @@ export default { id = pick.id.id this.bubble(id) } + if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') { + const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data + this.dialog.visible = true + this.dialog.title = label + this.dialog.type = point_type + this.dialog.id = id + this.dialog.name = name + this.dialog.infoname = infoname + this.dialog.corpInfoId = corpInfoId + } if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) { // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') { @@ -2445,7 +2455,7 @@ export default { ry_drag.getPosition(czksPerLoc[index]) } else { const perLoc = { - id: item.cardId, + id: item.cardId + '', name: item.realName, idNumber: item.idNumber, x: item.longitude,