zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0707

This commit is contained in:
shijing 2022-07-07 18:56:48 +08:00
parent 459636e5b0
commit 25e0cb4b13
2 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/am/vchannel_view.vue
View File

@ -1,8 +1,10 @@
<template> <template>
<el-drawer <el-drawer
id="mapDrawer"
:title="channelName+'位置标记'" :title="channelName+'位置标记'"
v-model="visible" v-model="visible"
destroy-on-close destroy-on-close
:size="'80%'"
@closed="closeDrawer" @closed="closeDrawer"
> >
<el-form <el-form
@ -194,15 +196,11 @@
submit() { submit() {
let that = this; let that = this;
let item = this.form.location; let item = this.form.location;
/*let item = this.form.location; console.log(this.form.location);
let tool = new jsmap.JSMapCoordTool(window.map);
let coordinate = {x:item[0],y:item[1],z:item.z};
let pixel = tool.mapToScreenCoordinate(coordinate);
that.form.location = pixel;*/
that.form.code = that.channelCode; that.form.code = that.channelCode;
that.form.type = that.channelType; that.form.type = that.channelType;
that.form.name = that.channelName; that.form.name = that.channelName;
that.form.location = {x:item[0],y:item[1],z:item.z}; that.form.location = {x:item[0],y:item[1],z:item[2]};
that.$API.am.tdevice.labelLocation.req(that.form) that.$API.am.tdevice.labelLocation.req(that.form)
.then(res => { .then(res => {
that.isSaveing = false; that.isSaveing = false;
@ -219,6 +217,8 @@
}; };
</script> </script>
<style> <style scoped>
.el-drawer.open{
width: 70%!important;
}
</style> </style>

91
src/views/bigScreen/index.vue
View File

@ -952,7 +952,6 @@
this.polygonMarkerLayers();//危险作业 this.polygonMarkerLayers();//危险作业
this.speakersMaskerLayers();//喇叭 this.speakersMaskerLayers();//喇叭
this.jobDomMarkerLayers();//危险作业图片 this.jobDomMarkerLayers();//危险作业图片
// let compassControl = new jsmap.JSMapGestureController(map);
let compassControl = new jsmap.JSCompassControl({ let compassControl = new jsmap.JSCompassControl({
position: jsmap.JSControlPosition.LEFT_TOP, position: jsmap.JSControlPosition.LEFT_TOP,
offset: { offset: {
@ -1076,7 +1075,7 @@
this.getAreas();//区域/风险区域$$ this.getAreas();//区域/风险区域$$
this.getGroup();//部门$$ this.getGroup();//部门$$
//右上展示数据 //右上展示数据
this.getVchannels();//摄像头$$ // this.getVchannels();//摄像头$$
this.getDangers();//危险作业$$ this.getDangers();//危险作业$$
// this.getRisks();//风险区域$$ // this.getRisks();//风险区域$$
this.getSpeakers();//喇叭$$ this.getSpeakers();//喇叭$$
@ -1121,7 +1120,7 @@
arr.push(obj) arr.push(obj)
} }
this.postList =arr; this.postList =arr;
console.log(arr) // console.log(arr)
}) })
}, },
//人员统计 //人员统计
@ -1188,7 +1187,7 @@
this.userList = res.filter(item => { this.userList = res.filter(item => {
return item.my_info.employee return item.my_info.employee
}); });
console.log(this.userList) // console.log(this.userList)
} }
}) })
}, },
@ -1219,19 +1218,19 @@
if (res.err_msg) { if (res.err_msg) {
} else { } else {
this.group = genTree(res); this.group = genTree(res);
console.log(this.group); // console.log(this.group);
} }
}); });
}, },
//选择部门 //选择部门
groupClick(data) { groupClick(data) {
console.log(data); // console.log(data);
}, },
//获取人员详细信息 //获取人员详细信息
showUserDetail() { showUserDetail() {
this.screenUserDetail = true; this.screenUserDetail = true;
this.$API.hrm.employee.item.req(this.screenUserItem.id).then(res=>{ this.$API.hrm.employee.item.req(this.screenUserItem.id).then(res=>{
console.log(res); // console.log(res);
this.screenUserItemDetail = res; this.screenUserItemDetail = res;
}) })
}, },
@ -1249,70 +1248,79 @@
}, },
//风险区域layer //风险区域layer
riskMaskerLayers() { riskMaskerLayers() {
this.riskMarkerLayer = new jsmap.JSBoxMarkerLayer({ let that = this;
that.riskMarkerLayer = new jsmap.JSBoxMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.riskMarkerLayer); window.map.addLayer(that.riskMarkerLayer);
this.showRiskMarkers(); that.showRiskMarkers();
}, },
//摄像头layer //摄像头layer
cameraMaskerLayers() {//图标文字 cameraMaskerLayers() {//图标文字
this.cameraMaskerLayer = new jsmap.JSIconTextMarkerLayer({ let that = this;
that.cameraMaskerLayer = new jsmap.JSIconTextMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.cameraMaskerLayer); window.map.addLayer(that.cameraMaskerLayer);
this.showCameraMarkers(); debugger;
console.log(that.cameraMaskerLayer);
that.getVchannels();
}, },
//监控视频播放 //监控视频播放
domMarkerLayers() { domMarkerLayers() {
this.domMarkerLayer = new jsmap.JSDomMarkerLayer({ let that = this;
that.domMarkerLayer = new jsmap.JSDomMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: true show: true
}); });
window.map.addLayer(this.domMarkerLayer); window.map.addLayer(that.domMarkerLayer);
}, },
jobDomMarkerLayers() { jobDomMarkerLayers() {
this.jobDomMarkerLayer = new jsmap.JSDomMarkerLayer({ let that = this;
that.jobDomMarkerLayer = new jsmap.JSDomMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.jobDomMarkerLayer); window.map.addLayer(that.jobDomMarkerLayer);
this.showJobDomMarkers(); that.showJobDomMarkers();
}, },
//员工标记layer //员工标记layer
userMaskerLayers() {//图标文字 userMaskerLayers() {//图标文字
this.userMaskerLayer = new jsmap.JSIconTextMarkerLayer({ let that = this;
that.userMaskerLayer = new jsmap.JSIconTextMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.userMaskerLayer); window.map.addLayer(that.userMaskerLayer);
}, },
//喇叭layer //喇叭layer
speakersMaskerLayers() {//消防物资 speakersMaskerLayers() {//消防物资
this.materialsMaskerLayer = new jsmap.JSIconTextMarkerLayer({ let that = this;
that.materialsMaskerLayer = new jsmap.JSIconTextMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.materialsMaskerLayer); window.map.addLayer(that.materialsMaskerLayer);
this.showSpeakersMarkers(); this.showSpeakersMarkers();
}, },
//危险作业Layer //危险作业Layer
polygonMarkerLayers() {//危险作业 polygonMarkerLayers() {//危险作业
this.polygonMaskerLayer = new jsmap.JSPolygonMarkerLayer({ let that = this;
that.polygonMaskerLayer = new jsmap.JSPolygonMarkerLayer({
minimumLevel: 3, minimumLevel: 3,
maxmumLevel: 22, maxmumLevel: 22,
show: false show: false
}); });
window.map.addLayer(this.polygonMaskerLayer); window.map.addLayer(that.polygonMaskerLayer);
this.showPolygonMarkers(); that.showPolygonMarkers();
}, },
//风险区域 //风险区域
showRiskMarkers() { showRiskMarkers() {
@ -1382,14 +1390,14 @@
this.pointMarkerLayer.addMarker(pointMarker); this.pointMarkerLayer.addMarker(pointMarker);
},*/ },*/
//摄像头 //摄像头
showCameraMarkers() { showCameraMarkers(list) {
let that = this; let that = this;
let iconTextMarker = null; list.forEach(item => {
that.Vchannels.forEach(item => { let cameraMarker = null;
let pixel = item.my_info.location; let pixel = item.my_info.location;
iconTextMarker = new jsmap.JSIconTextMarker({ cameraMarker = new jsmap.JSIconTextMarker({
id: item.channelCode, id: item.channelCode,
position: {x: pixel[0], y: pixel[1], z: pixel[2]}, //坐标 position: {x: pixel.x, y: pixel.y, z: pixel.z}, //坐标
floorId: 1, //楼层id,默认为1（地面） floorId: 1, //楼层id,默认为1（地面）
image: "/img/camera.svg", image: "/img/camera.svg",
text: '摄像头', text: '摄像头',
@ -1406,20 +1414,18 @@
displayCondition: new jsmap.JSDisplayCondition(0.0, 1000), displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1), nearFarScale: new jsmap.JSNearFarScale(0.0, 1, 500, 1),
show: true, show: true,
callback: (marker) => { callback: () => {
// iconTextMarker.jump();标注跳动
console.log(marker);
} }
}); });
that.cameraMaskerLayer.addMarker(iconTextMarker); debugger;
console.log(that.cameraMaskerLayer);
that.cameraMaskerLayer.addMarker(cameraMarker);
}) })
}, },
//人员 //人员
showUserMarkers() { showUserMarkers() {
let that = this; let that = this;
let iconTextMarker = null,iconTextMarker1 = null; let iconTextMarker = null;
debugger;
if(that.userList.length>0){ if(that.userList.length>0){
let employee_ = that.userList[0].my_info.employee_; let employee_ = that.userList[0].my_info.employee_;
iconTextMarker = new jsmap.JSIconTextMarker({ iconTextMarker = new jsmap.JSIconTextMarker({
@ -1448,6 +1454,7 @@
return employee_ return employee_
} }
}); });
that.userMaskerLayer.addMarker(iconTextMarker); that.userMaskerLayer.addMarker(iconTextMarker);
setTimeout(function () { setTimeout(function () {
console.log(that.userMaskerLayer); console.log(that.userMaskerLayer);
@ -1457,14 +1464,14 @@
animate: true animate: true
});//动画效果,持续时间一秒 });//动画效果,持续时间一秒
},3000); },3000);
/*setTimeout(function () { setTimeout(function () {
console.log(that.userMaskerLayer); console.log(that.userMaskerLayer);
that.userMaskerLayer.updateMarkerPosition(iconTextMarker,{ that.userMaskerLayer.updateMarkerPosition(iconTextMarker,{
floorId:1, floorId:1,
position: {x:114.6315404372349, y: 38.813557855009435, z:0}, position: {x:114.6315404372349, y: 38.813557855009435, z:0},
animate: true animate: true
});//动画效果,持续时间一秒 });//动画效果,持续时间一秒
},6000);*/ },6000);
debugger; debugger;
/*let employee_1 = that.userList[1].my_info.employee_; /*let employee_1 = that.userList[1].my_info.employee_;
iconTextMarker1 = new jsmap.JSIconTextMarker({ iconTextMarker1 = new jsmap.JSIconTextMarker({
@ -1747,11 +1754,13 @@
}, },
//获取摄像头列表 //获取摄像头列表
getVchannels() { getVchannels() {
this.$API.am.video.list.req(this.params).then(res => { let that = this;
this.$API.am.video.list.req(that.params).then(res => {
if (res.err_msg) { if (res.err_msg) {
this.$message.error(res.err_msg); this.$message.error(res.err_msg);
} else { } else {
this.Vchannels = res.pageData; that.Vchannels = res.pageData;
that.showCameraMarkers(res.pageData);
} }
}); });
}, },