diff --git a/test-ui/src/views/test/uiTest/addScene.vue b/test-ui/src/views/test/uiTest/addScene.vue index 5ccd042..fdd9dec 100644 --- a/test-ui/src/views/test/uiTest/addScene.vue +++ b/test-ui/src/views/test/uiTest/addScene.vue @@ -180,15 +180,19 @@ export default { handleClickSave() { if (this.informationForm.name === null || this.informationForm.name === '') { this.$modal.msgWarning("请输入名称！"); + return } if (this.informationForm.groupId === null || this.informationForm.groupId === '') { this.$modal.msgWarning("请选择模块！"); + return } if (this.informationForm.status === null || this.informationForm.status === '') { this.$modal.msgWarning("请选择状态"); + return } if (this.informationForm.dutyBy === null || this.informationForm.dutyBy === '') { this.$modal.msgWarning("请输入责任人"); + return } addAutomation(this.informationForm).then(res => { if (res.code === 200) { diff --git a/test-ui/src/views/test/uiTest/advancedSetting.vue b/test-ui/src/views/test/uiTest/advancedSetting.vue index e607674..91b7707 100644 --- a/test-ui/src/views/test/uiTest/advancedSetting.vue +++ b/test-ui/src/views/test/uiTest/advancedSetting.vue @@ -118,18 +118,19 @@ - 添加 + 添加 -
+
提取窗口信息
-
+
- + @@ -139,15 +140,15 @@ + @click="beforeWindowDelete(index, index1)">
-
+
提取元素信息
-
+
@@ -158,7 +159,8 @@ - + @@ -168,7 +170,40 @@ + @click="beforeElemetDelete(index, index1)"> +
+
+ +
+ +
+ +
+ + + + + +
+ + + + + + +
+ +
+ + + + + +
@@ -187,6 +222,157 @@ 添加 +
+
+ +
+
+
{{ index + 1 }}
+
等待时间
+ +
+
+ + + +
+
+ +
+ + + +
+
将提取的内容保存到变量中
+ + + + + + + + + + + + + + + + + 添加 + +
+
提取窗口信息
+
+
+
+ + + + + + + + +
+
+ + +
+
+
+
+ +
+
提取元素信息
+
+
+
+ + + + + + + + + + + + +
+
+ + +
+
+ +
+ +
+ +
+ + + + + +
+ + + + + + +
+ +
+ + + + + + +
+
+
+
+
+ + +
+
+
@@ -242,7 +428,7 @@ export default { saveForm: { errorHandling: '1', // 错误处理 waitElementTime: 15000, // 等待元素超时时间 - screenshotConfiguration: '1', // 截图配置 + screenshotConfiguration: 1, // 截图配置 beforeList: [], // 前置数组 afterList: [], // 后置数组 before: '1', @@ -250,10 +436,6 @@ export default { informationType: '1', windowType: null, elementType: null, - beforeWindowList: [], // 前置-窗口信息数组 - beforeElementList: [], // 前置-元素信息数组 - afterWindowList: [], // 后置-窗口信息数组 - afterElementList: [], // 后置-元素信息数组 }, searchForm: { pageNum: 1, @@ -279,6 +461,8 @@ export default { locType: [{ required: true, message: '请选择定位类型', trigger: 'blur' }], elementLoc: [{ required: true, message: '请输入元素定位', trigger: 'blur' }], }, + groupList: [], // 操作对象分组 + elementList: [], // 操作对象分组 } }, mounted() { @@ -353,42 +537,144 @@ export default { var param = { settingType: '1', // 前置操作 operateType: '3', // 数据提取 - dataExtractionQOList: [], + dataExtractionQOList: { + windowExtractions: [], // 提取窗口信息 + elementExtractions: [], // 提取元素信息 + }, isDisabled: '1', name: '数据提取', } this.saveForm.beforeList.push(param) } - }, // 添加 - 后置操作 - addAfter() { }, + addAfter() { + if (this.saveForm.after === '1') { + // 等待时间 + var param = { + settingType: '2', // 后置操作 + operateType: '1', // 等待时间 + awateTime: 15000, + isDisabled: '1', + } + this.saveForm.afterList.push(param) + } else { + // 数据提取 + var param = { + settingType: '2', // 后置操作 + operateType: '3', // 数据提取 + dataExtractionQOList: { + windowExtractions: [], // 提取窗口信息 + elementExtractions: [], // 提取元素信息 + }, + isDisabled: '1', + name: '数据提取', + } + this.saveForm.afterList.push(param) + } + }, // 删除 beforeDelete(val) { this.saveForm.beforeList = this.saveForm.beforeList.filter((item, index) => index !== val); }, + afterDelete(val) { + this.saveForm.afterList = this.saveForm.afterList.filter((item, index) => index !== val); + }, // 添加 - addBeforeDataExtractionQOList() { + addBeforeDataExtractionQOList(index) { if (this.saveForm.informationType === '1' && this.saveForm.windowType != null) { // 提取窗口信息且子分类不为空 var param = { windowType: this.saveForm.windowType, value: null, isDisabled: '1', + informationType: '1', } - this.saveForm.beforeWindowList.push(param) + this.saveForm.beforeList[index].dataExtractionQOList.windowExtractions.push(param) } else if (this.saveForm.informationType === '2' && this.saveForm.elementType != null) { // 提取元素信息且子分类不为空 + var param = { + elementType: this.saveForm.elementType, + value: null, + isDisabled: '1', + elementAttribute: null, + informationType: '2', + operateObject: null, // 操作对象 + operateGroupId: null, // 元素对象 + operateElementId: null, // 元素对象 + operateLocType: null, // 元素定位 + operateLocValue: null, // 元素定位 + } + this.saveForm.beforeList[index].dataExtractionQOList.elementExtractions.push(param) + } else { + this.$modal.msgError("请选择子分类"); + } + }, + addAfterDataExtractionQOList(index) { + if (this.saveForm.informationType === '1' && this.saveForm.windowType != null) { + // 提取窗口信息且子分类不为空 + var param = { + windowType: this.saveForm.windowType, + value: null, + isDisabled: '1', + informationType: '1', + } + this.saveForm.afterList[index].dataExtractionQOList.windowExtractions.push(param) + } else if (this.saveForm.informationType === '2' && this.saveForm.elementType != null) { + // 提取元素信息且子分类不为空 + var param = { + elementType: this.saveForm.elementType, + value: null, + isDisabled: '1', + elementAttribute: null, + informationType: '2', + operateObject: null, // 操作对象 + operateGroupId: null, // 元素对象 + operateElementId: null, // 元素对象 + operateLocType: null, // 元素定位 + operateLocValue: null, // 元素定位 + } + this.saveForm.afterList[index].dataExtractionQOList.elementExtractions.push(param) + } else { + this.$modal.msgError("请选择子分类"); } }, // 删除 - beforeWindowDelete(val) { - this.saveForm.beforeWindowList = this.saveForm.beforeWindowList.filter((item, index) => index !== val); + beforeWindowDelete(val, val1) { + this.saveForm.beforeList[val].dataExtractionQOList.windowExtractions = this.saveForm.beforeList[val].dataExtractionQOList.windowExtractions.filter((item, index) => index !== val1) + }, + beforeElemetDelete(val, val1) { + this.saveForm.beforeList[val].dataExtractionQOList.elementExtractions = this.saveForm.beforeList[val].dataExtractionQOList.elementExtractions.filter((item, index) => index !== val1) + }, + afterWindowDelete(val, val1) { + this.saveForm.afterList[val].dataExtractionQOList.windowExtractions = this.saveForm.afterList[val].dataExtractionQOList.windowExtractions.filter((item, index) => index !== val1) + }, + afterElemetDelete(val, val1) { + this.saveForm.afterList[val].dataExtractionQOList.elementExtractions = this.saveForm.afterList[val].dataExtractionQOList.elementExtractions.filter((item, index) => index !== val1) + }, + // 元素对象 + getOperateGroup() { + this.getElementListData(this.saveForm.operateGroupId) + }, + // 元素定位 + getOperateLoc() { + this.getElementListData(this.saveForm.operateLocType) + }, + // 获取元素列表 + getElementListData(id) { + getElementList({ groupId: id }).then(res => { + if (res.code === 200) { + this.elementList = res.rows + } + }) }, }, watch: { detail(newVal, oldVal) { + if (newVal === null) { + return + } this.saveForm.beforeList = [] this.saveForm.afterList = [] @@ -400,61 +686,30 @@ export default { if (newVal.uiHighSettingVOList != null) { this.uiHighSettingVOList = newVal.uiHighSettingVOList } + this.uiHighSettingVOList.forEach(item => { + switch (item.settingType) { + // 前置操作 + case '1': + this.saveForm.beforeList.push(item) + break + // 后置操作 + case '2': + this.saveForm.afterList.push(item) + break + // 错误处理 + case '3': + this.saveForm.errorHandling = item.errorHandling + break + // 其他设置 + case '4': + if (item.otherSettingsQO != null) { + this.saveForm.waitElementTime = item.otherSettingsQO.waitElementTime + this.saveForm.screenshotConfiguration = item.otherSettingsQO.screenshotConfiguration + } + break + } + }) - Promise.all([ - new Promise((resolve) => { - this.uiHighSettingVOList.forEach(item => { - switch (item.settingType) { - // 前置操作 - case '1': - this.saveForm.beforeList.push(item) - break - // 后置操作 - case '2': - this.saveForm.afterList.push(item) - break - // 错误处理 - case '3': - this.saveForm.errorHandling = item.errorHandling - break - // 其他设置 - case '4': - this.saveForm.waitElementTime = item.otherSettingsQO.waitElementTime - this.saveForm.screenshotConfiguration = item.otherSettingsQO.screenshotConfiguration - break - } - }) - resolve(); - }), - new Promise((resolve) => { - this.saveForm.beforeList.forEach(item => { - if (item.informationType === '1' && item) { - // 提取窗口信息 - this.saveForm.beforeWindowList.push(item) - } else { - // 提取元素信息 - this.saveForm.beforeElementList.push(item) - } - }) - resolve(); - }), - new Promise((resolve) => { - this.saveForm.afterList.forEach(item => { - if (item.informationType === '1') { - // 提取窗口信息 - this.saveForm.afterWindowList.push(item) - } else { - // 提取元素信息 - this.saveForm.afterElementList.push(item) - } - }) - resolve(); - }) - ]).then(() => { - console.log('Both arrays have been processed.'); - }); - - console.log(this.saveForm.beforeList) }, saveForm: { handler(newVal, oldVal) { @@ -575,6 +830,12 @@ export default { padding: 10px; } } + + } + + .operateObject-wrap { + display: flex; + gap: 10px; } } diff --git a/test-ui/src/views/test/uiTest/editScene.vue b/test-ui/src/views/test/uiTest/editScene.vue index 53d291d..65ada0c 100644 --- a/test-ui/src/views/test/uiTest/editScene.vue +++ b/test-ui/src/views/test/uiTest/editScene.vue @@ -194,15 +194,19 @@ export default { handleClickSave() { if (this.informationForm.name === null || this.informationForm.name === '') { this.$modal.msgWarning("请输入名称！"); + return } if (this.informationForm.groupId === null || this.informationForm.groupId === '') { this.$modal.msgWarning("请选择模块！"); + return } if (this.informationForm.status === null || this.informationForm.status === '') { this.$modal.msgWarning("请选择状态"); + return } if (this.informationForm.dutyBy === null || this.informationForm.dutyBy === '') { this.$modal.msgWarning("请输入责任人"); + return } updateAutomation(this.informationForm).then(res => { if (res.code === 200) { diff --git a/test-ui/src/views/test/uiTest/sceneStep.vue b/test-ui/src/views/test/uiTest/sceneStep.vue index 429ef9b..66f37b7 100644 --- a/test-ui/src/views/test/uiTest/sceneStep.vue +++ b/test-ui/src/views/test/uiTest/sceneStep.vue @@ -95,7 +95,7 @@ - +
@@ -149,7 +149,7 @@ - +
@@ -210,7 +210,7 @@ - +
@@ -243,7 +243,7 @@ - +
@@ -283,7 +283,7 @@ - +