Commit c476bb5c authored by xxx's avatar xxx

1

parent 77a4a1ed
...@@ -1967,6 +1967,28 @@ var HttpReq = function(){ ...@@ -1967,6 +1967,28 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
//大屏——数据总览——卡车铲车排行榜
kaChanRankListDayQuery: function(param){
return request({
url: '/api/Manmades/jiedanDay',
method: 'get',
params:param,
})
},
kaChanRankListZhouQuery: function(param){
return request({
url: '/api/Manmades/jiedanZhou',
method: 'get',
params:param,
})
},
kaChanRankListMouQuery: function(param){
return request({
url: '/api/Manmades/jiedanMou',
method: 'get',
params:param,
})
},
//大屏——智能调度——近期通知列表 //大屏——智能调度——近期通知列表
recentNoticeQuery: function(param){ recentNoticeQuery: function(param){
return request({ return request({
......
...@@ -102,40 +102,7 @@ ...@@ -102,40 +102,7 @@
<div :class="truckRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="truckChangeField('yunzai')">运载量</div> <div :class="truckRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="truckChangeField('yunzai')">运载量</div>
<div :class="truckRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="truckChangeField('jiedan')">接单数</div> <div :class="truckRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="truckChangeField('jiedan')">接单数</div>
</div> </div>
<div class="dataScrView_leftView_content_views3"> <div class="dataScrView_leftView_content_views3" id="dataScrView_leftView_content_views3_1"></div>
<div v-if="truckRankListData.selectFieldText == 'juli'">
<div v-for="(item,index) in truckRankListData.listData" :key="index">
<div style="color:#1DF9FC;">{{index + 1}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div>
<div style="color:#1AC9FF;">{{item.juli}}KM</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div>
</div>
</div>
<div v-if="truckRankListData.selectFieldText == 'time'">
<div v-for="(item,index) in truckRankListData.listData" :key="index">
<div style="color:#1DF9FC;">{{index + 1}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div>
<div style="color:#1AC9FF;">{{item.time}}H</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div>
</div>
</div>
<div v-if="truckRankListData.selectFieldText == 'yunzai'">
<div v-for="(item,index) in truckRankListData.listData" :key="index">
<div style="color:#1DF9FC;">{{index + 1}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div>
<div style="color:#1AC9FF;">{{item.yunzai}}</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div>
</div>
</div>
<div v-if="truckRankListData.selectFieldText == 'jiedan'">
<div v-for="(item,index) in truckRankListData.listData" :key="index">
<div style="color:#1DF9FC;">{{index + 1}}</div>
<div style="color:#BCF0FE;">{{item.name}}</div>
<div style="color:#1AC9FF;">{{item.jiedan}}</div>
<div style="color:#BCF0FE;">{{item.createTime}}</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
<!-- 铲车司机排行榜--> <!-- 铲车司机排行榜-->
...@@ -151,9 +118,9 @@ ...@@ -151,9 +118,9 @@
<div class="dataScrView_leftView_content"> <div class="dataScrView_leftView_content">
<div class="dataScrView_leftView_content_views2"> <div class="dataScrView_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 == 'time1' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('average')">平均时长</div>
<div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('yunzai')">装车量</div> <div :class="forkLiftRankListData.selectFieldText == 'yunzai' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('zcweight')">装车量</div>
<div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('jiedan')">装车数</div> <div :class="forkLiftRankListData.selectFieldText == 'jiedan' ? '' : 'selectFieldStyle' " @click="forkLiftChangeField('zcnum')">装车数</div>
</div> </div>
<div class="dataScrView_leftView_content_views3"> <div class="dataScrView_leftView_content_views3">
<div v-if="forkLiftRankListData.selectFieldText == 'time'"> <div v-if="forkLiftRankListData.selectFieldText == 'time'">
...@@ -442,9 +409,9 @@ export default { ...@@ -442,9 +409,9 @@ export default {
}, },
//产量数据以及中间图表数据 //产量数据以及中间图表数据
outputMineData:{ outputMineData:{
day:{finish:'',eff:0,plan:'',}, day:{finish:'0',eff:0,plan:'0',},
month:{finish:'',eff:0,plan:'',}, month:{finish:'0',eff:0,plan:'0',},
year:{finish:'',eff:0,plan:'',}, year:{finish:'0',eff:0,plan:'0',},
}, },
//运载数据以及中间图表数据 //运载数据以及中间图表数据
carryCenterData:{ carryCenterData:{
...@@ -471,11 +438,13 @@ export default { ...@@ -471,11 +438,13 @@ export default {
}, },
//卡车排行榜 //卡车排行榜
truckRankListData:{ truckRankListData:{
echartsX:'Km',
carclass:'卡车', carclass:'卡车',
selectTimeText:'day', selectTimeText:'day',
selectFieldText:'juli', selectFieldText:'juli',
listData:[],
selectTimeDate:'', selectTimeDate:'',
driverName:[],
driverSeriesData:[],
}, },
//铲车排行榜 //铲车排行榜
forkLiftRankListData:{ forkLiftRankListData:{
...@@ -648,32 +617,68 @@ export default { ...@@ -648,32 +617,68 @@ export default {
} }
}) })
//获取卡车排行榜 //获取卡车排行榜
this.truckRankListData.selectTimeDate = this.currentTime.day;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 5; truckQuery1.size = 5;
truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc'; truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc';
truckQuery1.carclass = this.truckRankListData.carclass; truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => { if(this.truckRankListData.selectTimeText == 'day'){
if(res.code == 200){ HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
this.truckRankListData.listData = res.data.content; let arr1 = [];
} let arr2 = [];
}) res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(this.truckRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(this.truckRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}
}) })
//获取铲车排行榜 //获取铲车排行榜
this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc'; forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => { if(this.truckRankListData.selectTimeText == 'day'){
if(res.code == 200){ HttpReq.truckDispatching.kaChanRankListDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res.data.content;
} })
}) }else if(this.truckRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(forkLiftQuery1).then((res) => {
})
}else if(this.truckRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(forkLiftQuery1).then((res) => {
})
}
}) })
//中间echarts图表 //中间echarts图表
this.centerEcharts(); this.centerEcharts();
...@@ -729,14 +734,46 @@ export default { ...@@ -729,14 +734,46 @@ export default {
//卡车切换时间 //卡车切换时间
truckChangeTime(text){ truckChangeTime(text){
this.truckRankListData.selectTimeText = text; this.truckRankListData.selectTimeText = text;
let truckQuery1 = {};
truckQuery1.size = 5;
truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc';
truckQuery1.carclass = this.truckRankListData.carclass;
if(text == 'day'){ if(text == 'day'){
this.truckRankListData.selectTimeDate = this.currentTime.day; HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
} let arr1 = [];
if(text == 'month'){ let arr2 = [];
this.truckRankListData.selectTimeDate = this.currentTime.month; res.forEach((item,index)=>{
} arr1.push(item.driver);
if(text == 'year'){ arr2.push(item[this.truckRankListData.selectFieldText]);
this.truckRankListData.selectTimeDate = this.currentTime.year; })
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(text == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(text == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
} }
}, },
//卡车切换字段排序 //卡车切换字段排序
...@@ -746,26 +783,136 @@ export default { ...@@ -746,26 +783,136 @@ export default {
truckQuery1.size = 5; truckQuery1.size = 5;
truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc'; truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc';
truckQuery1.carclass = this.truckRankListData.carclass; truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate; if(text == 'juli'){
this.truckRankListData.echartsX = 'km';
}else if(text == 'time'){
this.truckRankListData.echartsX = 'H';
}else if(text == 'yunzai'){
this.truckRankListData.echartsX = '';
}else if(text == 'jiedan'){
this.truckRankListData.echartsX = '';
}
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => { if(this.truckRankListData.selectTimeText == 'day'){
if(res.code == 200){ HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
this.truckRankListData.listData = res.data.content; let arr1 = [];
} let arr2 = [];
}) res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(this.truckRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}else if(this.truckRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = [];
let arr2 = [];
res.forEach((item,index)=>{
arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]);
})
this.truckRankListData.driverName = arr1.reverse();
this.truckRankListData.driverSeriesData = arr2.reverse();
this.truckChangeEcharts();
})
}
}) })
}, },
//卡车排行榜Echarts
truckChangeEcharts(){
console.log(this.truckRankListData);
echarts.init(document.getElementById('dataScrView_leftView_content_views3_1')).dispose();
var myChart = echarts.init(document.getElementById('dataScrView_leftView_content_views3_1'));
var option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: {
top:'22%',
left: '1%',
bottom: '-2%',
containLabel: true
},
xAxis: {
name:this.truckRankListData.echartsX,
type: 'value',
boundaryGap: [0, 0.01],
axisLabel: {
show: true,
textStyle: {
color: '#BFF7FF'
}
},
axisLine: {
lineStyle: {
color: '#BFF7FF',
width: 1
}
}
},
yAxis: {
name:'司机姓名',
type: 'category',
data: this.truckRankListData.driverName,
axisLabel: {
show: true,
textStyle: {
color: '#BFF7FF'
}
},
axisLine: {
lineStyle: {
color: '#BFF7FF',
width: 0
}
}
},
series: [
{
type: 'bar',
barWidth: 12,
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: '#23FFE2' },
{ offset: 1, color: '#0F86EB' }
])
},
data: this.truckRankListData.driverSeriesData,
}
]
};
option && myChart.setOption(option);
},
//铲车切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
if(text == 'day'){ if(text == 'day'){
this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
} }
if(text == 'month'){ if(text == 'week'){
this.forkLiftRankListData.selectTimeDate = this.currentTime.month;
} }
if(text == 'year'){ if(text == 'month'){
this.forkLiftRankListData.selectTimeDate = this.currentTime.year;
} }
}, },
//铲车切换字段排序 //铲车切换字段排序
...@@ -775,13 +922,8 @@ export default { ...@@ -775,13 +922,8 @@ export default {
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc'; forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => {
if(res.code == 200){
this.forkLiftRankListData.listData = res.data.content;
}
})
}) })
}, },
//中间模块选择 //中间模块选择
...@@ -1132,7 +1274,7 @@ export default { ...@@ -1132,7 +1274,7 @@ export default {
line-height: 5.5vh; line-height: 5.5vh;
text-align: center; text-align: center;
color: white; color: white;
font-size: 18px; font-size: 16px;
} }
.driverInforViewsStyle{ .driverInforViewsStyle{
width: 100%; width: 100%;
......
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