~yj/tal_autoTest.git

			@@ -23,7 +23,7 @@
			点击创建按钮
			:return:
			"""
			self.click(PackageList.create_btn)
			self.click_wait(PackageList.create_btn)
			# 切换到add窗口的iframe
			self.switch_iframe(PackageList.add_iframe)

			@@ -33,7 +33,7 @@
			:return:
			"""
			# 点击删除按钮
			self.click(PackageList.delete_btn)
			self.click_wait(PackageList.delete_btn)
			# 点击确认按钮
			self.click_wait(PackageList.delete_confirm_btn)

			@@ -43,7 +43,7 @@
			:param testPackageName: 测试包名称
			:return:
			"""
			self.send_text(testPackageName, PackageList.add_testPackageName_input)
			self.send_text_wait(testPackageName, PackageList.add_testPackageName_input)

			def reportCompanyName_input(self, reportCompanyName):
			"""
			@@ -51,7 +51,7 @@
			:param reportCompanyName: 报告企业名称
			:return:
			"""
			self.send_text(reportCompanyName, PackageList.add_reportCompanyName_input)
			self.send_text_wait(reportCompanyName, PackageList.add_reportCompanyName_input)

			def testPackageType_select(self, testPackageType):
			"""
			@@ -60,9 +60,9 @@
			:return:
			"""
			# 点击下拉框
			self.click(PackageList.add_testPackageType_select)
			self.click_wait(PackageList.add_testPackageType_select)
			# 获取所有选项
			options = self.get_elements(PackageList.add_testPackageType_option)
			options = self.get_elements_wait(PackageList.add_testPackageType_option)
			# 判断选项是否与传入的选项相等
			for opt in options:
			if opt.text == testPackageType:
			@@ -77,12 +77,12 @@
			:return:
			"""
			# 点击查询按钮
			self.click(PackageList.add_prodTree_btn)
			self.click_wait(PackageList.add_prodTree_btn)
			# 切换到prodTree的iframe
			self.switch_iframe_wait(PackageList.prodTree_iframe)
			time.sleep(2)
			# 获取所有选项
			options = self.get_elements(PackageList.prodTree_option)
			options = self.get_elements_wait(PackageList.prodTree_option)
			# 判断选项是否与传入选项相等
			for opt in options:
			if opt.text == prodName:
			@@ -91,7 +91,7 @@
			# 切换到上一层的iframe
			self.switch_parent_iframe()
			# 点击确认按钮
			self.click(PackageList.prodTree_confirm_btn)
			self.click_wait(PackageList.prodTree_confirm_btn)

			def hrReportEmail_input(self, hr_email):
			"""
			@@ -99,7 +99,7 @@
			:param hr_email:
			:return:
			"""
			self.send_text(hr_email, PackageList.add_hrEmail_input)
			self.send_text_wait(hr_email, PackageList.add_hrEmail_input)

			def invalidTime_input(self, invalid_time):
			"""
			@@ -107,8 +107,8 @@
			:param invalid_time:
			:return:
			"""
			self.send_text(invalid_time, PackageList.add_invalidTime)
			self.click(PackageList.add_invalidTime)
			self.send_text_wait(invalid_time, PackageList.add_invalidTime)
			self.click_wait(PackageList.add_invalidTime)

			def testTemplateLangType_select(self, text):
			"""
			@@ -119,9 +119,9 @@
			# 分割text
			lang_types = text.split(",")
			# 点击下拉框
			self.click(PackageList.add_templateLangType_select)
			self.click_wait(PackageList.add_templateLangType_select)
			# 获取所有选项
			options = self.get_elements(PackageList.add_templateLangType_option)
			options = self.get_elements_wait(PackageList.add_templateLangType_option)
			# 判断选项是否与传入的选项相等
			for opt in options:
			for lang_type in lang_types:
			@@ -139,9 +139,9 @@
			# 分割text
			lang_types = text.split(",")
			# 点击下拉框
			self.click(PackageList.add_hrTemplateLangType_select)
			self.click_wait(PackageList.add_hrTemplateLangType_select)
			# 获取所有选项
			options = self.get_elements(PackageList.add_hrTemplateLangType_option)
			options = self.get_elements_wait(PackageList.add_hrTemplateLangType_option)
			# 判断选项是否与传入的选项相等
			for opt in options:
			for lang_type in lang_types:
			@@ -159,9 +159,9 @@
			# 分割text
			templates = text.split(",")
			# 点击下拉框
			self.click(PackageList.add_reportTemplateId_select)
			self.click_wait(PackageList.add_reportTemplateId_select)
			# 获取所有选项
			options = self.get_elements(PackageList.add_reportTemplateId_option)
			options = self.get_elements_wait(PackageList.add_reportTemplateId_option)
			# 判断选项是否与传入的选项相等
			for opt in options:
			for template in templates:
			@@ -170,14 +170,38 @@
			opt.click()
			break
			# 再次点击下拉框
			self.click(PackageList.add_reportTemplateId_select)
			self.click_wait(PackageList.add_reportTemplateId_select)

			def position_input(self, text):
			"""
			输入要评价的岗位
			:param text:
			:return:
			"""
			self.send_text_wait(text, PackageList.add_position_input)

			def professionalCategory_input(self, text):
			"""
			输入职业大类
			:param text:
			:return:
			"""
			self.send_text_wait(text, PackageList.add_professionalCategory_input)

			def superiorPosition_input(self, text):
			"""
			输入上级岗位
			:param text:
			:return:
			"""
			self.send_text_wait(text, PackageList.add_superiorPosition_input)

			def autoSendReport_checkbox(self):
			"""
			点击测试者接收报告
			:return:
			"""
			self.click(PackageList.add_autoSendReport_checkbox)
			self.click_wait(PackageList.add_autoSendReport_checkbox)

			def memberReportLangType_select(self, text):
			"""
			@@ -188,9 +212,9 @@
			# 分割text
			lang_types = text.split(",")
			# 点击下拉框
			self.click(PackageList.add_memberTemplateLangType_select)
			self.click_wait(PackageList.add_memberTemplateLangType_select)
			# 获取所有选项
			options = self.get_elements(PackageList.add_memberTemplateLangType_option)
			options = self.get_elements_wait(PackageList.add_memberTemplateLangType_option)
			# 判断选项是否与传入的选项相等
			for opt in options:
			for lang_type in lang_types:
			@@ -199,6 +223,32 @@
			opt.click()
			break

			def select_code_checkbox(self, check_text, uncheck_text):
			"""
			选择人口学编码
			:param uncheck_text: 取消选中的选框文本，以 , 分割
			:param check_text: 选择的选框文本，以 , 分割
			:return:
			"""
			# 获取所有人口选编码选框元素
			code_boxs = self.get_elements_wait(PackageList.add_code_checkbox)

			# 将check_text分割
			code_check_texts = check_text.split(',')
			for code_text in code_check_texts:
			for code_box in code_boxs:
			if code_text == code_box.text:
			code_box.click()

			# 将check_text分割
			code_uncheck_texts = uncheck_text.split(',')
			for code_text in code_uncheck_texts:
			for code_box in code_boxs:
			if code_text == code_box.text:
			code_box.click()



			def add_confirm(self):
			"""
			点击确认按钮
			@@ -206,7 +256,7 @@
			"""
			# 回到上一层iframe
			self.switch_parent_iframe()
			self.click(PackageList.add_confirm_btn)
			self.click_wait(PackageList.add_confirm_btn)

			def is_create_success(self, packageName):
			"""
			@@ -214,7 +264,7 @@
			:param packageName: 测试包名称
			:return: bool
			"""
			names = self.get_elements(PackageList.table_packageName_a)
			names = self.get_elements_wait(PackageList.table_packageName_a)
			for name in names:
			if name.text == packageName:
			return True
			@@ -227,7 +277,7 @@
			:return:
			"""
			# 获取到table的所有tr
			table_trs = self.get_elements(PackageList.table_package_tr)
			table_trs = self.get_elements_wait(PackageList.table_package_tr)
			for tr in table_trs:
			# 测试包名称在tr中的定位
			package_name_loc = (By.XPATH, "td[2]/a")
			@@ -247,7 +297,7 @@
			点击生成分享链接按钮
			:return:
			"""
			self.click(PackageList.share_1_btn)
			self.click_wait(PackageList.share_1_btn)

			def get_share_url(self):
			"""
			@@ -261,9 +311,9 @@
			# 退回上一层iframe
			self.switch_parent_iframe()
			# 点击关闭按钮
			self.click(PackageList.share_cancel_btn)
			self.click_wait(PackageList.share_cancel_btn)
			time.sleep(1)
			return url


			def selector(self, click_loc, options_loc, text):
			"""
			@@ -274,9 +324,9 @@
			:return:
			"""
			# 点击下拉框
			self.click(click_loc)
			self.click_wait(click_loc)
			# 获取所有选项
			options = self.get_elements(options_loc)
			options = self.get_elements_wait(options_loc)
			# 判断选项是否与传入的选项相等
			for opt in options:
			if opt.text == text: