From 26cc54920191cc4a6a366d8807bc925c0bf0069a Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 29 Nov 2023 10:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/map/index/touxiang.png | Bin 0 -> 6437 bytes src/views/map/dialog/index.vue | 12 ++- src/views/map/dialog/peoplePositionYGS.vue | 77 ++++++++++++++++++ src/views/map/index.vue | 87 ++++++++++++++++----- src/views/map/js/ry_dragentity.js | 1 - 5 files changed, 151 insertions(+), 26 deletions(-) create mode 100644 src/assets/map/index/touxiang.png create mode 100644 src/views/map/dialog/peoplePositionYGS.vue diff --git a/src/assets/map/index/touxiang.png b/src/assets/map/index/touxiang.png new file mode 100644 index 0000000000000000000000000000000000000000..752e5ef113469c3d1fb5e03ac1f8d09bca31b5c1 GIT binary patch literal 6437 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 literal 0 HcmV?d00001 diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 2520858..44d559c 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -46,11 +46,9 @@ - - - - + + @@ -90,9 +88,9 @@ import cutroadCfdD from './cutroadCfdD.vue' import breakgroundCfdD from './breakgroundCfdD.vue' import hoistingCfdD from './hoistingCfdD.vue' import peoplePositionCfdD from './peoplePositionCfdD.vue' -import peoplePositionNine from './peoplePositionNine.vue' import carPositionCfdD from './carPositionCfdD.vue' import peoplePositionOne from './peoplePositionOne.vue' +import peoplePositionYGS from './peoplePositionYGS.vue' export default { components: { @@ -129,10 +127,10 @@ export default { hoistingCfdD, MkGateMachineCfd, peoplePositionCfdD, - peoplePositionNine, carPositionCfdD, videoPlayBianjieruqin, - peoplePositionOne + peoplePositionOne, + peoplePositionYGS }, props: { title: { diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue new file mode 100644 index 0000000..5acd245 --- /dev/null +++ b/src/views/map/dialog/peoplePositionYGS.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 6093cf0..ef45e86 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -232,8 +232,12 @@ import { animate } from 'motion' import loadMapBoxCfd from './js/mapboxCfd' import loadMapBox from './js/mapbox' import AnquanCfd from './components/anquanCfd' -import { forEach } from 'lodash' +import { differenceBy, intersectionBy } from 'lodash' import mqtt from 'mqtt' +import img4_0_1 from '../../assets/map/gangkou_index/point/icon27.png' +import img4_0_2 from '../../assets/map/gangkou_index/point/icon28.png' +import img4_0_3 from '../../assets/map/gangkou_index/point/icon29.png' +import img4_0 from '../../assets/map/gangkou_index/point/ico21.png' let viewer = null let drag = null let ry_drag = null @@ -768,6 +772,7 @@ export default { cfdDIngweiTimer: '', cfdCarDIngweiTimer: '', perLocArr: [], + perLocArrDiff: [], carLocArr: [], pointBoxCfd: [], pointBox: [], @@ -1151,7 +1156,6 @@ export default { id = pick.id.id this.bubble(id) } - console.log(point_id) 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') { @@ -1517,7 +1521,6 @@ export default { if (this.cfdDIngweiTimer) { clearInterval(this.cfdDIngweiTimer) } - this.perLocArr = [] } this.destroyConnection() @@ -1531,9 +1534,22 @@ export default { this.changeSceneMode(this.rightOptionsList[index].check) } else if (index === 4) { this.destroyConnection() - this.onePerLocArr = [] this.clearAllBottomOptionsItemsCheck() this.clearAllBottomOptionsItemsEntityCollection() + this.onePerLocArr = [] + this.perLocArr = [] + this.clearMqttPoint() + if (this.gangkouActive === '00004') { + // if (this.fwebsocket) { + // this.fwebsocket.close() + // } + if (this.timer) { + clearInterval(this.timer) + } + if (this.cfdDIngweiTimer) { + clearInterval(this.cfdDIngweiTimer) + } + } } else if (index === 5) { this.pureMap = !this.pureMap this.componentKey = Math.random() @@ -1621,8 +1637,12 @@ export default { if (this.timer) { clearInterval(this.timer) } + if (this.cfdDIngweiTimer) { + clearInterval(this.cfdDIngweiTimer) + } } + this.clearAllBottomOptionsItemsCheck() this.CORP_INFO_ID = '' this.gangkouActive = '' viewer.entities.removeAll() @@ -1672,6 +1692,7 @@ export default { clearInterval(this.cfdDIngweiTimer) } this.perLocArr = [] + this.clearMqttPoint('cfdrydw') } if (this.gangkouActive === '00004' && urlType === 'carPosition') { if (this.cfdCarDIngweiTimer) { @@ -1698,10 +1719,11 @@ export default { this.bottomOptionsList[pindex].list[index].check = true if (this.gangkouActive === '00004') { this.cfdBottomOptionsList[pindex].list[index].check = true + this.bottomOptionsList[pindex].list[index].check = false } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { - !this.connecting ? this.createConnection() : this.doSubscribe() + !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe() } else { requestFN( pointUrl, @@ -1763,10 +1785,10 @@ export default { await this.initColorList() this.isItWithinTheArea() // this.initPerLocWebsocket() + this.timerCfdDingweiPointInit() + } else { + this.dragEntity(points, pindex, index) } - - // 人员定位开启实时获取定位websocket （曹妃甸使用） - 结束 - this.dragEntity(points, pindex, index) }).catch((e) => { console.log(e) }) @@ -1787,10 +1809,33 @@ export default { // } } }, - + timerCfdDingweiPointInit() { + for (let i = 0; i < this.perLocArr.length; i++) { + if (this.perLocArr[i].color === 'red') this.perLocArr[i].icon_type = 'img4_0_1' + else if (this.perLocArr[i].color === 'orange') this.perLocArr[i].icon_type = 'img4_0_2' + else if (this.perLocArr[i].color === 'yellow') this.perLocArr[i].icon_type = 'img4_0_3' + else this.perLocArr[i].icon_type = 'img4_0' + this.perLocArr[i].id = this.perLocArr[i].cardNo + this.perLocArr[i].x = this.perLocArr[i].position.x + this.perLocArr[i].y = this.perLocArr[i].position.y + ry_drag.addEntity(this.perLocArr[i]) + this.mqttPoint['cfdrydw' + this.perLocArr[i].cardNo] = this.perLocArr[i].cardNo + } + }, + timerCfdDingweiPointUpdate() { + for (let i = 0; i < this.perLocArrDiff.length; i++) { + if (this.perLocArr[i].color === 'red') this.perLocArr[i].icon_type = 'img4_0_1' + else if (this.perLocArr[i].color === 'orange') this.perLocArr[i].icon_type = 'img4_0_2' + else if (this.perLocArr[i].color === 'yellow') this.perLocArr[i].icon_type = 'img4_0_3' + else this.perLocArr[i].icon_type = 'img4_0' + this.perLocArrDiff[i].x = this.perLocArrDiff[i].position.x + this.perLocArrDiff[i].y = this.perLocArrDiff[i].position.y + ry_drag.getPosition(this.perLocArrDiff[i]) + } + }, timerCfdDingwei() { this.cfdDIngweiTimer = setInterval(() => { - this.localtionReload(1, 0) + // this.localtionReload(1, 0) requestFN( '/map/getCurrentLocationOnline', { @@ -1839,10 +1884,15 @@ export default { } points.push(point) } - this.perLocArr = points + if (this.perLocArr.length === 0) { + this.perLocArr = points + } + this.perLocArrDiff = intersectionBy(this.perLocArr, points, 'cardNo') + this.perLocArr = differenceBy(this.perLocArr, points, 'cardNo') this.isItWithinTheArea() - this.dragEntity(this.perLocArr, pindex, index) + this.timerCfdDingweiPointInit() + this.timerCfdDingweiPointUpdate() }) }, 30000) }, @@ -1909,7 +1959,7 @@ export default { // eslint-disable-next-line no-implied-eval this.timer = setInterval(() => { this.initColorList() - this.localtionReload(1, 0) + // this.localtionReload(1, 0) }, 300000) }, // 获取各种颜色人员列表（八项作业与工单） @@ -1944,7 +1994,7 @@ export default { this.subscribeSuccess = false }, // 创建连接 - createConnection() { + createConnection(CORP_INFO_ID) { try { const { protocol, host, port, endpoint, ...options } = this.connection const connectUrl = `${protocol}://${host}:${port}${endpoint}` @@ -1961,14 +2011,14 @@ export default { this.client.on('error', error => { console.log('Connection failed', error) }) - this.mqttMessage() + this.mqttMessage(CORP_INFO_ID) } } catch (error) { this.connecting = false console.log('mqtt.connect error', error) } }, - mqttMessage() { + mqttMessage(CORP_INFO_ID) { this.client.on('message', (topic, message) => { // console.info(message) // if(this.intOne === 0){ @@ -1997,8 +2047,9 @@ export default { icon_type: 'img4_0' + pointColor, // infoname: item.realName, data_id: item.deviceCode, - point_type: '标记点peoplePositionOne' - // label: item.realName + point_type: '标记点peoplePositionOne', + label: '人员定位', + corpInfoId: CORP_INFO_ID } this.onePerLocArr.push(perLoc) ry_drag.addEntity(perLoc) diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js index 1451988..3936398 100644 --- a/src/views/map/js/ry_dragentity.js +++ b/src/views/map/js/ry_dragentity.js @@ -18,7 +18,6 @@ export default class DragEntity { const position = Cesium.Cartesian3.fromDegrees(point.x, point.y, 0) point.property.addSample(start, position) point.lastTime = start - const entityOption = { id: point.id, name: point.name,