补充展厅巡检后的会议创建流程。

.gitignore

-/预定系统/reports
 /预定系统/log
\ No newline at end of file

预定系统/README.md

@@ -155,3 +155,5 @@
 33. 2025-01-03
    - 调试展厅巡检的异常，补充对视讯资源异常情况的判断处理。
    - 切换标准版预订系统功能检测环境，定时运行程序，并进行调试，修复出现的异常情况。
+34. 2025-01-06
+   - 补充展厅巡检后的会议创建流程。
\ No newline at end of file

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

@@ -10,8 +10,21 @@ sys.path.append(预定系统_path)
 # 导入模块
 from 预定系统.Base.base import *
 
+
+# 获取当前脚本所在的目录
+current_dir = os.path.dirname(os.path.abspath(__file__))
+
+# 构建CSV文件的绝对路径
+csv_file_path = os.path.join(current_dir, '../../../测试数据/展厅巡检/会议补充预约.csv')
+
 class Server_monitoring_0001:
+    """
+        执行指令：
+            1.cd 预定系统
+            2.hytest --report_title 会议预约测试报告 --report_url_prefix http://192.168.1.225 --test 展厅补充会议创建_001
+    """
     tags = ['展厅巡检','服务器状态巡检']
+    ddt_cases = read_csv_data(csv_file_path)
 
     def teststeps(self):
         i = 0
@@ -30,3 +43,98 @@ class Server_monitoring_0001:
 
         else:
             INFO("无法获取或解析文件内容")
+
+        # 补充预定系统会议创建
+            # 初始化通知文本为空字符串
+            notify_text = ""
+            # 从全局存储中获取webdriver实例
+            wd = GSTORE['wd']
+            name = self.name
+            conference_name, message_name, book_type, check_text = self.para
+
+            # 在会议室列表搜索会议室
+            STEP(1, f"在会议室列表搜索：{conference_name}")
+            # 展开筛选下拉框
+            safe_click((By.XPATH, "//i[@class='el-collapse-item__arrow el-icon-arrow-right']"), wd)
+            sleep(1)
+            # 输入会议室名称，并点击【查询】按钮
+            safe_send_keys((By.XPATH, "//input[@placeholder='请输入会议室名称']"), conference_name, wd)
+            safe_click((By.XPATH, "//button[@type='button']//span[contains(text(),'查询')]"), wd)
+            sleep(1)
+
+            # 点击【会议预定】按钮，进入会议预定界面
+            STEP(2, "点击【会议预定】按钮")
+            safe_click((By.XPATH, "//span[@class='MeetingCityList_t_btn']"), wd)
+            sleep(1)
+
+            # 在会议预定第一步界面进行数据填入
+            STEP(3, "会议第一步数据填写")
+            INFO(
+                f"输入会议名称：{message_name}，选择会议类型：视讯融合会议，选择预约类型：{book_type}")
+            # 输入会议名称
+            safe_send_keys((By.XPATH, "//input[@placeholder='请输入会议名称']"), message_name, wd)
+
+            # 判断会议类型
+            safe_click((By.XPATH,
+                        f"//div[@class='reserve_input']//span[@class='el-checkbox__label'][normalize-space()='讯飞语音转录']"),
+                       wd)
+            sleep(2)
+
+            # 选择普通会议
+            safe_click((By.XPATH, f"//span[contains(text(),'{book_type}')]"), wd)
+            sleep(1)
+
+            # 选择签到时间
+            INFO("选择提前30分钟开始签到")
+            safe_click((By.XPATH, "(//span[@class='el-switch__core'])[2]"), wd)
+            safe_click((By.XPATH, "(//span[@class='el-switch__core'])[3]"), wd)
+            sleep(1)
+            safe_send_keys((By.XPATH, "//input[@id='input_checkin']"), "30", wd)
+
+            # 根据开始时间选择8点30
+            safe_click((By.XPATH, f"(//div[normalize-space()='08:30'])[1]"), wd)
+            safe_click((By.XPATH, f"(//div[normalize-space()='08:45'])[1]"), wd)
+
+            # 在会议预定第二步界面进行数据填入
+            STEP(4, "会议第二步数据填写")
+            # 点击【下一步】进入会议预定第二步界面
+            safe_click((By.XPATH, "//div[contains(text(),'下一步')]"), wd)
+            sleep(1)
+
+            # 根据参会人名称搜搜对应参会人
+            ipn = ['赵嘉诚', 'CZJ', '马晓丽', '王兵', '陈林', '李立键', '丁海洪', '刘建胜', '潘松林', '卢培锽',
+                   '黄史恭', '罗一龙', '彭甘宇']
+            for i in range(0, 13):
+                safe_send_keys((By.XPATH, "//input[@placeholder='账号/用户名']"), ipn[i], wd)
+                send_keyboard((By.XPATH, "//input[@placeholder='账号/用户名']"), wd)
+                sleep(1)
+                # 选择内部参会人
+                safe_click((By.XPATH,
+                            "//th[contains(@class,'is-leaf el-table__cell')]//span[contains(@class,'el-checkbox__inner')]"),
+                           wd)
+                # 获取已选的参会人名称
+                # 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", "选择内部参会人")
+
+            # 点击【下一步】按钮
+            safe_click((By.XPATH, "//div[contains(text(),'下一步')]"), wd)
+            sleep(1)
+            safe_click((By.XPATH, "//div[contains(text(),'下一步')]"), wd)
+
+            # 进入会议预约第三步进行填写
+            STEP(5, "会议第三步数据填写")
+            # 取消短信提醒
+            safe_click((By.XPATH, "//div[@class='Sendout']//span[@class='el-checkbox__label'][contains(text(),'全选')]"), wd)
+            sleep(2)
+            safe_click((By.XPATH, "//div[@class='Sendout']//span[@class='el-checkbox__label'][contains(text(),'全选')]"), wd)
+
+            # 点击【确定】按钮
+            STEP(6, "点击【确定】按钮")
+            safe_click((By.XPATH, "//div[contains(text(),'确定')]"), wd)
+
+            # 点击最后【确定】按钮，预定成功后会跳转至已预定界面
+            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", "预定会议成功界面")
\ No newline at end of file

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

@@ -18,18 +18,12 @@ except ModuleNotFoundError as e:
 
 def suite_setup():
     STEP(1, "初始化浏览器")
-    login_exhibit_url = 'http://192.168.5.200:38083/#/login'
+    login_exhibit_url = 'http://192.168.5.200:8080/#/login/logindf'
+    login_exhibit_ngrok_url = 'http://nat.ubainsyun.com:11060/#/login/logindf'
     browser_init(login_exhibit_url)
 
     wd = GSTORE['wd']
-    STEP(2, "登录系统")
-    safe_send_keys((By.XPATH, "//input[@placeholder='手机号/用户名/邮箱']"),"admin@czj",wd)
-    safe_send_keys((By.XPATH, "//input[@placeholder='密码']"),"Ubains@54321",wd)
-    safe_send_keys((By.XPATH, "//input[@placeholder='图形验证']"),"csba",wd)
-    safe_click((By.XPATH, "//span[@class='el-checkbox__inner']"),wd)
-    sleep(2)
-    safe_click((By.XPATH, "//div[@id='pane-1']//div//span[contains(text(),'登录')]"),wd)
-    sleep(2)
+    admin_login("Test02", "ubains@123")
 
 def suite_teardown():
     browser_quit()
\ No newline at end of file

预定系统/定时执行功能测试.py

@@ -70,7 +70,7 @@ start_workers(3)
 # 每天早上07:50执行后台系统设置功能测试
 schedule.every().day.at("10:00").do(run_task, run_automation_test, report_title="预定系统_后台管理功能_测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="预定系统功能", ding_type="标准版巡检")
 
-schedule.every().day.at("08:05").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="标准版巡检")
+schedule.every().day.at("07:55").do(run_task, run_automation_test, report_title="展厅巡检测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检", ding_type="展厅巡检")
 
 # schedule.every().day.at("08:25").do(run_task, run_automation_test, report_title="展厅巡检_腾讯终端入会测试报告", report_url_prefix="http://nat.ubainsyun.com:31133", test_case="展厅巡检_腾讯会议")
 

预定系统/测试数据/展厅巡检/会议补充预约.csv

+name,conference_name,message_name,book_type,check_text
+展厅补充会议创建_001,展厅会议室,展厅巡检测试,普通会议,预定成功
\ No newline at end of file