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

沧州矿石、曹实业、曹煤炭地图同步

5_7_地图同步
songwenxuan 2024-05-07 15:28:48 +08:00
parent 4954bc68e3
commit d42c834bfd
22 changed files with 437 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/login/index.vue
View File

@ -180,16 +180,16 @@ export default {
} }
}, },
watch: { watch: {
$route: { // $route: {
handler: function(route) { // handler: function(route) {
const query = route.query // const query = route.query
if (query) { // if (query) {
this.redirect = query.redirect // this.redirect = query.redirect
this.otherQuery = this.getOtherQuery(query) // this.otherQuery = this.getOtherQuery(query)
} // }
}, // },
immediate: true // immediate: true
} // }
}, },
created() { created() {
const loginCount = this.validStr(sessionStorage.getItem('loginCount')) ? sessionStorage.getItem('loginCount') : 0 const loginCount = this.validStr(sessionStorage.getItem('loginCount')) ? sessionStorage.getItem('loginCount') : 0
@ -231,18 +231,19 @@ export default {
console.log(this.identifyCode) console.log(this.identifyCode)
}, },
getImgList() { getImgList() {
this.loading = false
// requestFN('/homepage/list').then(res => { // requestFN('/homepage/list').then(res => {
// this.hImgs = res.hImgs // this.hImgs = res.hImgs
// }) // })
requestFN( // requestFN(
'/homepage/list', // '/homepage/list',
{} // {}
).then((data) => { // ).then((data) => {
this.hImgs = data.hImgs // this.hImgs = data.hImgs
}).catch((e) => { // }).catch((e) => {
this.loading = false // this.loading = false
}) // })
}, },
backgroundImage(FILEPATH) { backgroundImage(FILEPATH) {
return { return {

4
src/views/map/components/caofeidian_index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="fensongsi_index"> <div class="fensongsi_index">
<div class="block2"> <div class="block2">
<layout-title title="cfd风险辨识管控"/> <layout-title title="风险辨识管控"/>
<div class="options"> <div class="options">
<div v-for="(item,index) in block2OptionsList" :key="index" class="option"> <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
<img :src="item.img" class="img_top" alt=""> <img :src="item.img" class="img_top" alt="">
@ -202,8 +202,6 @@ export default {
TYPE: this.type TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.block4OptionsList[0].list[0].count = data.inpeopleGate
this.block4OptionsList[0].list[1].count = data.outpeopleGate
this.block4OptionsList[1].list[0].count = data.invehicleGate this.block4OptionsList[1].list[0].count = data.invehicleGate
this.block4OptionsList[1].list[1].count = data.outvehicleGate this.block4OptionsList[1].list[1].count = data.outvehicleGate
}).catch((e) => { }).catch((e) => {

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

@ -194,7 +194,7 @@ export default {
this.block1OptionsList[0].count = data.pd.WINDSPEED || '-' this.block1OptionsList[0].count = data.pd.WINDSPEED || '-'
this.block1OptionsList[1].count = data.pd.TEMPERATURE || '-' this.block1OptionsList[1].count = data.pd.TEMPERATURE || '-'
this.block1OptionsList[2].count = this.calculateWindDirection(data.pd.WINDDIRECTION) this.block1OptionsList[2].count = this.calculateWindDirection(data.pd.WINDDIRECTION)
// this.block1OptionsList[3].count = data.pd.HUMIDITY || '-' this.block1OptionsList[3].count = data.pd.HUMIDITY || '-'
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })
@ -287,7 +287,7 @@ export default {
return arr[i].directions + '风' return arr[i].directions + '风'
} }
} }
return '静风' return '-'
}, },
// 定时器 // 定时器
start() { start() {
@ -321,9 +321,9 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
this.block2OptionsList[0].count = data.riskIdentificationCount[0] this.block2OptionsList[0].count = data.riskUnit
this.block2OptionsList[1].count = data.riskIdentificationCount[1] this.block2OptionsList[1].count = data.identificationParts
this.block2OptionsList[2].count = data.riskIdentificationCount[2] this.block2OptionsList[2].count = data.riskPoint
}) })
}, },
getPersonPositioningCount() { getPersonPositioningCount() {
@ -334,8 +334,8 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
this.block3OptionsList[0].count = data.personPositioningCount[0] this.block3OptionsList[0].count = data.userCount
this.block3OptionsList[1].count = data.personPositioningCount[1] this.block3OptionsList[1].count = data.departCount
}) })
} }
} }

28
src/views/map/components/czks_index.vue
View File

@ -55,9 +55,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
@ -92,17 +89,22 @@ export default {
{ {
title: '风速监测', title: '风速监测',
img: require('../../../assets/map/qixiang/ico1.png'), img: require('../../../assets/map/qixiang/ico1.png'),
count: '-' count: 0
}, },
{ {
title: '温度监测', title: '温度监测',
img: require('../../../assets/map/qixiang/ico2.png'), img: require('../../../assets/map/qixiang/ico2.png'),
count: '-' count: 0
}, },
{ {
title: '风向监测', title: '风向监测',
img: require('../../../assets/map/qixiang/ico3.png'), img: require('../../../assets/map/qixiang/ico3.png'),
count: '-' count: 0
},
{
title: '大气湿度',
img: require('../../../assets/map/qixiang/ico4.png'),
count: 0
} }
], ],
block2OptionsList: [ block2OptionsList: [
@ -317,16 +319,10 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
data.riskList.forEach(item => { this.block4OptionsList[1].list[0].count = data.data.grocery.entered
if (item.TYPE == 'levelA') this.block4OptionsList[0].list[0].count = item.COUNT this.block4OptionsList[1].list[1].count = data.data.grocery.quited
if (item.TYPE == 'levelB') this.block4OptionsList[0].list[1].count = item.COUNT this.block4OptionsList[0].list[0].count = data.data.mineral.entered
if (item.TYPE == 'levelC') this.block4OptionsList[0].list[2].count = item.COUNT this.block4OptionsList[0].list[1].count = data.data.mineral.quited
if (item.TYPE == 'levelD') this.block4OptionsList[0].list[3].count = item.COUNT
})
this.block4OptionsList[1].list[0].count = data.czksCarToday.oreIn
this.block4OptionsList[1].list[1].count = data.czksCarToday.oreOut
this.block4OptionsList[1].list[2].count = data.czksCarToday.groceryIn
this.block4OptionsList[1].list[3].count = data.czksCarToday.groceryOut
}) })
}, },
getRiskIdentificationCount() { getRiskIdentificationCount() {

4
src/views/map/components/menjinCfd.vue
View File

@ -223,8 +223,8 @@ export default {
id: '12' id: '12'
} }
).then((data) => { ).then((data) => {
// this.block2OptionsList[0].list[0].count = data.inpeopleGate this.block2OptionsList[0].list[0].count = data.inpeopleGate
// this.block2OptionsList[0].list[1].count = data.outpeopleGate this.block2OptionsList[0].list[1].count = data.outpeopleGate
this.block2OptionsList[2].list[0].count = data.invehicleGate this.block2OptionsList[2].list[0].count = data.invehicleGate
this.block2OptionsList[2].list[1].count = data.outvehicleGate this.block2OptionsList[2].list[1].count = data.outvehicleGate
}).catch((e) => { }).catch((e) => {

47
src/views/map/components/menjinCzks.vue
View File

@ -47,7 +47,7 @@
v-for="(item,index) in block3OptionsList" v-for="(item,index) in block3OptionsList"
:key="index" :key="index"
:class="['title', {active:index === block3OptionsIndex}]" :class="['title', {active:index === block3OptionsIndex}]"
@click="block3OptionsClick(index)" @click="getIORecords(index)"
> >
{{ item }} {{ item }}
</div> </div>
@ -61,23 +61,10 @@
</div> </div>
<div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll"> <div v-infinite-scroll="load" :infinite-scroll-disabled="disabled" class="scroll">
<div v-for="(item,index) in block3List" :key="index" class="tr"> <div v-for="(item,index) in block3List" :key="index" class="tr">
<div v-if="block3OptionsIndex == 0" class="td line1">{{ item.USERNAME }}</div> <div class="td line1">{{ block3OptionsIndex === 0 ? '矿石区闸机' : '杂货区闸机' }}</div>
<div v-if="block3OptionsIndex == 1" class="td">{{ item.LICENSE_PLATE }}</div> <div class="td" style="width: 50px">{{ item.TRUCK_NO }}</div>
<div class="td">{{ item.TIME }}</div> <div class="td" style="color: white">{{ item.CREATTIME }}</div>
<div v-if="block3OptionsIndex == 0" :class="['td',{green:item.STATE == '0'}]"> <div class="td">{{ item.PASS_TYPE == 0 ? '进' : '出' }}</div>
{{ item.STATE == '0' ? '进入' : '出港' }}
</div>
<div v-if="block3OptionsIndex == 0" :class="['td',{yellow:item.STATE == '0'}]">{{
item.EQUIPMENTNAME
}}
</div>
<div v-if="block3OptionsIndex == 1" :class="['td',{green:item.STATE == '4'}]">
{{ item.STATE == '4' ? '进场' : '出场' }}
</div>
<div v-if="block3OptionsIndex == 1" :class="['td',{yellow:item.STATE == '4'}]">{{
item.COMING_REASON
}}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -183,15 +170,25 @@ export default {
}, },
created() { created() {
this.getDoorManagement() this.getDoorManagement()
this.load()
}, },
methods: { methods: {
load() { load() {
this.loading = true this.loading = true
this.currentPage += 1 this.currentPage = parseInt(this.currentPage) + parseInt(1)
this.loadRecord(this.block3OptionsIndex) this.getIORecords(this.index)
}, },
loadRecord(index) { getIORecords(index) {
this.getDoorWayRecords(index) this.type = index
this.block3OptionsIndex = index
requestFN(
'/map/getIORecords?showCount=20' + '&currentPage=' + this.currentPage + '&type=' + this.block3OptionsIndex,
{}
).then((data) => {
this.block3List = this.block3List.concat(data.data.pd.data)
this.currentPage = data.data.pd.currentPage
this.loading = false
})
}, },
getDoorManagement() { getDoorManagement() {
requestFN( requestFN(
@ -201,12 +198,14 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
this.block1OptionsList[0].count1 = data.czksCarToday.CAR_GATE_COUNT
this.block1OptionsList[1].count1 = data.czksCarToday.VIDEO_COUNT
this.block2OptionsList[0].list[0].count = data.czksCarToday.oreInAll this.block2OptionsList[0].list[0].count = data.czksCarToday.oreInAll
this.block2OptionsList[0].list[1].count = data.czksCarToday.oreOutAll this.block2OptionsList[0].list[1].count = data.czksCarToday.oreOutAll
this.block2OptionsList[0].list[2].count = data.czksCarToday.oreInAll - data.czksCarToday.oreOutAll this.block2OptionsList[0].list[2].count = data.czksCarToday.oreAll
this.block2OptionsList[1].list[0].count = data.czksCarToday.groceryInAll this.block2OptionsList[1].list[0].count = data.czksCarToday.groceryInAll
this.block2OptionsList[1].list[1].count = data.czksCarToday.groceryOutAll this.block2OptionsList[1].list[1].count = data.czksCarToday.groceryOutAll
this.block2OptionsList[1].list[2].count = data.czksCarToday.groceryInAll - data.czksCarToday.groceryOutAll this.block2OptionsList[1].list[2].count = data.czksCarToday.groceryAll
}) })
}, },
block3OptionsClick(index) { block3OptionsClick(index) {

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

@ -234,7 +234,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.boardList = data.boardList // 参数map this.boardList = data.boardList // 参数map
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]

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

@ -230,7 +230,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]

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

@ -243,7 +243,7 @@ export default {
this.listLoading = false this.listLoading = false
this.info = data.pd this.info = data.pd
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
for (let i = 0; i < data.measuresList.length; i++) { for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组 // 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

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

@ -285,7 +285,7 @@ export default {
data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
} }
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map this.gasList = data.gasList // 参数map
this.gas = data.gas || {} // 参数map this.gas = data.gas || {} // 参数map

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

@ -229,7 +229,7 @@ export default {
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]

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

@ -242,7 +242,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map this.gasList = data.gasList // 参数map
this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : [] this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : []

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

@ -229,7 +229,7 @@ export default {
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]

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

@ -233,7 +233,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
this.measuresList = data.measuresList // 参数map this.measuresList = data.measuresList // 参数map
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]

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

@ -282,7 +282,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
for (let i = 0; i < data.measuresList.length; i++) { for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组 // 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

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

@ -282,7 +282,7 @@ export default {
this.listLoading = false this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1 || []
for (let i = 0; i < data.measuresList.length; i++) { for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组 // 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')

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

@ -11,9 +11,10 @@
<xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/> <xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
<xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/> <xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
<alarm-device v-if="type === 'alarm'" :id="id" :type="type" :gangkou="gangkou"/> <alarm-device v-if="type === 'alarm'" :id="id" :type="type" :gangkou="gangkou"/>
<mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/> <mk-gate-machine v-if="gangkou !== '00002' && type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
<mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/> <mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
<mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/> <mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
<mk-gate-machine-czks v-if="gangkou === '00002' && type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
<zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/> <zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
<video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/> <video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
<video-play-cmt v-if="type === 'platcamera00005' || type === 'CAMERA00005'" :id="id" :type="type" :gangkou="gangkou"/> <video-play-cmt v-if="type === 'platcamera00005' || type === 'CAMERA00005'" :id="id" :type="type" :gangkou="gangkou"/>
@ -27,26 +28,26 @@
<hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/> <hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
<!--秦港一公司 动火作业 详细页面 end--> <!--秦港一公司 动火作业 详细页面 end-->
<!--其他公司 动火作业 详细页面 start--> <!--其他公司 动火作业 详细页面 start-->
<hotwork v-if="type === 'HOTWORK' || type === 'HOTWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/> <hotwork v-if="gangkou !== '00004' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6' && type === 'HOTWORK' || type === 'HOTWORK00005'" :id="id" :type="type" :gangkou="gangkou"/>
<!--其他公司 动火作业 详细页面 end--> <!--其他公司 动火作业 详细页面 end-->
<!--其他七项作业共用一个详细页面 start--> <!--其他七项作业共用一个详细页面 start-->
<confinedspace v-if="type === 'CONFINEDSPACE' || type === 'CONFINEDSPACE00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <confinedspace v-if="gangkou !== '00004' && type === 'CONFINEDSPACE' || type === 'CONFINEDSPACE00005'" :id="id" :type="type" :gangkou="gangkou"/>
<electricityOrder v-if="type === 'ELECTRICITY' || type === 'ELECTRICITY00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <electricityOrder v-if="gangkou !== '00004' && type === 'ELECTRICITY' || type === 'ELECTRICITY00005'" :id="id" :type="type" :gangkou="gangkou"/>
<highworkOrder v-if="type === 'HIGHWORK' || type === 'HIGHWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <highworkOrder v-if="gangkou !== '00004' && type === 'HIGHWORK' || type === 'HIGHWORK00005'" :id="id" :type="type" :gangkou="gangkou"/>
<hoistingOrder v-if="type === 'HOISTING' || type === 'HOISTING00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <hoistingOrder v-if="gangkou !== '00004' && type === 'HOISTING' || type === 'HOISTING00005'" :id="id" :type="type" :gangkou="gangkou"/>
<blindboardOrder v-if="type === 'BLINDBOARD' || type === 'BLINDBOARD00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <blindboardOrder v-if="gangkou !== '00004' && type === 'BLINDBOARD' || type === 'BLINDBOARD00005'" :id="id" :type="type" :gangkou="gangkou"/>
<cutroadOrder v-if="type === 'CUTROAD' || type === 'CUTROAD00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <cutroadOrder v-if="gangkou !== '00004' && type === 'CUTROAD' || type === 'CUTROAD00005'" :id="id" :type="type" :gangkou="gangkou"/>
<breakgroundOrder v-if="type === 'BREAKGROUND' || type === 'BREAKGROUND00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/> <breakgroundOrder v-if="gangkou !== '00004' && type === 'BREAKGROUND' || type === 'BREAKGROUND00005'" :id="id" :type="type" :gangkou="gangkou"/>
<!--其他七项作业共用一个详细页面 end--> <!--其他七项作业共用一个详细页面 end-->
<!--曹妃甸东 八项作业 曹实业详细页面 start--> <!--曹妃甸东 八项作业 曹实业详细页面 start-->
<hotworkCfdD v-if="type === 'HOTWORK'&& corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <hotworkCfdD v-if="type === 'HOTWORK'&& gangkou === '00004'" :id="id" :type="type"/>
<confinedspaceCfdD v-if="type === 'CONFINEDSPACE' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <confinedspaceCfdD v-if="type === 'CONFINEDSPACE' && gangkou === '00004'" :id="id" :type="type"/>
<electricityCfdD v-if="type === 'ELECTRICITY' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <electricityCfdD v-if="type === 'ELECTRICITY' && gangkou === '00004'" :id="id" :type="type"/>
<highworkCfdD v-if="type === 'HIGHWORK' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <highworkCfdD v-if="type === 'HIGHWORK' && gangkou === '00004'" :id="id" :type="type"/>
<blindboardCfdD v-if="type === 'BLINDBOARD' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <blindboardCfdD v-if="type === 'BLINDBOARD' && gangkou === '00004'" :id="id" :type="type"/>
<cutroadCfdD v-if="type === 'CUTROAD' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <cutroadCfdD v-if="type === 'CUTROAD' && gangkou === '00004'" :id="id" :type="type"/>
<breakgroundCfdD v-if="type === 'BREAKGROUND' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <breakgroundCfdD v-if="type === 'BREAKGROUND' && gangkou === '00004'" :id="id" :type="type"/>
<hoistingCfdD v-if="type === 'HOISTING' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/> <hoistingCfdD v-if="type === 'HOISTING' && gangkou === '00004'" :id="id" :type="type"/>
<peoplePositionCfdD v-if="type === 'peoplePosition'" :id="id" :type="type" :infoname="infoname"/> <peoplePositionCfdD v-if="type === 'peoplePosition'" :id="id" :type="type" :infoname="infoname"/>
<peoplePositionCzks v-if="type === 'peoplePositionCzks'" :id="id" :type="type" /> <peoplePositionCzks v-if="type === 'peoplePositionCzks'" :id="id" :type="type" />
<peoplePositionCmt v-if="type === 'peoplePositionCmt'" :id="id" :type="type" :infoname="infoname"/> <peoplePositionCmt v-if="type === 'peoplePositionCmt'" :id="id" :type="type" :infoname="infoname"/>
@ -56,8 +57,8 @@
<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'" :id="id" :type="type" /> <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" :gangkou="gangkou"/>
<outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" /> <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" :gangkou="gangkou"/>
<!-- 重点工程 end --> <!-- 重点工程 end -->
</el-dialog> </el-dialog>
</div> </div>
@ -74,6 +75,7 @@ import windspeedstationCmt from './weatherstationCmt.vue'
import XfControl from './xfControl.vue' import XfControl from './xfControl.vue'
import XfPoint from './xfPoint.vue' import XfPoint from './xfPoint.vue'
import MkGateMachine from './mkGateMachine.vue' import MkGateMachine from './mkGateMachine.vue'
import MkGateMachineCzks from './mkGateMachineCzks.vue'
import MkGateMachineCfd from './mkGateMachineCfd.vue' import MkGateMachineCfd from './mkGateMachineCfd.vue'
import MkGateMachineCmt from './mkGateMachineCmt.vue' import MkGateMachineCmt from './mkGateMachineCmt.vue'
import Zhong_da_info from './zhong_da_info.vue' import Zhong_da_info from './zhong_da_info.vue'
@ -150,7 +152,8 @@ export default {
peoplePositionYGS, peoplePositionYGS,
outSourceInfo, outSourceInfo,
outSourceVideoInfo, outSourceVideoInfo,
MkGateMachineCmt MkGateMachineCmt,
MkGateMachineCzks
}, },
props: { props: {
title: { title: {

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

@ -54,7 +54,7 @@
</tr> </tr>
<tr v-for="(item, index) in measuresList" :key="item.cardNo"> <tr v-for="(item, index) in measuresList" :key="item.cardNo">
<td style="text-align: center">{{ index + 1 }}</td> <td style="text-align: center">{{ index + 1 }}</td>
<td style="text-align: center">{{ item.doorName }}</td> <td style="text-align: center">{{ item.GATE_MACHINE_NAME }}</td>
<td style="text-align: center">{{ item.personName }}</td> <td style="text-align: center">{{ item.personName }}</td>
<td style="text-align: center">{{ item.cardNo }}</td> <td style="text-align: center">{{ item.cardNo }}</td>
<td style="text-align: center">{{ item.inAndOutType === '0' ? '出' : '进' }}</td> <td style="text-align: center">{{ item.inAndOutType === '0' ? '出' : '进' }}</td>

142
src/views/map/dialog/mkGateMachineCzks.vue Normal file
View File

@ -0,0 +1,142 @@
<template>
<div class="app-container print-work">
<div v-if= "type !== 'CAMERA'" class="level-title">
<h1>区域名称：{{ GATE_AREA_NAME }}</h1>
</div>
<table v-if= "type !== 'CAMERA'" class="table-ui">
<tr style="width: 80%;text-align: center">
<td colspan="2">闸机名称</td>
<td colspan="4">{{ GATE_AREA_NAME }}</td>
</tr>
<!-- <tr>-->
<!-- <td class="bbg-transparent">型号</td>-->
<!-- <td >{{ info.GATE_MACHINE_MODEL }}</td>-->
<!-- </tr>-->
<tr style="width: 80%;text-align: center">
<td colspan="1">今日进</td>
<td colspan="1">{{ type == 'CAR'? info.CAR_IN : info.PERSON_IN }}</td>
<td colspan="1">今日出</td>
<td colspan="1">{{ type == 'CAR'? info.CAR_OUT : info.PERSON_OUT }}</td>
<td colspan="1">当前滞留</td>
<td colspan="1">{{ type == 'CAR'? info.CAR_IN - info.CAR_OUT : info.PERSON_IN - info.PERSON_OUT }}</td>
</tr>
<tr v-if="type == 'PERSON'">
<td colspan="6">
<table class="table-ui">
<tr>
<td>卡号</td>
<td>人员姓名</td>
<td>刷卡时间</td>
<td>状态</td>
</tr>
<tr v-for="(item,index) in recordAllList" :key="index">
<td>{{ item.CARDTYPE }}</td>
<td>{{ item.USERNAME }}</td>
<td>{{ item.TIME }}</td>
<td>
<span v-if="item.STATE === '0'">进入</span>
<span v-if="item.STATE === '1'">出去</span>
</td>
</tr>
</table>
</td>
</tr>
</table>
<div v-if= "type == 'CAMERA'" class="level-title">
<h1>摄像头名称：{{ info.VIDEONAME }}</h1>
</div>
<table v-if= "type == 'CAMERA'" class="table-ui">
<tr>
<td class="bbg-transparent">编码</td>
<td >{{ info.CODE }}</td>
</tr>
</table>
<div class="video">
<video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
</div>
</div>
</template>
<script>
import { requestFN } from '@/utils/request'
import moment from 'moment'
import videoPlay from './video_play.vue'
export default {
components: { videoPlay },
props: {
id: {
type: String,
default() {
return ''
}
},
type: {
type: String,
default() {
return ''
}
},
gangkou: {
type: String,
default: ''
}
},
data() {
return {
GATE_AREA_NAME: '',
config: config,
info: {},
recordAllList: []
}
},
created() {
this.getData()
this.getListData()
},
methods: {
formatDate(date, format) {
if (date) {
return moment(date).format(format)
} else {
return ''
}
},
getData() {
requestFN(
'/map/getGatesInAndOutNumById',
{
GATE_AREA_ID: this.id,
TYPE: this.type,
GANGKOU: this.gangkou
}
).then((data) => {
this.GATE_AREA_NAME = data.data.GATE_AREA_NAME
this.info.CAR_IN = data.data.entered
this.info.CAR_OUT = data.data.quited
this.$forceUpdate()
}).catch((e) => {
})
},
getListData() {
requestFN(
'/map/getGatesInAndOutListById?showCount=10000&currentPage=1',
{
GATE_AREA_ID: this.id,
TYPE: this.type,
GANGKOU: this.gangkou
}
).then((data) => {
this.recordAllList = data.recordAllList
this.$forceUpdate()
}).catch((e) => {
})
}
}
}
</script>
<style lang="scss" scoped>
.video{
margin-top: 20px;
}
</style>

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

@ -73,6 +73,11 @@
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<xiaofang
v-if="gangkouActive && gangkouActive === '00004' && bottomOptionsIndex === 4"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
<anquan <anquan
v-if="gangkouActive && gangkouActive !== '00004' && bottomOptionsIndex === 2" v-if="gangkouActive && gangkouActive !== '00004' && bottomOptionsIndex === 2"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
@ -109,7 +114,7 @@
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<bianjieruqin <bianjieruqin
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && bottomOptionsIndex === 6" v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 6"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
@ -118,6 +123,16 @@
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<zhongdian
v-if="gangkouActive && gangkouActive === '00004' && bottomOptionsIndex === 5"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
<zhongdian
v-if="gangkouActive && gangkouActive === '00005' && bottomOptionsIndex === 6"
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
<zhongda <zhongda
v-if="gangkouActive && bottomOptionsIndex === 8 && gangkouActive !== '00002'" v-if="gangkouActive && bottomOptionsIndex === 8 && gangkouActive !== '00002'"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
@ -155,8 +170,8 @@
<div v-if="gangkouActive && !pureMap" :key="bottomOptionsKey" class="bottom_options"> <div v-if="gangkouActive && !pureMap" :key="bottomOptionsKey" class="bottom_options">
<template v-for="(item,index) in cfdBottomOptionsList" v-if="gangkouActive === '00004'"> <template v-for="(item,index) in cfdBottomOptionsList" v-if="gangkouActive === '00004'">
<template v-if="bottomOptionsIndex === '' ? true : bottomOptionsIndex === index"> <template v-if="bottomOptionsIndex === '' ? true : bottomOptionsIndex === index">
<template v-if="containAuthorizationShow(item)"> <template>
<template v-if="eliminateAuthorizationShow(item)"> <template>
<div <div
:class="['option',{active:bottomOptionsIndex === index}]" :class="['option',{active:bottomOptionsIndex === index}]"
:key="index" :key="index"
@ -164,8 +179,8 @@
> >
<div v-if="bottomOptionsIndex !== ''" class="item"> <div v-if="bottomOptionsIndex !== ''" class="item">
<template v-for="(item1,index1) in item.list"> <template v-for="(item1,index1) in item.list">
<template v-if="containAuthorizationShow(item1)"> <template>
<template v-if="eliminateAuthorizationShow(item1)"> <template>
<div <div
:key="index1" :key="index1"
class="items" class="items"
@ -452,6 +467,16 @@ export default {
containAuthorization: [], containAuthorization: [],
eliminateAuthorization: [], eliminateAuthorization: [],
list: [ list: [
{
label: '人员闸机',
dialog_width: '600px',
check: false,
type: 'PERSON',
img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
containAuthorization: ['6aa255d41602497fa0f934a822820df4'],
eliminateAuthorization: []
},
{ {
label: '车辆', label: '车辆',
dialog_width: '600px', dialog_width: '600px',
@ -460,6 +485,16 @@ export default {
checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'), checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
type: 'CAR', type: 'CAR',
containAuthorization: [], containAuthorization: [],
eliminateAuthorization: ['6aa255d41602497fa0f934a822820df4']
},
{
label: '车辆闸机',
dialog_width: '600px',
check: false,
img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
type: 'CAR',
containAuthorization: ['6aa255d41602497fa0f934a822820df4'],
eliminateAuthorization: [] eliminateAuthorization: []
}, },
{ {
@ -540,7 +575,7 @@ export default {
img: require('../../assets/map/gangkou_index/buttom/ico28.png'), img: require('../../assets/map/gangkou_index/buttom/ico28.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico28_on.png'), checkImg: require('../../assets/map/gangkou_index/buttom/ico28_on.png'),
containAuthorization: [], containAuthorization: [],
eliminateAuthorization: [] eliminateAuthorization: ['6aa255d41602497fa0f934a822820df4', 'f8da1790b1034058ae2efefd69af3284']
} }
] ]
}, },
@ -640,7 +675,7 @@ export default {
img: require('../../assets/map/gangkou_index/buttom/ico3.png'), img: require('../../assets/map/gangkou_index/buttom/ico3.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico3_on.png'), checkImg: require('../../assets/map/gangkou_index/buttom/ico3_on.png'),
containAuthorization: [], containAuthorization: [],
eliminateAuthorization: [] eliminateAuthorization: ['f8da1790b1034058ae2efefd69af3284']
} }
] ]
}, },
@ -1075,6 +1110,94 @@ export default {
eliminateAuthorization: [] eliminateAuthorization: []
} }
] ]
},
{
img: require('../../assets/map/gangkou_index/img5.png'),
checkImg: require('../../assets/map/gangkou_index/img5_on.png'),
label: '消防管控',
pointUrl: '/map/getFireControl',
list: [
{
label: '消防救援队',
check: false,
pointUrl: '/map/getFireControl',
img: require('../../assets/map/gangkou_index/buttom/ico4.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico4_on.png'),
type: 'xfjyd01',
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '消防控制室',
check: false,
type: 'xfkzs01',
pointUrl: '/map/getFireControl',
img: require('../../assets/map/gangkou_index/buttom/ico5.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico5_on.png'),
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '消防泵房',
check: false,
type: 'xfbf01',
pointUrl: '/map/getFireControl',
img: require('../../assets/map/gangkou_index/buttom/ico6.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico6_on.png'),
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '消防水源',
check: false,
type: 'xfsy01',
pointUrl: '/map/getFireControl',
img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '消防点位',
check: false,
type: 'point',
pointUrl: '/map/getFireControl',
img: require('../../assets/map/gangkou_index/buttom/ico8.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico8_on.png'),
containAuthorization: [],
eliminateAuthorization: []
}
]
},
{
img: require('../../assets/map/gangkou_index/img12.png'),
checkImg: require('../../assets/map/gangkou_index/img12_on.png'),
label: '重点工程',
pointUrl: '/map/keyProject/listAllLocation',
containAuthorization: [],
eliminateAuthorization: [],
list: [
{
label: '重点工程定位',
dialog_width: '1200px',
check: false,
type: 'PROJECT',
img: require('../../assets/map/gangkou_index/buttom/ico27.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico27_on.png'),
containAuthorization: [],
eliminateAuthorization: []
},
{
label: '视频定位',
dialog_width: '1200px',
check: false,
type: 'VIDEO',
img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
containAuthorization: [],
eliminateAuthorization: []
}
]
} }
], ],
arr: [ arr: [
@ -1416,7 +1539,7 @@ export default {
} }
if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) { if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) {
// if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') { // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
console.log(444444444444444444444444)
const { label, point_type, data_id, infoname, code } = pick.id._monitoItems.data const { label, point_type, data_id, infoname, code } = pick.id._monitoItems.data
this.dialog.visible = true this.dialog.visible = true
this.dialog.title = label this.dialog.title = label
@ -1453,7 +1576,10 @@ export default {
} }
if (point_type.indexOf('标记点') !== -1) { if (point_type.indexOf('标记点') !== -1) {
const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data
console.log('消防方法++++++++++++++++++++++++++++++++++++++++++++++++')
console.log(dialog_width)
this.dialog.visible = true this.dialog.visible = true
this.dialog.gangkou = this.gangkouActive
this.dialog.title = label this.dialog.title = label
this.dialog.type = point_type.substring(3) this.dialog.type = point_type.substring(3)
this.dialog.id = data_id this.dialog.id = data_id
@ -1962,7 +2088,7 @@ export default {
}, },
bottomOptionsItemsClick(pindex, index, label, urlType, pointUrl, dialog_width) { bottomOptionsItemsClick(pindex, index, label, urlType, pointUrl, dialog_width) {
if (this.bottomOptionsList[pindex].list[index].check || this.gangkouActive === '00004' && this.cfdBottomOptionsList[pindex].list[index].check) { if ((this.gangkouActive === '00004' && this.cfdBottomOptionsList[pindex].list[index].check) || (this.bottomOptionsList[pindex].list.length > index && this.bottomOptionsList[pindex].list[index].check)) {
// 取消选中 // 取消选中
// 沧州矿石人员定位关闭 // 沧州矿石人员定位关闭
if (this.gangkouActive === '00002' && urlType === 'peoplePosition') { if (this.gangkouActive === '00002' && urlType === 'peoplePosition') {
@ -1977,7 +2103,9 @@ export default {
if (this.timer) { if (this.timer) {
clearInterval(this.timer) clearInterval(this.timer)
} }
this.bottomOptionsList[pindex].list[index].check = false if (this.bottomOptionsList[pindex].list.length > index) {
this.bottomOptionsList[pindex].list[index].check = false
}
this.clearCmtMqttPoint('person') this.clearCmtMqttPoint('person')
if (this.fwebsocket && this.fwebsocket.url) { if (this.fwebsocket && this.fwebsocket.url) {
this.perLocArr = [] this.perLocArr = []
@ -2012,7 +2140,9 @@ export default {
this.doUnSubscribe() this.doUnSubscribe()
this.clearMqttPoint('1698584148364034050/UwbBQ/') this.clearMqttPoint('1698584148364034050/UwbBQ/')
} }
this.bottomOptionsList[pindex].list[index].check = false if (this.bottomOptionsList[pindex].list.length > index) {
this.bottomOptionsList[pindex].list[index].check = false
}
if (this.gangkouActive === '00004') { if (this.gangkouActive === '00004') {
this.cfdBottomOptionsList[pindex].list[index].check = false this.cfdBottomOptionsList[pindex].list[index].check = false
} }
@ -2025,10 +2155,14 @@ export default {
}) })
} else { } else {
// 选中 // 选中
this.bottomOptionsList[pindex].list[index].check = true if (this.bottomOptionsList[pindex].list.length > index) {
this.bottomOptionsList[pindex].list[index].check = true
}
if (this.gangkouActive === '00004') { if (this.gangkouActive === '00004') {
this.cfdBottomOptionsList[pindex].list[index].check = true this.cfdBottomOptionsList[pindex].list[index].check = true
this.bottomOptionsList[pindex].list[index].check = false if (this.bottomOptionsList[pindex].list.length > index) {
this.bottomOptionsList[pindex].list[index].check = false
}
} }
if (this.gangkouActive === '00002' && urlType === 'peoplePosition') { if (this.gangkouActive === '00002' && urlType === 'peoplePosition') {
this.czksPeoplePosition() this.czksPeoplePosition()
@ -3041,7 +3175,7 @@ export default {
if (item && item.list && item.list.length > 0) { if (item && item.list && item.list.length > 0) {
if (item.label === '消防管控') { if (item.label === '消防管控') {
if (e.label === '消防救援队' && e.label === '报警设备') { if (e.label === '消防救援队' && e.label === '报警设备') {
if (this.gangkouActive === '00005') { if (this.gangkouActive === '00005' || this.gangkouActive === '00004') {
return true return true
} else { } else {
return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '') return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
@ -3053,13 +3187,13 @@ export default {
} }
if (item.label === '气象监测') { if (item.label === '气象监测') {
if (e.label === '气象站') { if (e.label === '气象站') {
return this.gangkouActive !== '00005' return this.gangkouActive !== '00005' && this.gangkouActive !== '00004'
} }
} }
} }
const CORP_INFO_ID = this.CORP_INFO_ID const CORP_INFO_ID = this.CORP_INFO_ID
if (e.containAuthorization.length === 0) return true if (e.containAuthorization && e.containAuthorization.length === 0) return true
if (e.containAuthorization.includes(CORP_INFO_ID)) { if (e.containAuthorization && e.containAuthorization.includes(CORP_INFO_ID)) {
return true return true
} else { } else {
return false return false

38
src/views/map/js/dragentity.js
View File

@ -4,7 +4,8 @@ const cameraImg = require('../../../assets/map/index/camera.png')
const Cesium = window.Cesium const Cesium = window.Cesium
const img0_0 = require('../../../assets/map/gangkou_index/point/ico1.png') const img0_0 = require('../../../assets/map/gangkou_index/point/ico1.png')
const img0_1 = require('../../../assets/map/gangkou_index/point/ico2.png') const img0_1 = require('../../../assets/map/gangkou_index/point/ico2.png')
const img0_2 = require('../../../assets/map/gangkou_index/point/ico3.png') const img0_2 = require('../../../assets/map/gangkou_index/point/ico2.png')
const img0_3 = require('../../../assets/map/gangkou_index/point/ico3.png')
const img1_0 = require('../../../assets/map/gangkou_index/point/ico4.png') const img1_0 = require('../../../assets/map/gangkou_index/point/ico4.png')
const img1_1 = require('../../../assets/map/gangkou_index/point/ico5.png') const img1_1 = require('../../../assets/map/gangkou_index/point/ico5.png')
@ -12,6 +13,11 @@ const img1_2 = require('../../../assets/map/gangkou_index/point/ico6.png')
const img1_3 = require('../../../assets/map/gangkou_index/point/ico7.png') const img1_3 = require('../../../assets/map/gangkou_index/point/ico7.png')
const img1_4 = require('../../../assets/map/gangkou_index/point/ico8.png') const img1_4 = require('../../../assets/map/gangkou_index/point/ico8.png')
const img1_5 = require('../../../assets/map/gangkou_index/point/ico32.png') const img1_5 = require('../../../assets/map/gangkou_index/point/ico32.png')
const cfd_img4_0 = require('../../../assets/map/gangkou_index/point/ico4.png')
const cfd_img4_1 = require('../../../assets/map/gangkou_index/point/ico5.png')
const cfd_img4_2 = require('../../../assets/map/gangkou_index/point/ico6.png')
const cfd_img4_3 = require('../../../assets/map/gangkou_index/point/ico7.png')
const cfd_img4_4 = require('../../../assets/map/gangkou_index/point/ico8.png')
const img2_0 = require('../../../assets/map/gangkou_index/point/ico9.png') const img2_0 = require('../../../assets/map/gangkou_index/point/ico9.png')
const img2_1 = require('../../../assets/map/gangkou_index/point/ico10.png') const img2_1 = require('../../../assets/map/gangkou_index/point/ico10.png')
@ -41,6 +47,8 @@ const cfd_img1_0_2 = require('../../../assets/map/gangkou_index/point/icon28.png
const cfd_img1_0_3 = require('../../../assets/map/gangkou_index/point/icon29.png') const cfd_img1_0_3 = require('../../../assets/map/gangkou_index/point/icon29.png')
const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png') const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
const cfd_img5_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
const cfd_img5_1 = require('../../../assets/map/gangkou_index/point/ico26.png')
const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png') const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png') const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
@ -53,7 +61,7 @@ const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png') const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
const imgMap = { const imgMap = {
img0_0, img0_1, img0_2, img0_0, img0_1, img0_2, img0_3,
img1_0, img1_1, img1_2, img1_3, img1_4, img1_5, img1_0, img1_1, img1_2, img1_3, img1_4, img1_5,
img2_0, img2_1, img2_2, img2_3, img2_4, img2_5, img2_6, img2_7, cfd_img2_8, img2_0, img2_1, img2_2, img2_3, img2_4, img2_5, img2_6, img2_7, cfd_img2_8,
cfd_img3_0, img3_0, img3_1, cfd_img3_0, img3_0, img3_1,
@ -62,7 +70,9 @@ const imgMap = {
img6_0, img6_1, img6_0, img6_1,
img7_0, img7_0,
img8_0, img8_1, img8_2, img8_3, img8_0, img8_1, img8_2, img8_3,
cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3 cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3,
cfd_img4_0, cfd_img4_1, cfd_img4_2, cfd_img4_3, cfd_img4_4,
cfd_img5_0, cfd_img5_1
} }
export { imgMap } export { imgMap }
@ -83,6 +93,7 @@ export default class DragEntity {
} }
addEntity(value) { addEntity(value) {
console.log(value)
let billboard = {} let billboard = {}
let labelText = value.MAP_POINT_NAME.length > 5 ? value.MAP_POINT_NAME.substring(0, 5) + '...' : value.MAP_POINT_NAME let labelText = value.MAP_POINT_NAME.length > 5 ? value.MAP_POINT_NAME.substring(0, 5) + '...' : value.MAP_POINT_NAME
let labelPixelOffset = new Cesium.Cartesian2(0, -55) let labelPixelOffset = new Cesium.Cartesian2(0, -55)
@ -123,6 +134,7 @@ export default class DragEntity {
} }
// 曹妃甸使用 // 曹妃甸使用
if (value.gangkou === '00004') { if (value.gangkou === '00004') {
console.log(66666666666)
if (value.label === '人员定位') { if (value.label === '人员定位') {
if (value.color === 'red') { if (value.color === 'red') {
billboard = { billboard = {
@ -187,6 +199,26 @@ export default class DragEntity {
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
disableDepthTestDistance: Number.POSITIVE_INFINITY disableDepthTestDistance: Number.POSITIVE_INFINITY
} }
} else if (value.icon_type.indexOf('4_') !== -1) {
billboard = {
image: imgMap['cfd_img' + value.icon_type],
height: 36,
width: 30,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
disableDepthTestDistance: Number.POSITIVE_INFINITY
}
} else if (value.icon_type.indexOf('5_') !== -1) {
billboard = {
image: imgMap['cfd_img' + value.icon_type],
height: 36,
width: 30,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
disableDepthTestDistance: Number.POSITIVE_INFINITY
}
} else { } else {
billboard = { billboard = {
image: imgMap['img' + value.icon_type], image: imgMap['img' + value.icon_type],

22
src/views/system/homepagepicture/components/indexList.vue
View File

@ -118,17 +118,17 @@ export default {
}, },
// 获取列表 // 获取列表
getList() { getList() {
this.listLoading = true // this.listLoading = true
requestFN( // requestFN(
'/homepage/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, // '/homepage/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ ...this.searchForm } // { ...this.searchForm }
).then((data) => { // ).then((data) => {
this.listLoading = false // this.listLoading = false
this.varList = data.hImgs // this.varList = data.hImgs
this.total = data.page.totalResult // this.total = data.page.totalResult
}).catch((e) => { // }).catch((e) => {
this.listLoading = false // this.listLoading = false
}) // })
}, },
getCountryList() { getCountryList() {
requestFN( requestFN(