提交 64e6e1a4 authored 作者: 陈泽健's avatar 陈泽健

补充审批会议模块的日志输出。

上级 4af40fe3
......@@ -205,4 +205,5 @@
- 展厅巡检补充离开模式、系统开的操作,将展厅内设备进行断电。
52. 2025-02-12
- 排查展厅巡检中的语音转录与摄像头关闭操作失效问题,原因是缺少一个返回操作,并且麦克风和摄像头的元素定位发生变化导致操作失败,缩短等待时间。
- 历史会议模块与会议审批模块补充调用清除浏览器驱动函数。
\ No newline at end of file
- 历史会议模块与会议审批模块补充调用清除浏览器驱动函数。
- 补充审批会议模块的日志输出。
\ No newline at end of file
import logging
from datetime import datetime, timedelta
from time import sleep
import sys
......@@ -172,19 +173,25 @@ class MeetingApproval_Status_000x:
sleep(2)
# 登录审批人的账号
admin_login("admin@ZDH","Ubains@4321")
logging.info("登录审批人账号")
sleep(2)
# 进入会议审批模块
safe_click((By.XPATH,"//ul[@class='meeting_list']//span[contains(text(),'会议审批')]"),wd)
INFO("进入会议审批模块")
logging.info("进入会议审批模块")
sleep(2)
# 查询会议
safe_send_keys((By.XPATH, "//input[@placeholder='请输入会议名称搜索']"), message_name, wd)
send_keyboard((By.XPATH, "//input[@placeholder='请输入会议名称搜索']"), wd)
INFO("查询会议")
logging.info("查询会议")
sleep(2)
# 查看会议详细信息
safe_click((By.XPATH, "//button[@type='button']//span[contains(text(),'详细信息')]"),wd)
sleep(2)
SELENIUM_LOG_SCREEN(wd, "50%", "Meeting_Approval", "Approval_Option", f"{name}_审批会议信息")
safe_click((By.XPATH, "//div[@aria-label='详细信息']//span[contains(text(),'确定')]"), wd)
logging.info("查看会议详细信息")
# 点击【审批】按钮
safe_click((By.XPATH, "//button[@type='button']//span[contains(text(),'审批')]"), wd)
......@@ -193,6 +200,8 @@ class MeetingApproval_Status_000x:
STEP(6, "审批通过")
# 审批通过
safe_send_keys((By.XPATH, "//textarea[@placeholder='请输入审批意见']"), approval_opinion, wd)
INFO("点击审批通过")
logging.info("审批通过")
sleep(1)
# 点击【同意】按钮
safe_click((By.XPATH, "//span[contains(text(),'同意')]"), wd)
......@@ -202,11 +211,14 @@ class MeetingApproval_Status_000x:
"Meeting_Approval", "Approval_Option", f"{name}审批通过提示信息")
CHECK_POINT("审批通过提示是否正确", notify_text == "审批完成!")
INFO(f"审批结果为:{notify_text}")
logging.info("审批通过")
else:
STEP(6, "审批不通过")
# 审批不通过,不输入审批意见
safe_click((By.XPATH, "//span[contains(text(),'驳回')]"), wd)
INFO("点击驳回操作")
logging.info("点击驳回操作")
sleep(1)
notify_text = get_notify_text(wd, (By.XPATH, "//p[contains(@class,'el-message__content')]"),
"Meeting_Approval", "Approval_Option", f"{name}审批意见为空提示信息")
......@@ -216,6 +228,8 @@ class MeetingApproval_Status_000x:
# 审批不通过,输入审批意见
safe_send_keys((By.XPATH, "//textarea[@placeholder='请输入审批意见']"), approval_opinion, wd)
INFO(f"输入审批意见{approval_opinion}")
logging.info("输入审批意见")
sleep(1)
# 点击【驳回】按钮
safe_click((By.XPATH, "//span[contains(text(),'驳回')]"), wd)
......@@ -225,13 +239,17 @@ class MeetingApproval_Status_000x:
"Meeting_Approval", "Approval_Option", f"{name}审批不通过提示信息")
INFO(f"审批结果为:{notify_text}")
CHECK_POINT("审批不通过提示是否正确", notify_text == "审批完成!")
logging.info("审批驳回")
STEP(7, "在我已审批模块查看是否存在审批操作后的会议数据")
logging.info("查看是否存在审批操作后的会议数据")
safe_click((By.XPATH, "//div[@id='tab-third']"), wd)
sleep(1)
# 查询会议
safe_send_keys((By.XPATH, "//input[@placeholder='请输入会议名称搜索']"), message_name, wd)
send_keyboard((By.XPATH, "//input[@placeholder='请输入会议名称搜索']"), wd)
INFO(f"查询会议{message_name}")
logging.info(f"查询会议{message_name}")
sleep(2)
# 查看审批会议的名称
notify_text = elment_get_text((By.CSS_SELECTOR, "body > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > div:nth-child(3) > div:nth-child(2) > div:nth-child(3) > 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)"), wd)
......@@ -241,6 +259,7 @@ class MeetingApproval_Status_000x:
# 查看审批会议的状态
notify_text = elment_get_text((By.CSS_SELECTOR, "body > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > div:nth-child(3) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > div:nth-child(3) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(1) > td:nth-child(7) > div:nth-child(1) > span:nth-child(1)"),wd)
INFO(f"审批会议状态为:{notify_text}")
logging.info(f"审批会议状态为:{notify_text}")
CHECK_POINT("审批会议状态是否正确", notify_text == approval_type)
SELENIUM_LOG_SCREEN(wd, "50%", "Meeting_Approval", "Approval_Option", f"{name}_审批会议名称")
......@@ -259,6 +278,7 @@ class MeetingApproval_Status_000x:
INFO(f"审批抄送的会议名称为:{notify_text}")
CHECK_POINT("审批抄送的会议名称是否正确", notify_text == message_name)
# 查看审批抄送会议的详细信息
logging.info("查看审批抄送会议的详细信息")
safe_click((By.CSS_SELECTOR, "body > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > div:nth-child(3) > div:nth-child(2) > div:nth-child(4) > div:nth-child(1) > div:nth-child(3) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(1) > td:nth-child(7) > div:nth-child(1) > button:nth-child(1) > span:nth-child(1)")
,wd)
SELENIUM_LOG_SCREEN(wd, "50%", "Meeting_Approval", "Approval_Option", f"{name}_审批抄送的会议详情")
......@@ -266,5 +286,6 @@ class MeetingApproval_Status_000x:
if name == '审批会议操作_001':
# 退出当前账号,返回至普通用户账号
INFO("退出当前账号,返回至普通用户账号")
logging.info("退出当前账号,返回至普通用户账号")
safe_click((By.XPATH, "//img[contains(@title,'退出登录')]"), wd)
admin_login("admin@user", "Ubains@4321")
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论