diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index d867323..7ebba32 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -48,7 +48,7 @@
-
+
@@ -194,6 +194,26 @@ export default {
type: String,
default: ''
},
+ personPhoto: {
+ type: String,
+ default: ''
+ },
+ RyDeptName: {
+ type: String,
+ default: ''
+ },
+ RyPostName: {
+ type: String,
+ default: ''
+ },
+ RyRealName: {
+ type: String,
+ default: ''
+ },
+ personTypeName: {
+ type: String,
+ default: ''
+ },
GATE_VIDEO_ID: {
type: String,
default: ''
diff --git a/src/views/map/dialog/peoplePositionCzks.vue b/src/views/map/dialog/peoplePositionCzks.vue
index 92255ff..2b2d2c6 100644
--- a/src/views/map/dialog/peoplePositionCzks.vue
+++ b/src/views/map/dialog/peoplePositionCzks.vue
@@ -9,19 +9,19 @@
|
姓名 |
- {{ info ? info.NAME : '' }} |
+ {{ info?info.NAME:RyRealName }} |
部门 |
- {{ info ? info.DEPARTMENT_NAME : '' }} |
+ {{ info?info.DEPARTMENT_NAME:RyDeptName }} |
岗位 |
- {{ info ? info.POST_NAME : '' }} |
+ {{ info?info.POST_NAME:RyPostName }} |
人员类型 |
- {{ info ? info.PERSON_TYPE : '' }} |
+ {{ info?info.PERSON_TYPE:personTypeName }} |
是否为隐患确认人 |
- {{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }} |
+ {{ info?info.IS_HAZARDCONFIRMER == 1 ?'是':'否' :'否' }} |
@@ -49,6 +49,30 @@ export default {
default() {
return ''
}
+ },
+ RyDeptName: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ RyPostName: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ RyRealName: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ personTypeName: {
+ type: String,
+ default() {
+ return ''
+ }
}
},
data() {
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index bf975b4..abd5d14 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -240,6 +240,11 @@
:infoname="dialog.infoname"
:name="dialog.name"
:GATE_VIDEO_ID="dialog.GATE_VIDEO_ID"
+ :person-photo="dialog.personPhoto"
+ :ry-dept-name="dialog.RyDeptName"
+ :ry-post-name="dialog.RyPostName"
+ :ry-real-name="dialog.RyRealName"
+ :person-type-name="dialog.personTypeName"
/>
@@ -865,7 +870,12 @@ export default {
id: '',
corpInfoId: '',
width: '',
- infoname: ''
+ infoname: '',
+ personPhoto: '',
+ RyDeptName: '',
+ RyPostName: '',
+ RyRealName: '',
+ personTypeName: ''
},
/* 曹妃甸使用参数开始*/
// 人员定位
@@ -1382,7 +1392,7 @@ export default {
this.bubble(id)
}
if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
- const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
+ const { label, point_type, id, corpInfoId, name, infoname, personPhoto, RyDeptName, RyPostName, RyRealName, personTypeName } = pick.id._monitoItems.data
this.dialog.visible = true
this.dialog.title = label
this.dialog.type = point_type
@@ -1390,6 +1400,11 @@ export default {
this.dialog.name = name
this.dialog.infoname = infoname
this.dialog.corpInfoId = corpInfoId
+ this.dialog.personPhoto = personPhoto
+ this.dialog.RyDeptName = RyDeptName
+ this.dialog.RyPostName = RyPostName
+ this.dialog.RyRealName = RyRealName
+ this.dialog.personTypeName = personTypeName
}
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') {
@@ -2540,9 +2555,14 @@ export default {
icon_type: 'img4_0_1',
infoname: item.realName,
personPhoto: item.personPhoto,
+ RyDeptName: item.deptName,
+ RyPostName: item.postName,
+ RyRealName: item.realName,
+ personTypeName: item.personTypeName,
data_id: item.cardId + '',
point_type: 'peoplePositionCzks',
- label: item.realName
+ label: item.realName,
+
}
czksPerLoc.push(perLoc)
ry_drag.addEntity(perLoc)