diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue index 4205302..0038468 100644 --- a/src/views/map/components/renyuan.vue +++ b/src/views/map/components/renyuan.vue @@ -55,7 +55,7 @@ -
+
@@ -72,7 +72,7 @@
-
+
@@ -225,7 +225,7 @@ export default { } ] } - if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26') { + if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || this.corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f' ) { this.block1OptionsList = [ { title: '总设备数', diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index f65b6c5..f5519d2 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -62,8 +62,8 @@ - - + + diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue index c954e60..157e4e2 100644 --- a/src/views/map/dialog/peoplePositionYGS.vue +++ b/src/views/map/dialog/peoplePositionYGS.vue @@ -49,7 +49,7 @@ - +
diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 45bbdd9..d08e7c4 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -2211,9 +2211,9 @@ export default { } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe() - } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') { + } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') { // websocket实时获取人员定位 - this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26') + this.initRYDWWebsocket(this.CORP_INFO_ID) } else { requestFN( pointUrl,
姓名 {{ (info && info.name) ? info.name : '未绑定人员' }}