Commit 00b4e8a3 authored by zhanglw's avatar zhanglw

采点卸点绩效统计报表

parent 2931d88f
...@@ -3114,6 +3114,23 @@ var HttpReq = function(){ ...@@ -3114,6 +3114,23 @@ var HttpReq = function(){
data: data, data: data,
}) })
}, },
//绩效采区报表查询
jxquTable: function(param){
return request({
url: '/api/performanceStatistics/prodTableOfMiningArea',
method: 'get',
params:param,
})
},
//绩效卸点报表查询
jxxdTable: function(param){
return request({
url: '/api/performanceStatistics/prodTableOfUnloadingPoint',
method: 'get',
params:param,
})
},
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择月份</label> <label class="el-form-item-label" style="font-weight: 500;">选择月份</label>
<el-date-picker v-model="query.createTime" type="month" placeholder="选择月份"></el-date-picker> <el-date-picker v-model="query.queryTime" type="month" placeholder="选择月份"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<div class="content-fix"> <div class="content-fix">
<div class="content" style="margin-top:15px;"> <div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <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="miningAreaName" label="采区" align="center"></el-table-column>
<el-table-column prop="nowPlan" label="月计划量" align="center"></el-table-column> <el-table-column prop="plan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际月产量" align="center"></el-table-column> <el-table-column prop="actualProd" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column> <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column> <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" /> <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
...@@ -67,21 +67,23 @@ export default { ...@@ -67,21 +67,23 @@ export default {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
if(this.query.createTime){ param.dmy = "month";
param.createTime = this.changeTimeFn(this.query.createTime); if (this.query.queryTime) {
}else{ param.queryTime = this.changeTimeFn(this.query.queryTime);
param.createTime = this.currentTime; } else {
} param.queryTime = this.currentTime;
}
this.$nextTick(()=>{ this.$nextTick(() => {
HttpReq.truckDispatching.caiquAreaQueryMonth(param).then((res) => { HttpReq.truckDispatching.jxquTable(param).then((res) => {
this.loading = false; this.loading = false;
this.tableData = res; if (res.code == 200 && res.data) {
this.total = res.length; this.tableData = res.data.data;
}) this.total = res.data.total;
}) }
})
})
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择年</label> <label class="el-form-item-label" style="font-weight: 500;">选择年</label>
<el-date-picker v-model="query.createTime" type="year" placeholder="选择年"></el-date-picker> <el-date-picker v-model="query.queryTime" type="year" placeholder="选择年"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<div class="content-fix"> <div class="content-fix">
<div class="content" style="margin-top:15px;"> <div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <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="miningAreaName" label="采区" align="center"></el-table-column>
<el-table-column prop="nowPlan" label="年计划量" align="center"></el-table-column> <el-table-column prop="plan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际年产量" align="center"></el-table-column> <el-table-column prop="actualProd" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="ratio" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column> <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column> <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" /> <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
...@@ -67,21 +67,24 @@ export default { ...@@ -67,21 +67,24 @@ export default {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
if(this.query.createTime){ param.dmy = "year";
param.createTime = this.changeTimeFn(this.query.createTime); if (this.query.queryTime) {
}else{ param.queryTime = this.changeTimeFn(this.query.queryTime);
param.createTime = this.currentTime; } else {
} param.queryTime = this.currentTime;
}
this.$nextTick(()=>{ this.$nextTick(() => {
HttpReq.truckDispatching.caiquAreaQueryYear(param).then((res) => { HttpReq.truckDispatching.jxquTable(param).then((res) => {
this.loading = false; this.loading = false;
this.tableData = res; if (res.code == 200 && res.data) {
this.total = res.length; this.tableData = res.data.data;
}) this.total = res.data.total;
}) }
})
})
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
......
...@@ -67,27 +67,24 @@ export default { ...@@ -67,27 +67,24 @@ export default {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
param.dmy = "day";
if(this.query.createTime){ if(this.query.createTime){
param.createTime = this.changeTimeFn(this.query.createTime); param.queryTime = this.changeTimeFn(this.query.createTime);
}else{ }else{
param.createTime = this.currentTime; param.queryTime = this.currentTime;
} }
this.$nextTick(()=>{ this.$nextTick(() => {
HttpReq.truckDispatching.apiManmadesCheDayQueryDay(param).then((res) => { HttpReq.truckDispatching.jxxdTable(param).then((res) => {
if(res.code == 200){ this.loading = false;
this.loading = false; if (res.code == 200 && res.data) {
this.tableData = res.data; this.tableData = res.data.data;
} this.total = res.data.total;
}) }
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => { })
if(res.code == 200){ })
this.total = res.data.length;
}
})
})
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<div class="content-fix"> <div class="content-fix">
<div class="content" style="margin-top:15px;"> <div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <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="uploadingPointName" label="卸点" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="日计划量" align="center"></el-table-column> <el-table-column prop="plan" label="日计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际日产量" align="center"></el-table-column> <el-table-column prop="actualProd" label="实际日产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column> <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column> <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" /> <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
...@@ -67,29 +67,25 @@ export default { ...@@ -67,29 +67,25 @@ export default {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
if(this.query.createTime){ param.dmy = "day";
param.createTime = this.changeTimeFn(this.query.createTime); if(this.query.createTime){
}else{ param.queryTime = this.changeTimeFn(this.query.createTime);
param.createTime = this.currentTime; }else{
} param.queryTime = this.currentTime;
}
this.$nextTick(()=>{
HttpReq.truckDispatching.xiequAreaQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.xiequAreaQueryDay({size:9999,page:0,createTime:param.createTime}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
})
})
}, this.$nextTick(() => {
HttpReq.truckDispatching.jxxdTable(param).then((res) => {
this.loading = false;
if (res.code == 200 && res.data) {
this.tableData = res.data.data;
this.total = res.data.total;
}
})
})
},
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) { if (rowIndex === 1) {
return 'warning-row'; return 'warning-row';
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<div class="content-fix"> <div class="content-fix">
<div class="content" style="margin-top:15px;"> <div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <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="uploadingPointName" label="卸点" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="月计划量" align="center"></el-table-column> <el-table-column prop="plan" label="月计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际月产量" align="center"></el-table-column> <el-table-column prop="actualProd" label="实际月产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column> <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column> <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" /> <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
...@@ -67,27 +67,24 @@ export default { ...@@ -67,27 +67,24 @@ export default {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
if(this.query.createTime){ param.dmy = "month";
param.createTime = this.changeTimeFn(this.query.createTime); if(this.query.createTime){
}else{ param.queryTime = this.changeTimeFn(this.query.createTime);
param.createTime = this.currentTime; }else{
} param.queryTime = this.currentTime;
}
this.$nextTick(()=>{ this.$nextTick(() => {
HttpReq.truckDispatching.xiequAreaQueryMonth(param).then((res) => { HttpReq.truckDispatching.jxxdTable(param).then((res) => {
if(res.code == 200){ this.loading = false;
this.loading = false; if (res.code == 200 && res.data) {
this.tableData = res.data; this.tableData = res.data.data;
} this.total = res.data.total;
}) }
HttpReq.truckDispatching.xiequAreaQueryMonth({size:9999,page:0,createTime:param.createTime}).then((res) => { })
if(res.code == 200){ })
this.total = res.data.length;
}
})
})
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<div class="content-fix"> <div class="content-fix">
<div class="content" style="margin-top:15px;"> <div class="content" style="margin-top:15px;">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <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="uploadingPointName" label="卸点" align="center"></el-table-column>
<el-table-column prop="dayPlan" label="年计划量" align="center"></el-table-column> <el-table-column prop="plan" label="年计划量" align="center"></el-table-column>
<el-table-column prop="total" label="实际年产量" align="center"></el-table-column> <el-table-column prop="actualProd" label="实际年产量" align="center"></el-table-column>
<el-table-column prop="rate" label="完成率" align="center"></el-table-column> <el-table-column prop="rate" label="完成率" align="center"></el-table-column>
<el-table-column prop="worktime" label="铲车工作时间(h)" align="center"></el-table-column> <el-table-column prop="timeOfWork" label="铲车工作时间(h)" align="center"></el-table-column>
<el-table-column prop="shovel" label="铲车车数" align="center"></el-table-column> <el-table-column prop="numberOfCC" label="铲车车数" align="center"></el-table-column>
<el-table-column prop="lorry" label="卡车车数" align="center"></el-table-column> <el-table-column prop="numberOfKC" label="卡车车数" align="center"></el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" /> <el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
...@@ -64,31 +64,27 @@ export default { ...@@ -64,31 +64,27 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
var sort = 'id,desc'; var sort = 'id,desc';
var param = {...this.query}; var param = {...this.query};
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.pageSize = this.size;
param.sort = sort; param.sort = sort;
if(this.query.createTime){ param.dmy = "year";
param.createTime = this.changeTimeFn(this.query.createTime); if(this.query.createTime){
}else{ param.queryTime = this.changeTimeFn(this.query.createTime);
param.createTime = this.currentTime; }else{
} param.queryTime = this.currentTime;
}
this.$nextTick(()=>{
HttpReq.truckDispatching.xiequAreaQueryYear(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.xiequAreaQueryYear({size:9999,page:0,createTime:param.createTime}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
})
})
this.$nextTick(() => {
HttpReq.truckDispatching.jxxdTable(param).then((res) => {
this.loading = false;
if (res.code == 200 && res.data) {
this.tableData = res.data.data;
this.total = res.data.total;
}
})
})
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) { if (rowIndex === 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