From 4702c483f11049c1c39ab36af9b13ca2b3dca2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 28 Apr 2021 22:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmIteration/XmIterationAdd.vue      |  5 +----
 .../xm/core/xmIteration/XmIterationMng.vue      |  2 +-
 .../core/xmIterationMenu/XmIterationMenuMng.vue |  9 +++------
 src/views/xm/core/xmTestCase/XmTestCaseMng.vue  | 11 +++++------
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue   | 17 +++++++++--------
 5 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index 65df30d4..b332a1ff 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -8,10 +8,7 @@
 				</el-form-item> 
 				<el-form-item v-else label="上级迭代" prop="pid">
 					 无上级
-				</el-form-item> 
-				<el-form-item label="迭代名称" prop="iterationName">
-					<el-input v-model="addForm.iterationName" placeholder="迭代名称" ></el-input>
-				</el-form-item> 
+				</el-form-item>  
 				<el-form-item label="迭代名称" prop="iterationName">
 					<el-input v-model="addForm.iterationName" placeholder="迭代名称" ></el-input>
 				</el-form-item> 
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index fe7a1c26..9336ac8a 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -7,7 +7,7 @@
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterations" icon="el-icon-search"></el-button>
 				</template>
 			</el-input> 
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus">新增一个迭代计划</el-button>
+			<el-button type="primary" @click="showAdd" icon="el-icon-plus">迭代计划</el-button>
  		</el-row>
 		<el-row v-if="!simple" class="app-container"> 
 			<!--列表 XmIteration 迭代定义-->
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index e82fc128..b5543e0f 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -11,11 +11,8 @@
 						<template slot="append">
 							<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmIterationMenus" icon="el-icon-search"></el-button>
 						</template>
-					</el-input> 
-					
-					<el-button type="primary" @click="showAdd" icon="el-icon-plus">加入更多故事到迭代计划</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> 
-
+					</el-input>  
+					<el-button type="primary" @click="showAdd" icon="el-icon-plus">加入更多故事到迭代计划</el-button> 
 				</el-row>
 				<el-row class="app-container">
 					<!--列表 XmIterationMenu 迭代定义-->
@@ -28,7 +25,7 @@
 						</el-table-column> 
 						<el-table-column label="操作" width="160" fixed="right">
 							<template slot-scope="scope">
-								<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete">移出迭代计划</el-button>
+								<el-button type="primary" @click="handleDel(scope.row,scope.$index)" icon="el-icon-right">移出</el-button>
 							</template>
 						</el-table-column>
 					</el-table>
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 3e74da9a..4d39e0da 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -10,8 +10,8 @@
 						<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="success" v-if="!multiSelect" circle icon="el-icon-plus" @click="showAdd"></el-button>
-				<el-button type="warning" v-if="multiSelect" @click="selected">确认选中</el-button> 
+				<el-button type="primary" v-if="!multiSelect" circle 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> 
 
 			</div>
@@ -21,13 +21,12 @@
 			<el-table max-height="700" :data="xmTestCases" @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 sortable type="index" width="45"></el-table-column>
-				<el-table-column prop="caseName" label="标题" min-width="80" >
+				<el-table-column prop="caseName" label="标题" min-width="100" >
 					<template scope="scope">
-						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primay" @click="showEdit(scope.row)">{{scope.row.caseName}}</el-link>
+						{{scope.row.id}}&nbsp;&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.caseName}}</el-link>
 					</template>
 				</el-table-column>
-				<el-table-column prop="id" label="编号" min-width="80" ></el-table-column> 
-				<el-table-column prop="caseRemark" label="备注" min-width="80" ></el-table-column> 
+ 				<el-table-column prop="caseRemark" label="备注" min-width="80" ></el-table-column> 
  				<el-table-column  prop="menuName" label="故事名" min-width="80" > 
 					<template slot="header">
 						故事<el-button @click="showMenu"  icon="el-icon-search" circle size="mini"></el-button>
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index a36d4e19..47ed46f8 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -10,10 +10,10 @@
 						<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> 
-				<el-button  type="primary" @click="showCase" icon="el-icon-plus">由用例创建执行计划</el-button>
-				<el-button  type="primary" @click="showBatchEdit" icon="el-icon-edit">批量修改</el-button>  
-				<el-button   type="danger" v-loading="load.del" @click="batchDel" icon="el-icon-delete" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-				
+				<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="danger" v-loading="load.del" @click="batchDel" icon="el-icon-delete" :disabled="this.sels.length===0 || load.del==true"></el-button> 
+				-->
 		</el-row>
 		<el-row class="app-container" v-else> 
 				<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
@@ -26,7 +26,7 @@
 		</el-row>
 		<el-row class="app-container"> 
 			<!--列表 XmTestCaseExec xm_test_case_exec-->
-			<el-table max-height="750" v-if="!gstcVisible" :data="xmTestCaseExecs" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table max-height="650" v-if="!gstcVisible" :data="xmTestCaseExecs" @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 sortable type="index" width="45"></el-table-column>
  				<el-table-column prop="projectName" label="项目名称" min-width="100" >
@@ -94,15 +94,16 @@
 							  </el-select>
 					  	</template> 
 				 </el-table-column>
-				<el-table-column v-if="!batchEditVisible" label="操作" width="260" fixed="right">
+				<el-table-column v-if="!batchEditVisible" label="操作" width="300" fixed="right">
 					<template scope="scope">
- 						<el-button type="primary" @click="showAddBug(scope.row,scope.$index)" icon="el-icon-plus">登记bug</el-button>
+ 						<el-button type="primary" @click="showAddBug(scope.row,scope.$index)" icon="el-icon-plus">bug</el-button>
 						<el-button  @click="showBugs(scope.row,scope.$index)" icon="el-icon-s-data">查bug</el-button>
+						<el-button type="danger" @click="handleDel(scope.row,$index)" icon="el-icon-delete"></el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<el-pagination v-if="!gstcVisible"  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> 
-      <xm-gantt v-if="gstcVisible" :tree-data="xmTestCaseExecs" :project-phase="selProject" :columns="ganrrColumns" :useRealTime="false"></xm-gantt>
+      		<xm-gantt v-if="gstcVisible" :tree-data="xmTestCaseExecs" :project-phase="selProject" :columns="ganrrColumns" :useRealTime="false"></xm-gantt>
 		
 			<!--编辑 XmTestCaseExec xm_test_case_exec界面-->
 			<el-dialog title="编辑xm_test_case_exec" :visible.sync="editFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">