Skip to content

K
kd_control
Commit 00b4e8a3 authored by zhanglw's avatar zhanglw
Browse files
Options

采点卸点绩效统计报表

parent 2931d88f
Show whitespace changes
Inline Side-by-side
Showing with 392 additions and 341 deletions
src/assets/js/common.js
View file @ 00b4e8a3
...@@ -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,
})
},
......
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ 00b4e8a3
...@@ -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="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>
...@@ -16,22 +16,24 @@ ...@@ -16,22 +16,24 @@
<!-- 表格 --> <!-- 表格 -->
<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;"
layout="total, prev, pager, next, sizes" @size-change="sizeChange"
@current-change="pageChange"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -42,7 +44,7 @@ ...@@ -42,7 +44,7 @@
</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() {
...@@ -51,9 +53,9 @@ export default { ...@@ -51,9 +53,9 @@ export default {
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
query:{}, query: {},
tableData: [], tableData: [],
currentTime:'', currentTime: '',
} }
}, },
mounted() { mounted() {
...@@ -67,19 +69,22 @@ export default { ...@@ -67,19 +69,22 @@ 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.queryTime) {
}else{ param.queryTime = this.changeTimeFn(this.query.queryTime);
param.createTime = this.currentTime; } else {
param.queryTime = this.currentTime;
} }
this.$nextTick(()=>{ this.$nextTick(() => {
HttpReq.truckDispatching.caiquAreaQueryDay(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;
}
}) })
}) })
...@@ -98,7 +103,7 @@ export default { ...@@ -98,7 +103,7 @@ export default {
this.loadData(); this.loadData();
}, },
// 重置搜索 // 重置搜索
clearLimit(){ clearLimit() {
this.query = {}; this.query = {};
this.currentTimeFn(); this.currentTimeFn();
this.loadData(); this.loadData();
...@@ -113,7 +118,7 @@ export default { ...@@ -113,7 +118,7 @@ export default {
this.loadData() this.loadData()
}, },
//获取当前时间 //获取当前时间
currentTimeFn(){ currentTimeFn() {
var date = new Date(); var date = new Date();
var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份 var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月 var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
...@@ -130,7 +135,7 @@ export default { ...@@ -130,7 +135,7 @@ export default {
this.currentTime = currentFormatDate; this.currentTime = currentFormatDate;
}, },
//转换查询时间 //转换查询时间
changeTimeFn(time){ changeTimeFn(time) {
var date = new Date(time); var date = new Date(time);
var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份 var year = date.getFullYear(); //年 ,从 Date 对象以四位数字返回年份
var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月 var month = date.getMonth() + 1; //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
...@@ -148,7 +153,7 @@ export default { ...@@ -148,7 +153,7 @@ export default {
return currentFormatDate; return currentFormatDate;
}, },
//导出 //导出
daochu(){ daochu() {
//获取表格 //获取表格
var exportFileContent = document.querySelector(".el-table").outerHTML; var exportFileContent = document.querySelector(".el-table").outerHTML;
//设置格式为Excel，表格内容通过btoa转化为base64，此方法只在文件较小时使用(小于1M) //设置格式为Excel，表格内容通过btoa转化为base64，此方法只在文件较小时使用(小于1M)
...@@ -160,7 +165,7 @@ export default { ...@@ -160,7 +165,7 @@ export default {
//设置链接 //设置链接
var link = window.URL.createObjectURL(blob); var link = window.URL.createObjectURL(blob);
var a = document.createElement("a"); //创建a标签 var a = document.createElement("a"); //创建a标签
a.download = "采区产量日报("+ this.currentTime + ").xls"; //设置被下载的超链接目标（文件名） a.download = "采区产量日报(" + this.currentTime + ").xls"; //设置被下载的超链接目标（文件名）
a.href = link; //设置a标签的链接 a.href = link; //设置a标签的链接
document.body.appendChild(a); //a标签添加到页面 document.body.appendChild(a); //a标签添加到页面
a.click(); //设置a标签触发单击事件 a.click(); //设置a标签触发单击事件
...@@ -171,39 +176,77 @@ export default { ...@@ -171,39 +176,77 @@ export default {
</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 {
.el-table .success-row {
background: #f0f9eb; background: #f0f9eb;
}
.device-manage {
.panel-bottom {
.el-button {
margin: 2px 0;
padding: 6px 15px;
font-size: 14px;
}
.btn-groub2 {
display: inline-block;
.el-button {
margin: 2px 0;
padding: 6px 15px;
font-size: 15px;
} }
.device-manage{
.panel-bottom{
.el-button{margin:2px 0;padding:6px 15px;font-size:14px;}
.btn-groub2{
display:inline-block;
.el-button{margin:2px 0;padding:6px 15px;font-size:15px;}
.el-button--warning { .el-button--warning {
background-color: #e6a23c; background-color: #e6a23c;
border-color: #e6a23c; border-color: #e6a23c;
} }
.el-button--warning:focus,.el-button--warning:hover{background:#ebb563;border-color:#ebb563;}
.el-button--warning:focus, .el-button--warning:hover {
background: #ebb563;
border-color: #ebb563;
} }
} }
} }
}
.ecahrt1-dialog {
display: flex;
align-items: center;
.ecahrt1-dialog{ .el-dialog {
display:flex;align-items:center; margin-top: inherit !important;
.el-dialog{ display: table !important;
margin-top:inherit !important;display:table !important;width:fit-content; width: fit-content;
.el-form-item{margin-right:0;}
.el-form-item {
margin-right: 0;
}
} }
.el-dialog__header{height:0;padding:0;display:block;} .el-dialog__header {
.form-body{ height: 0;
border:1px solid #999;width:800px;height:500px;position:relative; padding: 0;
>div{position:absolute;top:0;left:0;height:100%;width:100%;} 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>
src/views/performanceStatistics/caiquOutput/month/index.vue
View file @ 00b4e8a3
...@@ -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,19 +67,21 @@ export default { ...@@ -67,19 +67,21 @@ 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.jxquTable(param).then((res) => {
HttpReq.truckDispatching.caiquAreaQueryMonth(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;
}
}) })
}) })
......
src/views/performanceStatistics/caiquOutput/year/index.vue
View file @ 00b4e8a3
...@@ -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,19 +67,22 @@ export default { ...@@ -67,19 +67,22 @@ 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;
}
}) })
}) })
......
src/views/performanceStatistics/carOutput/day/index.vue
View file @ 00b4e8a3
...@@ -67,24 +67,21 @@ export default { ...@@ -67,24 +67,21 @@ 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;
this.tableData = res.data; if (res.code == 200 && 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;
} }
}) })
}) })
......
src/views/performanceStatistics/xiedianOutput/day/index.vue
View file @ 00b4e8a3
...@@ -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,28 +67,24 @@ export default { ...@@ -67,28 +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.xiequAreaQueryDay(param).then((res) => { HttpReq.truckDispatching.jxxdTable(param).then((res) => {
if(res.code == 200){
this.loading = false; this.loading = false;
this.tableData = res.data; if (res.code == 200 && res.data) {
} this.tableData = res.data.data;
}) this.total = res.data.total;
HttpReq.truckDispatching.xiequAreaQueryDay({size:9999,page:0,createTime:param.createTime}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
} }
}) })
}) })
}, },
tableRowClassName({row, rowIndex}) { tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) { if (rowIndex === 1) {
......
src/views/performanceStatistics/xiedianOutput/month/index.vue
View file @ 00b4e8a3
...@@ -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,24 +67,21 @@ export default { ...@@ -67,24 +67,21 @@ 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 = "month";
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.xiequAreaQueryMonth(param).then((res) => { HttpReq.truckDispatching.jxxdTable(param).then((res) => {
if(res.code == 200){
this.loading = false; this.loading = false;
this.tableData = res.data; if (res.code == 200 && 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;
} }
}) })
}) })
......
src/views/performanceStatistics/xiedianOutput/year/index.vue
View file @ 00b4e8a3
...@@ -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,28 +67,24 @@ export default { ...@@ -67,28 +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 = "year";
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.xiequAreaQueryYear(param).then((res) => { HttpReq.truckDispatching.jxxdTable(param).then((res) => {
if(res.code == 200){
this.loading = false; this.loading = false;
this.tableData = res.data; if (res.code == 200 && res.data) {
} this.tableData = res.data.data;
}) this.total = res.data.total;
HttpReq.truckDispatching.xiequAreaQueryYear({size:9999,page:0,createTime:param.createTime}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
} }
}) })
}) })
}, },
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