@@ -168,7 +154,7 @@
@@ -177,25 +163,26 @@
-
+
全部
+ class="multiple-select-li" @click="warningTypeSelected(typeItem.id,typeItem.name)">
{{ typeItem.name }}
-
+
+
@@ -271,16 +258,14 @@
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -719,9 +704,10 @@
触发时间：
{{ screenWarningItem.create_time }}
-
+
事件截图：
![]()
+
![]()
@@ -781,6 +767,7 @@ export default {
screenJob: false,
screenUser: false,
screenRisk: false,
+ speakerPlayStatus:false,
screenWarning: false,
screenUserDetail: false,
warningTypeShow: false,
@@ -810,7 +797,12 @@ export default {
speakerList: [],//喇叭列表
userList: [],//人员列表
deptList: [],//部门列表
- postList: [],//岗位列表
+ postList: [
+ {id:0,name:'全部',label:'全部'},
+ {id:1,name:'正式员工',label:'正式员工'},
+ {id:2,name:'相关方',label:'相关方'},
+ {id:3,name:'访客',label:'访客'},
+ {id:4,name:'司机',label:'司机'}],//岗位列表
dangerList: [],//岗位列表
areaList: [],//区域列表/风险区域列表
areaOperation:[],
@@ -871,6 +863,7 @@ export default {
30:'较大风险',
40:'重大风险'
},
+ eventTypeName:'全部',
}
},
created() {
@@ -956,7 +949,6 @@ export default {
if (type === 'Symbol(boxmarker)') {
let areaId = item.properties.get("areaId");
console.log(areaId);
- debugger;
that.$API.am.area.item.req(areaId).then(res=>{
debugger;
console.log(res);
@@ -1060,7 +1052,7 @@ export default {
this.getGroup();//部门$$
//右上展示数据
this.getDangers();//危险作业$$
- this.getAllPost();//岗位
+ // this.getAllPost();//岗位
this.getWarningTotal();//事件统计
this.getWarningType();//事件类型
let pageHeight = document.getElementsByClassName('screen-cockpit')[0].clientHeight;
@@ -1072,7 +1064,9 @@ export default {
this.areaTableHeight = areaTableHeight;
document.getElementsByClassName('cockpit-info')[0].style.height = domHeight + 'px';
// document.getElementsByClassName('area-info-body')[0].style.height = simpleBodyHeight + 'px';
- setInterval(function () { }, 3000)
+ setInterval(function () {
+
+ }, 300000)
},
methods: {
showTime() {
@@ -1123,8 +1117,10 @@ export default {
that.areaDetail = true;
that.areaDetailId = data.id;
this.getAreaOperation();
- // let points = data.third_info.xx_rail.detail.polygon.points[0];
- window.map.flyToPosition(new jsmap.JSPoint(114.63168864138028, 38.81254802029822, 0), { duration: 1000 });
+ debugger;
+ console.log(data);
+ 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 });
},
//区域下的作业
@@ -1154,41 +1150,81 @@ export default {
//区域下的人员
getAreaBlt(){
let that = this;
- that.$API.third.tdevice.list.req({area:that.areaDetailId,type:30,page:0}).then(res=>{
+ that.$API.third.blt.all.req({area:that.areaDetailId}).then(res=>{
console.log(res)
that.areaUser = res;
})
},
- //岗位
- getAllPost() {
- this.$API.system.post.list.req({ page: 0 }).then(res => {
- let arr = [];
- let children = genTree(res);
- for (let i = 0; i < 4; i++) {
+
+ //加载部门数据
+ getGroup() {
+ let that = this;
+ that.$API.system.dept.list.req({ page: 0 }).then(res => {
+ if (res.err_msg) {
+ } else {
+ let rpartsList=[];
+ let children = genTree(res);
+ for (let i = 0; i < 5; i++) {
let obj = new Object();
if (i === 0) {
- obj.id = '';
+ obj.id = 0;
obj.name = '全部';
obj.label = '全部';
} else if (i === 1) {
- obj.id = '';
+ obj.id = 1;
obj.name = '正式员工';
obj.label = '正式员工';
obj.children = children;
} else if (i === 2) {
- obj.id = '';
+ obj.id = 2;
obj.name = '相关方';
obj.label = '相关方';
+ obj.children = rpartsList;
} else if (i === 3) {
- obj.id = '';
+ obj.id = 3;
obj.name = '访客';
obj.label = '访客';
+ }else if (i === 4) {
+ obj.id = 4;
+ obj.name = '司机';
+ obj.label = '司机';
}
arr.push(obj)
}
- this.postList = arr;
- })
+ that.postList = arr;
+ }
+ });
},
+ //岗位
+ // getAllPost() {
+ // this.$API.system.post.list.req({ page: 0 }).then(res => {
+ // let arr = [];
+ // let children = genTree(res);
+ // for (let i = 0; i < 4; i++) {
+ // let obj = new Object();
+ // if (i === 0) {
+ // obj.id = '';
+ // obj.name = '全部';
+ // obj.label = '全部';
+ // } else if (i === 1) {
+ // obj.id = '';
+ // obj.name = '正式员工';
+ // obj.label = '正式员工';
+ // obj.children = children;
+ // } else if (i === 2) {
+ // obj.id = '';
+ // obj.name = '相关方';
+ // obj.label = '相关方';
+ // } else if (i === 3) {
+ // obj.id = '';
+ // obj.name = '访客';
+ // obj.label = '访客';
+ // }
+ // arr.push(obj)
+ // }
+ // this.postList = arr;
+ // })
+ // },
//人员统计
getManCount() {
let that = this;
@@ -1279,7 +1315,7 @@ export default {
})
},
//警报类型查询
- warningTypeSelected(id) {
+ warningTypeSelected(id,name) {
debugger;
let that = this;
this.warningTypeShow = false;
@@ -1288,8 +1324,7 @@ export default {
if (id !== null) {
params.cates = id;
}
- debugger;
- console.log(params);
+ this.eventTypeName = name;
that.$API.ecm.event.list.req(params).then(res => {
if (res.err_msg) { } else {
that.warningData.list = res.results;
@@ -1298,16 +1333,7 @@ export default {
})
//获取新数据
},
- //加载部门数据
- getGroup() {
- this.$API.system.dept.list.req({ page: 0 }).then(res => {
- if (res.err_msg) {
- } else {
- this.group = genTree(res);
- // console.log(this.group);
- }
- });
- },
+
//选择部门
groupClick(data) {
// console.log(data);
@@ -1566,11 +1592,9 @@ export default {
}else {
userImage = "/img/visitor.png"
}
- debugger;
- console.log(item)
that.userMarker[item.mac] = new jsmap.JSIconTextMarker({
id: item.my_info.code,
- position: { x:1694, y: 257399, z: item.z }, //坐标
+ position: { x:item.longitude, y: item.latitude, z: item.z }, //坐标
floorId: 1, //楼层id,默认为1（地面）
image: userImage,
text: employee_.name,
@@ -1591,10 +1615,8 @@ export default {
employee: employee_
},
});
- debugger;
- console.log(that.userMarker)
that.userMaskerLayer.addMarker(that.userMarker[item.mac]);
- // window.map.flyToPosition(new jsmap.JSPoint(item.x, item.latitude, 0), { duration: 1000 });
+ // window.map.flyToPosition(new jsmap.JSPoint(114.63016059048613, 38.813788495383136, 0), { duration: 1000 });
})
// setInterval(function () {
@@ -1606,12 +1628,13 @@ export default {
// });//动画效果,持续时间一秒
// }, 11000)
}
- /*setInterval(function () {
+ setInterval(function () {
that.refreshUserMarker();
- }, 8500)*/
+ }, 30000)
},
//更新人员标记
refreshUserMarker() {
+ debugger;
let that = this;
that.$API.third.blt.all.req().then(res => {
if (res.err_msg) {
@@ -1625,11 +1648,13 @@ export default {
that.userList = refreshList.concat(addUser);//更新userList
that.showUserMarkers(addUser);//增加新进在线员工
//that.userMaskerLayer.removeMarker(sectorMarker)(addUser);//删除离线员工
- refreshList.forEach(item => {
- that.userMaskerLayer.updateMarkerPosition(that.userMarker[item.id], {
+ refreshList.forEach(item1 => {
+ debugger;
+ console.log(item1)
+ that.userMaskerLayer.updateMarkerPosition(that.userMarker[item1.id], {
floorId: 1,
- position: { x: item.longitude, y: item.latitude, z: item.z },
- animate: { duration: 1000, }
+ position: { x: item1.longitude, y: item1.latitude, z: item1.z },
+ animate: { duration: 10000, }
});//动画效果,持续时间一秒
})
}
@@ -1935,6 +1960,15 @@ export default {
that.showUserSelect = false;
}, 300)
},
+ allWarningView(){
+ this.$router.push('/ecm/event')
+ },
+ speakerPasue(){
+ this.speakerPlayStatus = false;
+ },
+ speakerPlay(){
+ this.speakerPlayStatus = true;
+ },
},
unmounted() {
window.map.destroy();
@@ -3246,6 +3280,10 @@ export default {
background: url(/public/img/b_ring.png) no-repeat;
background-size: 100% 100%;
}
+ .sound-quiet {
+ background: url(/public/img/b_quiet.png) no-repeat;
+ background-size: 100% 100%;
+ }
}
diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue
index f3c976d4..5687b16d 100644
--- a/src/views/ecm/event_handlefrom.vue
+++ b/src/views/ecm/event_handlefrom.vue
@@ -48,64 +48,27 @@