修改上传人员信息表为D盘固定位置；新增上传弹窗检查

page_objects/upload_config_page.py

@@ -633,10 +633,13 @@ class UploadConfigPage:
     def _load_user_data(self):
         """加载用户数据从Excel文件，只提取名字和身份证到字典"""
         try:
-            # 默认路径：当前脚本的上一级目录下的"上传人员信息.xlsx"
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            parent_dir = os.path.dirname(current_dir)
-            excel_path = os.path.join(parent_dir, "上传人员信息.xlsx")
+            # # 默认路径：当前脚本的上一级目录下的"上传人员信息.xlsx"
+            # current_dir = os.path.dirname(os.path.abspath(__file__))
+            # parent_dir = os.path.dirname(current_dir)
+            # excel_path = os.path.join(parent_dir, "上传人员信息.xlsx")
+
+            # 固定路径：D:\uploadInfo\上传人员信息.xlsx
+            excel_path = os.path.join("D:\\", "uploadInfo", "上传人员信息.xlsx")
 
             if not os.path.exists(excel_path):
                 logging.error(f"Excel文件不存在: {excel_path}")
@@ -1535,16 +1538,24 @@ class UploadConfigPage:
             save_upload_btn = WebDriverWait(self.driver, 10).until(
                 EC.element_to_be_clickable((AppiumBy.ID, "com.bjjw.cjgc:id/improve_save_btn"))
             )
-            save_upload_btn.click()
-            self.logger.info("已点击保存上传按钮")
             
-            # 处理警告弹窗
-            time.sleep(1)
-            if not self.handle_warning_dialog():
-                self.logger.error("处理警告弹窗失败")
-                return False
+            max_retries = 3
+            for attempt in range(max_retries):
+                save_upload_btn.click()
+                self.logger.info(f"已点击保存上传按钮 (第 {attempt + 1} 次)")
                 
-            return True
+                # 处理警告弹窗
+                time.sleep(1)
+                if self.handle_warning_dialog():
+                    self.logger.info("处理警告弹窗成功")
+                    return True
+                else:
+                    self.logger.warning(f"处理警告弹窗失败，准备重试 ({attempt + 1}/{max_retries})")
+                    if attempt < max_retries - 1:
+                        time.sleep(1)
+            
+            self.logger.error(f"处理警告弹窗失败，已达到最大重试次数 {max_retries}")
+            return False
             
         except TimeoutException:
             self.logger.error("点击保存上传按钮超时")
@@ -1821,6 +1832,12 @@ class UploadConfigPage:
                 self.logger.error("获取工况信息失败")
                 return False
 
+            # 遍历返回数据的所有workinfoname，如果为空就打印当前在上传的线路名称
+            for workinfo in work_conditions.values():
+                if not workinfo.get('workinfoname'):
+                    print(f"❌❌❌❌❌线路编码 '{self.line_num}' 中有工况缺失（请复制发送编码给相关人员）❌❌❌❌❌")
+                    return False
+
             # 提取人员姓名和身份证
             if not self._load_user_data():
                 self.logger.error("加载用户数据失败")