| xqd
@@ -122,6 +122,20 @@ class DataController extends BaseController
|
|
|
|
|
|
public function getStat(Request $request)
|
|
|
{
|
|
|
+ $info = [];
|
|
|
+ $device_arr = $request->input('device_ids');
|
|
|
+ $device_name_arr = $request->input('device_name_ids');
|
|
|
+ $spec_arr = $request->input('spec_ids');
|
|
|
+ if (array_sum($device_arr) != 0)
|
|
|
+ {
|
|
|
+ array_push($info,Device::whereIn('id',$device_arr)->pluck('name')->toArray()) ;
|
|
|
+ array_push($info,DeviceName::whereIn('id',$device_name_arr)->pluck('name')->toArray()) ;
|
|
|
+ array_push($info,Spec::whereIn('device_id',$device_arr)
|
|
|
+ ->whereIn('device_name_id',$device_name_arr)
|
|
|
+ ->whereIn('id',$spec_arr)
|
|
|
+ ->pluck('name')->toArray());
|
|
|
+ array_push($info,RentType::where('id',$request->input('rent_type_ids'))->value('name'));
|
|
|
+ }
|
|
|
if(!$request->input('project_ids')) return $this->error(['msg' => '']);
|
|
|
if($request->input('chart_type') == 'pie') return $this->getPieData($request);
|
|
|
else if($request->input('chart_type') == 'radar') return $this->getRadarData($request);
|
| xqd
@@ -154,7 +168,7 @@ class DataController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
$legends = $projects->pluck('name');
|
|
|
- return $this->success(['data' => compact('values', 'names', 'legends')]);
|
|
|
+ return $this->success(['data' => compact('values', 'names', 'legends','info')]);
|
|
|
}
|
|
|
|
|
|
public function getRadarData(Request $request)
|