| xqd
@@ -405,17 +405,13 @@ class DataController extends BaseController
|
|
|
|
|
|
public function getMaxStat(Request $request)
|
|
|
{
|
|
|
- $info = null;
|
|
|
+ $info = [];
|
|
|
if ($request->input('devices')!=null)
|
|
|
{
|
|
|
- $devices = Device::where('id',$request->input('device_ids'))->value('name');
|
|
|
- $device_name = DeviceName::where('id',$request->input('device_name_ids'))->value('name');
|
|
|
- $spec_name = Spec::where('device_id',$request->input('device_ids'))->where('device_name_id',$request->input('device_name_ids'))->where('id',$request->input('spec_ids'))->value('name');
|
|
|
- $rent_type = RentType::where('id',$request->input('rent_type_ids'))->value('name');
|
|
|
- $info['device'] = $devices;
|
|
|
- $info['device_name'] = $device_name;
|
|
|
- $info['spec_name'] = $spec_name;
|
|
|
- $info['rent_type'] = $rent_type;
|
|
|
+ array_push($info,Device::where('id',$request->input('device_ids'))->value('name')) ;
|
|
|
+ array_push($info,DeviceName::where('id',$request->input('device_name_ids'))->value('name')) ;
|
|
|
+ array_push($info,Spec::where('device_id',$request->input('device_ids'))->where('device_name_id',$request->input('device_name_ids'))->where('id',$request->input('spec_ids'))->value('name'));
|
|
|
+ array_push($info,RentType::where('id',$request->input('rent_type_ids'))->value('name'));
|
|
|
}
|
|
|
$date = $request->input('date');
|
|
|
$date = $date ? $date : Carbon::now()->toDateString();
|
| xqd
@@ -452,7 +448,6 @@ class DataController extends BaseController
|
|
|
{
|
|
|
$value = 0;
|
|
|
}
|
|
|
-// dd($values);
|
|
|
$values = 0;
|
|
|
}else
|
|
|
{
|