From e2cad5345678266960d40f1ba5e3ffac4d5c85e8 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Wed, 13 Jul 2022 09:19:05 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workPlan/workReservation/index.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
index b747f16..0b25a62 100644
--- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
@@ -1,7 +1,8 @@
<template>
<div class="home-container">
<el-scrollbar height="100%">
- <el-row>
+ <el-row class="homeCard">
+<!-- <div class="homeCard">-->
<el-col :span="6">
<div class="grid-content topInfo">
<div>当前所属部门：</div>
@@ -42,8 +43,10 @@
<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="120" />
<el-table-column prop="time" label="预约时间" width="150" />
@@ -62,6 +65,7 @@
</template>
</el-table-column>
</el-table>
+ </div>
</el-row>
<el-dialog v-model="dialogFormVisible" title="新增预约">
<el-form :model="reservationForm">
@@ -222,19 +226,21 @@
$homeNavLengh: 8;
.home-container {
height: 100%;
- background: #fff;
overflow: hidden;
- padding: 40px;
+ padding: 20px;
.el-row{
margin-bottom: 20px;
}
- .el-row:last-child {
+ .el-row:last-of-type {
margin-bottom: 0;
}
- .el-col{
+ .homeCard{
+ width: 100%;
display: flex;
align-items: center;
- margin: 40px 0 20px;
+ padding: 20px;
+ background: #fff;
+ border-radius: 4px;
}
.grid-content{
align-items: center;
--
Gitblit v1.9.2