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

1、一公司人员定位调整及未正确显示人员定位信息bug修复 

2、将9公司人员定位系统调整成默认人员定位。
liujun-25-相关方企业新增属性
liujun 2024-11-25 09:09:41 +08:00
parent 8cc04a5b35
commit 6d4d7ce75b
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/map/components/renyuan.vue
View File

@ -55,7 +55,7 @@
</div>
</div>
</div>
<div v-if="!(corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f')" class="block4">
<div v-if="corpInfoId === '035958e685cf4850bc40151c5e0617a6'" class="block4">
<layout-title title="报警列表"/>
<div class="content">
<div class="table">
@ -72,7 +72,7 @@
</div>
</div>
</div>
<div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f'" class="block4">
<div v-if="corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" class="block4">
<layout-title title="报警列表"/>
<div class="content">
<div class="table">
@ -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)
})
}

4
src/views/map/dialog/index.vue
View File

@ -62,8 +62,8 @@
<carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
<!--曹妃甸东 八项作业 曹实业详细页面 end-->
<peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
<peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" />
<peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" :corp-id="corpInfoId" />
<peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" />
<peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" :corp-id="corpInfoId" />
<!-- 重点工程 start -->
<outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
<outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />

2
src/views/map/dialog/peoplePositionYGS.vue
View File

@ -49,7 +49,7 @@
</tr>
</table>
<!-- 九公司人员定位页面 -->
<table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26' || corpId === '033549ed3bd648e49c8a65eb4993ec2f'" class="table-ui">
<table v-if="corpId !== '035958e685cf4850bc40151c5e0617a6'" class="table-ui">
<tr>
<td class="bbg-transparent">姓名</td>
<td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td>

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

@ -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 {