fix:gx大屏调整
This commit is contained in:
parent
cc53e681c5
commit
b88b888dbc
|
|
@ -536,10 +536,7 @@ export default {
|
||||||
let end_date = that.$TOOL.dateFormat(nowDate, 'yyyy-MM-dd');
|
let end_date = that.$TOOL.dateFormat(nowDate, 'yyyy-MM-dd');
|
||||||
that.start_date = start_date;
|
that.start_date = start_date;
|
||||||
that.end_date = end_date;
|
that.end_date = end_date;
|
||||||
console.log('that.start_date',that.start_date)
|
|
||||||
console.log('that.end_date',that.end_date)
|
|
||||||
this.bigScreenName = this.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
|
this.bigScreenName = this.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
|
||||||
console.log('this.bigScreenName',this.bigScreenName)
|
|
||||||
this.showTime();
|
this.showTime();
|
||||||
loadBabylon().then(()=>{
|
loadBabylon().then(()=>{
|
||||||
this.initView()
|
this.initView()
|
||||||
|
|
@ -644,6 +641,7 @@ export default {
|
||||||
},
|
},
|
||||||
//时间
|
//时间
|
||||||
showTime() {
|
showTime() {
|
||||||
|
console.log(this.currentDate, this.currentWeek)
|
||||||
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
|
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
|
||||||
this.currentWeek = this.$TOOL.dateFormat(new Date(), "week");
|
this.currentWeek = this.$TOOL.dateFormat(new Date(), "week");
|
||||||
this.currentDate = this.$TOOL.dateFormat(new Date(),"yyyy年MM月dd日");
|
this.currentDate = this.$TOOL.dateFormat(new Date(),"yyyy年MM月dd日");
|
||||||
|
|
@ -712,7 +710,10 @@ export default {
|
||||||
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].生产数;
|
||||||
|
}else{
|
||||||
|
that.count_day = 0;
|
||||||
}
|
}
|
||||||
|
console.log('that.count_day',that.count_day)
|
||||||
});
|
});
|
||||||
let ondDayTime = 86400000;
|
let ondDayTime = 86400000;
|
||||||
let nowDate = new Date();
|
let nowDate = new Date();
|
||||||
|
|
@ -729,7 +730,10 @@ export default {
|
||||||
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){
|
||||||
that.count_week = res1.data2.ds0[0].生产数;
|
that.count_week = res1.data2.ds0[0].生产数;
|
||||||
|
}else{
|
||||||
|
that.count_week = 0;
|
||||||
}
|
}
|
||||||
|
console.log('that.count_week',that.count_week)
|
||||||
});
|
});
|
||||||
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();
|
||||||
|
|
@ -741,7 +745,10 @@ export default {
|
||||||
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){
|
||||||
that.count_month = res2.data2.ds0[0].生产数;
|
that.count_month = res2.data2.ds0[0].生产数;
|
||||||
|
}else{
|
||||||
|
that.count_month = 0;
|
||||||
}
|
}
|
||||||
|
console.log('that.count_month',that.count_month)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//不合格分布
|
//不合格分布
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue