Просмотр исходного кода

Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

任敬轩 9 часов назад
Родитель
Сommit
5b66738942
1 измененных файлов с 7 добавлено и 5 удалено
  1. 7 5
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

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

@@ -4498,7 +4498,7 @@ class CameraApiController extends BaseController
                 if (++$index_1==1){
                     $total2 .= '2.'.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个('.$var1.'),'.'作业厂点'.$sgdd_num.'个('.$var2.");\n";
                 } else{
-                    $total2 .= '  '.$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个('.$var1.'),'.'作业厂点'.$sgdd_num.'个('.$var2.");\n";
+                    $total2 .= "\t\t\t".$index_1.'.'.$value->title.'引进委外单位'.$wwdw_num.'个('.$var1.'),'.'作业厂点'.$sgdd_num.'个('.$var2.");\n";
                 }
 
 
@@ -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,9 +4599,9 @@ 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";
+                    $total3 .= "\t\t\t".$index_2.'.'.$value->title.'委外作业'.count($work_place_list_arr).'项,委外施工单位'.count($dd_wwdw).'个,施工点'.$dd_sgdsl."个;\n";
                 }