diff --git a/src/App.vue b/src/App.vue
index 0ffa327..4178ff7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,4 +25,7 @@ export default {
font-size: 14px !important;
font-weight: 500;
}
+.el-loading-mask{
+ z-index: 9999 !important;
+}
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index b0da679..ebaae81 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1052,6 +1052,7 @@ export default {
},
subscription: {
topic: '+/UwbBQ/+/prop',
+ topic1: '+/+/+/alarm',
qos: 0
},
@@ -1072,7 +1073,8 @@ export default {
CORP_INFO_ID: '',
longitude: '',
latitude: ''
- }
+ },
+ trajectoryEntityCollection: {}
}
},
mounted() {
@@ -1183,6 +1185,58 @@ export default {
this.closeBubbles()
}
}, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+ viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_DOUBLE_CLICK)
+ viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+ document.addEventListener('contextmenu', function(event) {
+ event.preventDefault()
+ })
+ this.handler.setInputAction(movement => {
+ const pick = viewer.scene.pick(movement.position)
+ if (Cesium.defined(pick) && (pick.id.id)) {
+ if (!pick.id._monitoItems) {
+ this.removeTrajectory()
+ return
+ }
+ const point_type = pick.id._monitoItems.data.point_type
+ const point_id = pick.id._monitoItems.data.id
+ const corpInfoId = pick.id._monitoItems.data.corpInfoId
+ if (point_type === '标记点peoplePositionOne') {
+ this.removeTrajectory()
+ this.addTrajectory(point_id, corpInfoId)
+ }
+ } else {
+ this.removeTrajectory()
+ }
+ }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+ },
+ addTrajectory(point_id, corpInfoId) {
+ requestFN(
+ '/map/getPersonTrace',
+ {
+ id: point_id,
+ corpId: corpInfoId
+ }
+ ).then((data) => {
+ if (data.list) {
+ const positions = []
+ for (let i = 0; i < data.list.length; i++) {
+ positions.push(Cesium.Cartesian3.fromDegrees(data.list[i].XAxis, data.list[i].YAxis))
+ }
+ const entity = new Cesium.Entity({
+ id: 'trajectory',
+ polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+ })
+ const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
+ collection.entities.add(entity)
+ viewer.dataSources.add(collection)
+ this.trajectoryEntityCollection = collection
+ }
+ })
+ },
+ removeTrajectory() {
+ if (Object.keys(this.trajectoryEntityCollection).length === 0) return
+ viewer.dataSources.remove(this.trajectoryEntityCollection)
+ this.trajectoryEntityCollection = {}
},
getCatesian3FromPX: function(px) {
@@ -1520,6 +1574,7 @@ export default {
this.destroyConnection()
this.clearAllBottomOptionsItemsCheck()
this.clearAllBottomOptionsItemsEntityCollection()
+ this.removeTrajectory()
this.onePerLocArr = []
this.perLocArr = []
this.clearMqttPoint()
@@ -1562,6 +1617,7 @@ export default {
this.addBranchPoint()
this.clearAllBottomOptionsItemsCheck()
this.clearAllBottomOptionsItemsEntityCollection()
+ this.removeTrajectory()
},
bottomOptionsClick(index) {
if (this.bottomClickDisable) return
@@ -1631,6 +1687,7 @@ export default {
} else if (this.CORP_INFO_ID) {
this.CORP_INFO_ID = ''
this.clearAllBottomOptionsItemsEntityCollection()
+ this.removeTrajectory()
this.dragAreaEntity(this.branchPoint)
this.toCenter(this.parentCenter)
this.destroyConnection()
@@ -1675,7 +1732,8 @@ export default {
}
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
this.doUnSubscribe()
- this.clearMqttPoint('1698584148364034050/UwbBQ/')
+ this.clearMqttPoint('+/UwbBQ/')
+ this.removeTrajectory()
}
this.bottomOptionsList[pindex].list[index].check = false
if (this.gangkouActive === '00004') {
@@ -1997,48 +2055,58 @@ export default {
},
mqttMessage(CORP_INFO_ID) {
this.client.on('message', (topic, message) => {
+ if (topic.indexOf('UwbBQ') !== -1 && topic.indexOf('prop') !== -1) {
// created by liu jun mqtt返回的参数可能是一个数组
- let peopleList = JSON.parse(message)
- if (!Array.isArray(peopleList)) {
- peopleList = [peopleList]
- }
- for (let i = 0; i < peopleList.length; i++) {
- const item = peopleList[i]
- // 如果不是人员信息则跳过
- // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
- if (item.productKey !== 'UwbBQ') {
- continue
+ let peopleList = JSON.parse(message)
+ if (!Array.isArray(peopleList)) {
+ peopleList = [peopleList]
}
- // 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
- const index = this.onePerLocArr.findIndex(item1 => {
- return item1.id.toString() === item.deviceCode.toString()
- })
- const x = item.properties[2].value
- const y = item.properties[3].value
- const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
- if (index !== -1) {
- this.onePerLocArr[index].x = x
- this.onePerLocArr[index].y = y
- this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
- ry_drag.getPosition(this.onePerLocArr[index])
- } else {
- // const id = '4_0_' +item.deviceCode
- const perLoc = {
- id: item.deviceCode,
- // name: item.realName,
- x: x,
- y: y,
- icon_type: 'img4_0' + pointColor,
- // infoname: item.realName,
- data_id: item.deviceCode,
- point_type: '标记点peoplePositionOne',
- label: '人员定位',
- corpInfoId: CORP_INFO_ID
+ for (let i = 0; i < peopleList.length; i++) {
+ const item = peopleList[i]
+ // 如果不是人员信息则跳过
+ // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
+ if (item.productKey !== 'UwbBQ') {
+ continue
+ }
+ // 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
+ const index = this.onePerLocArr.findIndex(item1 => {
+ return item1.id.toString() === item.deviceCode.toString()
+ })
+ const x = item.properties[2].value
+ const y = item.properties[3].value
+ const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
+ if (index !== -1) {
+ this.onePerLocArr[index].x = x
+ this.onePerLocArr[index].y = y
+ this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
+ ry_drag.getPosition(this.onePerLocArr[index])
+ } else {
+ // const id = '4_0_' +item.deviceCode
+ const perLoc = {
+ id: item.deviceCode,
+ // name: item.realName,
+ x: x,
+ y: y,
+ icon_type: 'img4_0' + pointColor,
+ // infoname: item.realName,
+ data_id: item.deviceCode,
+ point_type: '标记点peoplePositionOne',
+ label: '人员定位',
+ corpInfoId: CORP_INFO_ID
+ }
+ this.onePerLocArr.push(perLoc)
+ ry_drag.addEntity(perLoc)
+ this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
}
- this.onePerLocArr.push(perLoc)
- ry_drag.addEntity(perLoc)
- this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
}
+ } else if (topic.indexOf('alarm') !== -1) {
+ const formatMessage = JSON.parse(message)
+ this.$notify({
+ title: '报警信息',
+ dangerouslyUseHTMLString: true,
+ message: `部门：${formatMessage.deptName}
类型：${formatMessage.identifierName}`,
+ type: 'error'
+ })
}
})
},
@@ -2052,8 +2120,8 @@ export default {
},
// 订阅
doSubscribe() {
- const { topic, qos } = this.subscription
- this.client.subscribe(topic, { qos }, (error, res) => {
+ const { topic, topic1, qos } = this.subscription
+ this.client.subscribe([topic, topic1], { qos }, (error, res) => {
if (error) {
console.log('Subscribe to topics error', error)
return
@@ -2064,8 +2132,8 @@ export default {
},
// 取消订阅
doUnSubscribe() {
- const { topic } = this.subscription
- this.client.unsubscribe(topic, error => {
+ const { topic, topic1 } = this.subscription
+ this.client.unsubscribe([topic, topic1], error => {
if (error) {
console.log('Subscribe to topics error', error)
}
diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
new file mode 100644
index 0000000..64997eb
--- /dev/null
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 忽略
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
new file mode 100644
index 0000000..3a157a1
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -0,0 +1,372 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
new file mode 100644
index 0000000..18d4ea3
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 编辑
+
+
+
+
+
+