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

地图代码合并

2024年1月24日测试
liujun 2024-01-30 10:08:31 +08:00
parent 70cae2001b
commit 07de513dc5
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,6 @@ import blindboardOrder from './blindboardOrder.vue'
import breakgroundOrder from './breakgroundOrder.vue'
import hoistingOrder from './hoistingOrder.vue'
import videoPlay from './video_play.vue'
import videoPlayCmt from './video_play_cmt.vue'
import videoPlayCfd from './video_play_cfd.vue'
import videoPlayCmt from './video_play_cmt.vue'
import videoPlayPlat from './video_play_plat.vue'
@ -99,7 +98,7 @@ import peoplePositionCfdD from './peoplePositionCfdD.vue'
import peoplePositionCmt from './peoplePositionCmt.vue'
import carPositionCfdD from './carPositionCfdD.vue'
import peoplePositionOne from './peoplePositionOne.vue'
import hotworkFirst from "./hotworkFirst";
import hotworkFirst from './hotworkFirst'
import peoplePositionYGS from './peoplePositionYGS.vue'
import outSourceInfo from './outSourceInfo.vue'
import outSourceVideoInfo from './outSourceVideoInfo.vue'
@ -124,7 +123,6 @@ export default {
breakgroundOrder,
hoistingOrder,
videoPlay,
videoPlayCmt,
videoPlayCfd,
videoPlayCmt,
videoPlayPlat,
@ -184,7 +182,7 @@ export default {
name: {
type: String,
default: ''
},
}
},
methods: {
closeDialog() {

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

@ -39,7 +39,7 @@
:corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"/>
<menjin
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
@ -191,7 +191,7 @@
>
<div v-if="bottomOptionsIndex !== ''" class="item">
<template v-for="(item1,index1) in item.list">
<template v-if="containAuthorizationShow(item1)">
<template v-if="containAuthorizationShow(item1,item)">
<template v-if="eliminateAuthorizationShow(item1)">
<div
:key="index1"
@ -513,16 +513,16 @@ export default {
containAuthorization: [],
eliminateAuthorization: []
},
// {
// label: '消防水源',
// dialog_width: '600px',
// check: false,
// type: 'xfsy01',
// img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
// checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
// containAuthorization: [],
// eliminateAuthorization: []
// },
{
label: '消防水源',
dialog_width: '600px',
check: false,
type: 'xfsy01',
img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '消防点位',
dialog_width: '600px',
@ -1406,7 +1406,7 @@ export default {
}
if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1') {
// if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
const { label, point_type, data_id, infoname,name, code } = pick.id._monitoItems.data
const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data
this.dialog.visible = true
this.dialog.title = label
this.dialog.type = point_type.substring(3) + this.gangkouActive
@ -2029,7 +2029,7 @@ export default {
} else {
point.infoname = varList[i].NAME
}
//曹煤炭数据
// 曹煤炭数据
if (this.gangkouActive === '00005') {
point.name = varList[i].MAP_POINT_NAME
point.infoname = varList[i].MAP_POINT_NAME
@ -2865,10 +2865,21 @@ export default {
this.bottomOptionsIndex = ''
this.collapse = false
},
containAuthorizationShow({ containAuthorization }) {
containAuthorizationShow(e, item) {
// create by liu jun (PS:此处根据[下面这个if]孙海官的需求，对消防管控的权限进行了特殊处理，未进入具体企业时，显示消防救援队，进入具体企业后，显示消防管控其他按钮)
if (item && item.list && item.list.length > 0) {
if (item.label === '消防管控') {
if (e.label === '消防救援队') {
return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
}
if (e.label !== '消防救援队') {
return (this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
}
}
}
const CORP_INFO_ID = this.CORP_INFO_ID
if (containAuthorization.length === 0) return true
if (containAuthorization.includes(CORP_INFO_ID)) {
if (e.containAuthorization.length === 0) return true
if (e.containAuthorization.includes(CORP_INFO_ID)) {
return true
} else {
return false