From e28e9395819fd992bc3e168b6ff89fb6f538f1bc Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:25:34 +0800
Subject: [PATCH] 提交代码

---
 src/views/system/role/index.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8d4f5d7..0e8c5b1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -11,10 +11,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="鏉冮檺瀛楃" prop="roleKey">
+      <el-form-item label="瑙掕壊缂栧彿" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
-          placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
+          placeholder="璇疯緭鍏ヨ鑹茬紪鍙�"
           clearable
           size="small"
           style="width: 240px"
@@ -103,11 +103,11 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="120" />
-      <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="鏉冮檺瀛楃" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="100" />
-      <el-table-column label="鐘舵��" align="center" width="100">
+      <el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="150" />
+      <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" min-width="150" />
+      <el-table-column label="瑙掕壊缂栧彿" prop="roleKey" :show-overflow-tooltip="true" min-width="150" />
+      <el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="150" />
+      <el-table-column label="鐘舵��" align="center" width="150">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -135,6 +135,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            class="del-btn"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
@@ -162,19 +163,19 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀硅鑹查厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
           <el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
         </el-form-item>
         <el-form-item prop="roleKey">
           <span slot="label">
-            <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+            <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勮鑹茬紪鍙凤紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
-            鏉冮檺瀛楃
+            瑙掕壊缂栧彿
           </span>
-          <el-input v-model="form.roleKey" placeholder="璇疯緭鍏ユ潈闄愬瓧绗�" />
+          <el-input v-model="form.roleKey" placeholder="璇疯緭鍏ヨ鑹茬紪鍙�" />
         </el-form-item>
         <el-form-item label="瑙掕壊椤哄簭" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
@@ -211,15 +212,15 @@
         <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
-    </el-dialog>
+    </Dialog>
 
     <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <Dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="瑙掕壊鍚嶇О">
           <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>
-        <el-form-item label="鏉冮檺瀛楃">
+        <el-form-item label="瑙掕壊缂栧彿">
           <el-input v-model="form.roleKey" :disabled="true" />
         </el-form-item>
         <el-form-item label="鏉冮檺鑼冨洿">
@@ -253,7 +254,7 @@
         <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
         <el-button @click="cancelDataScope">鍙� 娑�</el-button>
       </div>
-    </el-dialog>
+    </Dialog>
   </div>
 </template>
 
@@ -340,7 +341,7 @@
           { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
         ],
         roleKey: [
-          { required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }
+          { required: true, message: "瑙掕壊缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
         ],
         roleSort: [
           { required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }
@@ -600,7 +601,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�"' + roleIds + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
         return delRole(roleIds);
       }).then(() => {
         this.getList();

--
Gitblit v1.9.1