Merge branch 'master' of github.com:Allvey/integrated-scheduling-v4 into github

equipment/dump.py

@@ -84,7 +84,7 @@ class DumpInfo(WalkManage):
             # except Exception as es:
             #     self.logger.error(f"卸载设备 {dump_id} 卸载时间信息缺失, 已设为默认值(1min)")
             #     self.logger.error(es)
-            self.unloading_time[self.dump_uuid_to_index_dict[dump_id]] = 2.00
+            self.unloading_time[self.dump_uuid_to_index_dict[dump_id]] = 10.00
         # print("average_unload_time: ", self.unloading_time[self.dump_uuid_to_index_dict[dump_id]])
 
     # 更新卸载设备出入时间
@@ -111,8 +111,8 @@ class DumpInfo(WalkManage):
             # except Exception as es:
             #     self.logger.error(f"卸载设备 {dump_id} 出入场时间信息缺失, 已设为默认值(1min)")
             #     self.logger.error(es)
-            self.entrance_time[self.dump_uuid_to_index_dict[dump_id]] = 0.50
-            self.exit_time[self.dump_uuid_to_index_dict[dump_id]] = 0.50
+            self.entrance_time[self.dump_uuid_to_index_dict[dump_id]] = 0.75
+            self.exit_time[self.dump_uuid_to_index_dict[dump_id]] = 0.75
 
     def update_dump_material(self):
         self.dump_material = {}

equipment/excavator.py

@@ -82,7 +82,7 @@ class ExcavatorInfo(WalkManage):
             self.logger.info(self.loading_time)
             self.logger.info("excavator_uuid_to_index_dict")
             self.logger.info(self.excavator_uuid_to_index_dict)
-            self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = 1.00
+            self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = 10.00
 
     # 更新挖机设备出入时间
     def update_excavator_entrance_exit_time(self):
@@ -111,8 +111,8 @@ class ExcavatorInfo(WalkManage):
             #     self.logger.error(es)
             self.entrance_time[
                 self.excavator_uuid_to_index_dict[excavator_id]
-            ] = 0.50
-            self.exit_time[self.excavator_uuid_to_index_dict[excavator_id]] = 0.50
+            ] = 0.75
+            self.exit_time[self.excavator_uuid_to_index_dict[excavator_id]] = 0.75
 
     # 读取出入场时间
     def get_loading_task_time(self):