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,
})
},
......
<template> <template>
<div class="common-page device-manage"> <div class="common-page device-manage">
<div class="option page-row"> <div class="option page-row">
<!--工具栏--> <!--工具栏-->
<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="date" placeholder="选择日期"></el-date-picker> <el-date-picker v-model="query.queryTime" type="date" 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>
<el-button type="primary" icon="el-icon-upload2" @click="daochu()">导出</el-button> <el-button type="primary" icon="el-icon-upload2" @click="daochu()">导出</el-button>
</div> </div>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="panel-bottom page-row"> <div class="panel-bottom page-row">
<h3>采区产量日报({{currentTime}})</h3> <h3>采区产量日报({{ currentTime }})</h3>
<div class="ctin-box"> <div class="ctin-box">
<div class="content-within"> <div class="content-within">
<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;"
</div> layout="total, prev, pager, next, sizes" @size-change="sizeChange"
</div> @current-change="pageChange"/>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import { Tools, HttpReq, Dates} from '@/assets/js/common.js'; import {Tools, HttpReq, Dates} from '@/assets/js/common.js';
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
query:{}, query: {},
tableData: [], tableData: [],
currentTime:'', currentTime: '',
} }
}, },
mounted() { mounted() {
this.currentTimeFn(); this.currentTimeFn();
this.$nextTick(() => { this.$nextTick(() => {
this.loadData(); this.loadData();
}) })
}, },
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 = "day";
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(()=>{
HttpReq.truckDispatching.caiquAreaQueryDay(param).then((res) => { this.$nextTick(() => {
this.loading = false; HttpReq.truckDispatching.jxquTable(param).then((res) => {
this.tableData = res; this.loading = false;
this.total = res.length; if (res.code == 200 && res.data) {
}) this.tableData = res.data.data;
}) this.total = res.data.total;
}
}, })
tableRowClassName({row, rowIndex}) { })
if (rowIndex === 1) {
return 'warning-row'; },
} else if (rowIndex === 3) { tableRowClassName({row, rowIndex}) {
return 'success-row'; if (rowIndex === 1) {
} return 'warning-row';
return ''; } else if (rowIndex === 3) {
}, return 'success-row';
// 点击搜索 }
toSearch() { return '';
this.page = 1; },
this.loadData(); // 点击搜索
}, toSearch() {
// 重置搜索 this.page = 1;
clearLimit(){ this.loadData();
this.query = {}; },
this.currentTimeFn(); // 重置搜索
this.loadData(); clearLimit() {
}, this.query = {};
pageChange(e) { this.currentTimeFn();
this.page = e this.loadData();
this.loadData() },
}, pageChange(e) {
sizeChange(e) { this.page = e
this.page = 1 this.loadData()
this.size = e },
this.loadData() sizeChange(e) {
}, this.page = 1
//获取当前时间 this.size = e
currentTimeFn(){ this.loadData()
var date = new Date(); },
var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份 //获取当前时间
var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月 currentTimeFn() {
var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31) var date = new Date();
//修改月份格式 var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
if (month >= 1 && month <= 9) { var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
month = "0" + month; var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
} //修改月份格式
//修改日期格式 if (month >= 1 && month <= 9) {
if (day >= 0 && day <= 9) { month = "0" + month;
day = "0" + day; }
} //修改日期格式
let currentFormatDate = year + "-" + month + "-" + day; if (day >= 0 && day <= 9) {
this.currentTime = currentFormatDate; day = "0" + day;
}, }
//转换查询时间 let currentFormatDate = year + "-" + month + "-" + day;
changeTimeFn(time){ this.currentTime = currentFormatDate;
var date = new Date(time); },
var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份 //转换查询时间
var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月 changeTimeFn(time) {
var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31) var date = new Date(time);
//修改月份格式 var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
if (month >= 1 && month <= 9) { var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
month = "0" + month; var day = date.getDate(); //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
} //修改月份格式
//修改日期格式 if (month >= 1 && month <= 9) {
if (day >= 0 && day <= 9) { month = "0" + month;
day = "0" + day; }
} //修改日期格式
let currentFormatDate = year + "-" + month + "-" + day; if (day >= 0 && day <= 9) {
this.currentTime = currentFormatDate; day = "0" + day;
return currentFormatDate; }
}, let currentFormatDate = year + "-" + month + "-" + day;
//导出 this.currentTime = currentFormatDate;
daochu(){ return currentFormatDate;
//获取表格 },
var exportFileContent = document.querySelector(".el-table").outerHTML; //导出
//设置格式为Excel,表格内容通过btoa转化为base64,此方法只在文件较小时使用(小于1M) daochu() {
//exportFileContent=window.btoa(unescape(encodeURIComponent(exportFileContent))); //获取表格
//var link = "data:"+MIMEType+";base64," + exportFileContent; var exportFileContent = document.querySelector(".el-table").outerHTML;
//使用Blob //设置格式为Excel,表格内容通过btoa转化为base64,此方法只在文件较小时使用(小于1M)
var blob = new Blob([exportFileContent], {type: "text/plain;charset=utf-8"}); //解决中文乱码问题 //exportFileContent=window.btoa(unescape(encodeURIComponent(exportFileContent)));
blob = new Blob([String.fromCharCode(0xFEFF), blob], {type: blob.type}); //var link = "data:"+MIMEType+";base64," + exportFileContent;
//设置链接 //使用Blob
var link = window.URL.createObjectURL(blob); var blob = new Blob([exportFileContent], {type: "text/plain;charset=utf-8"}); //解决中文乱码问题
var a = document.createElement("a"); //创建a标签 blob = new Blob([String.fromCharCode(0xFEFF), blob], {type: blob.type});
a.download = "采区产量日报("+ this.currentTime + ").xls"; //设置被下载的超链接目标(文件名) //设置链接
a.href = link; //设置a标签的链接 var link = window.URL.createObjectURL(blob);
document.body.appendChild(a); //a标签添加到页面 var a = document.createElement("a"); //创建a标签
a.click(); //设置a标签触发单击事件 a.download = "采区产量日报(" + this.currentTime + ").xls"; //设置被下载的超链接目标(文件名)
document.body.removeChild(a); //移除a标签 a.href = link; //设置a标签的链接
}, document.body.appendChild(a); //a标签添加到页面
} a.click(); //设置a标签触发单击事件
document.body.removeChild(a); //移除a标签
},
}
} }
</script> </script>
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
.el-table .warning-row { .el-table .warning-row {
background: oldlace; background: oldlace;
} }
.el-table .success-row {
background: #f0f9eb; .el-table .success-row {
} background: #f0f9eb;
}
.device-manage{
.panel-bottom{ .device-manage {
.el-button{margin:2px 0;padding:6px 15px;font-size:14px;} .panel-bottom {
.btn-groub2{ .el-button {
display:inline-block; margin: 2px 0;
.el-button{margin:2px 0;padding:6px 15px;font-size:15px;} padding: 6px 15px;
.el-button--warning { font-size: 14px;
background-color: #e6a23c; }
border-color: #e6a23c;
} .btn-groub2 {
.el-button--warning:focus,.el-button--warning:hover{background:#ebb563;border-color:#ebb563;} display: inline-block;
}
} .el-button {
} margin: 2px 0;
padding: 6px 15px;
.ecahrt1-dialog{ font-size: 15px;
display:flex;align-items:center; }
.el-dialog{
margin-top:inherit !important;display:table !important;width:fit-content; .el-button--warning {
.el-form-item{margin-right:0;} background-color: #e6a23c;
} border-color: #e6a23c;
}
.el-dialog__header{height:0;padding:0;display:block;}
.form-body{ .el-button--warning:focus, .el-button--warning:hover {
border:1px solid #999;width:800px;height:500px;position:relative; background: #ebb563;
>div{position:absolute;top:0;left:0;height:100%;width:100%;} border-color: #ebb563;
} }
} }
}
}
.ecahrt1-dialog {
display: flex;
align-items: center;
.el-dialog {
margin-top: inherit !important;
display: table !important;
width: fit-content;
.el-form-item {
margin-right: 0;
}
}
.el-dialog__header {
height: 0;
padding: 0;
display: block;
}
.form-body {
border: 1px solid #999;
width: 800px;
height: 500px;
position: relative;
> div {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
}
}
}
</style> </style>
...@@ -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