diff --git a/src/assets/map/gangkou_index/point/ico31_offline.png b/src/assets/map/gangkou_index/point/ico31_offline.png new file mode 100644 index 0000000..ca6bed6 Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico31_offline.png differ diff --git a/src/assets/map/gangkou_index/point/ico31_online.png b/src/assets/map/gangkou_index/point/ico31_online.png new file mode 100644 index 0000000..a7e3222 Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico31_online.png differ diff --git a/src/views/map/components/bianjieruqin.vue b/src/views/map/components/bianjieruqin.vue index 8fac441..687ef9e 100644 --- a/src/views/map/components/bianjieruqin.vue +++ b/src/views/map/components/bianjieruqin.vue @@ -1,7 +1,7 @@ @@ -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++ } }) }) diff --git a/src/views/map/dialog/outSourceVideoInfo.vue b/src/views/map/dialog/outSourceVideoInfo.vue index 1f9883a..a916b29 100644 --- a/src/views/map/dialog/outSourceVideoInfo.vue +++ b/src/views/map/dialog/outSourceVideoInfo.vue @@ -7,7 +7,9 @@ - + + + diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 7b79fbf..26ad6ec 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -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') { diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index cd17ac5..a879784 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -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 }
视频名称{{ pd.VIDEONAME }}{{ pd.VIDEONAME }}在线状态{{ pd.ONLINE_STATUS }}
所属重点工程