1

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

@@ -40,7 +40,7 @@
 				</div>
 				<div class="carInFrom_content">
 					<div>运行状态：</div>
-					<div class="carInFrom_input">{{realTimeData.status == 0 ? '运行中' : realTimeData.status == 1 ? '空闲' : '暂无状态'}}</div>
+					<div class="carInFrom_input">{{realTimeData.status == 0 ? '空闲' : realTimeData.status == 1 ? '运行中' : '暂无状态'}}</div>
 				</div>
 				<div class="carInFrom_content">
 					<div>运行时长：</div>

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

@@ -18,7 +18,7 @@
 				<span>今日装车次数：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carNum ? carInformationData2.carNum : '无'}}</span>
 			</div>
 			<div>
-				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.status == 0 ? '运行中' : carInformationData2.status == 1 ? '空闲' : '暂无状态'}}</span>
+				<span>运重状态：</span><span style="color: rgb(24,228,240);">{{carInformationData2.status == 0 ? '空闲' : carInformationData2.status == 1 ? '运行中' : '暂无状态'}}</span>
 			</div>
 			<div>
 				<span>运载种类：</span><span style="color: rgb(24,228,240);">{{carInformationData2.carclass ? carInformationData2.carclass : '无'}}</span>

src/views/MLargeScreen/index.vue

@@ -164,12 +164,21 @@ export default {
 							if(res1.code == 200){
 								res1.data.forEach((item,index) => {
 									this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{
-										this.$notify({
-											title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
-											type: 'warning',
-											duration: 10000,
-											dangerouslyUseHTMLString: true,
-										});
+										if(this.carclass == '铲车' && item.type != 3){
+											this.$notify({
+												title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
+												type: 'warning',
+												duration: 10000,
+												dangerouslyUseHTMLString: true,
+											});
+										}else if(this.carclass != '铲车'){
+											this.$notify({
+												title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
+												type: 'warning',
+												duration: 10000,
+												dangerouslyUseHTMLString: true,
+											});
+										}
 									});
 								});
 							}