fix:光芯大屏单个任务产量请求参数修改
This commit is contained in:
parent
cc17dde1dc
commit
a87de2a427
|
@ -706,12 +706,12 @@ export default {
|
||||||
let week = nowDate.getDay();//当前时间的week数
|
let week = nowDate.getDay();//当前时间的week数
|
||||||
let weekFirst = week-1;//第一天对应的天数
|
let weekFirst = week-1;//第一天对应的天数
|
||||||
let weekLast = 7-week;//最后一天对应的天数
|
let weekLast = 7-week;//最后一天对应的天数
|
||||||
let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
|
let first = that.$TOOL.dateFormat2(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
|
||||||
let last = new Date(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.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周'
|
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月,EXTRACT(WEEK FROM mlog.handle_date) AS 周'
|
||||||
}};
|
}};
|
||||||
that.$API.bi.dataset.exec.req('lineDay_m2', objWeek).then((res1) => {
|
that.$API.bi.dataset.exec.req('lineDay_m2', objWeek).then((res1) => {
|
||||||
if(res1.data2.ds0&&res1.data2.ds0.length>0){
|
if(res1.data2.ds0&&res1.data2.ds0.length>0){
|
||||||
|
@ -723,7 +723,7 @@ export default {
|
||||||
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.work_end_time) AS 月'
|
select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月'
|
||||||
}};
|
}};
|
||||||
that.$API.bi.dataset.exec.req('lineDay_m2', objMonth).then((res2) => {
|
that.$API.bi.dataset.exec.req('lineDay_m2', objMonth).then((res2) => {
|
||||||
if(res2.data2.ds0&&res2.data2.ds0.length>0){
|
if(res2.data2.ds0&&res2.data2.ds0.length>0){
|
||||||
|
|
Loading…
Reference in New Issue