dev
parent
9388b47113
commit
ed415c8c6b
|
|
@ -318,20 +318,20 @@ class CropYieldController extends Controller
|
||||||
}
|
}
|
||||||
if(!($baseId > 0)){
|
if(!($baseId > 0)){
|
||||||
$data[$_year] = 0;
|
$data[$_year] = 0;
|
||||||
if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$year])){
|
if(isset(json_decode($settingCharts['city_data_chart_nongye'], true)[$_year])){
|
||||||
$data[$_year] += (json_decode($settingCharts['city_data_chart_nongye'], true)[$year])*10000;
|
$data[$_year] += (json_decode($settingCharts['city_data_chart_nongye'], true)[$_year])*10000;
|
||||||
}
|
}
|
||||||
if(isset(json_decode($settingCharts['city_data_chart_yuye'], true)[$year])){
|
if(isset(json_decode($settingCharts['city_data_chart_yuye'], true)[$_year])){
|
||||||
$data[$_year] += (json_decode($settingCharts['city_data_chart_yuye'], true)[$year])*10000;
|
$data[$_year] += (json_decode($settingCharts['city_data_chart_yuye'], true)[$_year])*10000;
|
||||||
}
|
}
|
||||||
if(isset(json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])){
|
if(isset(json_decode($settingCharts['city_data_chart_xumuye'], true)[$_year])){
|
||||||
$data[$_year] += (json_decode($settingCharts['city_data_chart_xumuye'], true)[$year])*10000;
|
$data[$_year] += (json_decode($settingCharts['city_data_chart_xumuye'], true)[$_year])*10000;
|
||||||
}
|
}
|
||||||
if(isset(json_decode($settingCharts['city_data_chart_lingye'], true)[$year])){
|
if(isset(json_decode($settingCharts['city_data_chart_lingye'], true)[$_year])){
|
||||||
$data[$_year] += (json_decode($settingCharts['city_data_chart_lingye'], true)[$year])*10000;
|
$data[$_year] += (json_decode($settingCharts['city_data_chart_lingye'], true)[$_year])*10000;
|
||||||
}
|
}
|
||||||
if(isset(json_decode($settingCharts['city_data_chart_activity'], true)[$year])){
|
if(isset(json_decode($settingCharts['city_data_chart_activity'], true)[$_year])){
|
||||||
$data[$_year] += (json_decode($settingCharts['city_data_chart_activity'], true)[$year])*10000;
|
$data[$_year] += (json_decode($settingCharts['city_data_chart_activity'], true)[$_year])*10000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue