diff --git a/test-test/src/main/java/com/test/test/controller/UiAutomationController.java b/test-test/src/main/java/com/test/test/controller/UiAutomationController.java
index 4a35ef2..340e7e0 100644
--- a/test-test/src/main/java/com/test/test/controller/UiAutomationController.java
+++ b/test-test/src/main/java/com/test/test/controller/UiAutomationController.java
@@ -1,9 +1,11 @@
package com.test.test.controller;
import java.util.List;
+import java.util.Map;
import com.test.common.utils.SeleniumUtils;
import com.test.test.domain.UiAutomation;
+import com.test.test.domain.UiReport;
import com.test.test.domain.qo.UiAutomationDataQO;
import com.test.test.domain.qo.UiAutomationQO;
import com.test.test.service.IUiAutomationService;
diff --git a/test-test/src/main/java/com/test/test/domain/qo/UiSceneStepsQO.java b/test-test/src/main/java/com/test/test/domain/qo/UiSceneStepsQO.java
index e9233c0..b22568a 100644
--- a/test-test/src/main/java/com/test/test/domain/qo/UiSceneStepsQO.java
+++ b/test-test/src/main/java/com/test/test/domain/qo/UiSceneStepsQO.java
@@ -50,10 +50,10 @@ public class UiSceneStepsQO extends BaseEntity
private String operateObject;
/** 元素库名称 */
- private Integer operateGroupId;
+ private Long operateGroupId;
/** 元素id */
- private Integer operateElementId;
+ private Long operateElementId;
/** 元素定位类型 */
private String operateLocType;
diff --git a/test-test/src/main/java/com/test/test/domain/vo/UiSceneStepsVO.java b/test-test/src/main/java/com/test/test/domain/vo/UiSceneStepsVO.java
index d5363bd..627740e 100644
--- a/test-test/src/main/java/com/test/test/domain/vo/UiSceneStepsVO.java
+++ b/test-test/src/main/java/com/test/test/domain/vo/UiSceneStepsVO.java
@@ -44,10 +44,10 @@ public class UiSceneStepsVO
private String operateObject;
/** 元素库名称 */
- private Integer operateGroupId;
+ private Long operateGroupId;
/** 元素id */
- private Integer operateElementId;
+ private Long operateElementId;
/** 元素定位类型 */
private String operateLocType;
diff --git a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java
index 30f6472..6e7259e 100644
--- a/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java
+++ b/test-test/src/main/java/com/test/test/service/impl/UiSceneStepsServiceImpl.java
@@ -99,18 +99,19 @@ public class UiSceneStepsServiceImpl implements IUiSceneStepsService {
createSceneStepsReport(orderNumber, step, reportId);
}
System.setProperty("webdriver.chrome.driver", chromeDriverPath);
- // 2. 创建一个临时目录作为 user-data-dir
- String uniqueUserDataDir="/tmp/chrome-"+ UUID.randomUUID();
-
- // 3. 配置 ChromeOptions
+
+ // 配置 ChromeOptions
ChromeOptions options = new ChromeOptions();
- options.addArguments("--headless"); // 改用传统无头模式（非 `--headless=new`）
- options.addArguments("--incognito"); // 无痕模式，不使用 user-data-dir
- options.addArguments("--no-sandbox"); // Docker/Linux 可能需要
- options.addArguments("--disable-dev-shm-usage"); // 避免 /dev/shm 不足
- options.addArguments("--remote-allow-origins=*"); // Chrome 11+ 需要
-// options.addArguments("--user-data-dir=" + uniqueUserDataDir); // 关键：唯一目录
- // 4. 启动 Chrome
+ options.addArguments("--headless");
+ options.addArguments("--no-sandbox");
+ options.addArguments("--disable-dev-shm-usage");
+ options.addArguments("--remote-allow-origins=*");
+ options.addArguments("--disable-gpu");
+ options.addArguments("--disable-extensions");
+ options.addArguments("--disable-plugins");
+ options.addArguments("--disable-software-rasterizer");
+
+ // 创建 ChromeDriver
WebDriver driver = new ChromeDriver(options);
SeleniumUtils seleniumUtils = new SeleniumUtils(driver);
diff --git a/test-ui/src/views/test/uiTest/advancedSetting.vue b/test-ui/src/views/test/uiTest/advancedSetting.vue
index bb56ee2..597c6cb 100644
--- a/test-ui/src/views/test/uiTest/advancedSetting.vue
+++ b/test-ui/src/views/test/uiTest/advancedSetting.vue
@@ -953,13 +953,12 @@ export default {
// 其他设置
case '4':
if (item.otherSettingsQO != null) {
- this.saveForm.waitElementTime = item.otherSettingsQO.waitElementTime
- this.saveForm.screenshotConfiguration = item.otherSettingsQO.screenshotConfiguration
+ this.saveForm.waitElementTime = item.otherSettingsQO.waitElementTime || 15000
+ this.saveForm.screenshotConfiguration = item.otherSettingsQO.screenshotConfiguration || 2
}
break
}
})
-
},
saveForm: {
handler(newVal, oldVal) {
@@ -977,8 +976,10 @@ export default {
// 其他设置
var param4 = {
settingType: '4',
- waitElementTime: this.saveForm.waitElementTime,
- screenshotConfiguration: this.saveForm.screenshotConfiguration,
+ otherSettingsQO: {
+ waitElementTime: this.saveForm.waitElementTime,
+ screenshotConfiguration: this.saveForm.screenshotConfiguration
+ }
}
newList.push(param4)
this.$emit('changeSetting', newList)
diff --git a/test-ui/src/views/test/uiTest/automationTest.vue b/test-ui/src/views/test/uiTest/automationTest.vue
index 51ef9bf..ce73534 100644
--- a/test-ui/src/views/test/uiTest/automationTest.vue
+++ b/test-ui/src/views/test/uiTest/automationTest.vue
@@ -32,7 +32,6 @@
已完成
-
diff --git a/test-ui/src/views/test/uiTest/sceneStep.vue b/test-ui/src/views/test/uiTest/sceneStep.vue
index 66f37b7..103aff8 100644
--- a/test-ui/src/views/test/uiTest/sceneStep.vue
+++ b/test-ui/src/views/test/uiTest/sceneStep.vue
@@ -101,12 +101,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -155,12 +163,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -216,12 +232,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -249,12 +273,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -289,12 +321,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -463,7 +503,7 @@ export default {
// 判断步骤类型
switch (newVal.stepType) {
case '1': // 提交表单
- this.typeTitle = '针对属性type="submit”的元素，用于提交表单数据'
+ this.typeTitle = '针对属性type="submit"的元素，用于提交表单数据'
break
case '2': // 下拉框操作
this.typeTitle = '对下拉选项进行操作，可实现单选，多选，以及取消选择的操作'