Commit 648ec0c7 authored by xxx's avatar xxx

修改

parent 98f88c66
...@@ -2038,6 +2038,14 @@ var HttpReq = function(){ ...@@ -2038,6 +2038,14 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
//大屏——车辆信息弹框——车辆实时数据
screenCarInforCarRealQuery2: function(param){
return request({
url: '/api/CarPeop/realtime',
method: 'get',
params:param,
})
},
//大屏——地图的增删改查 //大屏——地图的增删改查
screenMapSetUpQuery: function(param){ screenMapSetUpQuery: function(param){
return request({ return request({
......
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
<div class="carManScrView_leftView_content"> <div class="carManScrView_leftView_content">
<div class="carManScrView_leftView_content_views2"> <div class="carManScrView_leftView_content_views2">
<div :class="forkLiftRankListData.selectFieldText == 'time' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('time')">工作时长</div> <div :class="forkLiftRankListData.selectFieldText == 'time' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('time')">工作时长</div>
<div :class="forkLiftRankListData.selectFieldText == 'time1' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('time1')">平均时长</div>
<div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('yunzai')">装车量</div> <div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('yunzai')">装车量</div>
<div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('jiedan')">装车数</div> <div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('jiedan')">装车数</div>
</div> </div>
...@@ -707,27 +708,16 @@ export default { ...@@ -707,27 +708,16 @@ export default {
return return
} }
this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number; this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.truckDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.truckDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ this.truckDynamicListData.rate = res.data.rate;
this.truckDynamicListData.rate = 0; this.truckDynamicListData.carry = res.data.carry;
this.truckDynamicListData.carry = 0; this.truckDynamicListData.workTime = res.data.workTime;
this.truckDynamicListData.workTime = 0; this.truckDynamicListData.mileage = res.data.mileage;
this.truckDynamicListData.mileage = 0; this.truckDynamicListData.startTime = res.data.startTime;
this.truckDynamicListData.startTime = ''; this.truckDynamicListData.endTime = res.data.endTime;
this.truckDynamicListData.endTime = ''; this.truckDynamicListData.loadArea = res.data.loadArea;
this.truckDynamicListData.loadArea = ''; this.truckDynamicListData.unloadArea = res.data.unloadArea;
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; this.truckDynamicListData.num2 = this.truckDynamicListData.num2 + 1;
}) })
...@@ -745,27 +735,16 @@ export default { ...@@ -745,27 +735,16 @@ export default {
return return
} }
this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number; this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.forkliftkDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.forkliftkDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ this.forkliftkDynamicListData.rate = res.data.rate;
this.forkliftkDynamicListData.rate = 0; this.forkliftkDynamicListData.carry = res.data.carry;
this.forkliftkDynamicListData.carry = 0; this.forkliftkDynamicListData.workTime = res.data.workTime;
this.forkliftkDynamicListData.workTime = 0; this.forkliftkDynamicListData.mileage = res.data.mileage;
this.forkliftkDynamicListData.mileage = 0; this.forkliftkDynamicListData.startTime = res.data.startTime;
this.forkliftkDynamicListData.startTime = ''; this.forkliftkDynamicListData.endTime = res.data.endTime;
this.forkliftkDynamicListData.endTime = ''; this.forkliftkDynamicListData.loadArea = res.data.loadArea;
this.forkliftkDynamicListData.loadArea = ''; this.forkliftkDynamicListData.unloadArea = res.data.unloadArea;
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; this.forkliftkDynamicListData.num2 = this.forkliftkDynamicListData.num2 + 1;
}) })
...@@ -783,27 +762,16 @@ export default { ...@@ -783,27 +762,16 @@ export default {
return return
} }
this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number; this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.otherCarDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery2({number:this.otherCarDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ this.otherCarDynamicListData.rate = res.data.rate;
this.otherCarDynamicListData.rate = 0; this.otherCarDynamicListData.carry = res.data.carry;
this.otherCarDynamicListData.carry = 0; this.otherCarDynamicListData.workTime = res.data.workTime;
this.otherCarDynamicListData.workTime = 0; this.otherCarDynamicListData.mileage = res.data.mileage;
this.otherCarDynamicListData.mileage = 0; this.otherCarDynamicListData.startTime = res.data.startTime;
this.otherCarDynamicListData.startTime = ''; this.otherCarDynamicListData.endTime = res.data.endTime;
this.otherCarDynamicListData.endTime = ''; this.otherCarDynamicListData.loadArea = res.data.loadArea;
this.otherCarDynamicListData.loadArea = ''; this.otherCarDynamicListData.unloadArea = res.data.unloadArea;
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; this.otherCarDynamicListData.num2 = this.otherCarDynamicListData.num2 + 1;
}) })
...@@ -1064,10 +1032,10 @@ export default { ...@@ -1064,10 +1032,10 @@ export default {
margin: 0px auto; margin: 0px auto;
width: 4.3vw; width: 4.3vw;
height: 4.3vw; height: 4.3vw;
border: 4px solid #06EFFE; line-height: 4.3vw;
border-radius: 50%;
line-height: 3.8vw;
font-size: 24px; font-size: 24px;
background:no-repeat center center url('~@/assets/images/cutGraph/bilikuang.png');
background-size:100% 100%;
} }
.otherCarDynamicContent1{ .otherCarDynamicContent1{
margin-top: 0.3vh; margin-top: 0.3vh;
...@@ -1086,9 +1054,9 @@ export default { ...@@ -1086,9 +1054,9 @@ export default {
margin: 0px auto; margin: 0px auto;
width: 4vw; width: 4vw;
height: 4vw; height: 4vw;
border: 4px solid #06EFFE; line-height: 4vw;
border-radius: 50%;
line-height: 3.5vw;
font-size: 24px; font-size: 24px;
background:no-repeat center center url('~@/assets/images/cutGraph/bilikuang.png');
background-size:100% 100%;
} }
</style> </style>
\ No newline at end of file
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