Commit 7207252a authored by liuzhaoh's avatar liuzhaoh

修复样式问题

parent 5c6fcb46
...@@ -400,7 +400,9 @@ onBeforeUnmount(() => {}); ...@@ -400,7 +400,9 @@ onBeforeUnmount(() => {});
width: 100%; width: 100%;
} }
.content-box { .content-box {
// margin-top: 24px; display: flex;
flex-direction: column;
height: 100%;
.search { .search {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -408,8 +410,9 @@ onBeforeUnmount(() => {}); ...@@ -408,8 +410,9 @@ onBeforeUnmount(() => {});
margin-bottom: 16px; margin-bottom: 16px;
} }
.table-box { .table-box {
flex: 1;
width: 100%; width: 100%;
height: calc(100vh - 280px); height: calc(100vh - 600px);
} }
} }
......
...@@ -1254,7 +1254,8 @@ const handlePaginationChange = (pagination) => { ...@@ -1254,7 +1254,8 @@ const handlePaginationChange = (pagination) => {
text-align: center; text-align: center;
} }
.table-box { .table-box {
height: calc(100vh - 200px); height: calc(100vh - 600px);
flex: 1;
} }
.yellow { .yellow {
// color: #faa508; // color: #faa508;
......
...@@ -1249,7 +1249,8 @@ const handlePaginationChange = (pagination) => { ...@@ -1249,7 +1249,8 @@ const handlePaginationChange = (pagination) => {
text-align: center; text-align: center;
} }
.table-box { .table-box {
height: calc(100vh - 200px); height: calc(100vh - 600px);
flex: 1;
} }
.yellow { .yellow {
// color: #faa508; // color: #faa508;
......
...@@ -328,6 +328,23 @@ onBeforeUnmount(() => {}); ...@@ -328,6 +328,23 @@ onBeforeUnmount(() => {});
width: 100%; width: 100%;
} }
.content-box { .content-box {
display: flex;
flex-direction: column;
height: 100%;
.search {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
}
.table-box {
width: 100%;
height: calc(100vh - 600px);
flex: 1;
}
}
.default-btn {
.search { .search {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -617,6 +617,9 @@ $borderColor: #bbbdc391; ...@@ -617,6 +617,9 @@ $borderColor: #bbbdc391;
box-sizing: border-box; box-sizing: border-box;
padding: 1rem; padding: 1rem;
overflow: hidden; overflow: hidden;
overflow: auto;
display: flex;
flex-direction: column;
} }
.top-box { .top-box {
padding-top: 18px; padding-top: 18px;
...@@ -633,7 +636,6 @@ $borderColor: #bbbdc391; ...@@ -633,7 +636,6 @@ $borderColor: #bbbdc391;
border: 1px solid rgba(13, 15, 18, 0.1); border: 1px solid rgba(13, 15, 18, 0.1);
box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1); box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1);
width: 100%; width: 100%;
height: 100%;
height: 63vh; height: 63vh;
background: #fff; background: #fff;
.chart-box { .chart-box {
...@@ -656,7 +658,7 @@ $borderColor: #bbbdc391; ...@@ -656,7 +658,7 @@ $borderColor: #bbbdc391;
border: 1px solid rgba(13, 15, 18, 0.1); border: 1px solid rgba(13, 15, 18, 0.1);
box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1); box-shadow: 0px 3px 6px 0px rgba(13, 15, 18, 0.1);
background: #fff; background: #fff;
padding: 10px; padding: 1%;
box-sizing: border-box; box-sizing: border-box;
.battery { .battery {
width: 100%; width: 100%;
...@@ -801,6 +803,7 @@ $borderColor: #bbbdc391; ...@@ -801,6 +803,7 @@ $borderColor: #bbbdc391;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
gap: 16px; gap: 16px;
flex: 1;
} }
.layout2 { .layout2 {
display: flex; display: flex;
......
<template> <template>
<div class="equipment-management"> <div class="equipment-management">
<div class="content-box">
<div class="search"> <div class="search">
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="工序"> <el-form-item label="工序">
...@@ -78,10 +77,7 @@ ...@@ -78,10 +77,7 @@
<el-button type="success" class="add-btn" @click="onExportFile" <el-button type="success" class="add-btn" @click="onExportFile"
>导出</el-button >导出</el-button
> >
<el-button <el-button type="success" class="add-btn" @click="onDownloadTemplate"
type="success"
class="add-btn"
@click="onDownloadTemplate"
>模板下载</el-button >模板下载</el-button
> >
</el-form-item> </el-form-item>
...@@ -112,7 +108,6 @@ ...@@ -112,7 +108,6 @@
</template> </template>
</common-table> </common-table>
</div> </div>
</div>
<setParamsDialog <setParamsDialog
v-model:dialogVisible="dialogVisible" v-model:dialogVisible="dialogVisible"
@close="closeDialog" @close="closeDialog"
...@@ -461,7 +456,8 @@ onMounted(() => { ...@@ -461,7 +456,8 @@ onMounted(() => {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
padding: 20px; padding: 20px;
.content-box { display: flex;
flex-direction: column;
.search { .search {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -470,8 +466,8 @@ onMounted(() => { ...@@ -470,8 +466,8 @@ onMounted(() => {
} }
.table-box { .table-box {
width: 100%; width: 100%;
height: calc(100vh - 235px); height: calc(100vh - 400px);
} flex: 1;
} }
} }
.default-btn { .default-btn {
......
...@@ -297,6 +297,22 @@ onBeforeUnmount(() => {}); ...@@ -297,6 +297,22 @@ onBeforeUnmount(() => {});
width: 100%; width: 100%;
} }
.content-box { .content-box {
display: flex;
flex-direction: column;
height: 100%;
.search {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
}
.table-box {
flex: 1;
width: 100%;
height: calc(100vh - 600px);
}
}
.default-btn {
.search { .search {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment