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

Merge branch 'limingyu-20240423-消防安全管理标点' into pet

20240528Test
limingyu 2024-05-07 13:45:52 +08:00
parent ef21d5b4c1 1269805fc9
commit 62ad6f1b75
6 changed files with 96 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/map/gangkou_index/point/ico31_offline.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/map/gangkou_index/point/ico31_online.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

116
src/views/map/components/bianjieruqin.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="shipin">
<div class="block1">
<layout-title title="视频状态"/>
<layout-title title="视频定位"/>
<div class="options">
<div class="option">
<div class="leftimg"/>
@ -15,7 +15,7 @@
</div>
</div>
<div class="block2">
<layout-title title="区域报警数"/>
<layout-title title="重点工程"/>
<div class="options">
<div v-for="(item,index) in block2OptionsList" :key="index" class="option">
<div class="circular"><img :src="item.img" alt=""></div>
@ -26,26 +26,25 @@
</div>
</div>
</div>
<div class="block3">
<layout-title title="报警记录"/>
<div class="content">
<div class="table">
<div class="tr">
<div class="td">防区</div>
<div class="td">摄像头名称</div>
<div class="td">时间</div>
</div>
<div class="scroll">
<div v-for="(item,index) in block3List" :key="index" class="tr">
<div class="td line1">{{ item.region }}</div>
<div class="td">{{ item.name }}</div>
<div class="td">{{ item.time }}</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="block3">-->
<!-- <layout-title title="报警记录"/>-->
<!-- <div class="content">-->
<!-- <div class="table">-->
<!-- <div class="tr">-->
<!-- <div class="td">防区</div>-->
<!-- <div class="td">摄像头名称</div>-->
<!-- <div class="td">时间</div>-->
<!-- </div>-->
<!-- <div class="scroll">-->
<!-- <div v-for="(item,index) in block3List" :key="index" class="tr">-->
<!-- <div class="td line1">{{ item.region }}</div>-->
<!-- <div class="td">{{ item.name }}</div>-->
<!-- <div class="td">{{ item.time }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</template>
@ -79,17 +78,25 @@ export default {
{
lable: '视频总数',
count: 0
},
{
lable: '在线数量',
count: 0
},
{
lable: '离线数量',
count: 0
}
],
block2OptionsList: [
{
img: require('../../../assets/map/bianjie/img1.png'),
label: '码头',
img: require('../../../assets/map/gangkou_index/point/ico15.png'),
label: '重点工程总数',
count: 0
},
{
img: require('../../../assets/map/bianjie/img2.png'),
label: '油罐区域',
img: require('../../../assets/map/gangkou_index/point/ico30.png'),
label: '重点工程开工数量',
count: 0
}
],
@ -163,33 +170,70 @@ export default {
this.initgetTable()
},
methods: {
// 初始化总摄像头数
// initCount() {
// requestFN(
// '/map/mapPlatformelectronic/listAll',
// {
// CORPINFO_ID: this.corpInfoId,
// AREA: this.area
// }
// ).then((data) => {
// this.block1OptionsList[0].count = data.allForMap
// })
// },
// 初始化总摄像头数
initCount() {
requestFN(
'/map/mapPlatformelectronic/listAll',
'/map/keyProject/listAllLocation',
{
CORPINFO_ID: this.corpInfoId,
AREA: this.area
AREA: this.area,
TYPE: 'VIDEO',
GANGKOU: this.gangkou
}
).then((data) => {
this.block1OptionsList[0].count = data.allForMap
this.block1OptionsList[0].count = data.varList.length
data.varList.forEach((item) => {
if (item.ONLINE_STATUS === '0') {
this.block1OptionsList[1].count++
} else {
this.block1OptionsList[2].count++
}
})
})
},
// 初始化港口摄像头数
// initgetTable() {
// requestFN(
// '/map/mapPlatformelectronic/listAllByArea',
// {
// CORPINFO_ID: this.corpInfoId,
// AREA: this.area
// }
// ).then((data) => {
// data.varList.forEach(item => {
// if (item.SUOSHUQUYU === '2') {
// this.block2OptionsList[0].count = item.co
// } else if (item.SUOSHUQUYU === '1') {
// this.block2OptionsList[1].count = item.co
// }
// })
// })
// },
// 初始化港口摄像头数
initgetTable() {
requestFN(
'/map/mapPlatformelectronic/listAllByArea',
'/outsourced/listForCount',
{
CORPINFO_ID: this.corpInfoId,
AREA: this.area
CORPINFO_ID: this.corpInfoId
}
).then((data) => {
this.block2OptionsList[0].count = data.varList.length
data.varList.forEach(item => {
if (item.SUOSHUQUYU === '2') {
this.block2OptionsList[0].count = item.co
} else if (item.SUOSHUQUYU === '1') {
this.block2OptionsList[1].count = item.co
if (item.STATE == 1) {
this.block2OptionsList[1].count++
}
})
})

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

@ -7,7 +7,9 @@
<table class="table-ui">
<tr>
<td class="bbg-transparent">视频名称</td>
<td colspan="3">{{ pd.VIDEONAME }}</td>
<td>{{ pd.VIDEONAME }}</td>
<td class="bbg-transparent">在线状态</td>
<td>{{ pd.ONLINE_STATUS }}</td>
</tr>
<tr>
<td class="bbg-transparent">所属重点工程</td>

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

@ -1826,6 +1826,14 @@ export default {
} else {
point.infoname = varList[i].NAME
}
// 摄像头是否在线
if (point.icon_type.indexOf('6_1') > -1) {
if (varList[i].ONLINE_STATUS === '0') {
point.icon_type = point.icon_type + '_online'
} else {
point.icon_type = point.icon_type + '_offline'
}
}
points.push(point)
}
if (this.gangkouActive === '00004' && urlType === 'carPosition') {

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

@ -43,6 +43,9 @@ const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.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_online = require('../../../assets/map/gangkou_index/point/ico31_online.png')
const img6_1_offline = require('../../../assets/map/gangkou_index/point/ico31_offline.png')
const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
@ -61,7 +64,8 @@ const imgMap = {
img6_0, img6_1,
img7_0,
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,
img6_1_online, img6_1_offline
}
export { imgMap }