|
@@ -8047,7 +8047,7 @@ class Whlabel extends Start_Controller
|
|
|
]
|
|
]
|
|
|
];
|
|
];
|
|
|
$cols = [
|
|
$cols = [
|
|
|
- ["wch"=>"10"],["wch"=>"10"],["wch"=>"20"],["wch"=>"40"],["wch"=>"40"],["wch"=>"20"],["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],["wch"=>"15"],
|
|
|
|
|
|
|
+ ["wch"=>"10"],["wch"=>"10"],["wch"=>"40"],["wch"=>"40"],["wch"=>"40"],["wch"=>"20"],["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],["wch"=>"15"],
|
|
|
];
|
|
];
|
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[
|
|
|
'data' => $end_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols
|
|
'data' => $end_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols
|
|
@@ -8108,7 +8108,7 @@ class Whlabel extends Start_Controller
|
|
|
]
|
|
]
|
|
|
];
|
|
];
|
|
|
$cols = [
|
|
$cols = [
|
|
|
- ["wch"=>"10"],["wch"=>"10"],["wch"=>"20"],["wch"=>"40"],["wch"=>"40"],["wch"=>"15"],["wch"=>"15"]
|
|
|
|
|
|
|
+ ["wch"=>"10"],["wch"=>"10"],["wch"=>"40"],["wch"=>"40"],["wch"=>"40"],["wch"=>"15"],["wch"=>"20"]
|
|
|
];
|
|
];
|
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[ 'data' => $final_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols])));
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[ 'data' => $final_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols])));
|
|
|
}
|
|
}
|
|
@@ -8240,7 +8240,8 @@ class Whlabel extends Start_Controller
|
|
|
]
|
|
]
|
|
|
];
|
|
];
|
|
|
$cols = [
|
|
$cols = [
|
|
|
- ["wch"=>"10"],["wch"=>"10"],["wch"=>"20"],["wch"=>"40"],["wch"=>"40"],["wch"=>"15"],["wch"=>"15"]
|
|
|
|
|
|
|
+ ["wch"=>"10"],["wch"=>"20"],["wch"=>"20"],["wch"=>"20"],["wch"=>"40"],["wch"=>"40"],["wch"=>"40"],["wch"=>"15"],["wch"=>"15"],
|
|
|
|
|
+ ["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],["wch"=>"10"],
|
|
|
];
|
|
];
|
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[
|
|
exit(json_encode(array('code' => 1,'msg'=>"获取成功",'data'=>[
|
|
|
'data' => $end_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols
|
|
'data' => $end_list,'title'=>$title,'merges'=>$merges,'cols'=>$cols
|
