diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue index 129f8fb7..70536f33 100644 --- a/src/views/bigScreen/index.vue +++ b/src/views/bigScreen/index.vue @@ -158,8 +158,8 @@
-
-
+
+
{{item1.voice_msg}}
@@ -1110,7 +1110,7 @@ export default { let height1 = document.getElementsByClassName('cockpit-count')[0].clientHeight; let height2 = document.getElementsByClassName('cockpit-alarm')[0].clientHeight; let height3 = document.getElementsByClassName('area-simple-title')[0].clientHeight; - debugger; + // debugger; let domHeight = pageHeight - height1 - 310 - 84; let areaTableHeight = domHeight - height3 - 50; this.areaTableHeight = areaTableHeight; @@ -1164,8 +1164,8 @@ export default { }, handleChange(item, check,item2,item3) { let that = this; - debugger; - console.log(check) + // debugger; + // console.log(check) this.deptChecked = check.checkedKeys; this.userParams.depts = check.checkedKeys; @@ -1185,14 +1185,14 @@ export default { window.map.addLayer(that.userMaskerLayer); let userListNew = []; that.userList.filter(item=>{ - debugger; - console.log(item); + // debugger; + // console.log(item); if(checkedKeys.indexOf(item.my_info.employee_.belong_dept_)>-1){ - debugger; + // debugger; userListNew.push(item) } }) - debugger; + // debugger; that.userList = userListNew; console.log(that.userList) that.showUserMarkers(userListNew); @@ -1282,9 +1282,9 @@ export default { //报警类型 getWarningType() { let that = this; - that.$API.ecm.event_cate.list.req().then(res => { + that.$API.ecm.event_cate.list.req({page:0}).then(res => { if (res.err_msg) { } else { - that.warningTypes = res.results; + that.warningTypes = res; } }) }, @@ -1435,8 +1435,7 @@ export default { getAreaBlt(){ let that = this; that.$API.third.blt.all.req({area:that.areaDetailId}).then(res=>{ - debugger; - console.log(res) + //console.log(res) that.areaUser = res.filter(item=>{ return item.my_info.employee; }); @@ -1600,17 +1599,13 @@ export default { //选择部门 groupClick(data) { - debugger; console.log(data); - debugger; }, checkChange(data1,data2,data3,data4){ - debugger; console.log(data1); console.log(data2); console.log(data3); console.log(data4); - debugger; }, //获取人员详细信息 showUserDetail() { @@ -1835,7 +1830,7 @@ export default { }, //人员 showUserMarkers(userList) { - debugger; + // debugger; let that = this; //标记图片 let userImage = ''; @@ -2192,7 +2187,7 @@ export default { //员工列表点击 userRowClick(row) { let that = this; - debugger; + // debugger; window.map.flyToMarker(that.userMarker[row.mac], { duration: 1000,range: 200 }) @@ -3977,4 +3972,17 @@ export default { position: fixed; opacity: 0; } +#eventScrenWrap{ + height:50px; + width: calc(100% - 50px); + overflow:hidden; + padding-left: 20px; + position: relative; +} +#eventScrenItem{ + line-height: 50px; + font-size: 20px; + color: cyan; + position: absolute; +}