From d7e4b63134fbb434ef382453ed8d3ef4cf378808 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 22 四月 2020 19:19:42 +0800
Subject: [PATCH] 界面调整

---
 src/views/list.vue |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/views/list.vue b/src/views/list.vue
index b7f0699..397bf70 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -44,36 +44,40 @@
 		</div>
 
 		<el-table  highlight-current-row
+				ref="data_table"
 				@current-change="tableChange"
 				v-loading="loading_table"
-				align="center"
-				 max-height="280" 	
-	 :data="tableData" style="width: 100%; " :row-class-name="tableRowClassName">
-			<el-table-column prop="name" label="椤圭洰鍚嶇О" >
+				size="small"
+				:data="tableData" 
+				header-cell-style="width: 100%; text-align: center;" 
+				:row-class-name="tableRowClassName">
+				<el-table-column type="index" width="50"> </el-table-column>
+			<el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip>
 			</el-table-column>
-			<el-table-column prop="status" label="褰撳墠鐘舵��"  :formatter="status_">
+			<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_">
 			</el-table-column>
-			<el-table-column prop="reseachType" label="鐮旂┒绫诲瀷" >
+			<el-table-column prop="reseachType" label="鐮旂┒绫诲瀷" width="130">
 			</el-table-column>
-			<el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" >
+			<el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="100" align="center">
 			</el-table-column>
-			<el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" >
+			<el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" width="100" align="center">
 			</el-table-column>
-			<el-table-column prop="delayCnt" label="寤舵湡椤圭洰" >
+			<el-table-column prop="delayCnt" label="寤舵湡椤圭洰" width="100" align="center">
 			</el-table-column>
-			<el-table-column prop="startTime" label="寮�濮嬫椂闂�" :formatter="dateFormat_">
+			<el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" align="center" :formatter="dateFormat_">
 			</el-table-column>
-			<el-table-column prop="endTime" label="缁撴潫鏃堕棿" :formatter="dateFormat_" >
+			<el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" align="center" :formatter="dateFormat_" >
 			</el-table-column>
 
-			<el-table-column prop="desp" label="椤圭洰鎻忚堪">
-			</el-table-column>
+			<el-table-column prop="desp" label="椤圭洰鎻忚堪" show-overflow-tooltip></el-table-column>
 		</el-table>
-		<el-pagination 
-		      @current-change="handleCurrentChange"
-		background :current-page="pagenum" :page-sizes="[15]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"
-		 :total="total">
-		</el-pagination>
+		<div style="text-align: right; background-color: #fff;">
+			<el-pagination 
+				@current-change="handleCurrentChange"
+				background :current-page="pagenum" :page-sizes="[15]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"
+			 :total="total">
+			</el-pagination>
+		</div>
 		
 		<el-dialog v-if="dialog_1"  @close="Cancel"  width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
 		  <newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
@@ -114,7 +118,7 @@
 				formInline: {
 					user: '',
 					region: ''
-				}
+				},
 			}
 		},
 		mounted() { //缁勪欢閰嶇疆鍚庯紝椤甸潰鏄剧ず鍓嶃�傜敤浜庡姞杞芥暟鎹�
@@ -143,6 +147,9 @@
 				this.dialog_2 = true;
 			},
 			tableChange(val) {
+				if (!val) {
+					val = {};
+				}
 				this.selected = val;
 				this.detailData = val;
 			//	this.editShow = true;
@@ -184,12 +191,18 @@
 						params
 					})
 					.then(data_ => {
-						console.log(data_);
+					//	console.log(data_);
+						let clientHeight = document.documentElement.clientHeight;
+						let tableHeight_ = clientHeight - 60 - 20 - 60 - 62 - 48 - 48 - 20;
+						this.$refs.data_table.$el.getElementsByClassName('el-table__body-wrapper')[0].style['height'] = tableHeight_ - 10 + "px";// - header_height
+						this.$refs.data_table.$el.getElementsByClassName('el-table__body-wrapper')[0].style['min-height'] = tableHeight_ - 10 + "px";
+						this.$refs.data_table.$el.getElementsByClassName('el-table__body-wrapper')[0].style['overflow'] = "overlay";
+						
 						this.tableData = data_.data.data.records; //缁檛ableData璧嬪��
 						this.total = data_.data.data.total;
 						this.loading_table = false;
 					}).catch(error => {
-						console.log(error);
+				//		console.log(error);
 					})
 			},
 			tableRowClassName(row, rowIndex) {

--
Gitblit v1.8.0