bugFix
This commit is contained in:
parent
32ea2d42b7
commit
3696aa6725
|
|
@ -7,8 +7,8 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
|
|||
# 接口地址
|
||||
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
|
||||
#VUE_APP_WS_API = 'ws://localhost:8000'
|
||||
#VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
|
||||
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
|
||||
VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
|
||||
#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
|
||||
#VUE_APP_BASEURL = http://127.0.0.1:8000
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="screen-per-list">
|
||||
<el-table :data="userList" style="width: 100%" :row-key="row => { return row.id }"
|
||||
<el-table :data="userList" style="width: 100%" :row-key="row => { return row.id }"
|
||||
highlight-current-row class="bigScreenTable" @row-click="userRowClick">
|
||||
<el-table-column label="姓名">
|
||||
<template #default="scope">
|
||||
|
|
@ -892,6 +892,7 @@ export default {
|
|||
audioSrc:'',
|
||||
audioIndex:0,
|
||||
audioList:{},
|
||||
employeeScroll:0,
|
||||
|
||||
}
|
||||
},
|
||||
|
|
@ -1059,7 +1060,8 @@ export default {
|
|||
that.screenUser = true;
|
||||
// debugger;
|
||||
window.map.flyToMarker(that.userMarker[that.screenUserItem.mac], {
|
||||
duration: 1000
|
||||
duration: 1000,
|
||||
range: 200
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1103,20 +1105,43 @@ export default {
|
|||
this.timerTime = null;
|
||||
this.eventTimer = null;
|
||||
this.eventAudioTimer = null;
|
||||
window.map.destroy();
|
||||
// window.map.destroy();
|
||||
clearInterval(this.timerUser)//人员
|
||||
clearInterval(this.timerTime)//时间
|
||||
clearInterval(this.eventTimer)//时间
|
||||
clearInterval(this.eventAudioTimer)//事件
|
||||
},
|
||||
methods: {
|
||||
handleChange(item, check) {
|
||||
debugger;
|
||||
console.log(check);
|
||||
handleChange(item, check,item2,item3) {
|
||||
// debugger;
|
||||
// let that = this;
|
||||
// console.log(item);
|
||||
// console.log(check);
|
||||
// console.log(item2);
|
||||
// console.log(item3);
|
||||
this.deptChecked = check.checkedKeys;
|
||||
this.userParams.depts = check.checkedKeys;
|
||||
let obj = {};
|
||||
obj.depts = check.checkedKeys;
|
||||
that.$API.third.blt.all.req(obj).then(res => {
|
||||
debugger;
|
||||
console.log('selectedUser:'+res)
|
||||
})
|
||||
this.refreshUserMarker();
|
||||
},
|
||||
//人员类型选择
|
||||
userFilter() {
|
||||
let that = this;
|
||||
this.showUserSelect = false;
|
||||
this.screenUser = true;
|
||||
// that.screenUserItem.name = this.userList[0].my_info.employee_.name;
|
||||
// that.screenUserItem.type = this.userList[0].my_info.employee_.type;
|
||||
// that.screenUserItem.id = this.userList[0].my_info.employee_.id;
|
||||
// that.screenUserItem.photo = this.userList[0].my_info.employee_.photo ? this.userList[0].my_info.employee_.photo : '';
|
||||
// that.screenUserItem.post_name = this.userList[0].my_info.employee_.post_name ? this.userList[0].my_info.employee_.post_name : '';
|
||||
// that.screenUserItem.belong_dept_name = this.userList[0].my_info.employee_.belong_dept_name ? this.userList[0].my_info.employee_.belong_dept_name : '';
|
||||
|
||||
},
|
||||
audioFinished(){
|
||||
if(this.audioIndex<this.audioList.length){
|
||||
this.audioIndex++;
|
||||
|
|
@ -1189,7 +1214,7 @@ export default {
|
|||
that.audioSrc=item.voice_f;
|
||||
// that.music.play();//播放
|
||||
if(item.location){
|
||||
window.map.flyToPosition(new jsmap.JSPoint(item.location.longitude, item.location.latitude), { duration: 1000 });
|
||||
window.map.flyToPosition(new jsmap.JSPoint(item.location.longitude, item.location.latitude), { range: 200,duration: 1000 });
|
||||
}
|
||||
}
|
||||
}else{
|
||||
|
|
@ -1252,7 +1277,7 @@ export default {
|
|||
that.areaDetailId = data.id;
|
||||
this.getAreaOperation();
|
||||
let points = data.third_info.xx_rail.detail.polygon.points[0];
|
||||
window.map.flyToPosition(new jsmap.JSPoint(points.x, points.y, points.z), { duration: 1000 });
|
||||
window.map.flyToPosition(new jsmap.JSPoint(points.x, points.y, points.z), { range: 200,duration: 1000 });
|
||||
},
|
||||
//区域下的作业
|
||||
getAreaOperation(){
|
||||
|
|
@ -1445,19 +1470,7 @@ export default {
|
|||
this.screenUserItemDetail = res;
|
||||
})
|
||||
},
|
||||
//人员类型选择
|
||||
userFilter() {
|
||||
let that = this;
|
||||
this.showUserSelect = false;
|
||||
this.screenUser = true;
|
||||
// that.screenUserItem.name = this.userList[0].my_info.employee_.name;
|
||||
// that.screenUserItem.type = this.userList[0].my_info.employee_.type;
|
||||
// that.screenUserItem.id = this.userList[0].my_info.employee_.id;
|
||||
// that.screenUserItem.photo = this.userList[0].my_info.employee_.photo ? this.userList[0].my_info.employee_.photo : '';
|
||||
// that.screenUserItem.post_name = this.userList[0].my_info.employee_.post_name ? this.userList[0].my_info.employee_.post_name : '';
|
||||
// that.screenUserItem.belong_dept_name = this.userList[0].my_info.employee_.belong_dept_name ? this.userList[0].my_info.employee_.belong_dept_name : '';
|
||||
|
||||
},
|
||||
//风险区域layer
|
||||
riskMaskerLayers() {
|
||||
let that = this;
|
||||
|
|
@ -1556,9 +1569,11 @@ export default {
|
|||
if (item.third_info.xx_rail!==null&&item.third_info.xx_rail!==undefined) {
|
||||
floorId = item.third_info.xx_rail.detail.floorId;
|
||||
let points = item.third_info.xx_rail.detail.polygon.points;
|
||||
// debugger;
|
||||
pointsList = points.map(item => {
|
||||
let obj = item;
|
||||
obj.z = 0;
|
||||
obj.x=item.longitude;
|
||||
obj.y=item.latitude;
|
||||
return obj
|
||||
});
|
||||
let areaId = item.id;
|
||||
|
|
@ -2024,6 +2039,10 @@ export default {
|
|||
//员工列表点击
|
||||
userRowClick(row) {
|
||||
let that = this;
|
||||
debugger;
|
||||
window.map.flyToMarker(that.userMarker[row.mac], {
|
||||
duration: 1000,range: 200
|
||||
})
|
||||
that.screenUserItem.name = row.my_info.employee_.name;
|
||||
that.screenUserItem.type = row.my_info.employee_.type;
|
||||
that.screenUserItem.id = row.my_info.employee_.id;
|
||||
|
|
@ -2035,7 +2054,7 @@ export default {
|
|||
userTrack() {
|
||||
this.tracking = true;
|
||||
window.map.trackMarker(this.userMarker[this.screenUserItem.mac], {
|
||||
range: 150
|
||||
range: 200
|
||||
})
|
||||
},
|
||||
//取消人员追踪
|
||||
|
|
@ -2108,13 +2127,13 @@ export default {
|
|||
modelAnimate: {
|
||||
multiplier: 2,
|
||||
},
|
||||
scale: 0.8,
|
||||
scale: 1,
|
||||
properties: {
|
||||
name: 'trackMarker'
|
||||
},
|
||||
callback: (marker) => {
|
||||
window.map.trackMarker(marker, {
|
||||
range: 40,
|
||||
range: 100,
|
||||
tilt: 60,
|
||||
rotate: 310
|
||||
});
|
||||
|
|
@ -2141,6 +2160,7 @@ export default {
|
|||
})
|
||||
},
|
||||
userLineTrackCancel(){
|
||||
window.location.reload();
|
||||
let that = this;
|
||||
that.lineTracking = false;
|
||||
that.userMaskerLayer.show = true;
|
||||
|
|
@ -2691,7 +2711,8 @@ export default {
|
|||
right: 18px;
|
||||
z-index: 1;
|
||||
transition: all .5s linear;
|
||||
|
||||
overflow-y: scroll;
|
||||
max-height: 80vh;
|
||||
.job-content {
|
||||
height: calc(100% - 44px);
|
||||
overflow-y: auto;
|
||||
|
|
|
|||
|
|
@ -88,7 +88,8 @@
|
|||
expandTrigger: 'hover', // 次级菜单的展开方式
|
||||
label: 'label', //
|
||||
value: 'value', //
|
||||
emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
|
||||
emitPath: false,
|
||||
checkStrictly: true
|
||||
}"
|
||||
clearable
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@
|
|||
label: 'label', //
|
||||
value: 'value', //
|
||||
emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
|
||||
checkStrictly: true
|
||||
}"
|
||||
clearable
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -284,6 +284,7 @@
|
|||
<el-select
|
||||
v-model="formworker.remployee"
|
||||
@change="selectWorker"
|
||||
filterable
|
||||
placeholder="选择项目人员"
|
||||
>
|
||||
<el-option
|
||||
|
|
|
|||
Loading…
Reference in New Issue