From 0e11714f01de9fe1756d6896f67bcd07ff50a148 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Wed, 10 Aug 2022 18:34:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
similarity index 91%
rename from src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
rename to src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
index ae00ade..27c6a17 100644
--- a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
+++ b/src/views/specialWorkSystem/workBasicManage/safeMeasuresManage/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="home-container">
- <el-scrollbar height="100%">
+ <div style="height: 100%">
<el-row class="homeCard">
<el-col :span="16">
<div class="grid-content topInfo">
@@ -15,7 +15,6 @@
<el-input v-model="searchWord" placeholder="输入检查内容"></el-input>
<el-button type="primary">查询</el-button>
<el-button plain>重置</el-button>
- <el-button plain :icon="Upload"></el-button>
</div>
</el-col>
</el-row>
@@ -33,6 +32,7 @@
ref="multipleTableRef"
:data="tableData"
style="width: 100%"
+ height="calc(100% - 100px)"
:header-cell-style="{background: '#fafafa'}"
@selection-change="handleSelectionChange"
>
@@ -54,22 +54,22 @@
</template>
</el-table-column>
</el-table>
- </div>
- <div class="pageBtn">
- <el-pagination
- v-model:currentPage="currentPage"
- v-model:page-size="pageSize"
- :page-sizes="[10, 15]"
- small=false
- background
- layout="total, sizes, prev, pager, next, jumper"
- :total="100"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
</div>
</div>
- </el-scrollbar>
+ </div>
<el-dialog v-model="dialogDetails" title="安全措施">
<el-form :model="details" label-width="120px">
<el-form-item label="作业类型">
@@ -338,14 +338,45 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: 100%;
+ height: calc(100vh - 114px);
+ box-sizing: border-box;
overflow: hidden;
- padding: 20px;
.homeCard{
width: 100%;
padding: 20px;
+ box-sizing: border-box;
background: #fff;
border-radius: 4px;
+
+ .main-card{
+ width: 100%;
+ height: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ .pageBtn{
+ height: 60px;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ &:last-of-type{
+ height: calc(100% - 100px);
+ }
}
.el-row{
display: flex;
@@ -369,31 +400,6 @@
white-space: nowrap;
margin-right: 20px;
}
- }
- }
- .main-card{
- width: 100%;
- .cardTop{
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 20px;
- .mainCardBtn{
- margin: 0;
- }
- }
- }
- .pageBtn{
- display: flex;
- align-items: center;
- justify-content: right;
- margin-top: 20px;
-
- .demo-pagination-block + .demo-pagination-block {
- margin-top: 10px;
- }
- .demo-pagination-block .demonstration {
- margin-bottom: 16px;
}
}
}
--
Gitblit v1.9.2