修改了上传页面点击的逻辑；增加循环
This commit is contained in:
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
@@ -28,7 +28,7 @@ missing module named multiprocessing.BufferTooShort - imported by multiprocessin
|
||||
missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level)
|
||||
missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional), zipimport (top-level)
|
||||
excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level)
|
||||
missing module named posix - imported by posixpath (optional), shutil (conditional), importlib._bootstrap_external (conditional), os (conditional, optional)
|
||||
missing module named posix - imported by os (conditional, optional), shutil (conditional), importlib._bootstrap_external (conditional), posixpath (optional)
|
||||
missing module named resource - imported by posix (top-level)
|
||||
missing module named multiprocessing.get_context - imported by multiprocessing (top-level), multiprocessing.pool (top-level), multiprocessing.managers (top-level), multiprocessing.sharedctypes (top-level)
|
||||
missing module named multiprocessing.TimeoutError - imported by multiprocessing (top-level), multiprocessing.pool (top-level)
|
||||
|
||||
@@ -38369,6 +38369,7 @@ imports:
|
||||
• <a href="#pandas">pandas</a>
|
||||
• <a href="#re">re</a>
|
||||
• <a href="#selenium.common.exceptions">selenium.common.exceptions</a>
|
||||
• <a href="#selenium.webdriver.common.by">selenium.webdriver.common.by</a>
|
||||
• <a href="#selenium.webdriver.support">selenium.webdriver.support</a>
|
||||
• <a href="#selenium.webdriver.support.expected_conditions">selenium.webdriver.support.expected_conditions</a>
|
||||
• <a href="#selenium.webdriver.support.ui">selenium.webdriver.support.ui</a>
|
||||
@@ -54961,6 +54962,7 @@ imports:
|
||||
imported by:
|
||||
<a href="#appium.webdriver.common.appiumby">appium.webdriver.common.appiumby</a>
|
||||
• <a href="#appium.webdriver.webdriver">appium.webdriver.webdriver</a>
|
||||
• <a href="#page_objects.upload_config_page">page_objects.upload_config_page</a>
|
||||
• <a href="#selenium.webdriver.remote.locator_converter">selenium.webdriver.remote.locator_converter</a>
|
||||
• <a href="#selenium.webdriver.remote.shadowroot">selenium.webdriver.remote.shadowroot</a>
|
||||
• <a href="#selenium.webdriver.remote.switch_to">selenium.webdriver.remote.switch_to</a>
|
||||
|
||||
Binary file not shown.
68
debug_page_source.xml
Normal file
68
debug_page_source.xml
Normal file
@@ -0,0 +1,68 @@
|
||||
<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
|
||||
|
||||
<hierarchy index="0" class="hierarchy" rotation="0" width="1080" height="2029">
|
||||
|
||||
<android.widget.FrameLayout index="0" package="com.bjjw.cjgc" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,0][1080,2118]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="0" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,0][1080,2118]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.FrameLayout index="0" package="com.bjjw.cjgc" class="android.widget.FrameLayout" text="" resource-id="android:id/content" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,89][1080,2118]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.RelativeLayout index="0" package="com.bjjw.cjgc" class="android.widget.RelativeLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,89][1080,2118]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,89][1080,1980]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.support.v4.view.ViewPager index="0" package="com.bjjw.cjgc" class="android.support.v4.view.ViewPager" text="" resource-id="com.bjjw.cjgc:id/vPager" checkable="false" checked="false" clickable="false" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="true" selected="false" bounds="[0,89][1080,1980]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.FrameLayout index="1" package="com.bjjw.cjgc" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,89][1080,1980]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.RelativeLayout index="0" package="com.bjjw.cjgc" class="android.widget.RelativeLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,89][1080,1980]" displayed="true" a11y-important="false" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.ListView index="0" package="com.bjjw.cjgc" class="android.widget.ListView" text="" resource-id="com.bjjw.cjgc:id/upload_result_list" checkable="false" checked="false" clickable="false" enabled="true" focusable="true" focused="true" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[28,117][1052,683]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/itemContainer" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[28,117][1052,305]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/longclick" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[56,159][875,263]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.TextView index="0" package="com.bjjw.cjgc" class="android.widget.TextView" text="CDWZQ-2标-刚性路基156右线-462321-462390-0" resource-id="com.bjjw.cjgc:id/title" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,159][875,218]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
<android.widget.TextView index="1" package="com.bjjw.cjgc" class="android.widget.TextView" text="测量时间：2026-02-02 09:59:42" resource-id="com.bjjw.cjgc:id/subtitle" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,218][590,263]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
<android.widget.Button index="1" package="com.bjjw.cjgc" class="android.widget.Button" text="上传" resource-id="com.bjjw.cjgc:id/upload_btn" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[875,145][1024,277]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="5" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
<android.widget.LinearLayout index="1" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/itemContainer" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[28,306][1052,494]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/longclick" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[56,348][875,452]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.TextView index="0" package="com.bjjw.cjgc" class="android.widget.TextView" text="CDWZQ-2标-三工区-任家湾特大桥-53#-56#" resource-id="com.bjjw.cjgc:id/title" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,348][875,407]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
<android.widget.TextView index="1" package="com.bjjw.cjgc" class="android.widget.TextView" text="测量时间：2026-02-28 13:34:06" resource-id="com.bjjw.cjgc:id/subtitle" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,407][585,452]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
<android.widget.Button index="1" package="com.bjjw.cjgc" class="android.widget.Button" text="上传" resource-id="com.bjjw.cjgc:id/upload_btn" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[875,334][1024,466]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="5" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
<android.widget.LinearLayout index="2" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/itemContainer" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[28,495][1052,683]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="3" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.LinearLayout index="0" package="com.bjjw.cjgc" class="android.widget.LinearLayout" text="" resource-id="com.bjjw.cjgc:id/longclick" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[56,537][875,641]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false">
|
||||
|
||||
<android.widget.TextView index="0" package="com.bjjw.cjgc" class="android.widget.TextView" text="CDWZQ-2标-区间路基136号-447970-448036-136" resource-id="com.bjjw.cjgc:id/title" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,537][875,596]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="1" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
<android.widget.TextView index="1" package="com.bjjw.cjgc" class="android.widget.TextView" text="测量时间：2026-02-28 11:44:46" resource-id="com.bjjw.cjgc:id/subtitle" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[84,596][583,641]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="2" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
<android.widget.Button index="1" package="com.bjjw.cjgc" class="android.widget.Button" text="上传" resource-id="com.bjjw.cjgc:id/upload_btn" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[875,523][1024,655]" displayed="true" a11y-important="true" screen-reader-focusable="false" drawing-order="5" showing-hint="false" text-entry-key="false" dismissable="false" a11y-focused="false" heading="false" live-region="0" context-clickable="false" content-invalid="false" />
|
||||
|
||||
</android.widget.LinearLayout>
|
||||
|
||||
</android.widget.ListView>
|
||||
|
||||
</android.widget.RelativeLayout>
|
||||
|
||||
BIN
dist/沉降观测自动上传.exe
vendored
BIN
dist/沉降观测自动上传.exe
vendored
Binary file not shown.
Binary file not shown.
@@ -429,7 +429,7 @@ def get_line_info_and_save_global(user_name: str) -> bool:
|
||||
# 存入全局字典：key=line_name，value=line_num
|
||||
global_variable.get_upload_breakpoint_dict()[line_name] = line_num
|
||||
|
||||
print(f"当前全局字典数据上传线路字典数据：{global_variable.get_upload_breakpoint_dict()}")
|
||||
|
||||
# 如果line_name不在列表中，则添加
|
||||
if line_name not in global_variable.get_upload_breakpoint_list():
|
||||
global_variable.get_upload_breakpoint_list().append(line_name)
|
||||
@@ -438,6 +438,7 @@ def get_line_info_and_save_global(user_name: str) -> bool:
|
||||
found_valid_data = True
|
||||
|
||||
if found_valid_data:
|
||||
# print(f"当前全局字典数据上传线路字典数据：{global_variable.get_upload_breakpoint_dict()}")
|
||||
logging.info(f"成功提取所有status=3的线路信息，当前全局字典数据：{global_variable.get_upload_breakpoint_dict()}")
|
||||
return True
|
||||
else:
|
||||
|
||||
109
main.py
109
main.py
@@ -163,32 +163,99 @@ class DeviceAutomation(object):
|
||||
EC.element_to_be_clickable((AppiumBy.ID, "com.bjjw.cjgc:id/img_2_layout"))
|
||||
)
|
||||
upload_page_btn.click()
|
||||
upload_page_btn.click()
|
||||
time.sleep(0.5)
|
||||
|
||||
upload_success_count = 0 # 上传成功的断点数量
|
||||
# 实现连续获取断点列表直到两次相同
|
||||
previous_breakpoint_list = None
|
||||
current_breakpoint_list = None
|
||||
max_attempts = 10 # 最大尝试次数
|
||||
attempt_count = 0
|
||||
while True:
|
||||
# 获取当前页面的断点列表
|
||||
|
||||
# 遍历断点列表，逐个执行上传操作
|
||||
upload_success_count = 0
|
||||
for breakpoint_name in global_variable.get_upload_breakpoint_list():
|
||||
try:
|
||||
logging.info(f"设备 {self.device_id} 开始处理断点 '{breakpoint_name}' 的上传")
|
||||
# 从当前页面获取断点列表名称
|
||||
current_breakpoint_list = self.upload_config_page.get_breakpoint_list_from_page()
|
||||
attempt_count += 1
|
||||
if current_breakpoint_list is None:
|
||||
logging.warning(f"设备 {self.device_id} 没有获取到断点列表，结束上传流程")
|
||||
break
|
||||
|
||||
# 安全地获取断点信息
|
||||
line_num = global_variable.get_upload_breakpoint_dict().get(breakpoint_name)
|
||||
if line_num is None:
|
||||
logging.warning(f"设备 {self.device_id} 断点 '{breakpoint_name}' 在字典中未找到，跳过上传")
|
||||
continue
|
||||
if not line_num:
|
||||
logging.warning(f"设备 {self.device_id} 断点 '{breakpoint_name}' 未获取到line_num，跳过上传")
|
||||
continue
|
||||
logging.info(f"第 {attempt_count} 次获取断点列表: {current_breakpoint_list}")
|
||||
|
||||
# 执行上传配置管理，传入当前断点名称
|
||||
if self.upload_config_page.upload_config_page_manager(self.results_dir, breakpoint_name, line_num):
|
||||
logging.info(f"设备 {self.device_id} 断点 '{breakpoint_name}' 上传成功")
|
||||
upload_success_count += 1
|
||||
else:
|
||||
logging.error(f"设备 {self.device_id} 断点 '{breakpoint_name}' 上传失败")
|
||||
# 检查是否与上一次获取的列表相同
|
||||
if previous_breakpoint_list is not None and current_breakpoint_list == previous_breakpoint_list:
|
||||
logging.info("连续两次获取到相同的断点列表，结束上传")
|
||||
# 下滑一次再次检查是否一致
|
||||
# 获取列表容器
|
||||
list_container = self.driver.find_element(AppiumBy.ID, "com.bjjw.cjgc:id/upload_result_list")
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"设备 {self.device_id} 处理断点 '{breakpoint_name}' 时发生异常: {str(e)}")
|
||||
# 计算滑动坐标
|
||||
start_x = list_container.location['x'] + list_container.size['width'] // 2
|
||||
# 向下滑动
|
||||
start_y = list_container.location['y'] + list_container.size['height'] * 0.95
|
||||
end_y = list_container.location['y'] + list_container.size['height'] * 0.05
|
||||
logging.info("向下滑动列表")
|
||||
self.driver.swipe(start_x, start_y, start_x, end_y, 500)
|
||||
current_breakpoint_list = self.upload_config_page.get_breakpoint_list_from_page()
|
||||
if previous_breakpoint_list is not None and current_breakpoint_list == previous_breakpoint_list:
|
||||
break
|
||||
|
||||
previous_breakpoint_list = current_breakpoint_list.copy() if current_breakpoint_list else None
|
||||
# 遍历当前页面列表，逐个执行上传操作
|
||||
|
||||
for breakpoint_name in current_breakpoint_list:
|
||||
|
||||
# # 遍历断点列表，逐个执行上传操作
|
||||
# upload_success_count = 0
|
||||
# for breakpoint_name in global_variable.get_upload_breakpoint_list():
|
||||
try:
|
||||
# 检查断点名称是否在当前页面列表中
|
||||
if breakpoint_name not in current_breakpoint_list:
|
||||
logging.warning(f"设备 {self.device_id} 断点 '{breakpoint_name}' 不在当前页面列表中，跳过上传")
|
||||
continue
|
||||
|
||||
logging.info(f"设备 {self.device_id} 开始处理断点 '{breakpoint_name}' 的上传")
|
||||
|
||||
# 安全地获取断点信息
|
||||
# breakpoint_names = global_variable.get_upload_breakpoint_dict()
|
||||
# logging.info(f"设备 {self.device_id} 断点字典 '{breakpoint_names}' 中包含断点 '{breakpoint_name}'")
|
||||
ui_breakpoint_dict = {}
|
||||
for key, value in global_variable.get_upload_breakpoint_dict().items():
|
||||
# 去掉末尾的"-平原"
|
||||
if key.endswith('-平原'):
|
||||
ui_key = key[:-3] # 去掉最后3个字符"-平原"
|
||||
else:
|
||||
ui_key = key
|
||||
ui_breakpoint_dict[ui_key] = value
|
||||
|
||||
line_num = ui_breakpoint_dict.get(breakpoint_name)
|
||||
logging.info(f"设备 {self.device_id} 断点 '{breakpoint_name}' 对应的line_num为 {line_num}")
|
||||
|
||||
if line_num is None:
|
||||
logging.warning(f"设备 {self.device_id} 断点 '{breakpoint_name}' 在字典中未找到，跳过上传")
|
||||
continue
|
||||
if not line_num:
|
||||
logging.warning(f"设备 {self.device_id} 断点 '{breakpoint_name}' 未获取到line_num，跳过上传")
|
||||
continue
|
||||
|
||||
# 执行上传配置管理，传入当前断点名称
|
||||
if self.upload_config_page.upload_config_page_manager(self.results_dir, breakpoint_name, line_num):
|
||||
logging.info(f"设备 {self.device_id} 断点 '{breakpoint_name}' 上传成功")
|
||||
upload_success_count += 1
|
||||
else:
|
||||
logging.error(f"设备 {self.device_id} 断点 '{breakpoint_name}' 上传失败")
|
||||
for i in range(3):
|
||||
if self.upload_config_page.upload_config_page_manager(self.results_dir, breakpoint_name, line_num):
|
||||
logging.info(f"设备 {self.device_id} 断点 '{breakpoint_name}' 重试上传成功")
|
||||
upload_success_count += 1
|
||||
break
|
||||
else:
|
||||
logging.error(f"设备 {self.device_id} 断点 '{breakpoint_name}' 上传失败，第 {i+1} 次重试")
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"设备 {self.device_id} 处理断点 '{breakpoint_name}' 时发生异常: {str(e)}")
|
||||
|
||||
logging.info(f"设备 {self.device_id} 上传配置管理执行完成，成功上传 {upload_success_count}/{len(global_variable.get_upload_breakpoint_list())} 个断点")
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -56,7 +56,7 @@ class ScreenshotPage:
|
||||
self.logger.info("向上滑动列表")
|
||||
|
||||
# 执行滑动
|
||||
self.driver.swipe(start_x, start_y, start_x, end_y, 1000)
|
||||
self.driver.swipe(start_x, start_y, start_x, end_y, 500)
|
||||
|
||||
|
||||
# 向上滑动时，检查是否滑动到顶
|
||||
@@ -1342,27 +1342,31 @@ class ScreenshotPage:
|
||||
retry_count += 1
|
||||
continue
|
||||
|
||||
# 点击返回按钮并处理弹窗
|
||||
if not self.execute_back_navigation_steps(device_id):
|
||||
self.logger.error(f"设备 {device_id} 处理返回按钮确认失败")
|
||||
retry_count += 1
|
||||
continue
|
||||
# 检查在不在测量列表页面，不在就点击返回按钮并处理弹窗
|
||||
if self.check_measurement_list(device_id):
|
||||
self.logger.error(f"设备 {device_id} 未在测量列表页面")
|
||||
# 点击返回按钮并处理弹窗
|
||||
if not self.execute_back_navigation_steps(device_id):
|
||||
self.logger.error(f"设备 {device_id} 处理返回按钮确认失败")
|
||||
retry_count += 1
|
||||
continue
|
||||
|
||||
# 成功处理完一个断点，添加到已处理列表
|
||||
processed_breakpoints.append(item)
|
||||
# add_breakpoint_to_upload_list(item, line_code)
|
||||
self.logger.info(f"成功处理断点: {item}")
|
||||
break # 跳出重试循环
|
||||
|
||||
# 检查是否重试次数用完仍未成功
|
||||
if retry_count >= max_retry_attempts:
|
||||
if retry_count == max_retry_attempts-1:
|
||||
self.logger.error(f"断点 {item} 经过 {max_retry_attempts} 次重试后仍然失败")
|
||||
|
||||
# 重新获取当前页面项目，因为可能有新的项目加载
|
||||
break
|
||||
continue
|
||||
# 向下滑动列表以加载更多项目
|
||||
if not self.scroll_list(direction="down"):
|
||||
self.logger.error("向下滑动列表失败")
|
||||
break
|
||||
continue
|
||||
|
||||
# 检查是否到达底部：连续两次获取的项目相同
|
||||
if current_items == previous_items and len(current_items) > 0:
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
# \page_objects\test_upload_config_page.py
|
||||
from appium.webdriver.common.appiumby import AppiumBy
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
from selenium.common.exceptions import TimeoutException, NoSuchElementException
|
||||
import logging
|
||||
@@ -25,6 +26,69 @@ class UploadConfigPage:
|
||||
self.more_download_page = MoreDownloadPage(driver, wait,device_id)
|
||||
self.device_id = device_id
|
||||
|
||||
|
||||
def get_breakpoint_list_from_page(self):
|
||||
"""
|
||||
从当前页面获取断点列表的断点名称
|
||||
Returns:
|
||||
list: 断点名称列表
|
||||
"""
|
||||
breakpoint_list = []
|
||||
try:
|
||||
# 优化点1: 等待列表容器出现，确保页面已加载
|
||||
self.wait.until(EC.presence_of_element_located((By.ID, "com.bjjw.cjgc:id/upload_result_list")))
|
||||
|
||||
# 优化点2: 等待至少一个itemContainer出现，确保列表有数据
|
||||
self.wait.until(EC.presence_of_element_located((By.ID, "com.bjjw.cjgc:id/itemContainer")))
|
||||
|
||||
# 方法1: 直接获取所有标题元素（最直接高效）
|
||||
title_elements = self.driver.find_elements(By.ID, "com.bjjw.cjgc:id/title")
|
||||
|
||||
if title_elements:
|
||||
for element in title_elements:
|
||||
breakpoint_name = element.text
|
||||
if breakpoint_name and breakpoint_name.strip(): # 增加空值过滤
|
||||
breakpoint_list.append(breakpoint_name.strip())
|
||||
print(f"✅ 直接通过title获取到 {len(breakpoint_list)} 个断点")
|
||||
|
||||
# 方法2: 如果方法1失败，通过itemContainer获取（备选方案）
|
||||
if not breakpoint_list:
|
||||
print("⚠️ 直接获取title失败，尝试通过itemContainer获取...")
|
||||
item_containers = self.driver.find_elements(By.ID, "com.bjjw.cjgc:id/itemContainer")
|
||||
for container in item_containers:
|
||||
try:
|
||||
title_element = container.find_element(By.ID, "com.bjjw.cjgc:id/title")
|
||||
breakpoint_name = title_element.text
|
||||
if breakpoint_name and breakpoint_name.strip():
|
||||
breakpoint_list.append(breakpoint_name.strip())
|
||||
except:
|
||||
continue
|
||||
print(f"✅ 通过itemContainer获取到 {len(breakpoint_list)} 个断点")
|
||||
|
||||
# 打印结果
|
||||
if breakpoint_list:
|
||||
print(f"📋 断点列表:")
|
||||
for i, name in enumerate(breakpoint_list, 1):
|
||||
print(f" {i}. {name}")
|
||||
else:
|
||||
print("⚠️ 未获取到任何断点，列表可能为空")
|
||||
|
||||
return breakpoint_list
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ 获取断点列表失败: {str(e)}")
|
||||
# 可以在这里打印更多调试信息
|
||||
try:
|
||||
page_source = driver.page_source
|
||||
print("📄 当前页面源码已保存，可用于调试")
|
||||
# 可以将page_source保存到文件，方便分析
|
||||
with open("debug_page_source.xml", "w", encoding="utf-8") as f:
|
||||
f.write(page_source)
|
||||
except:
|
||||
pass
|
||||
return breakpoint_list
|
||||
|
||||
|
||||
def go_upload_config_page(self):
|
||||
"""点击img_2_layout（上传页面按钮）"""
|
||||
try:
|
||||
@@ -343,8 +407,8 @@ class UploadConfigPage:
|
||||
'com.bjjw.cjgc:id/point_values'
|
||||
)
|
||||
|
||||
self.logger.info(f"找到 {len(point_name_elements)} 个测点")
|
||||
self.logger.info(f"找到 {len(point_value_elements)} 个数据元素")
|
||||
# self.logger.info(f"找到 {len(point_name_elements)} 个测点")
|
||||
# self.logger.info(f"找到 {len(point_value_elements)} 个数据元素")
|
||||
|
||||
# 提取每个测点的数据
|
||||
for i, (name_element, value_element) in enumerate(zip(point_name_elements, point_value_elements)):
|
||||
@@ -383,7 +447,7 @@ class UploadConfigPage:
|
||||
|
||||
point_data.append(point_info)
|
||||
|
||||
self.logger.info(f"测点 {i+1}: {point_name}")
|
||||
# self.logger.info(f"测点 {i+1}: {point_name}")
|
||||
# self.logger.info(f"完整数据: {point_value}")
|
||||
|
||||
except Exception as e:
|
||||
@@ -487,54 +551,54 @@ class UploadConfigPage:
|
||||
self.logger.error(f"检查上传配置页面时发生意外错误: {str(e)}")
|
||||
return False
|
||||
|
||||
def collect_all_point_data(self, results_dir):
|
||||
"""循环滑动收集所有测点数据，直到没有新数据出现"""
|
||||
all_point_data = []
|
||||
seen_point_names = set() # 用于跟踪已经见过的测点名称
|
||||
max_scroll_attempts = 20 # 最大滑动次数，防止无限循环
|
||||
scroll_attempt = 0
|
||||
# def collect_all_point_data(self, results_dir):
|
||||
# """循环滑动收集所有测点数据，直到没有新数据出现"""
|
||||
# all_point_data = []
|
||||
# seen_point_names = set() # 用于跟踪已经见过的测点名称
|
||||
# max_scroll_attempts = 20 # 最大滑动次数，防止无限循环
|
||||
# scroll_attempt = 0
|
||||
|
||||
self.logger.info("开始循环滑动收集所有测点数据...")
|
||||
# self.logger.info("开始循环滑动收集所有测点数据...")
|
||||
|
||||
while scroll_attempt < max_scroll_attempts:
|
||||
scroll_attempt += 1
|
||||
self.logger.info(f"第 {scroll_attempt} 次尝试获取数据...")
|
||||
# while scroll_attempt < max_scroll_attempts:
|
||||
# scroll_attempt += 1
|
||||
# self.logger.info(f"第 {scroll_attempt} 次尝试获取数据...")
|
||||
|
||||
# 获取当前屏幕的测点数据
|
||||
current_point_data = self.get_point_data()
|
||||
# # 获取当前屏幕的测点数据
|
||||
# current_point_data = self.get_point_data()
|
||||
|
||||
if not current_point_data:
|
||||
self.logger.info("当前屏幕没有测点数据，停止滑动")
|
||||
break
|
||||
# if not current_point_data:
|
||||
# self.logger.info("当前屏幕没有测点数据，停止滑动")
|
||||
# break
|
||||
|
||||
# 统计新发现的测点
|
||||
new_points_count = 0
|
||||
for point in current_point_data:
|
||||
point_name = point.get('point_name')
|
||||
if point_name and point_name not in seen_point_names:
|
||||
# 新测点，添加到结果集
|
||||
all_point_data.append(point)
|
||||
seen_point_names.add(point_name)
|
||||
new_points_count += 1
|
||||
# # 统计新发现的测点
|
||||
# new_points_count = 0
|
||||
# for point in current_point_data:
|
||||
# point_name = point.get('point_name')
|
||||
# if point_name and point_name not in seen_point_names:
|
||||
# # 新测点，添加到结果集
|
||||
# all_point_data.append(point)
|
||||
# seen_point_names.add(point_name)
|
||||
# new_points_count += 1
|
||||
|
||||
self.logger.info(f"本次获取到 {len(current_point_data)} 个测点，其中 {new_points_count} 个是新测点")
|
||||
# self.logger.info(f"本次获取到 {len(current_point_data)} 个测点，其中 {new_points_count} 个是新测点")
|
||||
|
||||
# 如果没有新数据，停止滑动
|
||||
if new_points_count == 0:
|
||||
self.logger.info("没有发现新测点，停止滑动")
|
||||
break
|
||||
# # 如果没有新数据，停止滑动
|
||||
# if new_points_count == 0:
|
||||
# self.logger.info("没有发现新测点，停止滑动")
|
||||
# break
|
||||
|
||||
# 滑动到下一页
|
||||
self.logger.info("滑动到下一页...")
|
||||
if not self.swipe_up():
|
||||
self.logger.warning("滑动失败，停止收集")
|
||||
break
|
||||
# # 滑动到下一页
|
||||
# self.logger.info("滑动到下一页...")
|
||||
# if not self.swipe_up():
|
||||
# self.logger.warning("滑动失败，停止收集")
|
||||
# break
|
||||
|
||||
# 等待页面稳定
|
||||
time.sleep(1)
|
||||
# # 等待页面稳定
|
||||
# time.sleep(1)
|
||||
|
||||
self.logger.info(f"数据收集完成，共获取 {len(all_point_data)} 个测点数据")
|
||||
return all_point_data
|
||||
# self.logger.info(f"数据收集完成，共获取 {len(all_point_data)} 个测点数据")
|
||||
# return all_point_data
|
||||
|
||||
def collect_check_all_point_data(self, max_variation):
|
||||
"""循环滑动收集所有测点数据，直到没有新数据出现"""
|
||||
@@ -547,7 +611,7 @@ class UploadConfigPage:
|
||||
|
||||
while scroll_attempt < max_scroll_attempts:
|
||||
scroll_attempt += 1
|
||||
self.logger.info(f"第 {scroll_attempt} 次尝试获取数据...")
|
||||
# self.logger.info(f"第 {scroll_attempt} 次尝试获取数据...")
|
||||
|
||||
# 获取当前屏幕的测点数据
|
||||
current_point_data = self.get_point_data()
|
||||
@@ -951,7 +1015,7 @@ class UploadConfigPage:
|
||||
|
||||
if workinfo_names:
|
||||
workinfo_name = workinfo_names[0] # 主要工况
|
||||
self.logger.info(f"为{work_type_name}({work_type_str})选择主要工况: {workinfo_name}")
|
||||
# self.logger.info(f"为{work_type_name}({work_type_str})选择主要工况: {workinfo_name}")
|
||||
|
||||
try:
|
||||
# 点击工况选择按钮
|
||||
@@ -1445,7 +1509,7 @@ class UploadConfigPage:
|
||||
EC.element_to_be_clickable((AppiumBy.XPATH, option_xpath))
|
||||
)
|
||||
option_element.click()
|
||||
self.logger.info(f"通过文本定位成功选择工况: {condition_name}")
|
||||
# self.logger.info(f"通过文本定位成功选择工况: {condition_name}")
|
||||
return True
|
||||
except TimeoutException:
|
||||
self.logger.debug(f"通过文本'{condition_name}'未找到工况选项")
|
||||
@@ -1512,12 +1576,12 @@ class UploadConfigPage:
|
||||
# return False
|
||||
# 跳转到上传配置页面
|
||||
if not go_main_click_tabber_button(self.driver, self.device_id, "com.bjjw.cjgc:id/img_2_layout"):
|
||||
logging.error(f"设备 {self.device_id} 跳转到上传配置页面失败")
|
||||
logging.error(f"设备 {self.device_id} 跳转到上传配置页面失败（下载操作）")
|
||||
return False
|
||||
|
||||
# 根据断点名称点击上传按钮
|
||||
if not self.click_upload_by_breakpoint_name(breakpoint_name):
|
||||
self.logger.error("点击上传按钮失败")
|
||||
self.logger.error("点击上传按钮失败（下载操作）")
|
||||
return False
|
||||
|
||||
if not self.handle_upload_dialog():
|
||||
@@ -1765,7 +1829,7 @@ class UploadConfigPage:
|
||||
|
||||
# 跳转到上传配置页面
|
||||
if not go_main_click_tabber_button(self.driver, self.device_id, "com.bjjw.cjgc:id/img_2_layout"):
|
||||
logging.error(f"设备 {self.device_id} 跳转到测量页面失败")
|
||||
logging.error(f"设备 {self.device_id} 跳转到上传配置页面失败")
|
||||
return False
|
||||
|
||||
# 根据断点名称点击上传按钮
|
||||
@@ -1846,17 +1910,7 @@ class UploadConfigPage:
|
||||
|
||||
# 获取线路的所有工况信息
|
||||
work_conditions = apis.get_work_conditions_by_linecode(self.line_num)
|
||||
# work_conditions = {'1962527': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 2},
|
||||
# '0299815Z2': {'sjName': '王顺', 'workinfoname': '冬休', 'work_type': 2},
|
||||
# '0299820H1': {'sjName': '王顺', 'workinfoname': '架桥机(运梁车) 首次通过后', 'work_type': 4},
|
||||
# '0431248D1': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 4},
|
||||
# '0431248D2': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 4},
|
||||
# '0299815Z1': {'sjName': '王顺', 'workinfoname': '架桥机(运梁车) 首次通过前', 'work_type': 2},
|
||||
# '0431289D2': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 4},
|
||||
# '0431330D1': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 2},
|
||||
# '0431330D2': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 2},
|
||||
# '0431370D1': {'sjName': '王顺', 'workinfoname': '轨道板(道床)铺设后，第1个月', 'work_type': 2}}
|
||||
self.logger.info(f"获取线路工况信息成功: {work_conditions}")
|
||||
# self.logger.info(f"获取线路工况信息成功: {work_conditions}")
|
||||
if not work_conditions:
|
||||
self.logger.error("获取工况信息失败")
|
||||
return False
|
||||
@@ -1896,9 +1950,9 @@ class UploadConfigPage:
|
||||
self.logger.error("点击保存上传并处理弹窗失败")
|
||||
return False
|
||||
|
||||
# 暂不上传，使用返回按钮替代。
|
||||
self.driver.back()
|
||||
return True
|
||||
# # 暂不上传，使用返回按钮替代。
|
||||
# self.driver.back()
|
||||
# return True
|
||||
|
||||
|
||||
# 等待上传，查看loading弹窗。没有就下一个
|
||||
|
||||
@@ -52,7 +52,7 @@ def update_file_status(username, from_status, to_status):
|
||||
|
||||
def parse_time_config():
|
||||
"""
|
||||
解析 time.txt，只获取状态为 true 的任务
|
||||
解析 time.txt，只获取状态为 ok 的任务
|
||||
"""
|
||||
time_map = {}
|
||||
if not os.path.exists(TIME_FILE_PATH):
|
||||
@@ -64,8 +64,8 @@ def parse_time_config():
|
||||
with open(TIME_FILE_PATH, 'r', encoding='utf-8') as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
# 匹配：用户名 时间 true (仅获取待处理任务)
|
||||
match = re.search(r'(\w+)\s+(\d{4}-\d{1,2}-\d{1,2}\s+\d{1,2}:\d{2}:\d{2})\s+ok$', line)
|
||||
# 匹配：用户名 时间 ok (仅获取待处理任务)
|
||||
match = re.search(r'([\w-]+)\s+(\d{4}-\d{1,2}-\d{1,2}\s+\d{1,2}:\d{2}:\d{2})\s+ok$', line)
|
||||
if match:
|
||||
username, scheduled_time = match.group(1), match.group(2)
|
||||
time_map[username] = scheduled_time
|
||||
@@ -112,6 +112,7 @@ def get_combined_tasks():
|
||||
"""
|
||||
try:
|
||||
local_times = parse_time_config()
|
||||
print(f"📝 [文件解析]local_times: {local_times}")
|
||||
if not local_times:
|
||||
return {}
|
||||
|
||||
@@ -187,7 +188,7 @@ def run_task(address, target_time, username):
|
||||
return f"❌ {username} 执行异常: {str(e)}"
|
||||
|
||||
def monitor_center():
|
||||
"""调度中心：每半小时检查一次"""
|
||||
"""调度中心：每10分钟检查一次"""
|
||||
while True:
|
||||
now_str = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
|
||||
print(f"\n{'='*20} 周期性检查开始 ({now_str}) {'='*20}")
|
||||
|
||||
80
test.py
Normal file
80
test.py
Normal file
@@ -0,0 +1,80 @@
|
||||
from globals.driver_utils import init_appium_driver
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
import permissions # 导入权限处理模块
|
||||
import logging
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
import main # 导入权限处理模块
|
||||
def get_breakpoint_list_from_page():
|
||||
driver, wait = init_appium_driver("77a6ac91")
|
||||
"""
|
||||
从当前页面获取断点列表的断点名称
|
||||
Returns:
|
||||
list: 断点名称列表
|
||||
"""
|
||||
breakpoint_list = []
|
||||
try:
|
||||
# 优化点1: 等待列表容器出现，确保页面已加载
|
||||
wait.until(EC.presence_of_element_located((By.ID, "com.bjjw.cjgc:id/upload_result_list")))
|
||||
|
||||
# 优化点2: 等待至少一个itemContainer出现，确保列表有数据
|
||||
wait.until(EC.presence_of_element_located((By.ID, "com.bjjw.cjgc:id/itemContainer")))
|
||||
|
||||
# 方法1: 直接获取所有标题元素（最直接高效）
|
||||
title_elements = driver.find_elements(By.ID, "com.bjjw.cjgc:id/title")
|
||||
|
||||
if title_elements:
|
||||
for element in title_elements:
|
||||
breakpoint_name = element.text
|
||||
if breakpoint_name and breakpoint_name.strip(): # 增加空值过滤
|
||||
breakpoint_list.append(breakpoint_name.strip())
|
||||
print(f"✅ 直接通过title获取到 {len(breakpoint_list)} 个断点")
|
||||
|
||||
# 方法2: 如果方法1失败，通过itemContainer获取（备选方案）
|
||||
if not breakpoint_list:
|
||||
print("⚠️ 直接获取title失败，尝试通过itemContainer获取...")
|
||||
item_containers = driver.find_elements(By.ID, "com.bjjw.cjgc:id/itemContainer")
|
||||
for container in item_containers:
|
||||
try:
|
||||
title_element = container.find_element(By.ID, "com.bjjw.cjgc:id/title")
|
||||
breakpoint_name = title_element.text
|
||||
if breakpoint_name and breakpoint_name.strip():
|
||||
breakpoint_list.append(breakpoint_name.strip())
|
||||
except:
|
||||
continue
|
||||
print(f"✅ 通过itemContainer获取到 {len(breakpoint_list)} 个断点")
|
||||
|
||||
# 打印结果
|
||||
if breakpoint_list:
|
||||
print(f"📋 断点列表:")
|
||||
for i, name in enumerate(breakpoint_list, 1):
|
||||
print(f" {i}. {name}")
|
||||
else:
|
||||
print("⚠️ 未获取到任何断点，列表可能为空")
|
||||
|
||||
return breakpoint_list
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ 获取断点列表失败: {str(e)}")
|
||||
# 可以在这里打印更多调试信息
|
||||
try:
|
||||
page_source = driver.page_source
|
||||
print("📄 当前页面源码已保存，可用于调试")
|
||||
# 可以将page_source保存到文件，方便分析
|
||||
with open("debug_page_source.xml", "w", encoding="utf-8") as f:
|
||||
f.write(page_source)
|
||||
except:
|
||||
pass
|
||||
return breakpoint_list
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if permissions.grant_appium_permissions("77a6ac91"):
|
||||
logging.info(f"设备 77a6ac91 权限授予成功")
|
||||
else:
|
||||
logging.warning(f"设备 77a6ac91 权限授予失败")
|
||||
|
||||
# 确保Appium服务器正在运行
|
||||
main.ensure_appium_server_running(4723)
|
||||
|
||||
get_breakpoint_list_from_page()
|
||||
@@ -1 +1,6 @@
|
||||
SJSG-7标-跨沿江高速特大桥-85#-89#-墩身-平原
|
||||
YKYGZQ-7-长房子特大桥0-3号墩-DK626+571-DK626+675-01-平原
|
||||
YKYGZQ-7-长房子泄水洞隧道大里程第四段-DK628+639-DK628+791-01-平原
|
||||
YKYGZQ-7-长房子泄水洞隧道大里程第二段-DK627+900-DK628+236-01-平原
|
||||
YKYGZQ-7-长房子泄水洞隧道大里程第一段-DK627+276-DK627+668-01-平原
|
||||
YKYGZQ-7-长房子泄水洞隧道大里程第三段-DK628+236-628+524-01-平原
|
||||
YKYGZQ-7-长房子泄水洞隧道大里程第五段-DK628+919-DK629+191-01-平原
|
||||
|
||||
Reference in New Issue
Block a user