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

修复曹煤炭港地图不显示重点工程详情页的问题

czks-cmt-gwj地图合并
songwenxuan 2024-03-13 20:56:57 +08:00
parent 1ac41c731d
commit ffbcda0ed8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@
<peoplePositionOne v-if="type === 'peoplePositionOne' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" /> <peoplePositionOne v-if="type === 'peoplePositionOne' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
<peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" /> <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
<!-- 重点工程 start --> <!-- 重点工程 start -->
<outSourceInfo v-if="type === 'PROJECT' || type === 'PROJECT00005'" :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" />
<!-- 重点工程 end --> <!-- 重点工程 end -->
</el-dialog> </el-dialog>

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

@ -1423,13 +1423,17 @@ export default {
this.dialog.name = name this.dialog.name = name
this.dialog.infoname = infoname this.dialog.infoname = infoname
this.dialog.corpInfoId = corpInfoId this.dialog.corpInfoId = corpInfoId
}else if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_id !== '6aa255d41602497fa0f934a822820df4') { } else if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_id !== '6aa255d41602497fa0f934a822820df4') {
console.log(point_type) console.log(point_type)
console.log(point_id) console.log(point_id)
const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data const { label, data_id, infoname, name, code } = pick.id._monitoItems.data
this.dialog.visible = true this.dialog.visible = true
this.dialog.title = label this.dialog.title = label
if (point_type === '标记点PROJECT' || point_type === '标记点VIDEO') {
this.dialog.type = point_type.substring(3)
} else {
this.dialog.type = point_type.substring(3) + this.gangkouActive this.dialog.type = point_type.substring(3) + this.gangkouActive
}
this.dialog.id = data_id this.dialog.id = data_id
this.dialog.name = name this.dialog.name = name
this.dialog.id = point_type.substring(3) === 'CAMERA' ? code : point_type.substring(3) === 'platcamera' ? code : data_id this.dialog.id = point_type.substring(3) === 'CAMERA' ? code : point_type.substring(3) === 'platcamera' ? code : data_id
@ -3028,7 +3032,7 @@ export default {
if (e.label === '消防救援队') { if (e.label === '消防救援队') {
if (this.gangkouActive === '00005') { if (this.gangkouActive === '00005') {
return true return true
}else { } else {
return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '') return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
} }
} }