diff --git a/src/api/xm/core/xmTestCase.js b/src/api/xm/core/xmTestCase.js index 62aad4c7..1f12b7bc 100644 --- a/src/api/xm/core/xmTestCase.js +++ b/src/api/xm/core/xmTestCase.js @@ -35,7 +35,7 @@ export const editSomeFieldsXmTestCase = params => { return axios.post(`${base}/x /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ //初始化页面上的字典 export const initDicts = (that) => { - var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus'];//在此添加要加载的字典 如['sex','grade','lvl'] + var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType'];//在此添加要加载的字典 如['sex','grade','lvl'] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ Object.assign(that.dicts,res.data.data) diff --git a/src/api/xm/core/xmTestPlanCase.js b/src/api/xm/core/xmTestPlanCase.js index 5d5fe0f2..9b87a524 100644 --- a/src/api/xm/core/xmTestPlanCase.js +++ b/src/api/xm/core/xmTestPlanCase.js @@ -38,7 +38,7 @@ export const importFromTestCase = params => { return axios.post(`${base}/xm/core /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ //初始化页面上的字典 export const initDicts = (that) => { - var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority'];//在此添加要加载的字典 如['sex','grade','lvl'] + var itemCodes=['testPlanStatus','testPlanTcode','testStepTcode','priority','testCaseStatus','caseType'];//在此添加要加载的字典 如['sex','grade','lvl'] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ Object.assign(that.dicts,res.data.data) diff --git a/src/common/js/util.js b/src/common/js/util.js index 25339843..eedcfcf2 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -39,7 +39,7 @@ export default { * 通过字典值获取其名称，返回根值相同的字典,并自动计算其对应显示样式 * 界面上可以类似使用 * 显示： - {{item.name}} + {{item.name}} * 下拉框： @@ -49,7 +49,7 @@ export default { * @param {*} dicts * @param {*} itemCode * @param {*} cellValue - * @returns [{id:'',name:'',className:''}] + * @returns [{id:'',name:'',className:'',color:'',icon:''}] */ formatDictsWithClass: function(dicts,itemCode,cellValue){ diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index b9eb89d1..71ca9351 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -315,3 +315,11 @@ table tr.hover-row{ max-width:80vw; } } + +.label-font-size{ + font-size: #C0C4CC; +} + +.title-font-size{ + font-size:28px; +} diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue index 8e984335..0c0e71e8 100644 --- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue +++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue @@ -31,6 +31,11 @@ + + + + + @@ -89,7 +94,7 @@ TestStepConfig, return { currOpType:'add',//add/edit load:{ list: false, edit: false, del: false, add: false },//查询中... - dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} + dicts:{caseType:[]},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} editFormRules: { id: [ //{ required: true, message: '主键不能为空', trigger: 'blur' } diff --git a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue index 6cbcc816..deaf957f 100644 --- a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue +++ b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue @@ -5,7 +5,7 @@ - 步骤 + # 操作 @@ -20,33 +20,49 @@ 缺陷 - + +
+ {{index+1}} - 操作：{{item.op}}
+ {{item.op}}
预期：{{item.eresult}} - - - - + +
+ + + + + +
+
+ {{formatDicts(dicts,'testStepTcode',item.tcode)}} + 执行结果 +
+ + + + +
- \ No newline at end of file diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue index 26104789..ce6341c7 100644 --- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue +++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue @@ -4,11 +4,126 @@ - + - - - + + + 模块：{{editForm.funcName}} + + + {{editForm.caseName}} + + + + {{editForm.execUsername}} +
+ {{editForm.execUsername}} + 执行人 +
+ + + +
+ {{formatDicts(dicts,'priority',editForm.priority)}} + 优先级 +
+ + + +
+ + + + + +
+
+ {{formatDicts(dicts,'testStepTcode',editForm.execStatus)}} + 执行结果 +
+ + + + + + + + + 用例状态 + + + {{item.name}} + + + + + + 用例版本 + + + {{editForm.verNum}} + + + + + + 用例类型 + + + {{item.name}} + + + + + + + 紧急程度 + + + {{item.name}} + + + + + + + + 前置条件 + + + {{editForm.preRemark?editForm.preRemark:'无'}} + + + + + 测试步骤 + + + + + + 保存测试步骤 + + + + + 备注 + + + {{editForm.caseRemark?editForm.caseRemark:'无'}} + + + + + + + + + + + + + @@ -23,14 +138,7 @@ - - - - - - 保存测试步骤 - - + @@ -55,11 +163,12 @@ import { initDicts, addXmTestPlanCase,editXmTestPlanCase,editSomeFieldsXmTestPlanCase } from '@/api/xm/core/xmTestPlanCase'; import { mapGetters } from 'vuex' import TestStepResult from './TestStepResult.vue'; + import MyInput from '@/components/MDinput/index'; export default { name:'xmTestPlanCaseEdit', components: { -TestStepResult, +TestStepResult,MyInput, }, computed: { @@ -85,7 +194,7 @@ TestStepResult, return { currOpType:'add',//add/edit load:{ list: false, edit: false, del: false, add: false },//查询中... - dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} + dicts:{'testPlanStatus':[],'testPlanTcode':[],'testStepTcode':[],'priority':[],'testCaseStatus':[],'caseType':[]},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} editFormRules: { caseId: [ //{ required: true, message: '测试用例编号不能为空', trigger: 'blur' } @@ -187,6 +296,41 @@ TestStepResult, - \ No newline at end of file