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