|
@@ -1354,7 +1354,7 @@ class common {
|
|
|
$max = 0;
|
|
$max = 0;
|
|
|
$data = array();
|
|
$data = array();
|
|
|
foreach($co2e as $val){
|
|
foreach($co2e as $val){
|
|
|
- $data[] = $val['catnum'];
|
|
|
|
|
|
|
+ $data[] = empty($val['catnum'])? 0 : $val['catnum'];
|
|
|
$total = $total + $val['catnum'];
|
|
$total = $total + $val['catnum'];
|
|
|
$max = $max < $val['catnum'] ? $val['catnum'] : $max;
|
|
$max = $max < $val['catnum'] ? $val['catnum'] : $max;
|
|
|
}
|
|
}
|
|
@@ -1366,7 +1366,7 @@ class common {
|
|
|
foreach($ContainerCounSeries as $k =>$v){
|
|
foreach($ContainerCounSeries as $k =>$v){
|
|
|
$color = common::getItemStyle($type,$k);
|
|
$color = common::getItemStyle($type,$k);
|
|
|
$ContainerCounSeries_return[] = array("name"=>$k,"type"=>"bar","emphasis" => array("focus" =>"none"),
|
|
$ContainerCounSeries_return[] = array("name"=>$k,"type"=>"bar","emphasis" => array("focus" =>"none"),
|
|
|
- "stack" =>"总计","data" =>$v['data'],"itemStyle" =>array("color" =>$color));
|
|
|
|
|
|
|
+ "stack" =>"总计","data" =>$v['data'],"itemStyle" =>array("color" =>$color),'barWidth'=>'20');
|
|
|
}
|
|
}
|
|
|
//处理返回原表数据格式
|
|
//处理返回原表数据格式
|
|
|
//计算刻度值 最小值是0,最大值是3000,刻度是500 interval
|
|
//计算刻度值 最小值是0,最大值是3000,刻度是500 interval
|