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

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
caoqianming 2022-10-27 16:48:51 +08:00
parent d721ccb890 b86083b3de
commit bdb1c3a014
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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