diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue index 0038468..65f8cae 100644 --- a/src/views/map/components/renyuan.vue +++ b/src/views/map/components/renyuan.vue @@ -55,7 +55,7 @@ -
+
@@ -72,7 +72,7 @@
-
+
@@ -195,8 +195,8 @@ export default { '/map/getAllDwMessage', { corpId: this.corpInfoId } ).then((data) => { // 一公司人员定位系统(我知道这里写的拉但是没办法,一天要把功能改完,后续有缘人在重构吧) + console.log(this.corpInfoId) if (this.corpInfoId === '035958e685cf4850bc40151c5e0617a6') { - this.block4List = data.alarmList.list this.block1OptionsList = [ { title: '在线设备数', @@ -216,16 +216,17 @@ export default { { title: '在线摄像头数', img: require('../../../assets/map/renyuan/ico4.png'), - count: data.orthermessage.infoList.HKcamera.num + count: data.orthermessage.infoList.HKcamera ? data.orthermessage.infoList.HKcamera.num : 0 }, { title: '在线报警设备数', img: require('../../../assets/map/renyuan/ico5.png'), - count: data.orthermessage.infoList.tklyr.num + count: data.orthermessage.infoList.tklyr ? data.orthermessage.infoList.tklyr.num : 0 } ] + this.block4List = data.alarmList.list } - if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || this.corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f' ) { + if (this.corpInfoId !== '035958e685cf4850bc40151c5e0617a6') { this.block1OptionsList = [ { title: '总设备数', @@ -246,6 +247,7 @@ export default { this.block4List = data.orthermessage.alarmList } }).catch((e) => { + console.log(e) this.$message.error(e) }) } diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index f5519d2..11687b4 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 157e4e2..c5bf0bd 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 9e90004..d30f9f2 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -2198,7 +2198,7 @@ export default { } } } - if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') { + if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') { this.clearRYDWPoint('+/UwbBQ/') this.removeTrajectory() } @@ -2247,7 +2247,7 @@ 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' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') { + } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') { // websocket实时获取人员定位 this.initRYDWWebsocket(this.CORP_INFO_ID) } else {
姓名 {{ (info && info.name) ? info.name : '未绑定人员' }}