Browse Source

同步sys-ui代码

master
陈裕财 2 years ago
parent
commit
86142be44e
  1. 16
      src/views/xm/core/xmMenu/XmEpicFeatures.vue
  2. 17
      src/views/xm/core/xmTask/XmPhase.vue
  3. 6
      src/views/xm/core/xmTask/XmTaskMng.vue
  4. 1
      src/views/xm/core/xmTestCasedb/index.vue

16
src/views/xm/core/xmMenu/XmEpicFeatures.vue

@ -4,7 +4,7 @@
<div style="display:flex;justify-content: space-between;">
<xm-product-select show-style="tag" v-if=" !xmProduct || !xmProduct.id" ref="xmProductSelect1" style="display:inline;" :auto-select="true" :link-project-id="selProject?selProject.id:null" @change2="onProductSelected" @clear="onProductClearSelect" ></xm-product-select>
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<span style="display:flex;">
<span style="display:flex;" v-show="filters.product && filters.product.id">
<el-popover
style="margin-left:5px;"
placement="top-start"
@ -34,7 +34,10 @@
-->
<el-row class="padding-bottom">
<el-button @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
<div class="icon" style="background-color: rgb(255, 153, 51);">
<i class="el-icon-upload2"></i>
</div>
<el-button @click="showImportFromMenuTemplate()">由模板快速导入需求</el-button>
</el-row>
</el-row>
<el-button type="primary" v-if="!disabledMng" circle plain slot="reference" icon="el-icon-plus"></el-button>
@ -93,7 +96,7 @@
<el-button type="primary" @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button>
</div>
</el-row>
<el-row class="padding-top">
<el-row class="padding-top" v-show="filters.product && filters.product.id">
<el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border height="100px" v-adaptive="{bottomOffset:50}" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"
element-loading-text="努力加载中"
element-loading-spinner="el-icon-loading"
@ -146,9 +149,10 @@
</template>
</el-table-column>
</el-table>
</el-row>
<el-row>
<el-pagination layout="total, sizes, prev, 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>
<el-row>
<el-pagination layout="total, sizes, prev, 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>
</el-row>
</el-row>
<!--编辑 XmMenu xm_project_menu界面-->
<el-dialog :title="'编辑'+(editForm&&editForm.dclass=='1'?'史诗':'特性')" :visible.sync="editFormVisible" width="90%" top="20px" append-to-body :close-on-click-modal="false" >

17
src/views/xm/core/xmTask/XmPhase.vue

@ -4,7 +4,7 @@
<div style="display:flex;justify-content: space-between;">
<xm-project-select show-style="tag" style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @change2="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable @keyup.enter.native="searchXmTasks()"></el-input>
<span style="display:flex;">
<span style="display:flex;" v-show="filters.selProject && filters.selProject.id">
<el-popover
style="margin-left:5px;"
placement="top-start"
@ -115,7 +115,7 @@
v-loading="load.edit"
> 更换上级</el-button>
</el-row>
<el-row class="padding-top">
<el-row class="padding-top" v-show="filters.selProject && filters.selProject.id">
<el-table
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData"
@ -174,7 +174,7 @@
trigger="hover"
>
<el-row>
<el-row>
<el-row class="padding-bottom">
<el-button
@click="showEpicFeaturesForCreateSubTask(scope.row)"
@ -182,7 +182,7 @@
>由史诗特性快速创建子计划 (推荐)</el-button
>
</el-row>
<el-row>
<el-row class="padding-bottom">
<el-button
@click="showTaskTemplate"
@ -190,12 +190,12 @@
>从模板快速导入子计划 </el-button
>
</el-row>
<el-row>
<el-row class="padding-bottom">
<el-button type="primary" @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>
<el-button @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>
</el-row>
</el-row>
<el-row>
<el-row class="padding-bottom">
<el-button @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" > 编辑计划</el-button>
</el-row>
@ -217,7 +217,6 @@
</template>
</el-table-column>
</el-table>
</el-row>
<el-pagination
ref="pagination"
layout="total, sizes, prev, pager, next"
@ -229,6 +228,8 @@
:total="pageInfo.total"
style="float: right;"
></el-pagination>
</el-row>
<!--编辑 XmTask xm_task界面-->
<el-dialog
title="编辑计划"

6
src/views/xm/core/xmTask/XmTaskMng.vue

@ -256,7 +256,7 @@
trigger="hover"
>
<el-row>
<el-row>
<el-row class="padding-bottom">
<div class="icon" :style="{backgroundColor: '#409EFF'}">
<i :class=" 'el-icon-s-operation' " ></i>
</div>
@ -267,7 +267,7 @@
>由用户故事快速创建任务(推荐)</el-button
>
</el-row>
<el-row>
<el-row class="padding-bottom">
<div class="icon" :style="{backgroundColor: '#409EFF'}">
<i :class=" 'el-icon-s-operation' " ></i>
@ -278,7 +278,7 @@
>从模板快速导入任务</el-button
>
</el-row>
<el-row>
<el-row class="padding-bottom">
<div class="icon" :style="{backgroundColor: '#409EFF'}">
<i :class=" 'el-icon-s-operation' " ></i>

1
src/views/xm/core/xmTestCasedb/index.vue

@ -39,6 +39,7 @@ export default {
if(!this.testCasedb||this.testCasedb.id!=this.$route.query.casedbId){
listXmTestCasedb({id:this.$route.query.casedbId}).then(res=>{
var tips = res.data.tips;
debugger
if(tips.isOk ){
if( res.data.data.length==1){
store.dispatch('setTestCasedb',res.data.data[0])

Loading…
Cancel
Save