From c7bc3eb18e1fda4254ca0195e2133d2ed978de11 Mon Sep 17 00:00:00 2001
From: china <527956374@qq.com>
Date: 星期四, 11 五月 2023 17:48:48 +0800
Subject: [PATCH] 样式调整
---
src/views/system/config/index.vue | 7 +--
src/assets/styles/index.scss | 25 ++++++++++--
src/views/tcp/connection/index.vue | 2
src/views/etaa/question_bank/index.vue | 11 ++---
src/views/etaa/paper/index.vue | 9 +---
src/layout/index.vue | 14 +++---
src/layout/components/AppMain.vue | 2
src/views/components/myTableV3.vue | 18 ++++++---
src/views/tcp/equip/index.vue | 2
9 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 96095ef..e17bf45 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -118,12 +118,27 @@
}
}
}
-
+//渚ц竟鏍�
+.sidebar-box {
+ margin: 0 20px 0 0 ;
+ .box-card{
+ min-height: 300px;
+ max-height: calc(100vh - 198px);
+ overflow: auto;
+ scrollbar-width: none; /* Firefox */
+ -ms-overflow-style: none; /* IE 10+ */
+ &::-webkit-scrollbar {
+ display: none; /* Chrome Safari */
+ }
+ }
+}
//main-container鍏ㄥ眬鏍峰紡
.app-container {
+ display: flex;
padding: 20px;
+ flex: 1;
+ overflow: auto;
}
-
.components-container {
margin: 30px 50px;
position: relative;
@@ -170,10 +185,10 @@
color: rgb(32, 160, 255);
}
}
-
+.filter-card{
+ margin-bottom: 20px;
+}
.filter-container {
- padding-bottom: 10px;
-
.filter-item {
display: inline-block;
vertical-align: middle;
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 0c6f4b7..aed40f7 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -24,7 +24,7 @@
<style lang="scss" scoped>
.app-main {
- /* 50= navbar 50 */
+ display: flex;
min-height: calc(100vh - 50px);
width: 100%;
position: relative;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c9032db..b65649c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -159,20 +159,20 @@
display: flex;
}
- .base-container {
+ .app-container {
/*50 = navbar */
flex: 1;
height: calc(100vh - 198px);
border-radius:10px;
overflow: auto;
- scrollbar-width: none; /* Firefox */
- -ms-overflow-style: none; /* IE 10+ */
- &::-webkit-scrollbar {
- display: none; /* Chrome Safari */
- }
+ //scrollbar-width: none; /* Firefox */
+ //-ms-overflow-style: none; /* IE 10+ */
+ //&::-webkit-scrollbar {
+ // display: none; /* Chrome Safari */
+ //}
.box-card{
.el-card__body{
- padding-top: 0;
+ //padding-top: 0;
.el-form-item--small.el-form-item{
margin-top: 20px;
margin-bottom: 0;
diff --git a/src/views/components/myTableV3.vue b/src/views/components/myTableV3.vue
index e695559..9ea4c56 100644
--- a/src/views/components/myTableV3.vue
+++ b/src/views/components/myTableV3.vue
@@ -7,6 +7,7 @@
v-for="(custom, idx) in myTable.tools.custom"
:key="idx"
site="tools"
+ :type="custom.myType"
:check-permission="custom.checkPermission"
:name="custom.name"
@click="custom.click"
@@ -94,8 +95,7 @@
:sortable="column.sortable"
:label="column.title"
:type="column.type"
- :width="column.width"
- :min-width="column.minWidth"
+ :min-width="column.width"
:align="column.align"
:header-align="column.align"
>
@@ -135,7 +135,7 @@
v-if="myTable.operation.show"
label="鎿嶄綔"
align="center"
- :width="myTable.operation.width"
+ :min-width="myTable.operation.width"
fixed="right"
>
<template slot-scope="scope">
@@ -425,6 +425,7 @@
})
)
this.myTable.loading = false
+ // this.$refs[this.myTable.ref].doLayout()
}).catch(() => {
this.myTable.loading = false
})
@@ -627,8 +628,11 @@
</script>
<style scoped>
->>> .el-table__fixed-right {
- height: 100% !important;
+>>> .el-table__header {
+ width: 100% !important;
+}
+>>> .el-table__body {
+ width: 100% !important;
}
/*璇︽儏琛ㄥ崟*/
@@ -663,5 +667,7 @@
text-align: center;
margin: 0 auto;
}
-
+.table-tool-bar{
+ margin-bottom: 20px;
+}
</style>
diff --git a/src/views/etaa/paper/index.vue b/src/views/etaa/paper/index.vue
index 4ee86f4..ac6817a 100644
--- a/src/views/etaa/paper/index.vue
+++ b/src/views/etaa/paper/index.vue
@@ -1,7 +1,6 @@
<template>
- <div class="app-main">
- <div class="base-container">
- <el-card shadow="never" class="box-card">
+ <div class="app-container">
+ <el-card shadow="never" class="box-card filter-card">
<!--鎼滅储鏉′欢-->
<div class="filter-container">
<el-form :inline="true" :model="filterForm" size="small">
@@ -40,7 +39,6 @@
<!--娣诲姞/缂栬緫寮圭獥-->
<add v-if="editSetting.show" :setting="editSetting" @close="editSetting.show=false" @search="search" />
</div>
- </div>
</template>
<script>
@@ -84,8 +82,7 @@
{
name: '娣诲姞',
checkPermission: 'etaa:paper:add',
- // myType: 'danger',
- mySize: 'mini',
+ myType: 'danger',
click: ()=> {
this.handleRAdd();
}
diff --git a/src/views/etaa/question_bank/index.vue b/src/views/etaa/question_bank/index.vue
index 3928307..f60b8d4 100644
--- a/src/views/etaa/question_bank/index.vue
+++ b/src/views/etaa/question_bank/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-main info-main">
+ <div class="app-container">
<el-aside class="sidebar-box" style="padding: 0;">
<div class="sidebar">
<el-card class="box-card" shadow="never">
@@ -15,8 +15,8 @@
</div>
</el-aside>
- <div class="base-container flex-1">
- <el-card shadow="never" class="box-card">
+ <div class="flex-1">
+ <el-card shadow="never" class="box-card filter-card">
<!--鎼滅储鏉′欢-->
<div class="filter-container">
<el-form :inline="true" :model="filterForm" size="small">
@@ -103,7 +103,7 @@
{
name: '娣诲姞璇曢',
// checkPermission: 'system:config:remove',
- // myType: 'danger',
+ myType: 'danger',
mySize: 'mini',
click: ()=> {
this.handleAdd();
@@ -413,9 +413,6 @@
</script>
<style scope lang="scss">
.info-main{
- display:-webkit-box;
- display: -moz-box;
- display: -0-box;
min-height: calc( 100vh - 50px);
}
.flex-1{
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index d09a315..e3587ed 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -1,7 +1,6 @@
<template>
- <div class="app-main">
- <div class="base-container">
- <el-card shadow="never" class="box-card">
+ <div class="app-container">
+ <el-card shadow="never" class="box-card filter-card">
<!--鎼滅储鏉′欢-->
<div class="filter-container">
<el-form :inline="true" :model="filterFrom" size="small">
@@ -37,8 +36,6 @@
<!--娣诲姞/缂栬緫寮圭獥-->
<edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show=false" @search="search" />
</div>
-
- </div>
</template>
<script>
diff --git a/src/views/tcp/connection/index.vue b/src/views/tcp/connection/index.vue
index 4ba3122..349d445 100644
--- a/src/views/tcp/connection/index.vue
+++ b/src/views/tcp/connection/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-main">
- <div class="base-container">
+ <div class="app-container">
<my-table-v3 ref="myTable" :filter="filterForm" :table="table" />
</div>
</div>
diff --git a/src/views/tcp/equip/index.vue b/src/views/tcp/equip/index.vue
index 9662bda..aec3089 100644
--- a/src/views/tcp/equip/index.vue
+++ b/src/views/tcp/equip/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-main">
- <div class="base-container">
+ <div class="app-container">
<my-table-v3 ref="myTable" :filter="filterForm" :table="table" />
</div>
</div>
--
Gitblit v1.9.1