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/authorityManage.vue |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index 3dbbfcb..31908d0 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -13,8 +13,10 @@
       >
        <div class="flex_box">
         <div style="margin-right: auto">
-         <el-form-item label="鍚嶇О">
-          <el-input v-model="ruleForm.name" style="width:200px"></el-input>
+         <el-form-item :label="$t('userManage.authorityM.name')">
+          <el-input v-model="ruleForm.name" style="width:200px" size="small" :placeholder="$t('userManage.authorityM.nameHolder')">
+            <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
+          </el-input>
         </el-form-item>
         </div>
         <div>
@@ -46,17 +48,18 @@
         </el-form-item>
         </div>
         </div>
-        
-       
-      
+
+
+
       </el-form>
     </div>
+    <div class="dividing-line"></div>
     <div class="table_box subpage_Div" :style="styleVar">
       <el-table
         :data="tableData"
         style="width: 100%"
         fit
-        height="calc(100% - 57px)"
+        height="calc(100% - 45px)"
         @selection-change="handleSelectionChange"
       >
         <el-table-column
@@ -114,7 +117,7 @@
         >
         </el-table-column>
         <el-table-column
-        
+
           :label="$t('common.operate')"
           width="170px"
         >
@@ -135,7 +138,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"
@@ -151,7 +154,7 @@
 <div class="infoBox_box" v-show="showinfoBox">
     <div
       class="infoBox subpage_Div box_div"
-    
+
     >
       <el-card class="box-card">
         <div
@@ -241,7 +244,7 @@
       :visible.sync="InsertFormdialog"
       top="2vh"
     >
-    
+
       <el-form :model="insertform" label-position="top">
         <el-form-item
           :label="$t('userManage.userInfoObj.name')"
@@ -274,7 +277,7 @@
           ></el-input>
         </el-form-item>
       </el-form>
-   
+
       <div
         slot="footer"
         class="dialog-footer"
@@ -413,7 +416,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)`;
       });
     },
     showPermsMenu(res) {
@@ -583,22 +587,21 @@
 .power_box {
   height: 98%;
   width: 98%;
-  padding: 1%;
+  padding: 0.5%;
 
   .el-input {
     width: 300px;
   }
   .power_quire {
-    padding: 8px;
-    margin-top: 20px;
+    //padding: 10px;
+    //margin-top: 20px;
 
     border-radius: 5px;
 
-    margin-bottom: 20px;
+    //margin-bottom: 20px;
     .el-form-item {
       margin: 5px;
     }
   }
 }
 </style>
- 
\ No newline at end of file

--
Gitblit v1.9.3