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/resourceManage.vue | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index 3b083e2..af175d2 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -13,7 +13,9 @@
>
<div class="flex_box">
<el-form-item :label="$t('userManage.resManageObj.name')" style="margin-right: auto">
- <el-input v-model="ruleForm.name" style="width:200px"></el-input>
+ <el-input v-model="ruleForm.name" size="small" style="width:200px" :placeholder="$t('userManage.resManageObj.nameHolder')">
+ <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
+ </el-input>
</el-form-item>
<el-form-item>
<el-button
@@ -45,16 +47,17 @@
>{{ $t('common.empty') }}</el-button>
</el-form-item>
</div>
-
+
</el-form>
</div>
+ <div class="dividing-line"></div>
<div class="table_box" :style="styleVar">
<el-table
:data="tableData"
style="width: 100%"
fit
@selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column
type="selection"
@@ -110,7 +113,7 @@
>
</el-table-column>
<el-table-column
-
+
:label="$t('common.operate')"
width="170px"
>
@@ -131,7 +134,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -147,7 +150,7 @@
<div class="infoBox_box" v-show="showinfoBox">
<div
class="infoBox box_div "
-
+
>
<div
slot="header"
@@ -384,9 +387,9 @@
autocomplete="off"
style="width:100%"
></el-input>
-
+
</div>
-
+
<div class="BoxFlexbutton">
<input
name="file1"
@@ -410,8 +413,8 @@
><i class="el-icon-upload2"></i></el-link>
</div>
</div>
-
-
+
+
</el-form-item>
<el-form-item
:label="$t('userManage.resManageObj.bak')"
@@ -447,7 +450,7 @@
</el-dialog>
<el-dialog
:title="$t('userManage.userInfoObj.editPermission')"
-
+
:visible.sync="EditFormdialog"
:before-close="EditFromDataClose"
top="2vh"
@@ -576,7 +579,7 @@
disabled
autocomplete="off"
style="width:100%"
-
+
></el-input>
</div>
<div class="BoxFlexbutton">
@@ -791,7 +794,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)`;
});
},
handleEditDepList(data, node, nodeData) {
@@ -1118,20 +1122,20 @@
.power_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5%;
.el-input {
width: 730px;
}
.power_quire {
- padding: 8px;
+ //padding: 10px;
- margin-top: 20px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
@@ -1161,4 +1165,3 @@
}
}
</style>
-
\ No newline at end of file
--
Gitblit v1.9.3