fix: 光芯大屏修改
This commit is contained in:
parent
e5b8552284
commit
2ab27c571c
|
|
@ -703,7 +703,7 @@ export default {
|
||||||
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
|
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
|
||||||
let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
|
let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
|
||||||
let current_date = that.currentYear+'-'+month+'-'+day;
|
let current_date = that.currentYear+'-'+month+'-'+day;
|
||||||
let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'二次超洗'}};
|
let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'一次超洗'}};
|
||||||
that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => {
|
that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => {
|
||||||
if(res0.data2.ds0&&res0.data2.ds0.length>0){
|
if(res0.data2.ds0&&res0.data2.ds0.length>0){
|
||||||
that.count_day = res0.data2.ds0[0].生产数;
|
that.count_day = res0.data2.ds0[0].生产数;
|
||||||
|
|
@ -717,7 +717,7 @@ export default {
|
||||||
let first = that.$TOOL.dateFormat2(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
|
let first = that.$TOOL.dateFormat2(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
|
||||||
let last = that.$TOOL.dateFormat2(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日
|
let last = that.$TOOL.dateFormat2(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日
|
||||||
let objWeek = {query:{
|
let objWeek = {query:{
|
||||||
start_date:first,end_date:last,mgroup_name:'二次超洗',
|
start_date:first,end_date:last,mgroup_name:'一次超洗',
|
||||||
group_bys_date:',月,周',order_bys_date:',月,周',
|
group_bys_date:',月,周',order_bys_date:',月,周',
|
||||||
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月,EXTRACT(WEEK FROM mlog.handle_date) AS 周'
|
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月,EXTRACT(WEEK FROM mlog.handle_date) AS 周'
|
||||||
}};
|
}};
|
||||||
|
|
@ -729,7 +729,7 @@ export default {
|
||||||
let start_month = that.currentYear+'-'+month+'-01';
|
let start_month = that.currentYear+'-'+month+'-01';
|
||||||
let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate();
|
let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate();
|
||||||
let objMonth = {query:{
|
let objMonth = {query:{
|
||||||
start_date:start_month,end_date:end_month,mgroup_name:'二次超洗',
|
start_date:start_month,end_date:end_month,mgroup_name:'一次超洗',
|
||||||
group_bys_date:',月',order_bys_date:',月',
|
group_bys_date:',月',order_bys_date:',月',
|
||||||
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月'
|
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月'
|
||||||
}};
|
}};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue