|
|
@ -55,7 +55,6 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
var personNum int //当班人数
|
|
|
var personNum int //当班人数
|
|
|
var attendancePersonNum int //出勤人数
|
|
|
|
|
|
var timeBeat float64 //节拍
|
|
|
var timeBeat float64 //节拍
|
|
|
var days int //展示天数
|
|
|
var days int //展示天数
|
|
|
var ippmTarge int //IPPM
|
|
|
var ippmTarge int //IPPM
|
|
|
@ -67,9 +66,6 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s |
|
|
if v.ParamName == "PersonNum" { |
|
|
if v.ParamName == "PersonNum" { |
|
|
personNum = utils.ValueToInt(v.CharParam1, 0) |
|
|
personNum = utils.ValueToInt(v.CharParam1, 0) |
|
|
} |
|
|
} |
|
|
if v.ParamName == "AttendancePersonNum" { |
|
|
|
|
|
attendancePersonNum = utils.ValueToInt(v.CharParam1, 0) |
|
|
|
|
|
} |
|
|
|
|
|
if v.ParamName == "Days" { |
|
|
if v.ParamName == "Days" { |
|
|
days = utils.ValueToInt(v.CharParam1, 0) |
|
|
days = utils.ValueToInt(v.CharParam1, 0) |
|
|
} |
|
|
} |
|
|
@ -328,7 +324,7 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s |
|
|
}(&wg) |
|
|
}(&wg) |
|
|
//图例003
|
|
|
//图例003
|
|
|
go func(wg *sync.WaitGroup) { |
|
|
go func(wg *sync.WaitGroup) { |
|
|
DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId) |
|
|
|
|
|
|
|
|
DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startDayTime, endDayTime, timeBeat, personNum, workLineId) |
|
|
wg.Done() // 操作完成，减少一个计数
|
|
|
wg.Done() // 操作完成，减少一个计数
|
|
|
}(&wg) |
|
|
}(&wg) |
|
|
//图例004
|
|
|
//图例004
|
|
|
|
