From 31350be55bc299ed1816335e85de09602aa65644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 3 Mar 2022 18:35:22 +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

---
 .../XmIterationForProjectComplex.vue           |  4 ++--
 .../xm/core/xmIteration/XmIterationSelect.vue  | 18 +++++++++---------
 .../xmProduct/XmProductForProjectComplex.vue   |  4 ++--
 .../xm/core/xmProject/XmProjectComplex.vue     |  4 ++--
 .../xm/core/xmProject/XmProjectSelect.vue      |  8 ++++----
 .../xmProjectPhase/XmProjectPhaseSelect.vue    | 14 +++++++++-----
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
index 44545a93..15c494a9 100644
--- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
@@ -1,10 +1,10 @@
 <template>
 	<section class="page-container border">
 		<el-row>
-			<el-col :span="iterationVisible==true?3:0" >
+			<el-col :span="iterationVisible==true?4:0" >
 				<xm-iteration-select :sel-project="selProject" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-select>
 			</el-col>
-			<el-col :span="iterationVisible==true?21:24" v-show="xmIteration && xmIteration.id">
+			<el-col :span="iterationVisible==true?20:24" v-show="xmIteration && xmIteration.id">
 				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">
 					
 					<el-tab-pane  lazy @click.stop="iterationVisible=!iterationVisible">
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 251bd7a9..2dd1cfc6 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -3,7 +3,7 @@
 		<el-row>
 			<!--列表 XmIteration 迭代定义-->
 			<el-table ref="table" :height="maxTableHeight" :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 prop="iterationName" label="迭代名称" min-width="160" >
+   				<el-table-column prop="iterationName" label="迭代名称" >
 					<template slot="header" slot-scope="scope">
 					迭代名称 <el-popover v-if=" !menuId && !productId"
 						placement="top-start"
@@ -56,16 +56,12 @@
 					</el-popover>
 				</template>
 					 <template slot-scope="scope">
-						 {{scope.row.seqNo}} &nbsp;&nbsp;{{scope.row.iterationName}}<br>
-						 <font class="font-class">{{formatterDate(scope.row,null,scope.row.startTime)}}~{{formatterDate(scope.row,null,scope.row.endTime)}} </font> 
-						 <el-tag type="warning">{{!scope.row.iphase?'未开始':scope.row.iphase}}</el-tag> 
-  						 <div class="progress">
-						  <el-progress  :percentage="calcFinishRate(scope.row)"></el-progress>
-						 </div>
+
+						 {{scope.row.iterationName}}  <font class="align-right" :color="calcFinishRate(scope.row)==100?'green':'#FF8C00'">{{calcFinishRate(scope.row)}}%</font>
 					 </template>
 				</el-table-column> 
 			</el-table>
-			<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>
+			<el-pagination  layout="total, 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>
 	</section>
@@ -368,5 +364,9 @@
   }
   .font-class{
 	  color: rgba(116, 85, 85, 0.493);
-  } 
+  }
+  
+.align-right{
+	float: right; 
+}
 </style>
diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index d5d3e419..cbacee54 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -1,10 +1,10 @@
 <template>
 	<section class="page-container border">
 		<el-row>
-			<el-col :span="productVisible==true?3:0" >
+			<el-col :span="productVisible==true?4:0" >
 				<xm-product-select :sel-project="selProject" :xm-iteration="xmIteration"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
 			</el-col>
-			<el-col :span="productVisible==true?21:24" v-show="xmProduct && xmProduct.id">
+			<el-col :span="productVisible==true?20:24" v-show="xmProduct && xmProduct.id">
 				<el-tabs type="border-card"  :value="showPanel"  @tab-click="tabClick">
 					<el-tab-pane>
 						<span v-show="productVisible==true" slot="label" @click.stop="productVisible=false" ><i class="el-icon-d-arrow-left" ></i> 隐藏左边产品列表</span>
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index 0460d0e9..7d64f910 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -1,10 +1,10 @@
 <template>
 	<section class="page-container border">
 		<el-row>
-			<el-col :span="projectVisible==true?3:0" >
+			<el-col :span="projectVisible==true?4:0" >
 				<xm-project-select   :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
 			</el-col>
-			<el-col :span="projectVisible==true?21:24" v-show="selProject && selProject.id">
+			<el-col :span="projectVisible==true?20:24" v-show="selProject && selProject.id">
 				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">
 					<el-tab-pane>
 						<span v-show="projectVisible==true" slot="label" @click.stop="projectVisible=false"><i class="el-icon-d-arrow-left" ></i> 隐藏左边项目列表</span>
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index fb8ac6c8..4f6fc94a 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>  
 		<el-row class="page-main padding-left">   
-			<el-table ref="table" :height="maxTableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" >
- 				<el-table-column prop="name" label="项目名称" min-width="80" >
+			<el-table ref="table" border :height="maxTableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" >
+ 				<el-table-column prop="name" label="项目名称" >
 					 <template slot-scope="scope">
 						 {{scope.row.name}}&nbsp;&nbsp;
-						 <font class="align-right"><el-tag :type="scope.row.totalProgress>=100?'success':'warning'">{{parseInt(scope.row.totalProgress)}}%</el-tag></font>
+						 <font class="align-right" :color="scope.row.totalProgress==100?'green':'#FF8C00'">{{parseInt(scope.row.totalProgress)}}%</font>
 					 </template>
 				</el-table-column>  
 			</el-table>
-			<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> 
+			<el-pagination  layout="total, 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> 
 	</section> 
 
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 89e9c879..00132908 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -2,21 +2,21 @@
 	<section>  
 		<el-row>
 		<el-table  lazy :load="loadXmProjectPhaseLazy" :height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 			<el-table-column prop="phaseName" label="计划名称" min-width="160" show-overflow-tooltip> 
+ 			<el-table-column prop="phaseName" label="计划名称"  show-overflow-tooltip> 
 				 <template slot="header" slot-scope="scope">
 					<div>计划  <el-tag  type="warning" v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
 				</template>
 				<template slot-scope="scope">  
-					<i v-if="scope.row.ntype=='1'" class="el-icon-folder-opened"></i>{{scope.row.seqNo}} &nbsp;&nbsp;<el-tooltip v-if="scope.row.milestone=='1'" content="里程碑"><i  class="el-icon-star-on"></i></el-tooltip>{{scope.row.phaseName}}<el-tag :type="scope.row.actRate>=100?'success':'primary'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </el-tag>  
+					<i v-if="scope.row.ntype=='1'" class="el-icon-folder-opened"></i>{{scope.row.seqNo}} &nbsp;&nbsp;<el-tooltip v-if="scope.row.milestone=='1'" content="里程碑"><i  class="el-icon-star-on"></i></el-tooltip>{{scope.row.phaseName}}
+					<font  :color="scope.row.actRate>=100?'green':'#FF8C00'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </font>  
 				</template>
 			</el-table-column>   
 		</el-table>
- 		<el-pagination    class="hidden-md-and-down"   layout="   prev,sizes, 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-pagination  layout=" total,  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>
 	</section>
-</template>
-
+</template> 
 <script>
 	import util from '@/common/js/util';//全局公共库
 	//import Sticky from '@/components/Sticky' // 粘性header组件
@@ -478,4 +478,8 @@
 </script>
 
 <style lang="scss" scoped> 
+
+.align-right{
+	float: right; 
+}
 </style>
\ No newline at end of file