fix:生产报告中小时数据的获取更正
This commit is contained in:
parent
0135367fea
commit
b881449d11
|
@ -457,11 +457,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = that.query.mgroup;
|
params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
|
|
@ -457,11 +457,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = that.query.mgroup;
|
params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
|
|
@ -585,11 +585,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = this.query.mgroup;
|
params4.mgroup = this.query.mgroup;
|
||||||
this.$API.enm.enstat.req(params4).then((res4) => {
|
this.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
|
|
@ -650,11 +650,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = that.query.mgroup;
|
params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
|
|
@ -599,11 +599,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = that.query.mgroup;
|
params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
@ -840,11 +840,8 @@ export default {
|
||||||
seriesData2 = [],
|
seriesData2 = [],
|
||||||
seriesData3 = [],
|
seriesData3 = [],
|
||||||
seriesData4 = [];
|
seriesData4 = [];
|
||||||
// debugger;
|
|
||||||
console.log(response);
|
|
||||||
let data = response;
|
let data = response;
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
// debugger;
|
|
||||||
let ind = item.day_s - 1;
|
let ind = item.day_s - 1;
|
||||||
seriesData0[ind] = item.total_production;
|
seriesData0[ind] = item.total_production;
|
||||||
seriesData1[ind] = item.production_hour;
|
seriesData1[ind] = item.production_hour;
|
||||||
|
|
|
@ -596,11 +596,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = that.query.mgroup;
|
params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
@ -783,7 +783,6 @@ export default {
|
||||||
seriesData2 = [],
|
seriesData2 = [],
|
||||||
seriesData3 = [],
|
seriesData3 = [],
|
||||||
seriesData4 = [];
|
seriesData4 = [];
|
||||||
console.log(response);
|
|
||||||
let data = response;
|
let data = response;
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
let ind = item.hour - 1;
|
let ind = item.hour - 1;
|
||||||
|
|
|
@ -457,10 +457,10 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_s";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = this.query.mgroup;
|
params4.mgroup = this.query.mgroup;
|
||||||
this.$API.enm.enstat.req(params4).then((res4) => {
|
this.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
|
|
|
@ -793,11 +793,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = this.query.mgroup;
|
params4.mgroup = this.query.mgroup;
|
||||||
this.$API.enm.enstat.req(params4).then((res4) => {
|
this.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
@ -1019,11 +1019,8 @@ export default {
|
||||||
seriesData2 = [],
|
seriesData2 = [],
|
||||||
seriesData3 = [],
|
seriesData3 = [],
|
||||||
seriesData4 = [];
|
seriesData4 = [];
|
||||||
// debugger;
|
|
||||||
console.log(response);
|
|
||||||
let data = response;
|
let data = response;
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
// debugger;
|
|
||||||
let ind = item.day_s - 1;
|
let ind = item.day_s - 1;
|
||||||
seriesData0[ind] = item.total_production;
|
seriesData0[ind] = item.total_production;
|
||||||
seriesData1[ind] = Number(item.production_hour).toFixed(2);
|
seriesData1[ind] = Number(item.production_hour).toFixed(2);
|
||||||
|
@ -1055,7 +1052,6 @@ export default {
|
||||||
query2.type = "month_s";
|
query2.type = "month_s";
|
||||||
query2.mgroup = that.query.mgroup;
|
query2.mgroup = that.query.mgroup;
|
||||||
this.$API.enm.enstat.req(query2).then((response) => {
|
this.$API.enm.enstat.req(query2).then((response) => {
|
||||||
// debugger;
|
|
||||||
let seriesData0 = [],
|
let seriesData0 = [],
|
||||||
seriesData1 = [],
|
seriesData1 = [],
|
||||||
seriesData2 = [],
|
seriesData2 = [],
|
||||||
|
|
|
@ -754,11 +754,11 @@ export default {
|
||||||
//上小时
|
//上小时
|
||||||
let params4 = {};
|
let params4 = {};
|
||||||
params4.page = 0;
|
params4.page = 0;
|
||||||
params4.year = year_h;
|
params4.year_s = year_h;
|
||||||
params4.month = month_h;
|
params4.month_s = month_h;
|
||||||
params4.day = days_h;
|
params4.day_s = days_h;
|
||||||
params4.hour = hours_h;
|
params4.hour_s = hours_h;
|
||||||
params4.type = "hour_st";
|
params4.type = "hour_s";
|
||||||
params4.mgroup = this.query.mgroup;
|
params4.mgroup = this.query.mgroup;
|
||||||
this.$API.enm.enstat.req(params4).then((res4) => {
|
this.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
if (res4.length > 0) {
|
||||||
|
@ -920,7 +920,6 @@ export default {
|
||||||
seriesData1 = [],
|
seriesData1 = [],
|
||||||
seriesData2 = [],
|
seriesData2 = [],
|
||||||
seriesData3 = [];
|
seriesData3 = [];
|
||||||
console.log("获取小时数据", response);
|
|
||||||
let data = response;
|
let data = response;
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
let ind = item.hour - 1;
|
let ind = item.hour - 1;
|
||||||
|
|
|
@ -444,7 +444,7 @@ export default {
|
||||||
//月目标
|
//月目标
|
||||||
let params5 = {};
|
let params5 = {};
|
||||||
params5.page = 0;
|
params5.page = 0;
|
||||||
params5.mgroup = "3346520558031773696";
|
params5.mgroup = that.query.mgroup;
|
||||||
this.$API.mtm.goal.list
|
this.$API.mtm.goal.list
|
||||||
.req(params5)
|
.req(params5)
|
||||||
.then((res5) => {
|
.then((res5) => {
|
||||||
|
|
Loading…
Reference in New Issue