Commit c7dd1160 authored by xxx's avatar xxx

修改

parent 5fcbfd4c
<template> <template>
<div class="mianViews"> <div class="mianViews">
<div class="topViews"> <div class="topViews">
<div class="topTitle">矿山卡车调度系统</div> <div class="topTitle">{{systemTitle}}</div>
<div class="topcontent"> <div class="topcontent">
<div style="margin-right: 20px;">{{currentTime}}</div> <div style="margin-right: 20px;">{{currentTime}}</div>
<ElectricQuantity style=" width: 75px;height: 30px;" :proIsCharge="IsCharge" :proQuantity="batteryEnegy"></ElectricQuantity> <ElectricQuantity style=" width: 75px;height: 30px;" :proIsCharge="IsCharge" :proQuantity="batteryEnegy"></ElectricQuantity>
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
//地图图片 //地图图片
configUrl: basePathUrl + 'config/config.json', configUrl: basePathUrl + 'config/config.json',
notifyPromise:Promise.resolve(), notifyPromise:Promise.resolve(),
systemTitle:'矿山卡车调度系统卡车终端',
orderReceiving:'开始接单', orderReceiving:'开始接单',
carName:'4001', carName:'4001',
personalName:'李三', personalName:'李三',
...@@ -163,7 +164,7 @@ export default { ...@@ -163,7 +164,7 @@ export default {
res1.data.forEach((item,index) => { res1.data.forEach((item,index) => {
this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{ this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{
this.$notify({ this.$notify({
title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : item.type == 3 ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警', title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
type: 'warning', type: 'warning',
duration: 10000, duration: 10000,
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
...@@ -196,10 +197,10 @@ export default { ...@@ -196,10 +197,10 @@ export default {
if(res.data.totalElements == 0){ if(res.data.totalElements == 0){
return return
}else{ }else{
//this.$refs.mars3dViewerMapMethod.getCarInforFn(this.carnumber,res.data.content[0].equipmentName);
this.carclass = res.data.content[0].carclass; this.carclass = res.data.content[0].carclass;
if(this.carclass == '铲车'){ if(this.carclass == '铲车'){
this.loadData1(); this.loadData1();
this.systemTitle = '矿山卡车调度系统铲车终端';
}else{ }else{
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment