Browse Source

优化

master
陈裕财 3 years ago
parent
commit
faa782e4a6
  1. 58
      src/components/Image/ImageCategoryTree.vue
  2. 75
      src/components/Image/UploadImage.vue
  3. 11
      src/styles/mdp.scss
  4. 4
      src/views/xm/core/xmIteration/XmIterationBox.vue
  5. 18
      src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
  6. 4
      src/views/xm/core/xmIteration/XmIterationMng.vue
  7. 15
      src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue
  8. 6
      src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
  9. 2
      src/views/xm/core/xmMenu/XmEpicFeatures.vue
  10. 4
      src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
  11. 2
      src/views/xm/core/xmMenu/XmMenuBox.vue
  12. 2
      src/views/xm/core/xmMenu/XmMenuBoxForIteration.vue
  13. 2
      src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue
  14. 2
      src/views/xm/core/xmMenu/XmMenuBoxForProject.vue
  15. 4
      src/views/xm/core/xmMenu/XmMenuMng.vue
  16. 2
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  17. 2
      src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
  18. 2
      src/views/xm/core/xmQuestion/XmQuestionForIteration.vue
  19. 2
      src/views/xm/core/xmQuestion/XmQuestionForProduct.vue
  20. 2
      src/views/xm/core/xmQuestion/XmQuestionForProject.vue
  21. 2
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  22. 2
      src/views/xm/core/xmQuestion/XmQuestionMngMy.vue
  23. 2
      src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue
  24. 2
      src/views/xm/core/xmTask/XmPhase.vue
  25. 2
      src/views/xm/core/xmTask/XmPhaseSelect.vue
  26. 2
      src/views/xm/core/xmTask/XmPlanForProduct.vue
  27. 2
      src/views/xm/core/xmTask/XmPlanForProject.vue
  28. 2
      src/views/xm/core/xmTask/XmTaskListForIteration.vue
  29. 2
      src/views/xm/core/xmTask/XmTaskMng.vue
  30. 4
      src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue

58
src/components/Image/ImageCategoryTree.vue

@ -1,10 +1,12 @@
<template> <template>
<section>
<el-row class="padding">
<el-button type="primary" style="float:left;" icon="el-icon-plus" @click.prevent.stop="addTopNode()">添加顶级分类</el-button>
<section class="border">
<el-row>
<div style="display:flex;justify-content: left;">
<el-input v-model="nodeFilterText"></el-input><el-button style="float:right;" icon="el-icon-plus" @click.prevent.stop="addTopNode()">顶级分类</el-button>
</div>
</el-row> </el-row>
<el-row> <el-row>
<el-tree
<el-tree
:data="categoryTreeData" :data="categoryTreeData"
:props="defaultTreeProps" :props="defaultTreeProps"
:filter-node-method="filterNode" :filter-node-method="filterNode"
@ -23,9 +25,8 @@
ref="nodeTree"> ref="nodeTree">
<div class="custom-tree-node" slot-scope="{ node, data}"> <div class="custom-tree-node" slot-scope="{ node, data}">
<div style="height:1.2em;">{{data.categoryName=='根'?'移动鼠标到此添加分类':data.categoryName}}</div> <div style="height:1.2em;">{{data.categoryName=='根'?'移动鼠标到此添加分类':data.categoryName}}</div>
<span class="el-ic" @click.stop title="鼠标点击其它地方可关闭窗口">
<span class="el-ic" @click.stop>
<el-popover <el-popover
title="鼠标点击其它地方可关闭窗口"
placement="top" placement="top"
width="300" width="300"
@ -44,43 +45,44 @@
<el-dialog <el-dialog
title="提示" title="提示"
:visible.sync="addVisible" :visible.sync="addVisible"
width="60%" append-to-body modal-append-to-body>
width="400" append-to-body >
<el-form ref="addImageCategory" :model="addImageCategory" label-width="200" > <el-form ref="addImageCategory" :model="addImageCategory" label-width="200" >
<el-form-item label="分类编号">
<el-input v-model="addImageCategory.id" placeholder="如果为空,则系统自动生成"></el-input>
</el-form-item>
<el-form-item label="分类名称" prop="categoryName" <el-form-item label="分类名称" prop="categoryName"
:rules="[ :rules="[
{ required: true, message: '名称不能为空'} { required: true, message: '名称不能为空'}
]"> ]">
<el-input v-model="addImageCategory.categoryName" ></el-input> <el-input v-model="addImageCategory.categoryName" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="">
<el-button @click="addVisible = false"> </el-button>
<el-button type="primary" v-loading="addLoading" @click="addImageCategorySubmit"> </el-button>
</el-form-item>
<el-form-item label="分类编号">
<el-input v-model="addImageCategory.id" placeholder="如果为空,则系统自动生成"></el-input>
</el-form-item>
</el-form> </el-form>
<el-row slot="footer">
<el-button @click="addVisible = false"> </el-button>
<el-button type="primary" v-loading="addLoading" @click="addImageCategorySubmit"> </el-button>
</el-row>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="提示" title="提示"
:visible.sync="editVisible" :visible.sync="editVisible"
width="60%" append-to-body modal-append-to-body>
width="400" append-to-body >
<el-form ref="editImageCategory" :model="editImageCategory" label-width="200" > <el-form ref="editImageCategory" :model="editImageCategory" label-width="200" >
<el-form-item label="分类编号" prop="id">
{{editImageCategory.id}}
</el-form-item>
<el-form-item label="分类名称" prop="categoryName" <el-form-item label="分类名称" prop="categoryName"
:rules="[ :rules="[
{ required: true, message: '名称不能为空'} { required: true, message: '名称不能为空'}
]"> ]">
<el-input v-model="editImageCategory.categoryName" ></el-input> <el-input v-model="editImageCategory.categoryName" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="">
<el-form-item label="分类编号" prop="id">
{{editImageCategory.id}}
</el-form-item>
</el-form>
<el-row slot="footer">
<el-button @click="editVisible = false"> </el-button> <el-button @click="editVisible = false"> </el-button>
<el-button type="primary" v-loading="editLoading" @click="editImageCategorySubmit"> </el-button> <el-button type="primary" v-loading="editLoading" @click="editImageCategorySubmit"> </el-button>
</el-form-item>
</el-form>
</el-row>
</el-dialog> </el-dialog>
</el-row> </el-row>
</section> </section>
@ -118,7 +120,8 @@
computed:{ computed:{
categoryTreeData() { categoryTreeData() {
var datas= this.translateDataToTree(this.treeData);
var d=this.treeData
var datas= this.translateDataToTree(d);
if(datas==null || datas.length==0){ if(datas==null || datas.length==0){
return [{pid:'',id:'C0',categoryType:'',categoryName:'根'}] return [{pid:'',id:'C0',categoryType:'',categoryName:'根'}]
}else{ }else{
@ -216,10 +219,10 @@
addImageCategory(this.addImageCategory).then(res=>{ addImageCategory(this.addImageCategory).then(res=>{
//console.log("res--"+JSON.stringify(res)); //console.log("res--"+JSON.stringify(res));
this.addLoading=false; this.addLoading=false;
if(res.data.tips.isOk){
this.$message.success(res.data.tips.msg);
this.getTreeData(true);
if(res.data.tips.isOk){
this.$message.success(res.data.tips.msg);
this.treeData.push(res.data.data)
this.addVisible=false;
}else{ }else{
this.$message.error(res.data.tips.msg); this.$message.error(res.data.tips.msg);
} }
@ -242,7 +245,8 @@
if(res.data.tips.isOk){ if(res.data.tips.isOk){
this.editVisible=false; this.editVisible=false;
this.$message.success(res.data.tips.msg); this.$message.success(res.data.tips.msg);
this.getTreeData(true);
this.getTreeData(true);
this.editVisible=false;
}else{ }else{
this.$message.error(res.data.tips.msg); this.$message.error(res.data.tips.msg);
} }

75
src/components/Image/UploadImage.vue

@ -1,27 +1,26 @@
<template> <template>
<section> <section>
<el-row v-loading="listLoading">
<el-col :span="6" class="border">
<el-row v-loading="listLoading" :gutter="10">
<el-col :span="6">
<category-tree ref="categoryTree" :show-count="false" show-checkbox :default-expand-all="true" :expand-on-click-node="false" v-on:check-change="handleLeftCategoryNodeClick"></category-tree> <category-tree ref="categoryTree" :show-count="false" show-checkbox :default-expand-all="true" :expand-on-click-node="false" v-on:check-change="handleLeftCategoryNodeClick"></category-tree>
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-row class="padding-left " style="height:36px;overflow: hidden;">
<el-input v-model="filters.key" style="width:40%;" placeholder="按文件名模糊查询"></el-input>
<el-button @click="searchImages" icon="el-icon-search"></el-button>
<el-button type="primary" @click="handleConfirm">确定选择</el-button>
<el-upload style="height:40px;width:120px;display: inline;margin-bottom: 0px;" :disabled="uploadOptions.categoryId==''||uploadOptions.categoryId==null" class="upload-demo" :show-file-list="false" :action="uploadAction" :on-change="fileChange" :on-success="handleSuccess" :before-upload="beforeupload" :data="uploadOptions" multiple>
<el-tooltip class="item" effect="dark" :content="uploadOptions.categoryId==''?'请先选择左边分类':'支持jpg和png,建议大小不超过200KB,超过1M将自动裁剪压缩'" placement="top-start">
<el-button icon="el-icon-upload">上传图库</el-button>
</el-tooltip>
<el-row>
<div style=" display:flex;flex-wrap: nowrap;justify-content: flex-start;">
<el-input style="max-width:20em;" v-model="filters.key" placeholder="按文件名模糊查询"></el-input>
<el-button style="margin-left:5px;" @click="searchImages" icon="el-icon-search"></el-button>
<el-button style="margin-left:5px;" type="primary" @click="handleConfirm">确定选择</el-button>
<el-upload style="margin-left:5px;" :disabled="!uploadOptions.categoryId" :show-file-list="false" :action="uploadAction" :on-change="fileChange" :on-success="handleSuccess" :before-upload="beforeupload" :data="uploadOptions" multiple>
<el-button icon="el-icon-upload" @click="onClickUpload">上传图库</el-button>
</el-upload> </el-upload>
<el-button type="danger" @click="handelDel" >删除</el-button>
<el-button style="margin-left:5px;" type="danger" @click="handelDel" >删除</el-button>
</div>
</el-row> </el-row>
<el-row class="padding-left">
<el-row class="padding-top">
<el-col :span="24" type="flex" class="allImg border padding"> <el-col :span="24" type="flex" class="allImg border padding">
<el-col :span="4" v-for="o in images" style="height:200px;width:200px;" :key="o.id" class="imgBox">
<el-card :body-style="{ padding: '0px' }">
<el-col :span="4" v-for="o in images" style="height:200px;" :key="o.id" class="imgBox">
<el-card :body-style="{ padding: '2px' }">
<div style="width:100%;position:relative;" :index="o.url" v-on:click="selectImg(o)"> <div style="width:100%;position:relative;" :index="o.url" v-on:click="selectImg(o)">
<div class="blank" v-show="o.show"> <div class="blank" v-show="o.show">
@ -365,6 +364,13 @@
} }
this.searchImages(); this.searchImages();
}, },
onClickUpload(){
if( !this.uploadOptions.categoryId){
this.$message({ message:"请在选择适当的分类。", type: 'error' });
return;
}
return;
},
handelDel(){ handelDel(){
if(this.selectImages.length==0){ if(this.selectImages.length==0){
this.$message({ message:"请选择要删除的图片", type: 'error' }); this.$message({ message:"请选择要删除的图片", type: 'error' });
@ -392,42 +398,15 @@
} }
</script> </script>
<style>
.uploadImgWindow{
height: 500px;
border: 1px solid #eee;
text-align: center;
color: #333;
}
.leftBox{
height:100%;
border-right: 1px solid #ccc;
}
.rightBox{
height:100%;
overflow:hidden;
}
<style lang="less" scope>
.allImg{ .allImg{
height:400px; height:400px;
overflow-y :auto; overflow-y :auto;
}
.windowTitle{
border-bottom: 1px solid #ccc;
height: 45px;
line-height: 42px;
text-align: right;
padding-right:20px;
margin-bottom: 2px;
}
.bottomBox{
text-align:center;
padding:15px;
}
}
.el-row {
flex-wrap: wrap;
margin-bottom: 6px;
}
ul>li{ ul>li{
text-align:left; text-align:left;

11
src/styles/mdp.scss

@ -314,13 +314,12 @@ table tr.hover-row{
/** /**
*解决表格固定列无法滚动问题 *解决表格固定列无法滚动问题
*/ */
.el-table {
.el-table__fixed {
height:auto !important;
bottom:17px !important;
}
}
.el-table__body-wrapper{
z-index:2
}
.icon { .icon {
color: #fff; color: #fff;
height: 20px; height: 20px;

4
src/views/xm/core/xmIteration/XmIterationBox.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding">
<section>
<el-row > <el-row >
<el-input v-if="filters.queryScope=='iterationId'" v-model="filters.id" style="width:20%;" placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input> <el-input v-if="filters.queryScope=='iterationId'" v-model="filters.id" style="width:20%;" placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input>
<el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="" <el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator=""
@ -49,7 +49,7 @@
<el-button type="primary" @click="showAdd" icon="el-icon-plus" round>迭代计划</el-button> <el-button type="primary" @click="showAdd" icon="el-icon-plus" round>迭代计划</el-button>
</span> </span>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<!--列表 XmIteration 迭代定义--> <!--列表 XmIteration 迭代定义-->
<el-table ref="table" :height="maxTableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="maxTableHeight" v-if="!gstcVisible" :data="xmIterationTreeData" row-key="id" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" aria-disabled width="55"></el-table-column> <el-table-column type="selection" aria-disabled width="55"></el-table-column>

18
src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue

@ -12,7 +12,7 @@
</xm-iteration-select> </xm-iteration-select>
</el-row> </el-row>
<el-row ref="pageBody" class="padding" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }">
<el-row ref="pageBody" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }">
<el-steps v-if="xmIteration&&xmIteration.id" <el-steps v-if="xmIteration&&xmIteration.id"
:active="calcIterationStatusStep" :active="calcIterationStatusStep"
finish-status="success" finish-status="success"
@ -281,7 +281,7 @@
</el-row> </el-row>
</div> </div>
</el-col> </el-col>
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19">
<el-tabs :value="showPanel" @tab-click="tabClick"> <el-tabs :value="showPanel" @tab-click="tabClick">
<el-tab-pane label="迭代概览" name="iterationOverview" > <el-tab-pane label="迭代概览" name="iterationOverview" >
@ -302,22 +302,22 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="迭代详情" name="detail" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="迭代详情" name="detail">
<xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields" :xm-product="xmProductCpd"></xm-iteration-edit> <xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields" :xm-product="xmProductCpd"></xm-iteration-edit>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="需求列表" name="menus" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="需求列表" name="menus">
<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-menu-mng> <xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-menu-mng>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="配置需求范围" name="iterationMenuMng" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="配置需求范围" name="iterationMenuMng">
<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration" :xm-product="xmProductCpd"></xm-iteration-menu-mng> <xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration" :xm-product="xmProductCpd"></xm-iteration-menu-mng>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="任务列表" name="tasks" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="任务列表" name="tasks">
<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-task-mng> <xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-task-mng>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="缺陷列表" name="bugs" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="缺陷列表" name="bugs">
<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-question-mng> <xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-question-mng>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="效能分析" name="效能" v-if="xmIteration&&xmIteration.id">
<el-tab-pane label="效能分析" name="效能">
<xm-rpt v-if="xmIteration && showPanel=='效能'" :xm-project="projectInfo" :xm-iteration="xmIteration" :xm-product="xmProductCpd" category="迭代级"></xm-rpt> <xm-rpt v-if="xmIteration && showPanel=='效能'" :xm-project="projectInfo" :xm-iteration="xmIteration" :xm-product="xmProductCpd" category="迭代级"></xm-rpt>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -484,7 +484,7 @@
this.$nextTick(() => { this.$nextTick(() => {
initDicts(this) initDicts(this)
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.pageBody.$el);
this.maxTableHeight = util.calcMaxHeight(this.$refs.pageBody.$el);
}); });
} }

4
src/views/xm/core/xmIteration/XmIterationMng.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding">
<section>
<el-row> <el-row>
<xm-product-select <xm-product-select
v-if="!xmProduct || !xmProduct.id" v-if="!xmProduct || !xmProduct.id"
@ -106,7 +106,7 @@
> >
</span> </span>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<!--列表 XmIteration 迭代定义--> <!--列表 XmIteration 迭代定义-->
<el-table <el-table
ref="table" ref="table"

15
src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue

@ -2,16 +2,15 @@
<section> <section>
<el-row> <el-row>
<el-col <el-col
:span="4"
class="padding"
:style="{ overflowY: 'auto' }"
:span="4"
:xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding"
> >
<div class="border"> <div class="border">
<el-row class="padding"> <el-row class="padding">
<h4>常用功能导航</h4> <h4>常用功能导航</h4>
</el-row> </el-row>
<el-row <el-row
ref="pageBody" class="padding" :style="{ height: (maxTableHeight-24) + 'px', overflowY: 'auto' }"
ref="pageBody" class="padding" :style="{ maxHeight: (maxTableHeight-24) + 'px', overflowY: 'auto' }"
> >
<el-steps <el-steps
:active="calcIterationStatusStep" :active="calcIterationStatusStep"
@ -270,10 +269,10 @@
</el-row> </el-row>
</div> </div>
</el-col> </el-col>
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19">
<el-tabs :value="showPanel" @tab-click="tabClick"> <el-tabs :value="showPanel" @tab-click="tabClick">
<el-tab-pane label="迭代概览" name="overview" > <el-tab-pane label="迭代概览" name="overview" >
<xm-iteration-overview class="padding-top" v-if="showPanel=='overview'" :xm-iteration="xmIteration"></xm-iteration-overview>
<xm-iteration-overview v-if="showPanel=='overview'" :xm-iteration="xmIteration"></xm-iteration-overview>
</el-tab-pane> </el-tab-pane>
@ -283,13 +282,13 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="配置需求范围" name="iterationMenuMng" > <el-tab-pane label="配置需求范围" name="iterationMenuMng" >
<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration" ref="iterationMenuMng" class="padding-top"></xm-iteration-menu-mng>
<xm-iteration-menu-mng class="padding-right" v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration" ref="iterationMenuMng"></xm-iteration-menu-mng>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="执行统计" name="iterationCalc" > <el-tab-pane label="执行统计" name="iterationCalc" >
<div v-if="showPanel=='iterationCalc'" class="padding">
<div v-if="showPanel=='iterationCalc'">
<el-row> <el-row>
<el-button type="primary" @click="loadTasksToXmIterationState" v-loading="load.calcIteration">计算迭代统计数据</el-button> <el-button type="primary" @click="loadTasksToXmIterationState" v-loading="load.calcIteration">计算迭代统计数据</el-button>
<br> <br>

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

@ -1,13 +1,13 @@
<template> <template>
<section> <section>
<el-row>
<el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<xm-epic-features-select :xm-product="{id:xmIteration.productId,name:''}" :show-select="false" @row-click="onEpicFeatureSelect"></xm-epic-features-select> <xm-epic-features-select :xm-product="{id:xmIteration.productId,name:''}" :show-select="false" @row-click="onEpicFeatureSelect"></xm-epic-features-select>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-row class="padding-left">
<el-row>
<el-input v-model="filters.key" style="width: 60%;" placeholder="模糊查询" clearable> <el-input v-model="filters.key" style="width: 60%;" placeholder="模糊查询" clearable>
</el-input> </el-input>
<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationMenus" icon="el-icon-search"></el-button> <el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationMenus" icon="el-icon-search"></el-button>
@ -18,7 +18,7 @@
</span> </span>
</el-row> </el-row>
<el-row class="page-main padding-left">
<el-row class="padding-top">
<!--列表 XmIterationMenu 迭代定义--> <!--列表 XmIterationMenu 迭代定义-->
<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="45"></el-table-column> <el-table-column type="selection" width="45"></el-table-column>

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

@ -93,7 +93,7 @@
<el-button type="primary" @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button> <el-button type="primary" @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button>
</div> </div>
</el-row> </el-row>
<el-row >
<el-row class="padding-top">
<el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border :height="maxTableHeight" :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" <el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border :height="maxTableHeight" :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-text="努力加载中"
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"

4
src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding">
<section>
<el-row> <el-row>
<div style="display:flex;"> <div style="display:flex;">
@ -10,7 +10,7 @@
<el-button style="margin-left:5px;" v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> <el-button style="margin-left:5px;" v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button>
</div> </div>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<el-table element-loading-text="努力加载中" :row-style="{height:'46px'}" element-loading-spinner="el-icon-loading" stripe fit border ref="table" :height="maxTableHeight" :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"> <el-table element-loading-text="努力加载中" :row-style="{height:'46px'}" element-loading-spinner="el-icon-loading" stripe fit border ref="table" :height="maxTableHeight" :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">
<template v-if="showSelect!==false && multi===true"> <template v-if="showSelect!==false && multi===true">
<el-table-column label="" type="selection" width="60" > <el-table-column label="" type="selection" width="60" >

2
src/views/xm/core/xmMenu/XmMenuBox.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding-left padding-right">
<section>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="7"> <el-col :span="7">
<!-- <!--

2
src/views/xm/core/xmMenu/XmMenuBoxForIteration.vue

@ -1,5 +1,5 @@
<template> <template>
<section>
<section class="padding">
<xm-menu-box v-if="xmProduct&&xmProduct.id" :xm-iteration="xmIteration" :xm-product="xmProduct"></xm-menu-box> <xm-menu-box v-if="xmProduct&&xmProduct.id" :xm-iteration="xmIteration" :xm-product="xmProduct"></xm-menu-box>
</section> </section>
</template> </template>

2
src/views/xm/core/xmMenu/XmMenuBoxForProduct.vue

@ -1,5 +1,5 @@
<template> <template>
<section>
<section class="padding">
<xm-menu-box v-if="xmProduct&& xmProduct.id" :xm-product="xmProduct"></xm-menu-box> <xm-menu-box v-if="xmProduct&& xmProduct.id" :xm-product="xmProduct"></xm-menu-box>
</section> </section>
</template> </template>

2
src/views/xm/core/xmMenu/XmMenuBoxForProject.vue

@ -1,5 +1,5 @@
<template> <template>
<section>
<section class="padding">
<xm-menu-box v-if="projectInfo && projectInfo.id" :sel-project="projectInfo"></xm-menu-box> <xm-menu-box v-if="projectInfo && projectInfo.id" :sel-project="projectInfo"></xm-menu-box>
</section> </section>
</template> </template>

4
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -233,7 +233,7 @@
</span> </span>
</el-row> </el-row>
<el-row v-if="displayType=='table'">
<el-row v-if="displayType=='table'" class="padding-top">
<el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"> <el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
<el-table-column sortable type="selection" width="40"></el-table-column> <el-table-column sortable type="selection" width="40"></el-table-column>
@ -355,7 +355,7 @@
</template> </template>
</el-table> </el-table>
</el-row> </el-row>
<el-row v-else-if="displayType=='agileUser'">
<el-row v-else-if="displayType=='agileUser'" class="padding-top">
<xm-menu-agile-kanban-user :xm-menus="xmMenus" :xm-product="xmProduct" ref="table" :table-height="maxTableHeight"></xm-menu-agile-kanban-user> <xm-menu-agile-kanban-user :xm-menus="xmMenus" :xm-product="xmProduct" ref="table" :table-height="maxTableHeight"></xm-menu-agile-kanban-user>
</el-row> </el-row>

2
src/views/xm/core/xmMenu/XmMenuSelect.vue

@ -136,7 +136,7 @@
<el-button style="float:right;" type="primary" v-if="multi" v-on:click="multiSelectedConfirm">确认</el-button> <el-button style="float:right;" type="primary" v-if="multi" v-on:click="multiSelectedConfirm">确认</el-button>
</el-row> </el-row>
<el-row ref="table">
<el-row ref="table" class="padding-top">
<el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" class="menu-table" :height="maxTableHeight" :data="xmMenusTreeData" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" class="menu-table" :height="maxTableHeight" :data="xmMenusTreeData" row-key="menuId" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column v-if="multi" type="selection" width="50"></el-table-column> <el-table-column v-if="multi" type="selection" width="50"></el-table-column>

2
src/views/xm/core/xmProduct/XmProductForLinkComplex.vue

@ -195,7 +195,7 @@
label="迭代" label="迭代"
name="iterationProductLink" name="iterationProductLink"
> >
<xm-iteration-mng style="margin-top:-10px;"
<xm-iteration-mng
v-if="showPanel == 'iterationProductLink'" v-if="showPanel == 'iterationProductLink'"
:xm-product="xmProduct" :xm-product="xmProduct"
></xm-iteration-mng> ></xm-iteration-mng>

2
src/views/xm/core/xmQuestion/XmQuestionForIteration.vue

@ -1,5 +1,5 @@
<template> <template>
<xm-question-mng class="padding-left padding-right" v-if="xmIteration && xmIteration.id" :xm-product="xmProduct" :xm-iteration="xmIteration"></xm-question-mng>
<xm-question-mng class="padding" v-if="xmIteration && xmIteration.id" :xm-product="xmProduct" :xm-iteration="xmIteration"></xm-question-mng>
</template> </template>
<script> <script>

2
src/views/xm/core/xmQuestion/XmQuestionForProduct.vue

@ -1,5 +1,5 @@
<template> <template>
<xm-question-mng class="padding-left padding-right" :xm-product="xmProduct"></xm-question-mng>
<xm-question-mng class="padding" :xm-product="xmProduct"></xm-question-mng>
</template> </template>
<script> <script>

2
src/views/xm/core/xmQuestion/XmQuestionForProject.vue

@ -1,5 +1,5 @@
<template> <template>
<xm-question-mng class="padding-left padding-right" :sel-project="projectInfo"></xm-question-mng>
<xm-question-mng class="padding" :sel-project="projectInfo"></xm-question-mng>
</template> </template>
<script> <script>

2
src/views/xm/core/xmQuestion/XmQuestionMng.vue

@ -110,7 +110,7 @@
<el-button @click="batchDel" type="danger" icon="el-icon-delete"></el-button> <el-button @click="batchDel" type="danger" icon="el-icon-delete"></el-button>
</span> </span>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<!--列表 XmQuestion xm_question--> <!--列表 XmQuestion xm_question-->
<el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" ref="table" :height="maxTableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" ref="table" :height="maxTableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column label="全选" type="selection" min-width="50" fixed="left"></el-table-column> <el-table-column label="全选" type="selection" min-width="50" fixed="left"></el-table-column>

2
src/views/xm/core/xmQuestion/XmQuestionMngMy.vue

@ -1,5 +1,5 @@
<template> <template>
<xm-question-mng :query-scene="'my'" class="padding-top"></xm-question-mng>
<xm-question-mng :query-scene="'my'" class="padding"></xm-question-mng>
</template> </template>
<script> <script>

2
src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue

@ -1,5 +1,5 @@
<template> <template>
<xm-question-mng :query-scene="'my'" class="padding-top"></xm-question-mng>
<xm-question-mng :query-scene="'my'" class="padding"></xm-question-mng>
</template> </template>
<script> <script>

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

@ -115,7 +115,7 @@
v-loading="load.edit" v-loading="load.edit"
> 更换上级</el-button> > 更换上级</el-button>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<el-table class="task-table" :row-style="{height:'46px'}" <el-table class="task-table" :row-style="{height:'46px'}"
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData" :data="tasksTreeData"

2
src/views/xm/core/xmTask/XmPhaseSelect.vue

@ -8,7 +8,7 @@
</div> </div>
</el-row> </el-row>
<el-table class="task-table"
<el-table class="task-table padding-top"
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData" :data="tasksTreeData"
@sort-change="sortChange" @sort-change="sortChange"

2
src/views/xm/core/xmTask/XmPlanForProduct.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding-left padding-right">
<section class="padding">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="7"> <el-col :span="7">
<xm-phase :xm-product="xmProduct" queryScope="plan" @row-click="onPhaseRowClick" @project-row-click="onProjectRowClick"></xm-phase> <xm-phase :xm-product="xmProduct" queryScope="plan" @row-click="onPhaseRowClick" @project-row-click="onProjectRowClick"></xm-phase>

2
src/views/xm/core/xmTask/XmPlanForProject.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="padding-left padding-right">
<section class="padding">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="7"> <el-col :span="7">
<xm-phase :sel-project="projectInfo" queryScope="plan" @row-click="onPhaseRowClick"></xm-phase> <xm-phase :sel-project="projectInfo" queryScope="plan" @row-click="onPhaseRowClick"></xm-phase>

2
src/views/xm/core/xmTask/XmTaskListForIteration.vue

@ -1,5 +1,5 @@
<template> <template>
<section>
<section class="padding">
<xm-task-mng v-if="xmIteration && xmIteration.id" :xm-product="xmProduct" :xm-iteration="xmIteration" ptype="1" query-scope="task"></xm-task-mng> <xm-task-mng v-if="xmIteration && xmIteration.id" :xm-product="xmProduct" :xm-iteration="xmIteration" ptype="1" query-scope="task"></xm-task-mng>
</section> </section>
</template> </template>

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

@ -333,7 +333,7 @@
</span> </span>
</el-row> </el-row>
<el-row ref="table">
<el-row ref="table" class="padding-top">
<template v-if="displayType!='grant'"> <template v-if="displayType!='grant'">
<xm-task-agile-kanban <xm-task-agile-kanban
:tableHeight="tableHeight" :tableHeight="tableHeight"

4
src/views/xm/core/xmTestCasedb/XmTestCasedbMng.vue

@ -1,5 +1,5 @@
<template> <template>
<section class="border padding">
<section class="padding">
<el-row> <el-row>
<xm-product-select v-if="!xmProduct" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="clearProduct"></xm-product-select> <xm-product-select v-if="!xmProduct" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="clearProduct"></xm-product-select>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable></el-input> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询" clearable></el-input>
@ -9,7 +9,7 @@
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button> <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
</span> </span>
</el-row> </el-row>
<el-row>
<el-row class="padding-top">
<!--列表 XmTestCasedb 测试用例库--> <!--列表 XmTestCasedb 测试用例库-->
<el-table ref="xmTestCasedbTable" :data="xmTestCasedbs" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table ref="xmTestCasedbTable" :data="xmTestCasedbs" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="55" show-overflow-tooltip fixed="left"></el-table-column> <el-table-column type="selection" width="55" show-overflow-tooltip fixed="left"></el-table-column>

Loading…
Cancel
Save