littleChange

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;}

src/views/am/area_form.vue

@@ -17,7 +17,7 @@
 					<el-form-item label="区域名称" prop="name">
 						<el-input
 							v-model="form.name"
-							placeholder="请输入真实姓名"
+							placeholder="请输入区域名称"
 							clearable
 						></el-input>
 					</el-form-item>
@@ -108,6 +108,7 @@
 						<el-switch v-model="visitor_yes"/>
 					</el-form-item>
 				</el-col>
+
 				<el-col :md="12" :sm="24">
 					<el-form-item label="准许相关方人员">
 						<el-switch v-model="remployee_yes"/>
@@ -118,6 +119,11 @@
 						<el-switch v-model="employee_yes"/>
 					</el-form-item>
 				</el-col>
+				<el-col  :md="12" :sm="24">
+					<el-form-item label="准许货车司机">
+						<el-switch v-model="driver_yes"/>
+					</el-form-item>
+				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
@@ -184,6 +190,7 @@
 				visitor_yes: false,
 				remployee_yes: false,
 				employee_yes: false,
+				driver_yes:false,
 				group: [],
 				postOptions: [],
 				selectionFilters: [],
@@ -220,6 +227,7 @@
 						if (this.employee_yes){arr.push('employee')}
 						if (this.remployee_yes){arr.push('remployee')}
 						if (this.visitor_yes){arr.push('visitor')}
+						if (this.driver_yes){arr.push('driver')}
 						this.form.access_list = arr;
 							this.isSaveing = true;
 						if (this.mode === "add") {
@@ -267,6 +275,9 @@
 				if (data.access_list.indexOf('visitor')>-1) {
 					this.visitor_yes = true;
 				}
+				if (data.access_list.indexOf('driver')>-1) {
+					this.driver_yes = true;
+				}
 			},
 		},
 	};

src/views/bigScreen/index.vue

@@ -257,6 +257,7 @@
 							<div @click="areaItemHandle(1)" :class="{'areaActive':areaShowType==1,'areaNavItem':1}" style="color:#ffffff">作业</div>
 							<div @click="areaItemHandle(2)" :class="{'areaActive':areaShowType==2,'areaNavItem':1}" style="color:#ffffff">监控</div>
 							<div @click="areaItemHandle(3)" :class="{'areaActive':areaShowType==3,'areaNavItem':1}" style="color:#ffffff">喇叭</div>
+							<div @click="areaItemHandle(4)" :class="{'areaActive':areaShowType==4,'areaNavItem':1}" style="color:#ffffff">人员</div>
 						</div>
 						<div class="content-body">
 							<el-table class="bigScreenTable" v-if="areaShowType==1" :data="areaOperation" :height="300">
@@ -269,18 +270,22 @@
 									</template>
 								</el-table-column>
 							</el-table>
-							<el-table class="bigScreenTable" v-if="areaShowType==2">
+							<el-table class="bigScreenTable" :data="areaVideo" v-if="areaShowType==2">
 								<el-table-column label="设备编号"></el-table-column>
 								<el-table-column label="通道名称"></el-table-column>
 								<el-table-column label="类型"></el-table-column>
 								<el-table-column label="是否在线"></el-table-column>
 							</el-table>
-							<el-table class="bigScreenTable" v-if="areaShowType==3">
+							<el-table class="bigScreenTable" :data="areaSpeaker" v-if="areaShowType==3">
 								<el-table-column label="喇叭名称"></el-table-column>
 								<el-table-column label="喇叭音量"></el-table-column>
 								<el-table-column label="ip"></el-table-column>
 								<el-table-column label="在线状态"></el-table-column>
 							</el-table>
+							<el-table class="bigScreenTable" :data="areaUser" v-if="areaShowType==4">
+								<el-table-column label="人员姓名"></el-table-column>
+								<el-table-column label="定位卡号"></el-table-column>
+							</el-table>
 						</div>
 					</div>
 				</div>
@@ -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=>{
+			that.areaDetailId = data.id;
-				console.log(res)
+			this.getAreaOperation();
-				that.areaOperation = res.results;
-			})
 			// 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 => {

src/views/ecm/event_handlefrom.vue

@@ -8,8 +8,56 @@
   >
   <el-container v-loading="loading">
     <el-main>
-      <el-card>
+      <el-card header="事件信息">
-        <el-descriptions title="事件信息" :border="true" :column="24">
+        <el-form id="infoForm" label-width="100px">
+          <el-row>
+            <el-col :span='10'>
+              <el-form-item label="事件种类：">
+                <el-tag
+                  v-for="item in form.cates_"
+                  :key="item.id"
+                  type="warning"
+                  >{{ item.name }}</el-tag>
+              </el-form-item>
+            </el-col>
+           <el-col :span="7">
+            <el-form-item label="事件标记："><span>{{ mark_options2[form.mark] }}</span></el-form-item>
+           </el-col>
+           <el-col :span="7">
+            <el-form-item label="发生时间："><span>{{ form.create_time }}</span></el-form-item>
+           </el-col>
+           <el-col :span="10">
+            <el-form-item label="发生区域："><span v-if="form.area_">{{ form.area_.name }}</span></el-form-item>
+           </el-col>
+           <el-col :span="7">
+            <el-form-item label="事件对象：">
+              <span v-if="form.obj_cate=='opl'">作业</span>
+              <span v-else-if="form.obj_cate=='people'">人员</span>
+              <span v-else>其他</span>
+            </el-form-item>
+           </el-col>
+           <el-col :span="7">
+            <el-form-item v-if="form.obj_cate=='people'" label="触发人："><span v-if="form.vemployee_">{{ form.vemployee_.name }}</span></el-form-item>
+            <el-form-item v-if="form.obj_cate=='opl'" label="触发作业："><span>{{ form.operation_name }}</span></el-form-item>
+           </el-col>
+           <el-col :span="10">
+            <el-form-item label="抓拍设备：">
+              <span v-if="form.vchannel"> {{ form.vchannel_.code }}-{{ form.vchannel_.name }}</span>
+              <span v-else> 未设置</span>
+            </el-form-item>
+           </el-col>
+            <el-col :span="14">
+              <el-form-item label="抓拍图片：">
+              <div style="display: flex" v-if="form.global_img!=null">
+                <img :src="form.global_img" style="margin-right: 8px;height: 146px;flex: 1;">
+                <img :src="form.face_img" style="margin-right: 8px;height: 146px;">
+            </div>
+            <div v-else>无抓拍</div>
+            </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <!-- <el-descriptions title="事件信息" :border="true" :column="24">
           <el-descriptions-item label="事件种类" :span="8"
             ><el-tag
               v-for="item in form.cates_"
@@ -57,8 +105,9 @@
               ></sc-upload>
             </div>
           </el-descriptions-item>
-        </el-descriptions>
+        </el-descriptions> -->
       </el-card>
+
       <el-card v-if="form.handle_user" style="margin-top: 8px">
         <el-descriptions title="事件处理" :border="true">
           <el-descriptions-item label="事件标记"
@@ -274,4 +323,12 @@ export default {
 .box-card {
   width: 100%;
 }
-</style>
+#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;
+}
+</style>