修改

src/axios/api.js

@@ -32,3 +32,4 @@ export const manmadeStatusQuery = '/api/Manmade/status'; //获取调度车辆次
 export const dingDanBiaoCaoZuo = '/api/Order'; //订单表操作
 export const getZhuangCheDingDanQuery = '/api/Order/ZC'; //获取装车订单
 export const getXieCheDingDanQuery = '/api/Order/XC'; //获取卸车订单
+export const getalarmRealQuery = '/api/alarm/real'; //获取车辆设备实时报警

src/views/MLargeScreen/components/carInformation/index.vue

@@ -8,10 +8,6 @@
 					<img src="../../../../assets/images/truckTuPian/fuxiaobiaotititle.png">
 					<span class="carInContent_left_title">车辆信息</span>
 				</div>
-				<div class="carInFrom_content">
-					<div>车辆名称：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.name}}</div>
-				</div>
 				<div class="carInFrom_content">
 					<div>车辆牌号：</div>
 					<div class="carInFrom_input">{{vehicleInformationData.number}}</div>
@@ -30,7 +26,7 @@
 				</div>
 				<div class="carInFrom_content">
 					<div>终端设备号：</div>
-					<div class="carInFrom_input">{{vehicleInformationData.plant}}</div>
+					<div class="carInFrom_input">{{vehicleInformationData.equipmentName}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>运重：</div>
@@ -183,7 +179,7 @@ export default {
 	line-height: 3vh;
 }
 .carInFrom_input{
-	width: 10vw;
+	width: 12vw;
 	border: 2px solid rgb(23,249,250);
 	border-radius: 5px;
 	padding:0px 10px;

src/views/MLargeScreen/index.vue

@@ -81,7 +81,8 @@ import {
 	waitingtrucksQuery,
 	vehicleInformationUpdate,
 	dingDanBiaoCaoZuo,
-	manualSchedulingQuery
+	manualSchedulingQuery,
+	getalarmRealQuery
 } from "@/axios/api.js"
 import startOrderReceiving from './components/startOrderReceiving/index.vue' //接受派单
 import voiceApplication from './components/voiceApplication/index.vue' //语音申请
@@ -128,9 +129,30 @@ export default {
             this.setNowTimes();
         }, 1000)
 		this.zongTimer2 = setInterval(() => {
+			//判断车辆类型
             if(this.carclass == '电铲'){
 				this.loadData1();
 			}
+			//获取报警记录
+			httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
+                if(res.code == 200){
+					if(res.data.totalElements == 0){
+						return
+					}else{
+						httpGet(getalarmRealQuery,{name:res.data.content[0].equipmentName}).then((res1) => {
+							if(res1.code == 200){
+								res1.data.forEach((item,index) => {
+									this.$notify({
+										title: (item.type == 1 ? "闯入" : item.type == 2 ? '闯出' : '') + item.areaName,
+										type: 'warning',
+										duration: 2500
+									});
+								});
+							}
+						});
+					}	
+				}
+            });
         }, 20000)
 	},
 	methods:{