From 6f547d926fff4ac05785444317026758a5ef21e0 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 25 二月 2023 17:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW
---
src/views/userManage/roleManage.vue | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index ff9bb64..3b1d366 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -22,8 +22,12 @@
>
<el-input
v-model="roleForm.username"
+ :placeholder="$t('userManage.RM.roleNameHolder')"
+ size="small"
style="width: 200px"
- />
+ >
+ <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
+ </el-input>
</el-form-item>
<el-form-item
:label="$t('userManage.RM.ownedSystem')"
@@ -31,8 +35,9 @@
>
<el-select
:popper-append-to-body="false"
+ size="small"
v-model="roleForm.depValue"
- placeholder="璇烽�夋嫨"
+ :placeholder="$t('userManage.RM.ownedSystemHolder')"
style="width: 200px"
>
<el-option
@@ -145,6 +150,7 @@
</el-form-item> -->
</el-form>
</div>
+ <div class="dividing-line"></div>
<div
class="table_box subpage_Div"
:style="styleVar"
@@ -152,7 +158,7 @@
<el-table
:data="tableData"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -244,12 +250,12 @@
size="small"
plain
>{{ $t("common.update") }}</el-button>
-
+
</template>
</el-table-column>
</el-table>
<div
- style="margin-top: 25px"
+ style="margin-top: 10px"
class="pagination_box"
>
<el-pagination
@@ -509,7 +515,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox box_div subpage_Div"
-
+
>
<div
slot="header"
@@ -660,7 +666,8 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 97}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
});
},
handleRouleDepList(data, node, nodeData) {
@@ -945,7 +952,7 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 300px;
@@ -971,12 +978,12 @@
.inquire {
height: auto;
- padding: 8px;
- margin-top: 20px;
+ //padding: 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
// width: calc(100% - 22px);
.el-form-item {
--
Gitblit v1.9.3