|
@@ -34,7 +34,9 @@ class Index extends Base
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $dbData = db('service_data')->where('add_date', date('Y-m-d'))->group('add_hour')->select();
|
|
|
|
|
|
|
+
|
|
|
|
|
+ //$dbData = db('service_data')->where('add_date',date('Y-m-d'))->group('add_hour')->select();
|
|
|
|
|
+ $dbData = db('service_data')->where('add_date',date('Y-m-d'))->select();
|
|
|
|
|
|
|
|
foreach($line as $key=>$vo){
|
|
foreach($line as $key=>$vo){
|
|
|
foreach($dbData as $k=>$v){
|
|
foreach($dbData as $k=>$v){
|
|
@@ -50,6 +52,7 @@ class Index extends Base
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
$showData = [];
|
|
$showData = [];
|
|
|
foreach($line as $key=>$vo){
|
|
foreach($line as $key=>$vo){
|
|
|
$showData['is_talking'][] = $vo['is_talking'];
|
|
$showData['is_talking'][] = $vo['is_talking'];
|