Browse Source

优化

master
陈裕财 4 years ago
parent
commit
5edd10df35
  1. 2
      src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
  2. 22
      src/views/xm/core/xmTestCase/XmTestCaseAdd.vue
  3. 26
      src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
  4. 28
      src/views/xm/core/xmTestCase/XmTestCaseMng.vue
  5. 34
      src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

2
src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue

@ -45,7 +45,7 @@
</el-row>
</el-col>
<el-col :span="14">
<xm-menu-select ref="menusSelect" iterationFilterType="not-join-curr-iteration" checkScope="0" :xm-product="{id:xmIteration.productId}" :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
<xm-menu-select ref="menusSelect" iterationFilterType="not-join-curr-iteration" checkScope="0" :xm-product="xmIteration?{id:xmIteration.productId}:null" :xm-iteration="xmIteration" :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-col>
</el-row>
</section>

22
src/views/xm/core/xmTestCase/XmTestCaseAdd.vue

@ -15,15 +15,15 @@
<el-button @click="showMenu">关联需求</el-button>
</el-form-item>
<el-form-item>
<el-col :span="12">测试步骤</el-col>
<el-col :span="12" offset="0">预期结果</el-col>
<el-col :span="12">
<vue-editor :id="'testStep'" :branch-id="userInfo.branchId" v-model="addForm.testStep" ref="testStep"></vue-editor>
</el-col>
<el-col :span="12" offset="0">
<vue-editor :id="'expectResult'" :branch-id="userInfo.branchId" v-model="addForm.expectResult" ref="expectResult"></vue-editor>
</el-col>
<el-form-item label="测试步骤" prop="testStep">
<vue-editor :id="'testStep3'" :branch-id="userInfo.branchId" v-model="addForm.testStep" ref="testStep" key="1"></vue-editor>
</el-form-item>
<el-form-item label="预期结果" prop="expectResult">
<vue-editor :id="'expectResult3'" :branch-id="userInfo.branchId" v-model="addForm.expectResult" ref="expectResult" key="2"></vue-editor>
</el-form-item>
<el-form-item>
<el-button @click.native="handleCancel">取消</el-button>
@ -33,8 +33,8 @@
</el-form-item>
</el-form>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" fullscreen :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''" @menus-selected="onSelectedMenus" ></xm-menu-select>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" checkScope="0" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer>
</el-row>
</section>

26
src/views/xm/core/xmTestCase/XmTestCaseEdit.vue

@ -1,5 +1,5 @@
<template>
<section class="page-container padding border">
<section class="padding">
<el-row>
<!--新增界面 XmTestCase 测试用例-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
@ -10,7 +10,7 @@
<el-input v-model="editForm.moduleName" placeholder="模块名称" ></el-input>
</el-form-item>
<el-form-item label="关联的需求" prop="menuId">
<el-tag v-if="editForm.menuId && editForm.menuId!=''" @close="clearFiltersMneu">{{editForm.menuName}}</el-tag>
<el-tag v-if="editForm.menuId && editForm.menuId!=''" @close="clearFiltersMneu">{{editForm.menuName?editForm.menuName:editForm.menuId}}</el-tag>
<el-tag v-else>还没关联任何需求</el-tag>
<el-button v-if="!editForm.menuId" @click="showMenu">关联需求</el-button>
</el-form-item>
@ -19,15 +19,15 @@
<el-radio v-model="editForm.caseStatus" label="0" placeholder="状态" >作废</el-radio>
</el-form-item>
<el-form-item>
<el-col :span="12">测试步骤</el-col>
<el-col :span="12" offset="0">预期结果</el-col>
<el-col :span="12">
<vue-editor :id="'testStep3'" :branch-id="userInfo.branchId" v-model="editForm.testStep" ref="testStep"></vue-editor>
</el-col>
<el-col :span="12" offset="0">
<vue-editor :id="'expectResult3'" :branch-id="userInfo.branchId" v-model="editForm.expectResult" ref="expectResult"></vue-editor>
</el-col>
<el-form-item label="测试步骤" prop="testStep">
<vue-editor :id="'testStep3'" :branch-id="userInfo.branchId" v-model="editForm.testStep" ref="testStep" key="1"></vue-editor>
</el-form-item>
<el-form-item label="预期结果" prop="expectResult">
<vue-editor :id="'expectResult3'" :branch-id="userInfo.branchId" v-model="editForm.expectResult" ref="expectResult" key="2"></vue-editor>
</el-form-item>
<el-form-item>
<el-button @click.native="handleCancel">取消</el-button>
@ -35,8 +35,8 @@
</el-form-item>
</el-form>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" fullscreen :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" :exclude-iteration-id="iteration?iteration.id:''" @menus-selected="onSelectedMenus" ></xm-menu-select>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select checkScope="0" :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer>
</el-row>
</section>

28
src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@ -2,8 +2,8 @@
<section class="page-container padding border">
<el-row>
<div>
<el-tag v-if=" filters.product " closable @close="clearProduct">{{this.filters.product.productName}}</el-tag>
<xm-product-select v-else :link-project-id="filters.selProject?filters.selProject.id:null" @row-click="onProductSelected"></xm-product-select>
<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null" @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择需求</el-button>
<el-tag v-else closable @close=" clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}({{filters.menus.length}})</el-tag>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
@ -11,10 +11,6 @@
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCases" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-button type="primary" v-if="!multiSelect" icon="el-icon-plus" @click="showAdd"></el-button>
<el-button type="primary" v-if="multiSelect" @click="selected">确认选中</el-button>
<el-button v-if="!multiSelect " type="danger" icon="el-icon-delete" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>
<el-popover
placement="top-start"
title="更多查询条件或操作"
@ -22,11 +18,10 @@
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font" v-if="!xmProduct">产品:</font>
<xm-product-select :link-project-id="filters.selProject?filters.selProject.id:null" @row-click="onProductSelected"></xm-product-select>
<xm-product-select :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null" @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
</el-col>
<el-col :span="24" style="padding-top:5px;" v-if="!selProject" >
<xm-project-select :link-product-id="filters.product?filters.product.id:null" @row-click="onPorjectConfirm"></xm-project-select>
<xm-project-select :auto-select="false" :link-product-id="filters.product?filters.product.id:null" @row-click="onPorjectConfirm" @clear-select="filters.selProject=null"></xm-project-select>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">需求:</font>
@ -63,6 +58,12 @@
</el-row>
<el-button slot="reference" icon="el-icon-more"></el-button>
</el-popover>
<span style="float:right;">
<el-button type="primary" v-if="!multiSelect" icon="el-icon-plus" @click="showAdd"></el-button>
<el-button type="primary" v-if="multiSelect" @click="selected">确认选中</el-button>
<el-button v-if="!multiSelect " type="danger" icon="el-icon-delete" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true"></el-button>
</span>
</div>
</el-row>
<el-row class="page-main ">
@ -99,19 +100,19 @@
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
<!--编辑 XmTestCase 测试用例界面-->
<el-drawer title="编辑测试用例" :visible.sync="editFormVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="编辑测试用例" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-test-case-edit :xm-test-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-test-case-edit>
</el-drawer>
<!--新增 XmTestCase 测试用例界面-->
<el-drawer title="新增测试用例" :visible.sync="addFormVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="新增测试用例" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-test-case-add :xm-test-case="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-add>
</el-drawer>
<el-drawer title="选中用户" :visible.sync="selectUserForFiltersVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="选中用户" :visible.sync="selectUserForFiltersVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onFiltersUserConfirm"></xm-group-mng>
</el-drawer>
</el-row>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="80%" :close-on-click-modal="false">
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer>
</section>
@ -361,7 +362,6 @@
},
onProductSelected(product){
this.filters.product=product;
this.productSelectVisible=false;
this.searchXmTestCases();
},
showMenu(){

34
src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@ -1,18 +1,13 @@
<template>
<section class="page-container padding border">
<el-row v-if="!batchEditVisible">
<el-checkbox v-model="gstcVisible" >甘特图</el-checkbox>
<xm-product-select :auto-select="false" :link-project-id="filters.selProject" @row-click="onProductSelected"></xm-product-select>
<xm-project-select :auto-select="false" :link-product-id="filters.product?filters.product.id:null" @row-click="onPorjectConfirm"></xm-project-select>
<xm-product-select style="display:inline;" :auto-select="false" :link-project-id="filters.selProject?filters.selProject.id:null" @row-click="onProductSelected" @clear-select="filters.xmProduct=null"></xm-product-select>
<xm-project-select style="display:inline;" :auto-select="false" :link-product-id="filters.product?filters.product.id:null" @row-click="onPorjectConfirm" @clear-select="filters.selProject=null"></xm-project-select>
<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择需求</el-button>
<el-tag v-else closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}({{filters.menus.length}})</el-tag>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>
</template>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
</el-input>
<el-button type="primary" @click="showCase" icon="el-icon-plus">由用例创建计划</el-button>
<el-button @click="showBatchEdit" icon="el-icon-right">批量修改</el-button>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>
<el-popover
placement="top-start"
title="更多查询条件或操作"
@ -64,6 +59,11 @@
</el-row>
<el-button slot="reference" icon="el-icon-more"></el-button>
</el-popover>
<span style="float:right;">
<el-button type="primary" @click="showCase" icon="el-icon-plus">由用例创建计划</el-button>
<el-button @click="showBatchEdit" icon="el-icon-right">批量修改</el-button>
</span>
</el-row>
<el-row class="page-main" v-else>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
@ -167,26 +167,26 @@
<el-drawer title="选择用例" :visible.sync="xmTestCaseMngVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-test-case-mng :multi-select="true" :visible="xmTestCaseMngVisible" @selected="onCaseSelected"></xm-test-case-mng>
</el-drawer>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" fullscreen size="80%" :close-on-click-modal="false">
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" fullscreen size="60%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer>
<el-drawer title="选中用户" :visible.sync="selectUserForFiltersVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="选中用户" :visible.sync="selectUserForFiltersVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onFiltersUserConfirm"></xm-group-mng>
</el-drawer>
<el-drawer title="选中用户" :visible.sync="selectUserVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="选中用户" :visible.sync="selectUserVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-group-mng v-if="filters.selProject" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
</el-drawer>
<el-drawer title="选中任务" :visible.sync="selectTaskVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="选中任务" :visible.sync="selectTaskVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-task-list :sel-project="filters.selProject" @task-selected="onSelectedTask"></xm-task-list>
</el-drawer>
<el-drawer title="查看用例" :visible.sync="caseVisible" size="80%" fullscreen append-to-body :close-on-click-modal="false">
<el-drawer title="查看用例" :visible.sync="caseVisible" size="60%" fullscreen append-to-body :close-on-click-modal="false">
<xm-test-case-mng :case-id="editForm.caseId" :visible="caseVisible" ></xm-test-case-mng>
</el-drawer>
<el-drawer title="测试用例" :visible.sync="caseVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="测试用例" :visible.sync="caseVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-test-case-edit :xm-test-case="xmTestCase" :visible="caseVisible" @cancel="caseVisible=false" ></xm-test-case-edit>
</el-drawer>
<el-drawer title="缺陷列表" :visible.sync="bugsVisible" size="80%" append-to-body fullscreen :close-on-click-modal="false">
<el-drawer title="缺陷列表" :visible.sync="bugsVisible" size="60%" append-to-body fullscreen :close-on-click-modal="false">
<xm-question-mng :xm-test-case="xmTestCase" :xm-test-case-exec="editForm" :sel-project="filters.selProject" :visible="bugsVisible" @cancel="bugsVisible=false" ></xm-question-mng>
</el-drawer>
<!--新增 XmQuestion xm_question界面-->
@ -742,7 +742,7 @@
//
},
XmProjectSelectmounted() {
mounted() {
this.filters.selProject=this.selProject;
this.filters.execUser=this.userInfo;
this.$nextTick(() => {

Loading…
Cancel
Save