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

九公司人员定位兼容杂货公司

hyx_2024-9-29_tongbu
liujun 2024-09-05 20:02:47 +08:00
parent 412f777fe4
commit f15ebbc735
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="corpInfoId !== '21590a00ea5e462e9ee44dd332dddc26'" class="block4"> <div v-if="!(corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f')" class="block4">
<layout-title title="报警列表"/> <layout-title title="报警列表"/>
<div class="content"> <div class="content">
<div class="table"> <div class="table">
@ -72,7 +72,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'" class="block4"> <div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f'" class="block4">
<layout-title title="报警列表"/> <layout-title title="报警列表"/>
<div class="content"> <div class="content">
<div class="table"> <div class="table">
@ -225,7 +225,7 @@ export default {
} }
] ]
} }
if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26') { if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || this.corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f' ) {
this.block1OptionsList = [ this.block1OptionsList = [
{ {
title: '总设备数', title: '总设备数',

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

@ -62,8 +62,8 @@
<carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/> <carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
<!--曹妃甸东 八项作业 曹实业详细页面 end--> <!--曹妃甸东 八项作业 曹实业详细页面 end-->
<peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/> <peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
<peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26')" :id="id" :type="type" /> <peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" />
<peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26')" :id="id" :type="type" :corp-id="corpInfoId" /> <peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" :corp-id="corpInfoId" />
<!-- 重点工程 start --> <!-- 重点工程 start -->
<outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" /> <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
<outSourceVideoInfo v-if="type === 'VIDEO'" :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> </tr>
</table> </table>
<!-- 九公司人员定位页面 --> <!-- 九公司人员定位页面 -->
<table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26'" class="table-ui"> <table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26' || corpId === '033549ed3bd648e49c8a65eb4993ec2f'" class="table-ui">
<tr> <tr>
<td class="bbg-transparent">姓名</td> <td class="bbg-transparent">姓名</td>
<td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td> <td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td>

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

@ -2211,9 +2211,9 @@ export default {
} }
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe() !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实时获取人员定位 // websocket实时获取人员定位
this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26') this.initRYDWWebsocket(this.CORP_INFO_ID)
} else { } else {
requestFN( requestFN(
pointUrl, pointUrl,