Skip to content

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

1

parent f415b37f
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 118 deletions
src/assets/js/common.js
View file @ 77a4a1ed
...@@ -1171,14 +1171,14 @@ var HttpReq = function(){ ...@@ -1171,14 +1171,14 @@ var HttpReq = function(){
//绩效统计——日报——区域产量报表采区 //绩效统计——日报——区域产量报表采区
caiquAreaQueryDay: function(param){ caiquAreaQueryDay: function(param){
return request({ return request({
url: '/api/Panel', url: 'api/Plan/Day',
method: 'get', method: 'get',
params:param, params:param,
}) })
}, },
caiquAreaAddDay: function(data){ caiquAreaAddDay: function(data){
return request({ return request({
url: '/api/Panel', url: 'api/Plan/Day',
method: 'POST', method: 'POST',
data:data, data:data,
}).then((res) => { }).then((res) => {
...@@ -1187,14 +1187,14 @@ var HttpReq = function(){ ...@@ -1187,14 +1187,14 @@ var HttpReq = function(){
}, },
caiquAreaUpdateDay: function(data){ caiquAreaUpdateDay: function(data){
return request({ return request({
url: '/api/Panel', url: 'api/Plan/Day',
method: 'PUT', method: 'PUT',
data:data, data:data,
}) })
}, },
caiquAreaDelDay: function(data){ caiquAreaDelDay: function(data){
return request({ return request({
url: '/api/Panel', url: 'api/Plan/Day',
method: 'Delete', method: 'Delete',
data:data, data:data,
}) })
...@@ -1419,14 +1419,14 @@ var HttpReq = function(){ ...@@ -1419,14 +1419,14 @@ var HttpReq = function(){
//绩效统计——月报——区域产量报表采区 //绩效统计——月报——区域产量报表采区
caiquAreaQueryMonth: function(param){ caiquAreaQueryMonth: function(param){
return request({ return request({
url: '/api/PanelMonth', url: '/api/Plan/Month',
method: 'get', method: 'get',
params:param, params:param,
}) })
}, },
caiquAreaAddMonth: function(data){ caiquAreaAddMonth: function(data){
return request({ return request({
url: '/api/PanelMonth', url: '/api/Plan/Month',
method: 'POST', method: 'POST',
data:data, data:data,
}).then((res) => { }).then((res) => {
...@@ -1435,14 +1435,14 @@ var HttpReq = function(){ ...@@ -1435,14 +1435,14 @@ var HttpReq = function(){
}, },
caiquAreaUpdateMonth: function(data){ caiquAreaUpdateMonth: function(data){
return request({ return request({
url: '/api/PanelMonth', url: '/api/Plan/Month',
method: 'PUT', method: 'PUT',
data:data, data:data,
}) })
}, },
caiquAreaDelMonth: function(data){ caiquAreaDelMonth: function(data){
return request({ return request({
url: '/api/PanelMonth', url: '/api/Plan/Month',
method: 'Delete', method: 'Delete',
data:data, data:data,
}) })
...@@ -1667,14 +1667,14 @@ var HttpReq = function(){ ...@@ -1667,14 +1667,14 @@ var HttpReq = function(){
//绩效统计——年报——区域产量报表采区 //绩效统计——年报——区域产量报表采区
caiquAreaQueryYear: function(param){ caiquAreaQueryYear: function(param){
return request({ return request({
url: '/api/PanelYear', url: 'api/Plan/Year',
method: 'get', method: 'get',
params:param, params:param,
}) })
}, },
caiquAreaAddYear: function(data){ caiquAreaAddYear: function(data){
return request({ return request({
url: '/api/PanelYear', url: 'api/Plan/Year',
method: 'POST', method: 'POST',
data:data, data:data,
}).then((res) => { }).then((res) => {
...@@ -1683,14 +1683,14 @@ var HttpReq = function(){ ...@@ -1683,14 +1683,14 @@ var HttpReq = function(){
}, },
caiquAreaUpdateYear: function(data){ caiquAreaUpdateYear: function(data){
return request({ return request({
url: '/api/PanelYear', url: 'api/Plan/Year',
method: 'PUT', method: 'PUT',
data:data, data:data,
}) })
}, },
caiquAreaDelYear: function(data){ caiquAreaDelYear: function(data){
return request({ return request({
url: '/api/PanelYear', url: 'api/Plan/Year',
method: 'Delete', method: 'Delete',
data:data, data:data,
}) })
......
src/views/MLargeScreen/components/dataAnalysis/index.vue
View file @ 77a4a1ed
...@@ -154,30 +154,26 @@ export default { ...@@ -154,30 +154,26 @@ export default {
//采取产量统计图表 //采取产量统计图表
this.echarts1Fn(); this.echarts1Fn();
//各采区日产量排名 //各采区日产量排名
HttpReq.truckDispatching.caiquAreaQueryDay({size:10,createTime:this.currentTime.day,sort:'output,desc',}).then((res) => { HttpReq.truckDispatching.caiquAreaQueryDay({size:10}).then((res) => {
if(res.code == 200){ this.outputRankData = res;
this.outputRankData = res.data.content;
}
}) })
//各采区当月完成率 //各采区当月完成率
HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999,createTime:this.currentTime.month,}).then((res) => { HttpReq.truckDispatching.caiquAreaQueryMonth({size:9999}).then((res) => {
if(res.code == 200){ let caiquName = [];
let caiquName = []; let wanchengNum = [];
let wanchengNum = []; let jihuaNum = [];
let jihuaNum = []; let wanchengRate = [];
let wanchengRate = []; res.forEach((item,index)=>{
res.data.content.forEach((item,index)=>{ caiquName.push(item.name);
caiquName.push(item.name); wanchengNum.push(item.finish);
wanchengNum.push(item.output); jihuaNum.push(item.plan);
jihuaNum.push(item.dayPlan); wanchengRate.push(parseFloat(item.eff) * 100);
wanchengRate.push(parseFloat(item.rate) * 100); })
}) this.echarts2Data.caiquName = caiquName;
this.echarts2Data.caiquName = caiquName; this.echarts2Data.wanchengNum = wanchengNum;
this.echarts2Data.wanchengNum = wanchengNum; this.echarts2Data.jihuaNum = jihuaNum;
this.echarts2Data.jihuaNum = jihuaNum; this.echarts2Data.wanchengRate = wanchengRate;
this.echarts2Data.wanchengRate = wanchengRate; this.echarts2Fn();
this.echarts2Fn();
}
}) })
//月生产完成效率 //月生产完成效率
this.echarts3Fn(); this.echarts3Fn();
......
src/views/MLargeScreen/components/dataScreening/index.vue
View file @ 77a4a1ed
...@@ -6,16 +6,37 @@ ...@@ -6,16 +6,37 @@
<div class="dataScrView_leftView_title">采区产量统计</div> <div class="dataScrView_leftView_title">采区产量统计</div>
<div class="dataScrView_leftView_content"> <div class="dataScrView_leftView_content">
<div class="dataScrView_leftView_content_view1"> <div class="dataScrView_leftView_content_view1">
<div class="dataScrView_leftView_content_view1_son1">{{outputMineData.day.rate}}%</div> <div class="dataScrView_leftView_content_view1_son1">{{parseInt(outputMineData.day.eff)}}%</div>
<div style="color:white;margin-left:15px;">当前日产量：<span style="color:#02F7EF;">{{outputMineData.day.output}}吨</span></div> <div style="color:white;margin-left:15px;font-size: 16px;">
<div>日产量</div>
<div class="outside-div1">
<div v-for="(item,index) in parseInt(parseInt(outputMineData.day.eff) / 10)" :key="index" class="inside-div1"></div>
</div>
当前日产量：
<span style="color:#02F7EF;">{{outputMineData.day.finish}}吨</span>
</div>
</div> </div>
<div class="dataScrView_leftView_content_view1"> <div class="dataScrView_leftView_content_view1">
<div class="dataScrView_leftView_content_view1_son1">{{outputMineData.month.rate}}%</div> <div class="dataScrView_leftView_content_view1_son1">{{parseInt(outputMineData.month.eff)}}%</div>
<div style="color:white;margin-left:15px;">当前月产量：<span style="color:#02F7EF;">{{outputMineData.month.output}}吨</span></div> <div style="color:white;margin-left:15px;font-size: 16px;">
<div>月产量</div>
<div class="outside-div1">
<div v-for="(item,index) in parseInt(parseInt(outputMineData.month.eff) / 10)" :key="index" class="inside-div1"></div>
</div>
当前月产量：
<span style="color:#02F7EF;">{{outputMineData.month.finish}}吨</span>
</div>
</div> </div>
<div class="dataScrView_leftView_content_view1"> <div class="dataScrView_leftView_content_view1">
<div class="dataScrView_leftView_content_view1_son1">{{outputMineData.year.rate}}%</div> <div class="dataScrView_leftView_content_view1_son1">{{parseInt(outputMineData.year.eff)}}%</div>
<div style="color:white;margin-left:15px;">当前年产量：<span style="color:#02F7EF;">{{outputMineData.year.output}}吨</span></div> <div style="color:white;margin-left:15px;font-size: 16px;">
<div>年产量</div>
<div class="outside-div1">
<div v-for="(item,index) in parseInt(parseInt(outputMineData.year.eff) / 10)" :key="index" class="inside-div1"></div>
</div>
当前年产量：
<span style="color:#02F7EF;">{{outputMineData.year.finish}}吨</span>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -174,42 +195,42 @@ ...@@ -174,42 +195,42 @@
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">今日计划量</div> <div style="color:#FFFFFF;font-size:14px;">今日计划量</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.day.dayPlan}}吨</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.day.plan}}吨</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/renwujihua1.png"> <img src="../../../../assets/images/cutGraph/renwujihua1.png">
</div> </div>
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">今日完成量</div> <div style="color:#FFFFFF;font-size:14px;">今日完成量</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.day.output}}吨</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.day.finish}}吨</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/mubiaoguanli1.png"> <img src="../../../../assets/images/cutGraph/mubiaoguanli1.png">
</div> </div>
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">今日完成率</div> <div style="color:#FFFFFF;font-size:14px;">今日完成率</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.day.rate}}%</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{parseInt(outputMineData.day.eff)}}%</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/wancheng1.png"> <img src="../../../../assets/images/cutGraph/wancheng1.png">
</div> </div>
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">当月计划量</div> <div style="color:#FFFFFF;font-size:14px;">当月计划量</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.month.dayPlan}}吨</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.month.plan}}吨</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/jihuarenwu2.png"> <img src="../../../../assets/images/cutGraph/jihuarenwu2.png">
</div> </div>
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">当月累计完成量</div> <div style="color:#FFFFFF;font-size:14px;">当月累计完成量</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.month.output}}吨</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.month.finish}}吨</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/zichantongji1.png"> <img src="../../../../assets/images/cutGraph/zichantongji1.png">
</div> </div>
<div> <div>
<div> <div>
<div style="color:#FFFFFF;font-size:14px;">当月完成率</div> <div style="color:#FFFFFF;font-size:14px;">当月完成率</div>
<div style="color:#00E9FD;font-size:16px;font-weight:600;">{{outputMineData.month.rate}}%</div> <div style="color:#00E9FD;font-size:16px;font-weight:600;">{{parseInt(outputMineData.month.eff)}}%</div>
</div> </div>
<img src="../../../../assets/images/cutGraph/wanchenglv1.png"> <img src="../../../../assets/images/cutGraph/wanchenglv1.png">
</div> </div>
...@@ -421,9 +442,9 @@ export default { ...@@ -421,9 +442,9 @@ export default {
}, },
//产量数据以及中间图表数据 //产量数据以及中间图表数据
outputMineData:{ outputMineData:{
day:{output:'',rate:0,dayPlan:'',}, day:{finish:'',eff:0,plan:'',},
month:{output:'',rate:0,dayPlan:'',}, month:{finish:'',eff:0,plan:'',},
year:{output:'',rate:0,dayPlan:'',}, year:{finish:'',eff:0,plan:'',},
}, },
//运载数据以及中间图表数据 //运载数据以及中间图表数据
carryCenterData:{ carryCenterData:{
...@@ -536,70 +557,76 @@ export default { ...@@ -536,70 +557,76 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
//获取采区当前日产量 //获取采区当前日产量
HttpReq.truckDispatching.caiquAreaQueryDay({size:1,createTime:this.currentTime.day}).then((res) => { HttpReq.truckDispatching.caiquAreaQueryDay().then((res) => {
if(res.code == 200){ let undueArray = {};
let undueArray = {}; if(res.length == 0){
if(res.data.totalElements == 0){ undueArray.eff = 0;
undueArray.rate = 0; undueArray.finish = 0;
undueArray.output = 0; undueArray.plan = 0;
undueArray.dayPlan = 0; }else{
if(res[0].eff == ''){
undueArray.eff = 0;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else if(res[0].eff >= 1){
undueArray.eff = 100;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else{ }else{
if(res.data.content[0].rate == ''){ undueArray.eff = parseFloat(res[0].eff) * 100;
undueArray.rate = 0; undueArray.finish = res[0].finish;
undueArray.output = res.data.content[0].output; undueArray.plan = res[0].plan;
undueArray.dayPlan = res.data.content[0].dayPlan;
}else{
undueArray.rate = parseFloat(res.data.content[0].rate) * 100;
undueArray.output = res.data.content[0].output;
undueArray.dayPlan = res.data.content[0].dayPlan;
}
} }
this.outputMineData.day = undueArray;
} }
this.outputMineData.day = undueArray;
}) })
//获取采区当前月产量 //获取采区当前月产量
HttpReq.truckDispatching.caiquAreaQueryMonth({size:1,createTime:this.currentTime.month}).then((res) => { HttpReq.truckDispatching.caiquAreaQueryMonth().then((res) => {
if(res.code == 200){ let undueArray = {};
let undueArray = {}; if(res.length == 0){
if(res.data.totalElements == 0){ undueArray.eff = 0;
undueArray.rate = 0; undueArray.finish = 0;
undueArray.output = 0; undueArray.plan = 0;
undueArray.dayPlan = 0; }else{
if(res[0].eff == ''){
undueArray.eff = 0;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else if(res[0].eff >= 1){
undueArray.eff = 100;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else{ }else{
if(res.data.content[0].rate == ''){ undueArray.eff = parseFloat(res[0].eff) * 100;
undueArray.rate = 0; undueArray.finish = res[0].finish;
undueArray.output = res.data.content[0].output; undueArray.plan = res[0].plan;
undueArray.dayPlan = res.data.content[0].dayPlan;
}else{
undueArray.rate = parseFloat(res.data.content[0].rate) * 100;
undueArray.output = res.data.content[0].output;
undueArray.dayPlan = res.data.content[0].dayPlan;
}
} }
this.outputMineData.month = undueArray;
} }
this.outputMineData.month = undueArray;
}) })
//获取采区当前年产量 //获取采区当前年产量
HttpReq.truckDispatching.caiquAreaQueryYear({size:1,createTime:this.currentTime.year}).then((res) => { HttpReq.truckDispatching.caiquAreaQueryYear().then((res) => {
if(res.code == 200){ let undueArray = {};
let undueArray = {}; if(res.length == 0){
if(res.data.totalElements == 0){ undueArray.eff = 0;
undueArray.rate = 0; undueArray.finish = 0;
undueArray.output = 0; undueArray.plan = 0;
undueArray.dayPlan = 0; }else{
if(res[0].eff == ''){
undueArray.eff = 0;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else if(res[0].eff >= 1){
undueArray.eff = 100;
undueArray.finish = res[0].finish;
undueArray.plan = res[0].plan;
}else{ }else{
if(res.data.content[0].rate == ''){ undueArray.eff = parseFloat(res[0].eff) * 100;
undueArray.rate = 0; undueArray.finish = res[0].finish;
undueArray.output = res.data.content[0].output; undueArray.plan = res[0].plan;
undueArray.dayPlan = res.data.content[0].dayPlan;
}else{
undueArray.rate = parseFloat(res.data.content[0].rate) * 100;
undueArray.output = res.data.content[0].output;
undueArray.dayPlan = res.data.content[0].dayPlan;
}
} }
this.outputMineData.year = undueArray;
} }
this.outputMineData.year = undueArray;
}) })
//获取司机信息 //获取司机信息
HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => { HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => {
...@@ -1016,6 +1043,21 @@ export default { ...@@ -1016,6 +1043,21 @@ export default {
</script> </script>
<style scoped> <style scoped>
/* 进度条样式 */
.outside-div1{
width: 15vw;
height: 20px;
border: 1px solid #91A9FF;
display: flex;
align-items: center;
}
.inside-div1{
margin-left: 0.13vw;
width: 9%;
height: 12px;
background-color: #02EEF7;
}
.el-progress__text{ .el-progress__text{
color:white; color:white;
font-weight: 600; font-weight: 600;
...@@ -1083,11 +1125,11 @@ export default { ...@@ -1083,11 +1125,11 @@ export default {
font-size: 20px; font-size: 20px;
} }
.dataScrView_leftView_content_view1_son1{ .dataScrView_leftView_content_view1_son1{
width: 60px; width: 5.5vh;
height: 60px; height: 5.5vh;
background:no-repeat center center url('~@/assets/images/cutGraph/bilikuang.png'); background:no-repeat center center url('~@/assets/images/cutGraph/bilikuang.png');
background-size:100% 100%; background-size:100% 100%;
line-height: 60px; line-height: 5.5vh;
text-align: center; text-align: center;
color: white; color: white;
font-size: 18px; font-size: 18px;
......
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ 77a4a1ed
...@@ -77,11 +77,9 @@ export default { ...@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryDay(param).then((res) => { HttpReq.truckDispatching.caiquAreaQueryDay(param).then((res) => {
if(res.code == 200){ this.loading = false;
this.loading = false; this.tableData = res;
this.tableData = res.data.content; this.total = res.length;
this.total = res.data.totalElements;
}
}) })
}) })
......
src/views/performanceStatistics/caiquOutput/month/index.vue
View file @ 77a4a1ed
...@@ -77,11 +77,9 @@ export default { ...@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryMonth(param).then((res) => { HttpReq.truckDispatching.caiquAreaQueryMonth(param).then((res) => {
if(res.code == 200){ this.loading = false;
this.loading = false; this.tableData = res;
this.tableData = res.data.content; this.total = res.length;
this.total = res.data.totalElements;
}
}) })
}) })
......
src/views/performanceStatistics/caiquOutput/year/index.vue
View file @ 77a4a1ed
...@@ -77,11 +77,9 @@ export default { ...@@ -77,11 +77,9 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
HttpReq.truckDispatching.caiquAreaQueryYear(param).then((res) => { HttpReq.truckDispatching.caiquAreaQueryYear(param).then((res) => {
if(res.code == 200){ this.loading = false;
this.loading = false; this.tableData = res;
this.tableData = res.data.content; this.total = res.length;
this.total = res.data.totalElements;
}
}) })
}) })
......
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