From ae9a949b125d7f87327ede5d306266d1ca760a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 11 Jul 2022 17:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmIteration/XmIterationForLinkComplex.vue | 65 ++++++++-----------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index dd6e5727..789e56ed 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -1,35 +1,23 @@
 <template>
-	<section class="page-container border">
+	<section>
 		<el-row> 
-			<el-col :span="24">
-				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick"> 
-					<el-tab-pane  lazy   name="iterations" disabled> 
-						<div  slot="label"> 
-								<xm-iteration-select ref="xmIterationSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear="onIterationClearSelect"></xm-iteration-select>
- 								 
-						</div>
-					</el-tab-pane>
-
-
-					<el-tab-pane  lazy   name="iterations2" disabled> 
-						<div  slot="label">
-							<el-popover
-								placement="bottom"
-								width="800"
-								v-model="iterationAddVisible"
-								trigger="manual">  
- 										<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
-  								<el-link type="warning" slot="reference" @click="iterationAddVisible=true" icon="el-icon-plus">迭代</el-link> 
-							</el-popover> 
-						</div>
-					</el-tab-pane>
-					<el-tab-pane label="迭代概览" lazy  name="iterationOverview" v-if="xmIteration && xmIteration.id"> 
-						<el-row ref="pageMainRef" :gutter="20">
-							<el-col
-								:span="6"
-								class="padding border"
-								:style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
-							>
+			<el-col :span="6" class="padding-right">
+				 <el-row class="padding">
+					<el-col :span="20">
+						<xm-iteration-select ref="xmIterationSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear="onIterationClearSelect"></xm-iteration-select>
+ 					</el-col>
+					<el-col :span="4">
+						<el-popover
+							placement="bottom"
+							width="800"
+							v-model="iterationAddVisible"
+							trigger="manual">  
+									<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
+							<el-link type="warning" slot="reference" @click="iterationAddVisible=true" icon="el-icon-plus">迭代</el-link> 
+						</el-popover> 
+					</el-col>
+ 				 </el-row> 
+				<el-row ref="pageMainRef" class="padding border" :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"> 
 								<h4 class="padding-bottom">常用功能快捷导航</h4>
 								<el-steps
 								:active="calcIterationStatusStep"
@@ -273,15 +261,18 @@
 											>重新打开</el-button
 										>
 										</span> 
-									</el-row> 
+									</el-row>  
 									</el-row>
 								</el-step>
-								</el-steps>
-							</el-col>
-							<el-col :span="18">
-								<xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-overview>
-							</el-col>
-						</el-row>
+								</el-steps> 
+						</el-row>			 
+			</el-col>
+			<el-col :span="18">
+				<el-tabs :value="showPanel" @tab-click="tabClick">  
+					<el-tab-pane label="迭代概览" lazy  name="iterationOverview" v-if="xmIteration && xmIteration.id"> 
+						 
+						<xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-overview>
+				 
 					</el-tab-pane>
 					<el-tab-pane label="执行统计" lazy  name="iterationCalc" v-if="xmIteration && xmIteration.id">
 						  <div v-if="showPanel=='iterationCalc'">