From cffe20b222f298a757e96e2b2e08c8baa3834bb4 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 05 七月 2022 18:06:45 +0800
Subject: [PATCH] 修改页面布局样式

---
 src/views/specialWorkSystem/workPlan/workReservation/index.vue |   57 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
index 71d014f..2378d4c 100644
--- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
@@ -1,6 +1,8 @@
 <template>
 	<div class="home-container">
+		<el-scrollbar height="100%">
 		<el-row>
+			<div class="homeCard">
 			<el-col :span="6">
 				<div class="grid-content topInfo">
 					<div>当前所属部门:</div>
@@ -35,34 +37,37 @@
 					</div>
 				</div>
 			</el-col>
-			<el-col :span="6">
+			<el-col :span="6" class="topBtns">
 				<div class="grid-content topInfo">
 					<div style="margin-right: 20px"><el-button type="primary" plain>查询历史</el-button></div>
 					<div><el-button type="success" @click="dialogFormVisible = true">新增预约</el-button></div>
 				</div>
 			</el-col>
+		</div>
 		</el-row>
 		<el-row>
+			<div class="homeCard">
 			<el-table :data="tableData" border style="width: 100%">
-				<el-table-column prop="id" label="编号" width="180" />
-				<el-table-column prop="time" label="预约时间" width="180" />
-				<el-table-column prop="department" label="预约部门" />
-				<el-table-column prop="dirtyWork" label="动土作业" width="180" />
-				<el-table-column prop="fireWork" label="动火作业" width="180" />
-				<el-table-column prop="hangWork" label="吊装作业" />
-				<el-table-column prop="spaceWork" label="受限空间作业" width="180" />
-				<el-table-column prop="cut" label="断路" width="180" />
+				<el-table-column prop="id" label="编号" width="120" />
+				<el-table-column prop="time" label="预约时间" width="150" />
+				<el-table-column prop="department" label="预约部门" width="180" />
+				<el-table-column prop="dirtyWork" label="动土作业" width="100" />
+				<el-table-column prop="fireWork" label="动火作业" width="100" />
+				<el-table-column prop="hangWork" label="吊装作业" width="100" />
+				<el-table-column prop="spaceWork" label="受限空间作业"/>
+				<el-table-column prop="cut" label="断路"/>
 				<el-table-column prop="high" label="高处" />
-				<el-table-column prop="block" label="盲板抽堵" width="180" />
-				<el-table-column prop="tempUse" label="临时用电" width="180" />
-				<el-table-column fixed label="操作">
+				<el-table-column prop="block" label="盲板抽堵"/>
+				<el-table-column prop="tempUse" label="临时用电"/>
+				<el-table-column fixed="right" label="操作">
 					<template #default>
 						<el-button link type="primary" size="small">操作</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
+			</div>
 		</el-row>
-		<el-dialog v-model="dialogFormVisible" title="Shipping address">
+		<el-dialog v-model="dialogFormVisible" title="新增预约">
 			<el-form :model="reservationForm">
 				<el-form-item label="我的当前部门" :label-width="formLabelWidth">
 					<el-input v-model="reservationForm.department" placeholder="" />
@@ -87,11 +92,12 @@
 			</el-form>
 			<template #footer>
 			  <span class="dialog-footer">
-				<el-button @click="dialogFormVisible = false">取消</el-button>
-				<el-button type="primary" @click="dialogFormVisible = false">确认</el-button>
+				<el-button @click="dialogFormVisible = false" size="default">取消</el-button>
+				<el-button type="primary" @click="dialogFormVisible = false" size="default">确认</el-button>
 			  </span>
 			</template>
 		</el-dialog>
+		</el-scrollbar>
 	</div>
 </template>
 
@@ -205,7 +211,6 @@
 				renderMenu,
 				searchTime,
 				typeValue,
-				defaultTime,
 				reserveOptions,
 				tableData,
 				dialogFormVisible,
@@ -220,14 +225,26 @@
 <style scoped lang="scss">
 	$homeNavLengh: 8;
 	.home-container {
+		height: 100%;
 		overflow: hidden;
-		padding: 20px 40px;
-		.el-col{
+		padding: 20px;
+		.el-row{
+			margin-bottom: 20px;
+		}
+		.el-row:last-of-type {
+			margin-bottom: 0;
+		}
+		.homeCard{
+			width: 100%;
 			display: flex;
 			align-items: center;
+			padding: 20px;
+			background: #fff;
+			border-radius: 4px;
 		}
 		.grid-content{
 			align-items: center;
+			min-height: 36px;
 		}
 
 		.topInfo{
@@ -249,6 +266,10 @@
 				flex: 1;
 			}
 		}
+		.topBtns{
+			display: flex;
+			justify-content: right;
+		}
 		.el-button--text {
 			margin-right: 15px;
 		}

--
Gitblit v1.9.2