Commit 0ee1634d authored by caicaicai's avatar caicaicai

修改

parent 910584a2
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 电铲排行榜--> <!-- 铲车排行榜-->
<div> <div>
<div class="carManScrView_leftView_title truck_titleStyle"> <div class="carManScrView_leftView_title truck_titleStyle">
<div>电铲排行榜</div> <div>铲车排行榜</div>
<div class="driverTitleDateStyle"> <div class="driverTitleDateStyle">
<div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')"></div> <div :class="forkLiftRankListData.selectTimeText == 'day' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('day')"></div>
<div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')"></div> <div :class="forkLiftRankListData.selectTimeText == 'week' ? 'driverTitleDateStyle_son1' : 'driverTitleDateStyle_son2' " @click="forkLiftChangeTime('week')"></div>
...@@ -160,9 +160,9 @@ ...@@ -160,9 +160,9 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 电铲动态--> <!-- 铲车动态-->
<div> <div>
<div class="carManScrView_rightView_title">电铲动态</div> <div class="carManScrView_rightView_title">铲车动态</div>
<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">
...@@ -285,9 +285,9 @@ export default { ...@@ -285,9 +285,9 @@ export default {
listData:[], listData:[],
selectTimeDate:'', selectTimeDate:'',
}, },
//电铲排行榜 //铲车排行榜
forkLiftRankListData:{ forkLiftRankListData:{
carclass:'电铲', carclass:'铲车',
selectTimeText:'day', selectTimeText:'day',
selectFieldText:'time', selectFieldText:'time',
listData:[], listData:[],
...@@ -307,7 +307,7 @@ export default { ...@@ -307,7 +307,7 @@ export default {
loadArea:'', loadArea:'',
unloadArea:'', unloadArea:'',
}, },
//电铲动态 //铲车动态
forkliftkDynamicListData:{ forkliftkDynamicListData:{
data:[], data:[],
num2:0, num2:0,
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
//获取车辆运行状况 //获取车辆运行状况
HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => { HttpReq.truckDispatching.carInformationQuery({size:9999}).then((res) => {
let kache1 = []; let kache1 = [];
let kachezaixian = []; let kachezaixian = [];
let kachelixian = []; let kachelixian = [];
...@@ -361,7 +361,7 @@ export default { ...@@ -361,7 +361,7 @@ export default {
res.data.content.forEach((item)=>{ res.data.content.forEach((item)=>{
if(item.carclass == '卡车'){ if(item.carclass == '卡车'){
kache1.push(item); kache1.push(item);
}else if(item.carclass == '电铲'){ }else if(item.carclass == '铲车'){
dianchan1.push(item); dianchan1.push(item);
}else{ }else{
qitache1.push(item); qitache1.push(item);
...@@ -410,13 +410,13 @@ export default { ...@@ -410,13 +410,13 @@ export default {
truckQuery1.carclass = this.truckRankListData.carclass; truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate; truckQuery1.createTime = this.truckRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(truckQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.truckRankListData.listData = res.data.content; this.truckRankListData.listData = res.data.content;
} }
}) })
}) })
//获取电铲排行榜 //获取铲车排行榜
this.forkLiftRankListData.selectTimeDate = this.currentTime.day; this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 10; forkLiftQuery1.size = 10;
...@@ -424,7 +424,7 @@ export default { ...@@ -424,7 +424,7 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate; forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(forkLiftQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.forkLiftRankListData.listData = res.data.content; this.forkLiftRankListData.listData = res.data.content;
} }
...@@ -439,7 +439,7 @@ export default { ...@@ -439,7 +439,7 @@ export default {
res.data.content.forEach((item,index)=>{ res.data.content.forEach((item,index)=>{
if(item.carclass == '卡车'){ if(item.carclass == '卡车'){
arr1.push(item); arr1.push(item);
}else if(item.carclass == '电铲'){ }else if(item.carclass == '铲车'){
arr2.push(item); arr2.push(item);
}else{ }else{
arr3.push(item); arr3.push(item);
...@@ -460,7 +460,7 @@ export default { ...@@ -460,7 +460,7 @@ export default {
this.dianchandongtai(); this.dianchandongtai();
this.qitachedongtai(); this.qitachedongtai();
//获取车辆运行状况 //获取车辆运行状况
HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => { HttpReq.truckDispatching.carInformationQuery({size:9999}).then((res) => {
let kache1 = []; let kache1 = [];
let kachezaixian = []; let kachezaixian = [];
let kachelixian = []; let kachelixian = [];
...@@ -476,7 +476,7 @@ export default { ...@@ -476,7 +476,7 @@ export default {
res.data.content.forEach((item)=>{ res.data.content.forEach((item)=>{
if(item.carclass == '卡车'){ if(item.carclass == '卡车'){
kache1.push(item); kache1.push(item);
}else if(item.carclass == '电铲'){ }else if(item.carclass == '铲车'){
dianchan1.push(item); dianchan1.push(item);
}else{ }else{
qitache1.push(item); qitache1.push(item);
...@@ -525,13 +525,13 @@ export default { ...@@ -525,13 +525,13 @@ export default {
truckQuery1.carclass = this.truckRankListData.carclass; truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate; truckQuery1.createTime = this.truckRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(truckQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.truckRankListData.listData = res.data.content; this.truckRankListData.listData = res.data.content;
} }
}) })
}) })
//获取电铲排行榜 //获取铲车排行榜
this.forkLiftRankListData.selectTimeDate = this.currentTime.day; this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 10; forkLiftQuery1.size = 10;
...@@ -539,7 +539,7 @@ export default { ...@@ -539,7 +539,7 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate; forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(forkLiftQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.forkLiftRankListData.listData = res.data.content; this.forkLiftRankListData.listData = res.data.content;
} }
...@@ -582,7 +582,7 @@ export default { ...@@ -582,7 +582,7 @@ export default {
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: ['卡车状态', '电铲状态', '其他车辆'], data: ['卡车状态', '铲车状态', '其他车辆'],
axisLabel: { axisLabel: {
show: true, show: true,
textStyle: { textStyle: {
...@@ -658,14 +658,14 @@ export default { ...@@ -658,14 +658,14 @@ export default {
truckQuery1.carclass = this.truckRankListData.carclass; truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate; truckQuery1.createTime = this.truckRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(truckQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.truckRankListData.listData = res.data.content; this.truckRankListData.listData = res.data.content;
} }
}) })
}) })
}, },
//电铲切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
if(text == 'day'){ if(text == 'day'){
...@@ -678,7 +678,7 @@ export default { ...@@ -678,7 +678,7 @@ export default {
this.forkLiftRankListData.selectTimeDate = this.currentTime.year; this.forkLiftRankListData.selectTimeDate = this.currentTime.year;
} }
}, },
//电铲切换字段排序 //铲车切换字段排序
forkLiftChangeField(text){ forkLiftChangeField(text){
this.forkLiftRankListData.selectFieldText = text; this.forkLiftRankListData.selectFieldText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
...@@ -687,7 +687,7 @@ export default { ...@@ -687,7 +687,7 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate; forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.carInformationQuery(forkLiftQuery1).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.forkLiftRankListData.listData = res.data.content; this.forkLiftRankListData.listData = res.data.content;
} }
...@@ -732,7 +732,7 @@ export default { ...@@ -732,7 +732,7 @@ export default {
this.truckDynamicListData.num2 = this.truckDynamicListData.num2 + 1; this.truckDynamicListData.num2 = this.truckDynamicListData.num2 + 1;
}) })
}, },
//电铲动态 //铲车动态
dianchandongtai(){ dianchandongtai(){
let num1 = parseInt(this.forkliftkDynamicListData.data.length) - 1; let num1 = parseInt(this.forkliftkDynamicListData.data.length) - 1;
//获取车辆实时数据 //获取车辆实时数据
......
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