Xu·LinPeng 5 dienas atpakaļ
vecāks
revīzija
1f8c9cd3b0

+ 5 - 4
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -5028,9 +5028,9 @@ class CameraApiController extends BaseController
 
         }
 
-        $uniqueKeys = array_keys($work_place_list);
-        $count1 = count($uniqueKeys);
-        $var3 = (int) ($count1 / 2);
+//        $uniqueKeys = array_keys($work_place_list);
+//        $count1 = count($uniqueKeys);
+//        $var3 = (int) ($count1 / 2);
 
 
         $total3 = '';
@@ -5039,6 +5039,7 @@ class CameraApiController extends BaseController
         foreach ($coal_washery_dict as $key=>$value) {
 
             $id = $value->ID;
+            $area_id_tmp = $value->area_id;
 
             if (isset($work_place_list[$id])) {
 
@@ -5070,7 +5071,7 @@ class CameraApiController extends BaseController
                 // 作业人数差值
                 $preVar11 = sprintf("%+d",$workNumber - $preWorkNumber);
 
-                if (++$index_2<=$var3){
+                if ($area_id_tmp == 1055262869143609349){
                     $total3 .= $index_2.'.'.$value->title.'作业'.$riskWorkNum.'项('.$preVar10.'),人数:'.$workNumber."人(".$preVar11.");\n";
                 } else{
                     $total4 .= $index_2.'.'.$value->title.'作业'.$riskWorkNum.'项('.$preVar10.'),人数:'.$workNumber."人(".$preVar11.");\n";