Commit c65cfa55 authored by caicaicai's avatar caicaicai

修改

parent ff4b80f5
...@@ -2,10 +2,10 @@ ENV = 'development' ...@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000' #VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.0.110:8001' VUE_APP_BASE_API = 'http://8.143.203.103:9090'
VUE_APP_WS_API = 'ws://192.168.0.111:9090/webSocket' VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket'
VUE_APP_LOCAL_API = 'http://192.168.0.110:8001' VUE_APP_LOCAL_API = 'http://8.143.203.103:9090'
VUE_APP_LOCAL_API2 = 'http://192.168.0.110:8001' VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9090'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<div class="carManScrView_rightView_content"> <div class="carManScrView_rightView_content">
<div class="carDynamicTitleStyle"> <div class="carDynamicTitleStyle">
<img src="../../../../assets/images/cutGraph/huoche11.png" height="28"> <img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
<div>KK35125</div> <div>{{truckDynamicListData.number}}</div>
</div> </div>
<div class="truckDynamicContent1"> <div class="truckDynamicContent1">
<div class="truckDynamicRateStyle"> <div class="truckDynamicRateStyle">
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<div class="carManScrView_rightView_content"> <div class="carManScrView_rightView_content">
<div class="carDynamicTitleStyle"> <div class="carDynamicTitleStyle">
<img src="../../../../assets/images/cutGraph/huoche11.png" height="28"> <img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
<div>KK35125</div> <div>{{forkliftkDynamicListData.number}}</div>
</div> </div>
<div class="ForkliftDynamicContent1"> <div class="ForkliftDynamicContent1">
<div> <div>
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
<div class="carManScrView_rightView_content"> <div class="carManScrView_rightView_content">
<div class="carDynamicTitleStyle"> <div class="carDynamicTitleStyle">
<img src="../../../../assets/images/cutGraph/huoche11.png" height="28"> <img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
<div>KK35125</div> <div>{{otherCarDynamicListData.number}}</div>
</div> </div>
<div class="otherCarDynamicContent1"> <div class="otherCarDynamicContent1">
<div> <div>
...@@ -265,6 +265,7 @@ export default { ...@@ -265,6 +265,7 @@ export default {
data() { data() {
return { return {
whetherShow:false, whetherShow:false,
carDongTaiQieHuanTimer:null,
//时间 //时间
currentTime:{ currentTime:{
day:'', day:'',
...@@ -294,6 +295,9 @@ export default { ...@@ -294,6 +295,9 @@ export default {
}, },
//卡车动态 //卡车动态
truckDynamicListData:{ truckDynamicListData:{
data:[],
num2:0,
number:'',
rate:28, rate:28,
carry:4210, carry:4210,
workTime:13, workTime:13,
...@@ -305,6 +309,9 @@ export default { ...@@ -305,6 +309,9 @@ export default {
}, },
//电铲动态 //电铲动态
forkliftkDynamicListData:{ forkliftkDynamicListData:{
data:[],
num2:0,
number:'',
rate:28, rate:28,
workTime:13, workTime:13,
mileage:135, mileage:135,
...@@ -315,6 +322,9 @@ export default { ...@@ -315,6 +322,9 @@ export default {
}, },
//其他车动态 //其他车动态
otherCarDynamicListData:{ otherCarDynamicListData:{
data:[],
num2:0,
number:'',
rate:28, rate:28,
workTime:13, workTime:13,
mileage:135, mileage:135,
...@@ -421,8 +431,37 @@ export default { ...@@ -421,8 +431,37 @@ export default {
} }
}) })
}) })
//卡车动态 //获取车辆信息
HttpReq.truckDispatching.carInformationQuery({size:9999}).then((res) => {
let arr1 = [];
let arr2 = [];
let arr3 = [];
if(res.code == 200){
res.data.content.forEach((item,index)=>{
if(item.carclass == '卡车'){
arr1.push(item);
}else if(item.carclass == '电铲'){
arr2.push(item);
}else{
arr3.push(item);
}
})
}
this.truckDynamicListData.data = arr1;
this.truckDynamicListData.num2 = 0;
this.forkliftkDynamicListData.data = arr2;
this.forkliftkDynamicListData.num2 = 0;
this.otherCarDynamicListData.data = arr3;
this.otherCarDynamicListData.num2 = 0;
this.kachedongtai();
this.dianchandongtai();
this.qitachedongtai();
this.carDongTaiQieHuanTimer = setInterval(() => {
this.kachedongtai();
this.dianchandongtai();
this.qitachedongtai();
}, 20000)
})
}) })
}else{ }else{
this.whetherShow = false; this.whetherShow = false;
...@@ -566,6 +605,111 @@ export default { ...@@ -566,6 +605,111 @@ export default {
}) })
}) })
}, },
//卡车动态
kachedongtai(){
let num1 = parseInt(this.truckDynamicListData.data.length) - 1;
//获取车辆实时数据
if(this.truckDynamicListData.num2 <= num1){
}else{
this.truckDynamicListData.num2 = 0;
}
this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.truckDynamicListData.number}).then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.truckDynamicListData.rate = 0;
this.truckDynamicListData.carry = 0;
this.truckDynamicListData.workTime = 0;
this.truckDynamicListData.mileage = 0;
this.truckDynamicListData.startTime = '';
this.truckDynamicListData.endTime = '';
this.truckDynamicListData.loadArea = '';
this.truckDynamicListData.unloadArea = '';
}else{
this.truckDynamicListData.rate = res.data.content[0].rate;
this.truckDynamicListData.carry = res.data.content[0].carry;
this.truckDynamicListData.workTime = res.data.content[0].workTime;
this.truckDynamicListData.mileage = res.data.content[0].mileage;
this.truckDynamicListData.startTime = res.data.content[0].startTime;
this.truckDynamicListData.endTime = res.data.content[0].endTime;
this.truckDynamicListData.loadArea = res.data.content[0].loadArea;
this.truckDynamicListData.unloadArea = res.data.content[0].unloadArea;
}
}
this.truckDynamicListData.num2 = this.truckDynamicListData.num2 + 1;
})
},
//电铲动态
dianchandongtai(){
let num1 = parseInt(this.forkliftkDynamicListData.data.length) - 1;
//获取车辆实时数据
if(this.forkliftkDynamicListData.num2 <= num1){
}else{
this.forkliftkDynamicListData.num2 = 0;
}
this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.forkliftkDynamicListData.number}).then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.forkliftkDynamicListData.rate = 0;
this.forkliftkDynamicListData.carry = 0;
this.forkliftkDynamicListData.workTime = 0;
this.forkliftkDynamicListData.mileage = 0;
this.forkliftkDynamicListData.startTime = '';
this.forkliftkDynamicListData.endTime = '';
this.forkliftkDynamicListData.loadArea = '';
this.forkliftkDynamicListData.unloadArea = '';
}else{
this.forkliftkDynamicListData.rate = res.data.content[0].rate;
this.forkliftkDynamicListData.carry = res.data.content[0].carry;
this.forkliftkDynamicListData.workTime = res.data.content[0].workTime;
this.forkliftkDynamicListData.mileage = res.data.content[0].mileage;
this.forkliftkDynamicListData.startTime = res.data.content[0].startTime;
this.forkliftkDynamicListData.endTime = res.data.content[0].endTime;
this.forkliftkDynamicListData.loadArea = res.data.content[0].loadArea;
this.forkliftkDynamicListData.unloadArea = res.data.content[0].unloadArea;
}
}
this.forkliftkDynamicListData.num2 = this.forkliftkDynamicListData.num2 + 1;
})
},
//其他车动态
qitachedongtai(){
let num1 = parseInt(this.otherCarDynamicListData.data.length) - 1;
//获取车辆实时数据
if(this.otherCarDynamicListData.num2 <= num1){
}else{
this.otherCarDynamicListData.num2 = 0;
}
this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.otherCarDynamicListData.number}).then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.otherCarDynamicListData.rate = 0;
this.otherCarDynamicListData.carry = 0;
this.otherCarDynamicListData.workTime = 0;
this.otherCarDynamicListData.mileage = 0;
this.otherCarDynamicListData.startTime = '';
this.otherCarDynamicListData.endTime = '';
this.otherCarDynamicListData.loadArea = '';
this.otherCarDynamicListData.unloadArea = '';
}else{
this.otherCarDynamicListData.rate = res.data.content[0].rate;
this.otherCarDynamicListData.carry = res.data.content[0].carry;
this.otherCarDynamicListData.workTime = res.data.content[0].workTime;
this.otherCarDynamicListData.mileage = res.data.content[0].mileage;
this.otherCarDynamicListData.startTime = res.data.content[0].startTime;
this.otherCarDynamicListData.endTime = res.data.content[0].endTime;
this.otherCarDynamicListData.loadArea = res.data.content[0].loadArea;
this.otherCarDynamicListData.unloadArea = res.data.content[0].unloadArea;
}
}
this.otherCarDynamicListData.num2 = this.otherCarDynamicListData.num2 + 1;
})
},
//获取当前时间 //获取当前时间
dayCurrentTimeFn(){ dayCurrentTimeFn(){
...@@ -602,6 +746,11 @@ export default { ...@@ -602,6 +746,11 @@ export default {
this.currentTime.year = currentFormatDate; this.currentTime.year = currentFormatDate;
}, },
}, },
beforeDestroy(){
if(this.carDongTaiQieHuanTimer) {
clearInterval(this.carDongTaiQieHuanTimer);
}
}
} }
</script> </script>
......
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