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/templateManage.vue | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue index 44e3b77..3414cb9 100644 --- a/src/views/userManage/templateManage.vue +++ b/src/views/userManage/templateManage.vue @@ -13,12 +13,15 @@ > <div class="flex_box"> <div style="margin-right: auto"> - <el-form-item label="鍚嶇О"> + <el-form-item :label="$t('userManage.authorityM.name')"> <el-input style="width:200px" - v-model="ruleForm.name" - - /> + size="small" + v-model="ruleForm.name" + :placeholder="$t('userManage.authorityM.nameHolder')" + > + <i slot="suffix" class="el-icon-search" @click="setRefreshTable"></i> + </el-input> </el-form-item> </div> <div> @@ -58,17 +61,18 @@ </el-form-item> </div> </div> - - - + + + </el-form> </div> + <div class="dividing-line"></div> <div class="table_box" :style="styleVar"> <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange" - height="calc(100% - 57px)" + height="calc(100% - 45px)" > <el-table-column type="selection" @@ -151,7 +155,7 @@ </template> </el-table-column> </el-table> - <div style="margin-top:25px"> + <div style="margin-top:10px"> <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" @@ -305,7 +309,7 @@ <div class="infoBox_box" v-show="showinfoBox"> <div class="infoBox subpage_Div box_div" - + > <div @@ -472,7 +476,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 + 30}px)`; + // this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`; }); }, //淇敼鍙栨秷 @@ -758,19 +763,19 @@ .authorityManagement_box { height: 98%; width: 98%; - padding: 1%; + padding: 0.5%; .el-input { width: 730px; } .searchComp { - padding: 8px; - margin-top: 20px; + //padding: 8px; + //margin-top: 20px; border-radius: 5px; - margin-bottom: 20px; + //margin-bottom: 20px; .el-form-item { margin: 5px; -- Gitblit v1.9.3