Browse Source

优化

master
陈裕财 3 years ago
parent
commit
cec0bb76e9
  1. 42
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  2. 2
      src/views/xm/core/xmTestCase/TestStepConfig.vue
  3. 3
      src/views/xm/core/xmTestPlanCase/TestStepResult.vue

42
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -110,14 +110,16 @@
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="测试步骤" name="2"> <el-tab-pane label="测试步骤" name="2">
<el-form-item label="" prop="opStep" label-width="0px">
<vue-editor v-if="visible && activateTabPaneName=='2'" class="rich-context" :id="'opStep'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.opStep" ref="opStep"></vue-editor>
<el-form-item label="" prop="opStep" label-width="0px" v-if="stepConfigVisible==false">
<test-step-result v-model="editForm.opStep"></test-step-result>
</el-form-item> </el-form-item>
<el-form-item label="" prop="opStep" label-width="0px" v-if="stepConfigVisible==true">
<test-step-config v-model="editForm.opStep"></test-step-config>
</el-form-item>
<el-row class="page-bottom"> <el-row class="page-bottom">
<el-button @click.native="handleCancel">取消</el-button> <el-button @click.native="handleCancel">取消</el-button>
<el-button @click="stepConfigVisible=!stepConfigVisible">{{stepConfigVisible?'完成步骤配置':'去配置步骤'}}</el-button>
<el-button v-loading="load.edit" v-if="editForm.opStep!=editFormBak.opStep" type="primary" @click.native="editXmQuestionSomeFields(editForm,'opStep',editForm.opStep)" :disabled="load.edit==true">保存</el-button> <el-button v-loading="load.edit" v-if="editForm.opStep!=editFormBak.opStep" type="primary" @click.native="editXmQuestionSomeFields(editForm,'opStep',editForm.opStep)" :disabled="load.edit==true">保存</el-button>
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
@ -210,6 +212,8 @@
import XmFuncSelect from '../xmFunc/XmFuncSelect' import XmFuncSelect from '../xmFunc/XmFuncSelect'
import XmUserField from '@/views/xm/core/components/XmUserField/index' import XmUserField from '@/views/xm/core/components/XmUserField/index'
import TestStepConfig from '../xmTestCase/TestStepConfig.vue';
import TestStepResult from '../xmTestPlanCase/TestStepResult.vue';
export default { export default {
computed: { computed: {
...mapGetters([ ...mapGetters([
@ -270,16 +274,16 @@
{required: true, message: '请指派给一个人', trigger: 'change' } {required: true, message: '请指派给一个人', trigger: 'change' }
], ],
description: [ description: [
{ min: 0, max: 250, message: '缺陷描述长度在 0 到 1000 个字符', trigger: 'change' },//
{ min: 0, max: 1000, message: '缺陷描述长度在 0 到 1000 个字符', trigger: 'change' },//
], ],
opStep: [ opStep: [
{ min: 0, max: 250, message: '测试步骤长度在 0 到 1000 个字符', trigger: 'change' },//
{ min: 0, max: 1000, message: '测试步骤长度在 0 到 1000 个字符', trigger: 'change' },//
], ],
expectResult: [ expectResult: [
{ min: 0, max: 250, message: '预期结果长度在 0 到 1000 个字符', trigger: 'change' },//
{ min: 0, max: 1000, message: '预期结果长度在 0 到 1000 个字符', trigger: 'change' },//
], ],
remarks: [ remarks: [
{ min: 0, max: 250, message: '处理意见长度在 0 到 1000 个字符', trigger: 'change' },//
{ min: 0, max: 1000, message: '处理意见长度在 0 到 1000 个字符', trigger: 'change' },//
], ],
}, },
@ -309,16 +313,12 @@
xmQuestionHandles:[], xmQuestionHandles:[],
selectTaskVisible:false, selectTaskVisible:false,
flowInfoVisible:false, flowInfoVisible:false,
selectMenuVisible:false,
receiptMessageEditorVisible:false,
tagSelectVisible:false,
descriptionEditorVisible:false,
descriptionEditorVisible:false,
expectResultEditorVisible:false,
opStepEditorVisible:false,
selectMenuVisible:false,
tagSelectVisible:false,
xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}], xmProductVersions:[{id:"1.0.0" ,name:'1.0.0'}],
activateTabPaneName:'12', activateTabPaneName:'12',
funcVisible:false, funcVisible:false,
stepConfigVisible:false,
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
}//end return }//end return
},//end data },//end data
@ -340,15 +340,7 @@
this.load.edit=true this.load.edit=true
let params = Object.assign({}, this.editForm); let params = Object.assign({}, this.editForm);
params.tardgetBugStatus=tardgetBugStatus; params.tardgetBugStatus=tardgetBugStatus;
if(params.expectResult){
params.expectResult=params.expectResult.replace(/<p>\n<br>\n<\p>/g,"");
params.expectResult=params.expectResult.replace(/<p><br><\/p>/g,"");
}
if(params.opStep){
params.opStep=params.opStep.replace(/<p>\n<br>\n<\/p>/g,"");
params.opStep=params.opStep.replace(/<p><br><\/p>/g,"");
}
if(params.description){ if(params.description){
params.description=params.description.replace(/<p>\n<br>\n<\/p>/g,""); params.description=params.description.replace(/<p>\n<br>\n<\/p>/g,"");
params.description=params.description.replace(/<p><br><\/p>/g,""); params.description=params.description.replace(/<p><br><\/p>/g,"");
@ -571,7 +563,7 @@
components: { components: {
// 'xm-question-edit':XmQuestionEdit // 'xm-question-edit':XmQuestionEdit
'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect, 'upload': AttachmentUpload,XmGroupMng,VueEditor,XmTaskList,xmMenuSelect,XmQuestionHandleMng,TagMng,XmProjectSelect,
XmMyDoFocus,XmFuncSelect,XmUserField,
XmMyDoFocus,XmFuncSelect,XmUserField,TestStepConfig,TestStepResult,
}, },
mounted() { mounted() {
console.log("question_add"); console.log("question_add");

2
src/views/xm/core/xmTestCase/TestStepConfig.vue

@ -107,7 +107,7 @@
} }
}else{ }else{
this.extInfosList=[] this.extInfosList=[]
this.addExtInfosFirstItem();
//this.addExtInfosFirstItem();
} }
} }
},//end methods },//end methods

3
src/views/xm/core/xmTestPlanCase/TestStepResult.vue

@ -132,6 +132,9 @@
return icons[0] return icons[0]
} }
return icons[parseInt(execStatus)] return icons[parseInt(execStatus)]
},
addBug(item,index){
} }
},//end methods },//end methods
components: { components: {

Loading…
Cancel
Save