Skip to content

卡
卡车调度系统
Commit 8f58a429 authored by xxx's avatar xxx
Browse files
Options

修改

parent 6377ebc3
Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 78 deletions
src/assets/js/common.js
View file @ 8f58a429
......@@ -1171,14 +1171,14 @@ var HttpReq = function(){
//绩效统计——日报——区域产量报表采区
caiquAreaQueryDay: function(param){
return request({
url: 'api/Plan/Day',
url: 'api/PlanNew/Day',
method: 'get',
params:param,
})
},
caiquAreaAddDay: function(data){
return request({
url: 'api/Plan/Day',
url: 'api/PlanNew/Day',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1187,14 +1187,14 @@ var HttpReq = function(){
},
caiquAreaUpdateDay: function(data){
return request({
url: 'api/Plan/Day',
url: 'api/PlanNew/Day',
method: 'PUT',
data:data,
})
},
caiquAreaDelDay: function(data){
return request({
url: 'api/Plan/Day',
url: 'api/PlanNew/Day',
method: 'Delete',
data:data,
})
......@@ -1419,14 +1419,14 @@ var HttpReq = function(){
//绩效统计——月报——区域产量报表采区
caiquAreaQueryMonth: function(param){
return request({
url: '/api/Plan/Month',
url: '/api/PlanNew/Month',
method: 'get',
params:param,
})
},
caiquAreaAddMonth: function(data){
return request({
url: '/api/Plan/Month',
url: '/api/PlanNew/Month',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1435,14 +1435,14 @@ var HttpReq = function(){
},
caiquAreaUpdateMonth: function(data){
return request({
url: '/api/Plan/Month',
url: '/api/PlanNew/Month',
method: 'PUT',
data:data,
})
},
caiquAreaDelMonth: function(data){
return request({
url: '/api/Plan/Month',
url: '/api/PlanNew/Month',
method: 'Delete',
data:data,
})
......@@ -1667,14 +1667,14 @@ var HttpReq = function(){
//绩效统计——年报——区域产量报表采区
caiquAreaQueryYear: function(param){
return request({
url: 'api/Plan/Year',
url: 'api/PlanNew/Year',
method: 'get',
params:param,
})
},
caiquAreaAddYear: function(data){
return request({
url: 'api/Plan/Year',
url: 'api/PlanNew/Year',
method: 'POST',
data:data,
}).then((res) => {
......@@ -1683,14 +1683,14 @@ var HttpReq = function(){
},
caiquAreaUpdateYear: function(data){
return request({
url: 'api/Plan/Year',
url: 'api/PlanNew/Year',
method: 'PUT',
data:data,
})
},
caiquAreaDelYear: function(data){
return request({
url: 'api/Plan/Year',
url: 'api/PlanNew/Year',
method: 'Delete',
data:data,
})
......
src/views/MLargeScreen/components/dataAnalysis/index.vue
View file @ 8f58a429
......@@ -89,7 +89,6 @@ export default {
return {
whetherShow:false,
dataAnalysisTimer:null,
colorARR:['#00A8FF','#8FDFFE','#F5335C','#00A8FF','#8FDFFE','#F5335C','#00A8FF','#8FDFFE','#F5335C','#00A8FF','#8FDFFE','#F5335C','#00A8FF','#8FDFFE','#F5335C'],
//时间
currentTime:{
day:'',
......@@ -97,28 +96,11 @@ export default {
year:'',
},
//采取产量统计
echarts1Data:[
{
name: "矿石",
value: 85,
itemStyle: {
opacity: 0.2,
color: "#8FDFFE",
},
},
{
name: "挖石",
value: 15,
itemStyle: {
opacity: 0.2,
color: "#00A8FF",
},
}
],
echarts1Data:[],
//各采区日产量排名
outputRankData:{
caiquName:['东采区1','西采区1','西采区2','南采区2'],
caiquSeriesData:[91,102,120,153],
caiquName:[],
caiquSeriesData:[],
},
//各采区当月完成率
echarts2Data:{
......@@ -126,16 +108,12 @@ export default {
wanchengNum:[],
jihuaNum:[],
wanchengRate:[],
caiquName1:['采区1','采区2','采区3','采区4',],
wanchengNum1:[21,40,15,31],
jihuaNum1:[50,50,50,50],
wanchengRate1:[42,80,30,62],
},
//月生产完成效率
echarts3Data:{
caiquName:['采区一', '采区二', '采区三', '采区四'],
wanchengNum:[20,25,48,63],
jihuaNum:[30,50,60,70],
caiquName:[],
wanchengNum:[],
jihuaNum:[],
},
//装卸点平均时长
loadAndUnloadListData:{
......@@ -205,30 +183,41 @@ export default {
}
this.echarts1_1Fn();
})
//各采区日产量排名 要换接口
HttpReq.truckDispatching.caiquAreaQueryDay({size:6}).then((res) => {
//各采区日产量排名
HttpReq.truckDispatching.caiquAreaQueryDay({size:6,sort:'total,desc'}).then((res) => {
let eh2_arr1 = [];
let eh2_arr2 = [];
res.forEach((item)=>{
eh2_arr1.push(item.name);
eh2_arr2.push(item.total);
})
this.outputRankData.caiquName = eh2_arr1.reverse();
this.outputRankData.caiquSeriesData = eh2_arr2.reverse();
this.echarts2_1Fn();
})
//各采区当月完成率 要换接口
HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999}).then((res) => {
let caiquName = [];
let wanchengNum = [];
let jihuaNum = [];
let wanchengRate = [];
res.forEach((item,index)=>{
caiquName.push(item.name);
wanchengNum.push(item.finish);
jihuaNum.push(item.plan);
wanchengRate.push(parseFloat(item.eff) * 100);
//各采区当月完成率 和 月生产完成效率
HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
console.log(res);
let eh2_1_arr1 = [];
let eh2_1_arr2 = [];
let eh2_1_arr3 = [];
let eh2_1_arr4 = [];
res.forEach((item)=>{
eh2_1_arr1.push(item.name);
eh2_1_arr2.push(item.total);
eh2_1_arr3.push(item.nowPlan);
eh2_1_arr4.push(item.ratio);
})
this.echarts2Data.caiquName = caiquName;
this.echarts2Data.wanchengNum = wanchengNum;
this.echarts2Data.jihuaNum = jihuaNum;
this.echarts2Data.wanchengRate = wanchengRate;
this.echarts2Data.caiquName = eh2_1_arr1;
this.echarts2Data.wanchengNum = eh2_1_arr2;
this.echarts2Data.jihuaNum = eh2_1_arr3;
this.echarts2Data.wanchengRate = eh2_1_arr4;
this.echarts3Data.caiquName = eh2_1_arr1;
this.echarts3Data.wanchengNum = eh2_1_arr2;
this.echarts3Data.jihuaNum = eh2_1_arr3;
this.echarts2Fn();
this.echarts3Fn();
})
//月生产完成效率 要换接口
this.echarts3Fn();
//装卸点平均时长
if(this.loadAndUnloadListData.selectTimeText == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res) => {
......@@ -418,8 +407,249 @@ export default {
//定时器
this.dataAnalysisTimer = setInterval(() => {
//采取产量统计图表
HttpReq.truckDispatching.getApiHl1().then((res) => {
if(res.code == 200){
let colorARR = ['#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220','#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220'];
let centerArray = [];
res.data.content.forEach((item,index)=>{
let a1 = {};
let a2 = {};
a1.name = item.name;
a1.value = item.num;
a2.opacity = 0.2,
a2.color = colorARR[index],
a1.itemStyle = a2;
centerArray.push(a1);
})
this.echarts1Data = centerArray;
}
this.echarts1_1Fn();
})
//各采区日产量排名
HttpReq.truckDispatching.caiquAreaQueryDay({size:6,sort:'total,desc'}).then((res) => {
let eh2_arr1 = [];
let eh2_arr2 = [];
res.forEach((item)=>{
eh2_arr1.push(item.name);
eh2_arr2.push(item.total);
})
this.outputRankData.caiquName = eh2_arr1.reverse();
this.outputRankData.caiquSeriesData = eh2_arr2.reverse();
this.echarts2_1Fn();
})
//各采区当月完成率 和 月生产完成效率
HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
console.log(res);
let eh2_1_arr1 = [];
let eh2_1_arr2 = [];
let eh2_1_arr3 = [];
let eh2_1_arr4 = [];
res.forEach((item)=>{
eh2_1_arr1.push(item.name);
eh2_1_arr2.push(item.total);
eh2_1_arr3.push(item.nowPlan);
eh2_1_arr4.push(item.ratio);
})
this.echarts2Data.caiquName = eh2_1_arr1;
this.echarts2Data.wanchengNum = eh2_1_arr2;
this.echarts2Data.jihuaNum = eh2_1_arr3;
this.echarts2Data.wanchengRate = eh2_1_arr4;
this.echarts3Data.caiquName = eh2_1_arr1;
this.echarts3Data.wanchengNum = eh2_1_arr2;
this.echarts3Data.jihuaNum = eh2_1_arr3;
this.echarts2Fn();
this.echarts3Fn();
})
//装卸点平均时长
if(this.loadAndUnloadListData.selectTimeText == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.content.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.content.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.content.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
//矿石产量比
if(this.oreProportionListData.selectTimeText == 'day'){
HttpReq.truckDispatching.screenOreProportionDayQuery().then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.oreProportionListData.proportionData = this.oreProportionListData.optionData;
}else{
let colorARR = ['#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220','#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220'];
let centerArray = [];
res.data.content.forEach((item,index)=>{
let a1 = {};
let a2 = {};
a1.name = item.name;
a1.value = item.num;
a2.opacity = 0.2,
a2.color = colorARR[index],
a1.itemStyle = a2;
centerArray.push(a1);
})
this.oreProportionListData.proportionData = centerArray;
}
this.echarts5Fn();
}
})
}
if(this.oreProportionListData.selectTimeText == 'week'){
HttpReq.truckDispatching.screenOreProportionMonthQuery().then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.oreProportionListData.proportionData = this.oreProportionListData.optionData;
}else{
let colorARR = ['#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220','#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220'];
let centerArray = [];
res.data.content.forEach((item,index)=>{
let a1 = {};
let a2 = {};
a1.name = item.name;
a1.value = item.num;
a2.opacity = 0.2,
a2.color = colorARR[index],
a1.itemStyle = a2;
centerArray.push(a1);
})
this.oreProportionListData.proportionData = centerArray;
}
this.echarts5Fn();
}
})
}
if(this.oreProportionListData.selectTimeText == 'month'){
HttpReq.truckDispatching.screenOreProportionYearQuery().then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
this.oreProportionListData.proportionData = this.oreProportionListData.optionData;
}else{
let colorARR = ['#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220','#00A8FF','#8FDFFE','#F4F03A','#F5335C','#E68220'];
let centerArray = [];
res.data.content.forEach((item,index)=>{
let a1 = {};
let a2 = {};
a1.name = item.name;
a1.value = item.num;
a2.opacity = 0.2,
a2.color = colorARR[index],
a1.itemStyle = a2;
centerArray.push(a1);
})
this.oreProportionListData.proportionData = centerArray;
}
this.echarts5Fn();
}
})
}
//报警路障申报统计
HttpReq.truckDispatching.breakDownQueryDay({size:9999}).then((res) => {
let that = this;
if(res.code == 200){
//报警路障申报统计过度数组
let alarmBreakArray = [];
let breakObj1 = {};
breakObj1.name = '车辆故障';
breakObj1.value = res.data.totalElements;
alarmBreakArray.push(breakObj1);
//获取报警信息
HttpReq.truckDispatching.callPoliceQuery({size:9999,}).then((res) => {
if(res.code == 200){
let alarmObj1 = {};
let alarmArray1 = [];
let alarmObj2 = {};
let alarmArray2 = [];
let alarmObj3 = {};
let alarmArray3 = [];
let alarmObj4 = {};
let alarmArray4 = [];
res.data.content.forEach((item,index)=>{
if(item.alarmclass == '超速'){
alarmArray1.push(item);
}else if(item.alarmclass == '无故停车'){
alarmArray2.push(item);
}else if(item.alarmclass == '驾离电子围栏'){
alarmArray3.push(item);
}else if(item.alarmclass == '驶入电子围栏'){
alarmArray4.push(item);
}
})
alarmObj1.name = '超速';
alarmObj1.value = alarmArray1.length;
alarmObj2.name = '无故停车';
alarmObj2.value = alarmArray2.length;
alarmObj3.name = '驾离电子围栏';
alarmObj3.value = alarmArray3.length;
alarmObj4.name = '驶入电子围栏';
alarmObj4.value = alarmArray4.length;
alarmBreakArray.push(alarmObj1);
alarmBreakArray.push(alarmObj2);
alarmBreakArray.push(alarmObj3);
alarmBreakArray.push(alarmObj4);
that.echarts6Data = alarmBreakArray;
this.$nextTick(()=>{
that.echarts6Fn();
})
}
})
}
})
//卸货点卸货量统计
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.month}).then((res) => {
if(res.code == 200){
let xiedianName = [];
let outputNum = [];
res.data.content.forEach((item,index)=>{
xiedianName.push(item.name);
outputNum.push(item.outputNum);
})
this.echarts7Data.xiedianName = xiedianName;
this.echarts7Data.outputNum = outputNum;
this.echarts7Fn();
}
})
},10000)
})
}else{
if(this.dataAnalysisTimer) {
......@@ -576,10 +806,16 @@ export default {
fontSize:15,
}
},
grid: {
left: '1%',
right: '2%',
bottom: '20%',
containLabel: true
},
xAxis: [
{
type: 'category',
data: this.echarts2Data.caiquName1,
data: this.echarts2Data.caiquName,
axisPointer: {
type: 'shadow'
},
......@@ -602,8 +838,8 @@ export default {
type: 'value',
name: '产量(T)',
min: 0,
max: 1000,
interval: 200,
max: 10000,
interval: 2000,
axisLabel: {
formatter: '{value}',
show: true,
......@@ -648,7 +884,7 @@ export default {
return value + 'T';
}
},
data: this.echarts2Data.wanchengNum1,
data: this.echarts2Data.wanchengNum,
barWidth: 10,
itemStyle: {
normal: {
......@@ -664,7 +900,7 @@ export default {
return value + 'T';
}
},
data: this.echarts2Data.jihuaNum1,
data: this.echarts2Data.jihuaNum,
barWidth: 10,
itemStyle: {
normal: {
......@@ -681,7 +917,7 @@ export default {
return value + '%';
}
},
data: this.echarts2Data.wanchengRate1,
data: this.echarts2Data.wanchengRate,
itemStyle: {
normal: {
lineStyle: { color: '#FFC200' } //设置线条颜色
......@@ -730,10 +966,8 @@ export default {
}
},
yAxis: {
min: 0,
max: 100,
type: 'value',
name: '完成率(%)',
name: '完成量',
nameTextStyle: { fontSize: 14 },
axisLabel: {
show: true,
......
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ 8f58a429
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="name" label="采区" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="nowPlan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
......
src/views/performanceStatistics/caiquOutput/month/index.vue
View file @ 8f58a429
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="name" label="采区" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="nowPlan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
......
src/views/performanceStatistics/caiquOutput/year/index.vue
View file @ 8f58a429
......@@ -23,9 +23,9 @@
<div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="name" label="采区" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="output" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="nowPlan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column>
......
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