diff --git a/src/style/app.scss b/src/style/app.scss index 6272c690..e0a83eff 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -98,3 +98,5 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo /*定宽页面*/ .sc-page {width: 1230px;margin: 0 auto;} + +.el-dialog__headerbtn { top: 0px;right: 0px;} diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index f613d3ac..3e75961a 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -17,7 +17,7 @@ @@ -108,6 +108,7 @@ + @@ -118,6 +119,11 @@ + + + + + - + - + + + + + @@ -809,6 +814,9 @@ export default { dangerList: [],//岗位列表 areaList: [],//区域列表/风险区域列表 areaOperation:[], + areaVideo:[], + areaSpeaker:[], + areaUser:[], //数据统计 userCount: { total: 0, @@ -822,6 +830,7 @@ export default { screenUserItem: {},//人员信息 screenUserItemDetail: {},//人员信息 url: '', + areaDetailId:'', params: { json: { data: { @@ -1059,7 +1068,7 @@ export default { let height2 = document.getElementsByClassName('cockpit-alarm')[0].clientHeight; let height3 = document.getElementsByClassName('area-simple-title')[0].clientHeight; let domHeight = pageHeight - height1 - height2 - 84; - let areaTableHeight = domHeight - height3 - 10; + let areaTableHeight = domHeight - height3 - 50; this.areaTableHeight = areaTableHeight; document.getElementsByClassName('cockpit-info')[0].style.height = domHeight + 'px'; // document.getElementsByClassName('area-info-body')[0].style.height = simpleBodyHeight + 'px'; @@ -1073,6 +1082,19 @@ export default { }, areaItemHandle(index){ this.areaShowType = index; + if(index==1){ + //区域下的作业 + this.getAreaOperation(); + }else if(index==2){ + //区域下的监控 + this.getAreaVchannel(); + }else if(index==3){ + //区域下的喇叭 + this.getAreaSpeaker(); + }else if(index==4){ + //区域下的人员 + this.getAreaBlt(); + } }, //报警统计 getWarningTotal() { @@ -1099,14 +1121,44 @@ export default { areaRowClick(data) { let that = this; that.areaDetail = true; - this.$API.opm.operation.list.req({area:data.id}).then(res=>{ - console.log(res) - that.areaOperation = res.results; - }) + 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 }); }, + //区域下的作业 + getAreaOperation(){ + let that = this; + this.$API.opm.operation.list.req({area:that.areaDetailId}).then(res=>{ + console.log(res) + that.areaOperation = res.results; + }) + }, + //区域下的监控 + getAreaVchannel(){ + let that = this; + that.$API.third.tdevice.list.req({area:that.areaDetailId,type:60,page:0}).then(res=>{ + console.log(res) + that.areaVideo = res; + }) + }, + //区域下的喇叭 + getAreaSpeaker(){ + let that = this; + that.$API.third.tdevice.list.req({area:that.areaDetailId,type:50,page:0}).then(res=>{ + console.log(res) + that.areaSpeaker = res; + }) + }, + //区域下的人员 + getAreaBlt(){ + let that = this; + that.$API.third.tdevice.list.req({area:that.areaDetailId,type:30,page:0}).then(res=>{ + console.log(res) + that.areaUser = res; + }) + }, //岗位 getAllPost() { this.$API.system.post.list.req({ page: 0 }).then(res => { diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue index 387b67fe..f3c976d4 100644 --- a/src/views/ecm/event_handlefrom.vue +++ b/src/views/ecm/event_handlefrom.vue @@ -8,8 +8,56 @@ > - - + + + + + + {{ item.name }} + + + + {{ mark_options2[form.mark] }} + + + {{ form.create_time }} + + + {{ form.area_.name }} + + + + 作业 + 人员 + 其他 + + + + {{ form.vemployee_.name }} + {{ form.operation_name }} + + + + {{ form.vchannel_.code }}-{{ form.vchannel_.name }} + 未设置 + + + + +
+ + +
+
无抓拍
+ + + + + + +#infoForm .el-form-item--default .el-form-item__label { + width: 150px; + height: 50px; + background: #fafafa; + line-height: 50px; + text-align: center!important; + border: 1px solid #dddddd; +} + \ No newline at end of file