调整截图文件的缩放比，实现测试报告点击图片弹窗放大功能。

预定系统/README.md

@@ -171,4 +171,6 @@
 39. 2025-01-13
    - 调整展厅巡检窗帘控制的等待时间。调整标准版功能巡检至测试发布192.168.5.235环境。去除移动端自动化测试完成后的退出操作。
 40. 2025-01-14
-   - 调整日志记录器。
+   - 调整日志记录器。
\ No newline at end of file
+41. 2025-01-15
+   - 调整截图文件的缩放比，实现测试报告点击图片弹窗放大功能。
\ No newline at end of file

预定系统/cases/展厅巡检/00展厅中控屏/展厅中控屏.py

@@ -40,7 +40,7 @@ class Exhibition_hall_Control_000x:
             STEP(2, "检查灯光控制功能")
             # 这是灯光开启前的截图
             INFO("请检查灯光开启前的监控视频状态是否正常")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Control_Manage", "light_down")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Control_Manage", "light_down")
 
             # 先截取当前空间的灯光状态图片
             light_rtsp_url = "rtsp://admin:huawei@123@192.168.4.15/LiveMedia/ch1/Media2"  # 替换为你的RTSP流地址
@@ -62,7 +62,7 @@ class Exhibition_hall_Control_000x:
 
             # 这是全部灯光关闭后在软件界面上的状态显示
             INFO("请检查中控屏软件的灯光关闭状态显示是否正常")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Control_Manage", "light_all_off")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Control_Manage", "light_all_off")
 
             # 截图获取当前软件的灯光控制界面
             app_drive.get_screenshot_as_file(
@@ -72,7 +72,7 @@ class Exhibition_hall_Control_000x:
 
             # 这是全部灯光开启后在软件界面上的状态显示
             INFO("请检查中控屏软件的灯光开启状态显示是否正常")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Control_Manage", "light_all_on")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Control_Manage", "light_all_on")
 
             # 截图获取当前软件的灯光控制界面
             app_drive.get_screenshot_as_file(
@@ -80,7 +80,7 @@ class Exhibition_hall_Control_000x:
 
             # 这是灯光开启后的截图
             INFO("请检查灯光开启后的监控视频状态是否正常")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Control_Manage", "light_on")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Control_Manage", "light_on")
 
             # 先截取当前空间的灯光状态图片
             light_rtsp_url = "rtsp://admin:huawei@123@192.168.4.15/LiveMedia/ch1/Media2"  # 替换为你的RTSP流地址

预定系统/cases/展厅巡检/01预定系统巡检/展厅会议预约巡检.py

@@ -164,7 +164,7 @@ class Exhibition_hall_inspection_000x:
             # 获取已选的参会人名称
             # notify_text = elment_get_text((By.XPATH, f"//span[normalize-space()='{ipn[i]}']"), wd)
         INFO(f"已选择参会人：{ipn}")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Meeting_Message", "选择内部参会人")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Meeting_Message", "选择内部参会人")
 
         # 点击【下一步】按钮
         safe_click((By.XPATH,"//div[contains(text(),'下一步')]"),wd)
@@ -215,12 +215,12 @@ class Exhibition_hall_inspection_000x:
         safe_click((By.XPATH,"(//li[contains(text(),'安卓信息')])[1]"),wd)
         INFO("进入安卓信息界面，查看门口屏设备列表，请查看设备列表状态显示是否正常")
         sleep(5)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Android", "门口屏设备列表")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Android", "门口屏设备列表")
         safe_click((By.XPATH,"(//span[contains(text(),'应用截屏')])[1]"),wd)
         sleep(30)
         INFO("查看门口屏截屏显示，请查看门口屏截屏功能是否正常")
         # 截屏查看门口屏的显示
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Android", "门口屏截屏")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Android", "门口屏截屏")
         # 返回上一级界面
         safe_click((By.XPATH,"//div[@aria-label='门口屏截屏']//i[@class='el-dialog__close el-icon el-icon-close']"), wd)
 
@@ -230,7 +230,7 @@ class Exhibition_hall_inspection_000x:
         sleep(1)
         safe_click((By.XPATH,"//span[contains(text(),'已预订会议')]"),wd)
         sleep(1)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "查看会控按钮")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "查看会控按钮")
 
         # 判断是否存在会控按钮
         INFO("判断是否存在【进入会控】按钮")
@@ -242,7 +242,7 @@ class Exhibition_hall_inspection_000x:
 
         # 会控操作
         STEP(10, "检查会控界面功能")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "检查会控界面功能")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "检查会控界面功能")
         INFO("请检查会控界面功能是否正常")
 
         # 添加SMC会场
@@ -263,7 +263,7 @@ class Exhibition_hall_inspection_000x:
         sleep(1)
         safe_click((By.XPATH,"//body[1]/div[1]/div[1]/div[3]/div[1]/div[2]/div[1]/div[1]/div[1]/div[2]/div[3]/div[1]/div[1]/div[1]/div[3]/table[1]/tbody[1]/tr[7]/td[1]/div[1]/label[1]/span[1]/span[1]"),wd)
         sleep(1)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "添加会场功能")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "添加会场功能")
         safe_click((By.XPATH,"//div[contains(text(),'确定')]"),wd)
         sleep(1)
 
@@ -274,7 +274,7 @@ class Exhibition_hall_inspection_000x:
         INFO("选择分屏功能")
         sleep(20)
         safe_click((By.XPATH, "//li[4]//img[1]"), wd)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "分屏功能")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "分屏功能")
 
         # 将左侧会场拖拽到右侧画面进行播放
         INFO("将左侧会场拖拽到右侧画面进行播放")
@@ -286,7 +286,7 @@ class Exhibition_hall_inspection_000x:
         sleep(5)
         single_click_and_drag((By.CSS_SELECTOR,"body > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > div:nth-child(3) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(1) > td:nth-child(2) > div:nth-child(1) > span:nth-child(1)"),(By.XPATH,"(//div)[120]"), wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "会场画面控制")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "会场画面控制")
 
         INFO("使用基础会控功能：禁用摄像头、麦克风")
         safe_click((By.XPATH,"//span[contains(text(),'禁用摄像头')]"),wd)
@@ -295,4 +295,4 @@ class Exhibition_hall_inspection_000x:
         INFO("开启指挥中心麦克风")
         sleep(2)
         safe_click((By.XPATH,"(//img[@title='解除静音'])[3]"),wd)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "MeetingControl", "会场画面控制")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "MeetingControl", "会场画面控制")
\ No newline at end of file

预定系统/cases/展厅巡检/02无纸化/无纸化1.0.py

@@ -27,7 +27,7 @@ class Exhibition_hall_NoPaperinspection_000x:
             # 使用显式等待来等待元素出现
             logging.info("等待登录页加载...")
             sleep(10)
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "No_PaperLess", "无纸化首页截图")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "No_PaperLess", "无纸化首页截图")
             app_drive.get_screenshot_as_file(
                 r"D:\GithubData\自动化\ubains-module-test\预定系统\reports\imgs\Exhibit_Inspect\No_PaperLess\无纸化首页截图.png")
 
@@ -41,7 +41,7 @@ class Exhibition_hall_NoPaperinspection_000x:
             logging.info("点击【会议签到】按钮成功")
             sleep(2)
             STEP(2, "无纸化会议信息")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "No_PaperLess", "无纸化会议信息截图")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "No_PaperLess", "无纸化会议信息截图")
             app_drive.get_screenshot_as_file(
                 r"D:\GithubData\自动化\ubains-module-test\预定系统\reports\imgs\Exhibit_Inspect\No_PaperLess\无纸化会议信息截图.png")
 
@@ -71,7 +71,7 @@ class Exhibition_hall_NoPaperinspection_000x:
 
             STEP(3, "无纸化议题信息")
             INFO("请查看议题显示")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "No_PaperLess", "议题文件截图")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "No_PaperLess", "议题文件截图")
             app_drive.get_screenshot_as_file(
                 r"D:\GithubData\自动化\ubains-module-test\预定系统\reports\imgs\Exhibit_Inspect\No_PaperLess\议题文件截图.png")
             for i in range(1,4):
@@ -83,7 +83,7 @@ class Exhibition_hall_NoPaperinspection_000x:
                 logging.info(f"点击议题文件{i}的【查看】按钮元素成功")
                 sleep(5)
                 INFO(f"请查看议题文件{i}显示")
-                SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "No_PaperLess", f"议题文件{i}截图")
+                SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "No_PaperLess", f"议题文件{i}截图")
                 app_drive.get_screenshot_as_file(
                     fr"D:\GithubData\自动化\ubains-module-test\预定系统\reports\imgs\Exhibit_Inspect\No_PaperLess\议题文件{i}截图.png")
                 sleep(2)

预定系统/cases/展厅巡检/03软终端入会/__st__.py

@@ -26,7 +26,7 @@ def suite_setup():
     admin_login("Test02", "ubains@123")
     sleep(5)
 
-    SELENIUM_LOG_SCREEN(wd,"50%","Exhibit_Inspect","Tx_meeting","会场画面截屏")
+    SELENIUM_LOG_SCREEN(wd,"75%","Exhibit_Inspect","Tx_meeting","会场画面截屏")
 
 def suite_teardown():
     browser_quit()
\ No newline at end of file

预定系统/cases/展厅巡检/04讯飞系统巡检/讯飞系统巡检.py

@@ -27,7 +27,7 @@ class XF_Meeting_0001:
         wd.switch_to.window(wd.window_handles[1])
 
         INFO("请检查讯飞系统是否正确单点登录")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "XF_meeting", "讯飞纪要界面截屏")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "XF_meeting", "讯飞纪要界面截屏")
 
         # 结束这场会议
         wd.switch_to.window(wd.window_handles[0])

预定系统/cases/展厅巡检/05运维系统/运维系统巡检.py

@@ -16,45 +16,45 @@ class Operation_maintenance_0001:
     def teststeps(self):
         wd = GSTORE['wd']
 
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "首页界面")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "首页界面")
         safe_click((By.XPATH, "(//span[contains(text(),'进入系统')])[4]"), wd)
         sleep(4)
         # 检查会议室数据展示界面并截图
         INFO("请查看会议室的数据展示情况")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "进入系统界面")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "进入系统界面")
 
         INFO("请查看设备列表的连接状态")
         # 检查五大系统的设备连接状态并截图
         safe_click((By.XPATH, "//span[contains(text(),'设备列表')]"), wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "设备连接状态")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "设备连接状态")
 
         INFO("请查看视频系统设备的连接状态")
         safe_click((By.XPATH, "(//img)[11]"), wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "视频系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "视频系统")
 
         INFO("请查看音频系统设备的连接状态")
         safe_click((By.XPATH, "(//img)[12]"), wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "音频系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "音频系统")
 
         INFO("请查看控制系统设备的连接状态")
         safe_click((By.XPATH, "(//img)[13]"),wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "控制系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "控制系统")
 
         INFO("请查看网络系统设备的连接状态")
         safe_click((By.XPATH, "(//img)[14]"),wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "网络系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "网络系统")
 
         INFO("请查看电源系统设备的连接状态")
         safe_click((By.XPATH, "(//img)[15]"),wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "电源系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "电源系统")
 
         INFO("请查看运维系统的告警数据展示")
         safe_click((By.XPATH, "//li[contains(text(),'数据展示')]"), wd)
         sleep(20)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Operation_maintenance", "告警数据展示")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Operation_maintenance", "告警数据展示")
\ No newline at end of file

预定系统/cases/展厅巡检/06统一平台系统/01统一平台巡检.py

@@ -66,7 +66,7 @@ class Unified_Platform_0001:
         # print(f"这是跳转后的窗口句柄{wd.window_handles}")
         sleep(10)
         INFO("请查看会议详情是否正确包含：多会议室、会议号、会议名称、会议时间")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "创建会议详情")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "创建会议详情")
 
         # 进入会控界面
         safe_click((By.XPATH, "//span[contains(text(),'进入会控')]"),wd)
@@ -98,7 +98,7 @@ class Unified_Platform_0001:
                               (By.CSS_SELECTOR,"body > div:nth-child(1) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(2) > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > div:nth-child(3)")
                                , wd)
         sleep(4)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "多画面设置")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "多画面设置")
 
         # 会控界面-设备控制
         INFO("关闭展厅会议室终端的摄像头")
@@ -109,8 +109,8 @@ class Unified_Platform_0001:
         INFO("开启展厅指挥中心终端的麦克风")
         safe_click((By.XPATH, "(//img[@title='取消静音'])[1]"),wd)
         sleep(2)
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "终端设备控制")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "终端入会画面")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "终端设备控制")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "终端入会画面")
 
         # 创建多SMC会议，提示MCU资源不足
         print(f"这是当前窗口句柄{wd.window_handles}")
@@ -150,4 +150,4 @@ class Unified_Platform_0001:
 
         # 获取会议详情截图信息
         INFO("请查看会议详情是否提示：”MCU资源不足“")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "创建多SMC会议提示MCU资源不足")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "创建多SMC会议提示MCU资源不足")
\ No newline at end of file

预定系统/cases/展厅巡检/06统一平台系统/02软终端入会.py

@@ -46,7 +46,7 @@ class Unified_Platform_Terminal_0001:
             logging.info("点击【加入会议】按钮成功")
             sleep(8)
             INFO("软终端入会画面")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Unified_Platform", "软终端入会画面")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Unified_Platform", "软终端入会画面")
             # 会议开始后，截取会议画面
             app_drive.get_screenshot_as_file(
                 r"D:\GithubData\自动化\ubains-module-test\预定系统\reports\imgs\Exhibit_Inspect\Unified_Platform\软终端入会画面.png")

预定系统/cases/展厅巡检/07桌牌系统/桌牌系统巡检.py

@@ -24,7 +24,7 @@ class Meeting_TableCard_0001:
         wd.switch_to.window(wd.window_handles[1])
         sleep(4)
         INFO("进入桌牌系统")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Meeting_TableCard", "进入桌牌系统")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Meeting_TableCard", "进入桌牌系统")
 
         # 点击桌牌管理进入桌牌投图
         safe_click((By.XPATH, "//span[contains(text(),'桌牌管理')]"),wd)
@@ -32,4 +32,4 @@ class Meeting_TableCard_0001:
         safe_click((By.XPATH, "//span[contains(text(),'桌牌投图')]"),wd)
         sleep(4)
         INFO("进入桌牌投图")
-        SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Meeting_TableCard", "进入桌牌投图")
+        SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Meeting_TableCard", "进入桌牌投图")
\ No newline at end of file

预定系统/cases/展厅巡检/08服务器监测/01服务器状态监测.py

@@ -115,7 +115,7 @@ class Server_monitoring_0001:
                 # 获取已选的参会人名称
                 # notify_text = elment_get_text((By.XPATH, f"//span[normalize-space()='{ipn[i]}']"), wd)
             INFO(f"已选择参会人：{ipn}")
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Server_Monitoring", "选择内部参会人")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Server_Monitoring", "选择内部参会人")
 
             # 点击【下一步】按钮
             safe_click((By.XPATH, "//div[contains(text(),'下一步')]"), wd)
@@ -137,4 +137,4 @@ class Server_monitoring_0001:
             STEP(7, "点击【确定】按钮")
             safe_click((By.XPATH, "//div[contains(@aria-label,'会议信息')]//span[contains(text(),'确定')]"), wd)
             sleep(3)
-            SELENIUM_LOG_SCREEN(wd, "50%", "Exhibit_Inspect", "Server_Monitoring", "预定会议成功界面")
+            SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Server_Monitoring", "预定会议成功界面")
\ No newline at end of file