|
@@ -217,13 +217,13 @@ export default {
|
|
|
const compProctList=ref([{
|
|
|
ai_prouct_no:'',
|
|
|
compDate:new Date().Format("yyyy-MM-dd"),
|
|
|
- compDateHour1:new Date().Format("yyyy-MM-dd hh")+":00:00",
|
|
|
- compDateHour2:new Date().Format("yyyy-MM-dd hh")+":00:00"
|
|
|
+ compDateHour1:new Date(new Date().getTime() - 3600000).Format("yyyy-MM-dd hh")+":00:00",
|
|
|
+ compDateHour2:new Date(new Date().getTime() - 3600000).Format("yyyy-MM-dd hh")+":00:00"
|
|
|
},{
|
|
|
ai_prouct_no:'',
|
|
|
compDate:new Date().Format("yyyy-MM-dd"),
|
|
|
- compDateHour1:new Date().Format("yyyy-MM-dd hh")+":00:00",
|
|
|
- compDateHour2:new Date().Format("yyyy-MM-dd hh")+":00:00"
|
|
|
+ compDateHour1:new Date(new Date().getTime() - 3600000).Format("yyyy-MM-dd hh")+":00:00",
|
|
|
+ compDateHour2:new Date(new Date().getTime() - 3600000).Format("yyyy-MM-dd hh")+":00:00"
|
|
|
}]);
|
|
|
const hourList=ref([]);
|
|
|
let lines={};
|
|
@@ -934,10 +934,10 @@ export default {
|
|
|
+" \r ...";
|
|
|
*/
|
|
|
tipText = lineNo1+"#产线\r"+dt
|
|
|
- +" \r 产 能(米):"+ReplaceNull(line1Data.length,'-')
|
|
|
- +" \r 白坯投放(T):"+ReplaceNull(line1Data.weight,'-')
|
|
|
- +" \r 电(kWh) :"+ReplaceNull(line1Data.elect,'-')
|
|
|
- +" \r 导热油(GJ) :"+ReplaceNull(line1Data.oil,'-')
|
|
|
+ +" \r 产 能(米):"+ReplaceNull(line1Data.length,'-')
|
|
|
+ +" \r 白坯投放(米):"+ReplaceNull(line1Data.bp,'-')
|
|
|
+ +" \r 电(kWh) :"+ReplaceNull(line1Data.elect,'-')
|
|
|
+ +" \r 导热油(GJ) :"+ReplaceNull(line1Data.oil,'-')
|
|
|
+" \r ...";
|
|
|
}else{
|
|
|
var dt1="";
|
|
@@ -987,10 +987,10 @@ export default {
|
|
|
*/
|
|
|
tipText = lineNo1+"#产线\r"+
|
|
|
dt1.padEnd(dtPadLen," ")+" "+dt2
|
|
|
- +" \r产 能(米):"+ReplaceNull(line1Data.length,'-')+" 产 能(米):"+ReplaceNull(line2Data.length,'-')
|
|
|
- +" \r白坯投放(T):"+ReplaceNull(line1Data.bp,'-').toString().padEnd(dataPadLen," ")+" 白坯投放(T):"+ReplaceNull(line2Data.bp,'-').toString().padEnd(5," ")
|
|
|
- +" \r电(kWh) :"+ReplaceNull(line1Data.elect,'-').toString().padEnd(dataPadLen," ")+" 电(kWh) :"+ReplaceNull(line2Data.elect,'-').toString().padEnd(5," ")
|
|
|
- +" \r热 油(GJ) :"+ReplaceNull(line1Data.oil,'-').toString().padEnd(dataPadLen," ")+" 热 油(GJ) :"+ReplaceNull(line2Data.oil,'-').toString().padEnd(5," ")
|
|
|
+ +" \r产 能(米):"+ReplaceNull(line1Data.length,'-')+" 产 能(米):"+ReplaceNull(line2Data.length,'-')
|
|
|
+ +" \r白坯投放(米):"+ReplaceNull(line1Data.bp,'-').toString().padEnd(dataPadLen," ")+" 白坯投放(米):"+ReplaceNull(line2Data.bp,'-').toString().padEnd(5," ")
|
|
|
+ +" \r电(kWh) :"+ReplaceNull(line1Data.elect,'-').toString().padEnd(dataPadLen," ")+" 电(kWh) :"+ReplaceNull(line2Data.elect,'-').toString().padEnd(5," ")
|
|
|
+ +" \r热 油(GJ) :"+ReplaceNull(line1Data.oil,'-').toString().padEnd(dataPadLen," ")+" 热 油(GJ) :"+ReplaceNull(line2Data.oil,'-').toString().padEnd(5," ")
|
|
|
+"\r ...";
|
|
|
}
|
|
|
var options = {
|
|
@@ -1030,10 +1030,10 @@ export default {
|
|
|
+" \r ...";
|
|
|
*/
|
|
|
var tipText = lineNo2+"#产线\r"+dt
|
|
|
- +" \r 产 能(米):"+ReplaceNull(line2Data.length,'-')
|
|
|
- +" \r 白坯投放(T):"+ReplaceNull(line2Data.weight,'-')
|
|
|
- +" \r 电(kWh) :"+ReplaceNull(line2Data.elect,'-')
|
|
|
- +" \r 导热油(GJ) :"+ReplaceNull(line2Data.oil,'-')
|
|
|
+ +" \r 产 能(米):"+ReplaceNull(line2Data.length,'-')
|
|
|
+ +" \r 白坯投放(米):"+ReplaceNull(line2Data.bp,'-')
|
|
|
+ +" \r 电(kWh) :"+ReplaceNull(line2Data.elect,'-')
|
|
|
+ +" \r 导热油(GJ) :"+ReplaceNull(line2Data.oil,'-')
|
|
|
+" \r ...";
|
|
|
var options = {
|
|
|
"text": tipText,
|