Compare commits
No commits in common. "dc45aaa78677188bfaf76b12224a553774f5d96b" and "08c1c98374788c25b3766152f4faec609249e57c" have entirely different histories.
dc45aaa786
...
08c1c98374
|
|
@ -62,28 +62,8 @@
|
|||
<carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
|
||||
<!--曹妃甸东 八项作业 曹实业详细页面 end-->
|
||||
<peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
|
||||
<peoplePositionOne
|
||||
v-if="type === 'peoplePositionOne' && !(
|
||||
corpInfoId === '035958e685cf4850bc40151c5e0617a6'
|
||||
|| corpInfoId === '17973964c87346e7a4a737cf252557d9'
|
||||
|| corpInfoId === '97b87eba9f9c49a0a917c1f412016fb1'
|
||||
|| corpInfoId === '286dcae730aa43ba82c97a676f9d8ee2'
|
||||
|| corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'
|
||||
|
||||
)"
|
||||
:id="id"
|
||||
:type="type" />
|
||||
<peoplePositionYGS
|
||||
v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6'
|
||||
|| corpInfoId === '17973964c87346e7a4a737cf252557d9'
|
||||
|| corpInfoId === '97b87eba9f9c49a0a917c1f412016fb1'
|
||||
|| corpInfoId === '286dcae730aa43ba82c97a676f9d8ee2'
|
||||
|| corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'
|
||||
|| corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f'
|
||||
)"
|
||||
:id="id"
|
||||
:type="type"
|
||||
:corp-id="corpInfoId" />
|
||||
<peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" />
|
||||
<peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" :corp-id="corpInfoId" />
|
||||
<!-- 重点工程 start -->
|
||||
<outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
|
||||
<outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@
|
|||
<!-- @dragAreaEntity="dragAreaEntity"-->
|
||||
<!-- />-->
|
||||
<info v-if="!gangkouActive"/>
|
||||
<gangkou-index
|
||||
v-if="gangkouActive === '00003' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && !CORP_INFO_ID"
|
||||
:area="area"/>
|
||||
<gangkou-index v-if="gangkouActive === '00003' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && !CORP_INFO_ID" :area="area"/>
|
||||
<fengongsi-index
|
||||
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
|
||||
:corp-info-id="CORP_INFO_ID"
|
||||
|
|
@ -310,7 +308,6 @@ import loadMapBoxCzks from './js/mapboxCzks'
|
|||
import loadMapBox from './js/mapbox'
|
||||
import AnquanCfd from './components/anquanCfd'
|
||||
import mqtt from 'mqtt'
|
||||
|
||||
let viewer = null
|
||||
let drag = null
|
||||
let ry_drag = null
|
||||
|
|
@ -1271,14 +1268,14 @@ export default {
|
|||
function S4() {
|
||||
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
|
||||
}
|
||||
|
||||
return S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4()
|
||||
},
|
||||
keepalive(token) {
|
||||
// 第二套方案
|
||||
requestFN(
|
||||
'/map/loginOrKeepAlive',
|
||||
{}
|
||||
{
|
||||
}
|
||||
).then((data) => {
|
||||
|
||||
})
|
||||
|
|
@ -1487,19 +1484,7 @@ export default {
|
|||
this.bubble(id)
|
||||
}
|
||||
if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
|
||||
const {
|
||||
label,
|
||||
point_type,
|
||||
id,
|
||||
corpInfoId,
|
||||
name,
|
||||
infoname,
|
||||
personPhoto,
|
||||
RyDeptName,
|
||||
RyPostName,
|
||||
RyRealName,
|
||||
personTypeName
|
||||
} = pick.id._monitoItems.data
|
||||
const { label, point_type, id, corpInfoId, name, infoname, personPhoto, RyDeptName, RyPostName, RyRealName, personTypeName } = pick.id._monitoItems.data
|
||||
this.dialog.visible = true
|
||||
this.dialog.title = label
|
||||
this.dialog.type = point_type
|
||||
|
|
@ -1551,17 +1536,7 @@ export default {
|
|||
return
|
||||
}
|
||||
if (point_type.indexOf('标记点') !== -1) {
|
||||
const {
|
||||
label,
|
||||
point_type,
|
||||
data_id,
|
||||
corpInfoId,
|
||||
dialog_width,
|
||||
infoname,
|
||||
code,
|
||||
video_type,
|
||||
name
|
||||
} = pick.id._monitoItems.data
|
||||
const { label, point_type, data_id, corpInfoId, dialog_width, infoname, code, video_type, name } = pick.id._monitoItems.data
|
||||
this.dialog.visible = true
|
||||
this.dialog.title = label
|
||||
this.dialog.name = name
|
||||
|
|
@ -2272,12 +2247,7 @@ export default {
|
|||
}
|
||||
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
||||
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
|
||||
} else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' ||
|
||||
this.CORP_INFO_ID === '17973964c87346e7a4a737cf252557d9' ||
|
||||
this.CORP_INFO_ID === '97b87eba9f9c49a0a917c1f412016fb1' ||
|
||||
this.CORP_INFO_ID === '286dcae730aa43ba82c97a676f9d8ee2' ||
|
||||
this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' ||
|
||||
this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
|
||||
} else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
|
||||
// websocket实时获取人员定位
|
||||
this.initRYDWWebsocket(this.CORP_INFO_ID)
|
||||
} else {
|
||||
|
|
@ -2995,7 +2965,7 @@ export default {
|
|||
const index = ninePerLoc.findIndex(item1 => {
|
||||
return item1.id.toString() === item.cardId.toString()
|
||||
})
|
||||
this.isPointWithinTheArea(this.pointBox,)
|
||||
this.isPointWithinTheArea(this.pointBox, )
|
||||
if (index !== -1) {
|
||||
ninePerLoc[index].x = item.longitude
|
||||
ninePerLoc[index].y = item.latitude
|
||||
|
|
@ -3100,15 +3070,13 @@ export default {
|
|||
// console.info(decodedStr)
|
||||
if (decodedStr) {
|
||||
// const perTrack = JSON.parse(decodedStr)
|
||||
const perTrack = {
|
||||
'msg': '000', 'data': [
|
||||
'8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单',
|
||||
'8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦',
|
||||
'8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖',
|
||||
'8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟',
|
||||
'8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官'
|
||||
]
|
||||
}
|
||||
const perTrack = { 'msg': '000', 'data': [
|
||||
'8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单',
|
||||
'8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦',
|
||||
'8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖',
|
||||
'8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟',
|
||||
'8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官'
|
||||
] }
|
||||
if (perTrack.msg === '000' && perTrack.data && perTrack.data.length > 0) {
|
||||
perTrack.data.forEach(item => {
|
||||
const newPos = item.split(',')
|
||||
|
|
@ -3154,9 +3122,7 @@ export default {
|
|||
|
||||
// Convert binary string to character-number array
|
||||
|
||||
var charData = strData.split('').map(function(x) {
|
||||
return x.charCodeAt(0)
|
||||
})
|
||||
var charData = strData.split('').map(function(x) { return x.charCodeAt(0) })
|
||||
|
||||
// Turn number array into byte-array
|
||||
|
||||
|
|
@ -3273,17 +3239,11 @@ export default {
|
|||
_this.perLocArr.forEach((item, index) => {
|
||||
// 判断是否存在于四色区域内
|
||||
const redFiled = []
|
||||
_this.pointBoxCfd.redList.forEach(item => {
|
||||
redFiled.push(...item['position'])
|
||||
})
|
||||
_this.pointBoxCfd.redList.forEach(item => { redFiled.push(...item['position']) })
|
||||
const orangeFiled = []
|
||||
_this.pointBoxCfd.orangeList.forEach(item => {
|
||||
orangeFiled.push(...item['position'])
|
||||
})
|
||||
_this.pointBoxCfd.orangeList.forEach(item => { orangeFiled.push(...item['position']) })
|
||||
const yellowFiled = []
|
||||
_this.pointBoxCfd.yellowList.forEach(item => {
|
||||
yellowFiled.push(...item['position'])
|
||||
})
|
||||
_this.pointBoxCfd.yellowList.forEach(item => { yellowFiled.push(...item['position']) })
|
||||
if (this.redList.indexOf(item.cardNo) > -1) {
|
||||
_this.$set(_this.perLocArr[index], 'color', 'red')
|
||||
} else if (redFiled !== [] && _this.forEachIsPointInPolygon(_this.pointBoxCfd.redList, item.position.x, item.position.y)) {
|
||||
|
|
@ -3529,7 +3489,7 @@ export default {
|
|||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
width: 100px;
|
||||
height: 30px;
|
||||
height:30px;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
|
@ -3688,7 +3648,7 @@ export default {
|
|||
text-align: center;
|
||||
|
||||
.suspension_img {
|
||||
width: 60px;
|
||||
width:60px;
|
||||
height: 60px;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -3787,22 +3747,19 @@ export default {
|
|||
transform: translateY(0);
|
||||
}
|
||||
}
|
||||
|
||||
.people_trajectory {
|
||||
.people_trajectory{
|
||||
position: absolute;
|
||||
top: -60px;
|
||||
left: 0;
|
||||
width: 400px;
|
||||
padding: 10px;
|
||||
background-image: linear-gradient(to right, rgb(31 62 129 / 57%) 0%, rgb(17 93 255 / 40%) 50%, rgb(31 62 129 / 57%) 100%);
|
||||
|
||||
.search_btn {
|
||||
.search_btn{
|
||||
background-color: #1563e3;
|
||||
color: #fff;
|
||||
border-color: #1563e3;
|
||||
}
|
||||
|
||||
.reset_btn {
|
||||
.reset_btn{
|
||||
background-color: #558be5;
|
||||
color: #fff;
|
||||
border-color: #558be5;
|
||||
|
|
@ -3813,33 +3770,27 @@ export default {
|
|||
.cesium-viewer-toolbar, .cesium-viewer-fullscreenContainer, .cesium-infoBox-visible {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.people_trajectory .el-input__inner {
|
||||
.people_trajectory .el-input__inner{
|
||||
background-color: #100693 !important;
|
||||
border-color: #100693 !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.people_trajectory_select {
|
||||
.people_trajectory_select{
|
||||
background-color: #100693 !important;
|
||||
border-color: #100693 !important;
|
||||
}
|
||||
|
||||
.people_trajectory_select .el-select-dropdown__item {
|
||||
.people_trajectory_select .el-select-dropdown__item{
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.people_trajectory_select .el-select-dropdown__item.hover {
|
||||
.people_trajectory_select .el-select-dropdown__item.hover{
|
||||
background-color: #2111ec !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.people_trajectory_select .popper__arrow {
|
||||
.people_trajectory_select .popper__arrow{
|
||||
border-top-color: #100693 !important;
|
||||
border-bottom-color: #100693 !important;
|
||||
}
|
||||
|
||||
.people_trajectory_select .popper__arrow::after {
|
||||
.people_trajectory_select .popper__arrow::after{
|
||||
border-top-color: #100693 !important;
|
||||
border-bottom-color: #100693 !important;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue