From 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 16 二月 2023 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/views/datamanage/dictionaryManage.vue | 131 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 36 deletions(-)
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index b04a0bd..1a969c0 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -5,8 +5,23 @@
`${$t('dataManage.dictionaryManage')}`,
]"></My-bread>
<el-divider />
- <div>
- <el-form
+ <div class="mainBox">
+ <div class="dictionaryContent">
+ <div class="dictionary_leftTree subpage_Div">
+ <ul>
+ <li
+ @click="getTableDesc(item)"
+ v-for="item in optionCount"
+ :class="{ active: activeName == item.tab }"
+ >
+ {{ item.tabDesc }}
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="right subpage_Div">
+ <div class="inquire">
+ <el-form
:inline="true"
:model="formInline"
class="demo-form-inline"
@@ -15,21 +30,10 @@
<el-input
v-model="formInline.tab"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
></el-input>
</el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-search"
- size="small"
- @click="getSelectDictTab"
- class="primary"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- icon="el-icon-refresh"
- size="small"
- @click="getRemoveForm"
- type="info"
- >{{ $t('common.reset') }}</el-button>
+ <el-form-item style="float:right">
<el-button
v-if="btnStatus.insert"
icon="el-icon-edit"
@@ -46,27 +50,27 @@
>{{
$t('common.delete')
}}</el-button>
+ <el-button
+ icon="el-icon-search"
+ size="small"
+ @click="getSelectDictTab"
+ class="primary"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ icon="el-icon-refresh"
+ size="small"
+ @click="getRemoveForm"
+ type="info"
+ >{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
- </div>
- <div class="dictionaryContent">
- <div class="dictionary_leftTree subpage_Div">
- <ul>
- <li
- @click="getTableDesc(item)"
- v-for="item in optionCount"
- :class="{ active: activeName == item.tab }"
- >
- {{ item.tabDesc }}
- </li>
- </ul>
- </div>
- <div class="dictionary_rightContent subpage_Div">
- <el-table
+ </div>
+ <div class="table_box">
+ <el-table
:data="tableData"
style="width: 100%"
@selection-change="handleSelectionChange"
- height="93%"
+ height="100%"
>
<el-table-column
type="selection"
@@ -153,7 +157,7 @@
</el-table>
<div
class="pagination_box"
- style="margin-top: 10px"
+ style="margin-top: 20px"
>
<el-pagination
@size-change="handleSizeChange"
@@ -165,6 +169,7 @@
:total="count"
>
</el-pagination>
+ </div>
</div>
</div>
</div>
@@ -699,13 +704,14 @@
width: 98%;
padding: 1%;
.dictionaryContent {
- width: 100%;
+ width: 16.5%;
height: 92%;
- display: flex;
- justify-content: space-between;
+ // display: flex;
+ // justify-content: space-between;
.dictionary_leftTree {
- width: 15%;
+ width: 100%;
height: 80%;
+ min-height: 700px;
border-radius: 5px;
padding: 1%;
@@ -744,4 +750,57 @@
margin-bottom: 10px;
}
}
+.mainBox {
+ width: 100%;
+ height: 92%;
+ display: flex;
+ justify-content: space-between;
+ .leftTree {
+ width: 15%;
+ height: 91%;
+
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ overflow-y: auto;
+ }
+ .right {
+ width: 80%;
+ height: 91%;
+
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ // overflow-y: auto;
+ .inquire {
+ // margin-bottom: 10px;
+ padding: 1%;
+
+ border-radius: 5px;
+ border: 1px solid #dcdfe6;
+ .el-form-item {
+ margin: 5px;
+ }
+ }
+ .table_box {
+ width: 100%;
+ height: 80%;
+ margin: 0 auto;
+ // overflow: auto;
+ margin-top: 10px;
+
+ .el-table /deep/ th.el-table__cell > .cell {
+ padding: 15px !important;
+ }
+
+ .el-table--border::after,
+ .el-table--group::after {
+ width: 0;
+ }
+ .el-table::before {
+ height: 0;
+ }
+ }
+ }
+ }
</style>
--
Gitblit v1.9.3