Bladeren bron

fix:export6

Xu·LinPeng 1 dag geleden
bovenliggende
commit
7c4990b213
1 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 5 3
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

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

@@ -4516,9 +4516,10 @@ class CameraApiController extends BaseController
                     'place' => '',
                 ];
 
+                $risk_index = 0;
                 foreach ($coal_washery_risk_info_arr as $k => $v) {
 
-                    $risk_index = 0;
+
                     $line['index'] = $index_1;
                     $line['wwdw_num'] = $wwdw_num;
                     $line['coal_washery'] = $value->title;
@@ -4580,11 +4581,12 @@ class CameraApiController extends BaseController
 
 
         $total3 = '';
+        $index_2 = 0;
         foreach ($coal_washery_dict as $key=>$value) {
             $dd_wwdw = [];
             $dd_sgdsl = 0;
             $id = $value->ID;
-            $index_2 = 0;
+
             if (isset($work_place_list[$id])) {
 
                 // 拿出当前施工地点的所有风险
@@ -4597,7 +4599,7 @@ class CameraApiController extends BaseController
                 }
 
                 if (++$index_2 == 1) {
-                    $total3 .= $index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项,委外施工单位'.count($dd_wwdw).'个,施工点'.$dd_sgdsl."个;\n";
+                    $total3 .= '3.'.$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项,委外施工单位'.count($dd_wwdw).'个,施工点'.$dd_sgdsl."个;\n";
                 }else{
                     $total3 .= '    '.++$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项,委外施工单位'.count($dd_wwdw).'个,施工点'.$dd_sgdsl."个;\n";
                 }