pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整面板统计

dev
vine_liutk 2023-03-07 17:29:13 +08:00
parent 9d1faa4bab
commit 9388b47113
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/CropYieldController.php
View File

@ -237,6 +237,10 @@ class CropYieldController extends Controller
$categories = Keywords::filter($request->all())->where('type_key', 'crops-category')->get();
$data = [];
$settingCharts = [];
if(!($baseId > 0)){
$settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
}
foreach ($categories as $category) {
$data[$category->name] = 0;
if (isset($totalData[$category->id])) {
@ -244,7 +248,7 @@ class CropYieldController extends Controller
}
//如果是没有查指定城镇，则如果设置数据统计，则使用统计数值；
if(!($baseId > 0)){
$settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
$data[$category->name] = 0;
switch($category->key){
case 'crops-cate-nongye':
if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){
@ -302,12 +306,34 @@ class CropYieldController extends Controller
->keyBy('time_year')->toArray();
$data = [];
$settingCharts = [];
if(!($baseId > 0)){
$settingCharts = Setting::where('slug', 'like', 'city_data_chart_%')->get()->pluck('value', 'slug')->toArray();
}
for ($i = 0; $i < 4; $i++) {
$_year = $nowYear - $i;
$data[$_year] = 0;
if (isset($totalData[$_year])) {
$data[$_year] = $totalData[$_year]['output_total'];
}
if(!($baseId > 0)){
$data[$_year] = 0;
if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){
$data[$_year] += (json_decode($settingCharts['city_data_chart_nongye'], true)[$year])*10000;
}
if(isset(json_decode($settingCharts['city_data_chart_yuye'], true)[$year])){
$data[$_year] += (json_decode($settingCharts['city_data_chart_yuye'], true)[$year])*10000;
}
if(isset(json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])){
$data[$_year] += (json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])*10000;
}
if(isset(json_decode($settingCharts['city_data_chart_lingye'], true)[$year])){
$data[$_year] += (json_decode($settingCharts['city_data_chart_lingye'], true)[$year])*10000;
}
if(isset(json_decode($settingCharts['city_data_chart_activity'], true)[$year])){
$data[$_year] += (json_decode($settingCharts['city_data_chart_activity'], true)[$year])*10000;
}
}
}
return $this->json([