From 8908f9cffef4b027f4760aa6ec082b42a04db151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 15 May 2022 11:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2elementui2.2.0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/signalR.js                         |   1 -
 src/views/components/dictData.vue            |   8 +-
 src/views/monitor/job/index.vue              |  69 ++++----
 src/views/monitor/job/log.vue                |   4 +-
 src/views/monitor/operlog/index.vue          | 159 +++++++++----------
 src/views/system/article/articleCategory.vue |   2 +-
 src/views/system/article/manager.vue         |  18 +--
 src/views/system/commonLang/index.vue        |  10 +-
 src/views/system/config/index.vue            |  31 ++--
 src/views/system/dept/index.vue              |  26 +--
 src/views/system/dict/index.vue              |  27 +++-
 src/views/system/menu/index.vue              |  38 +++--
 src/views/system/notice/index.vue            |   6 +-
 src/views/system/post/index.vue              |  16 +-
 src/views/system/role/index.vue              |  30 ++--
 src/views/system/roleusers/index.vue         |  24 ++-
 src/views/system/user/index.vue              |  29 ++--
 src/views/tool/file/index.vue                |  28 ++--
 src/views/tool/gen/index.vue                 |  13 +-
 19 files changed, 285 insertions(+), 254 deletions(-)

diff --git a/src/utils/signalR.js b/src/utils/signalR.js
index 31097b0..071033e 100644
--- a/src/utils/signalR.js
+++ b/src/utils/signalR.js
@@ -60,7 +60,6 @@ export default {
   },
   // 接收消息处理
   receiveMsg(connection) {
-    console.log(connection)
     connection.on("onlineNum", (data) => {
       store.dispatch("socket/changeOnlineNum", data);
     });
diff --git a/src/views/components/dictData.vue b/src/views/components/dictData.vue
index 79ef921..e8f4f72 100644
--- a/src/views/components/dictData.vue
+++ b/src/views/components/dictData.vue
@@ -27,7 +27,9 @@
     <el-table-column label="字典标签" align="center" prop="dictLabel">
       <template #default="scope">
         <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</span>
-        <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }} </el-tag>
+        <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass"
+          >{{ scope.row.dictLabel }}
+        </el-tag>
       </template>
     </el-table-column>
     <el-table-column label="字典键值" align="center" prop="dictValue" />
@@ -40,8 +42,8 @@
     <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
       <template #default="scope">
-        <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">编辑</el-button>
-        <el-button type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
+        <el-link size="small" class="ml10" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">编辑</el-link>
+        <el-link size="small" class="ml10" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-link>
       </template>
     </el-table-column>
   </el-table>
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 4cc35e8..bf9126d 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -10,8 +10,7 @@
               clearable
               prefix-icon="el-icon-search"
               @keyup.enter="handleQuery"
-              @clear="handleQuery"
-            />
+              @clear="handleQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="search" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -55,66 +54,66 @@
         </el-table-column>
         <el-table-column prop="lastRunTime" align="center" label="最后运行时间" :show-overflow-tooltip="true" />
         <el-table-column prop="remark" align="center" label="备注" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-button type="text" icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row)">
+            <el-link size="small" icon="view" v-hasPermi="['monitor:job:query']" @click="handleJobLog(scope.row)">
               {{ $t('btn.log') }}
-            </el-button>
-            <el-button
-              type="text"
+            </el-link>
+            <el-link
+              size="small"
               v-if="scope.row.isStart"
               v-hasPermi="['monitor:job:run']"
               icon="remove"
               title="运行"
-              @click="handleRun(scope.row)"
-            >
+              @click="handleRun(scope.row)">
               {{ $t('btn.run') }}
-            </el-button>
-            <el-button
-              type="text"
+            </el-link>
+            <el-link
+              type="warning"
+              size="small"
               v-if="scope.row.isStart"
               v-hasPermi="['monitor:job:stop']"
               icon="video-pause"
               style="color: red"
               title="停止"
-              @click="handleStop(scope.row)"
-            >
+              @click="handleStop(scope.row)">
               {{ $t('btn.stop') }}
-            </el-button>
+            </el-link>
 
-            <el-button
-              type="text"
+            <el-link
+              type="primary"
+              size="small"
+              class="ml10"
               v-if="!scope.row.isStart"
               v-hasPermi="['monitor:job:start']"
               icon="video-play"
               title="启动"
-              @click="handleStart(scope.row)"
-            >
+              @click="handleStart(scope.row)">
               {{ $t('btn.start') }}
-            </el-button>
-            <el-button
-              type="text"
+            </el-link>
+            <el-link
+              class="ml10"
+              size="small"
+              type="info"
               v-if="!scope.row.isStart"
               v-hasPermi="['monitor:job:edit']"
               icon="edit"
-              style="color: gray"
               title="编辑"
-              @click="handleUpdate(scope.row)"
-            >
+              @click="handleUpdate(scope.row)">
               {{ $t('btn.edit') }}
-            </el-button>
+            </el-link>
 
-            <el-button
-              type="text"
+            <el-link
+              type="danger"
+              class="ml10"
+              size="small"
               v-if="!scope.row.isStart"
               v-hasPermi="['monitor:job:delete']"
               icon="delete"
-              style="color: red"
               title="删除"
-              @click="handleDelete(scope.row)"
-            >
+              @click="handleDelete(scope.row)">
               {{ $t('btn.delete') }}
-            </el-button>
+            </el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -239,7 +238,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ $t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
         </div>
       </template>
@@ -549,8 +548,8 @@ const logForm = reactive({
   jobId: undefined,
   title: undefined,
 })
-function onJobLogView(){
-	router.push({ path: 'job/log' })
+function onJobLogView() {
+  router.push({ path: 'job/log' })
 }
 /** 任务日志列表查询 */
 function handleJobLog(row) {
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index df449ee..c3af69a 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -67,7 +67,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="view" @click="handleView(scope.row)">详细</el-button>
+          <el-button text icon="view" @click="handleView(scope.row)">详细</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -106,7 +106,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="open = false">关 闭</el-button>
+          <el-button text @click="open = false">关 闭</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 86cf5d5..b8d4020 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -18,7 +18,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间">
-        <el-date-picker v-model="dateRange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
@@ -28,14 +33,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:operlog:remove']">
+          删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="delete" @click="handleClean" v-hasPermi="['monitor:operlog:remove']">清空</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['system:operlog:export']">导出
-        </el-button>
+        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['system:operlog:export']">导出 </el-button>
       </el-col>
       <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -54,14 +60,15 @@
       <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
       <el-table-column label="操作状态" align="center" prop="status">
-        <template #default="{row}">
+        <template #default="{ row }">
           <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column label="用时" align="center" prop="elapsed">
         <template #default="scope">
-          <span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed }}
-            ms</span>
+          <span :style="scope.row.elapsed < 1000 ? 'color:green' : scope.row.elapsed < 3000 ? 'color:orange' : 'color:red'">
+            {{ scope.row.elapsed }} ms
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="日志内容" align="center" prop="errorMsg" :show-overflow-tooltip="true" />
@@ -72,13 +79,14 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="view" @click="handleView(scope.row,scope.index)" v-hasPermi="['monitor:operlog:query']">详细
+          <el-button size="small" text icon="view" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">
+            详细
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
@@ -126,21 +134,15 @@
           <el-button @click="open = false">关 闭</el-button>
         </div>
       </template>
-
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  list,
-  delOperlog,
-  cleanOperlog,
-  exportOperlog,
-} from "@/api/monitor/operlog";
+import { list, delOperlog, cleanOperlog, exportOperlog } from '@/api/monitor/operlog'
 
 export default {
-  name: "operlog",
+  name: 'operlog',
   data() {
     return {
       // 遮罩层
@@ -174,117 +176,110 @@ export default {
         businessType: undefined,
         status: undefined,
       },
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
     var dictParams = [
-      { dictType: "sys_oper_type", columnName: "businessTypeOptions" },
-      { dictType: "sys_common_status", columnName: "statusOptions" },
-    ];
+      { dictType: 'sys_oper_type', columnName: 'businessTypeOptions' },
+      { dictType: 'sys_common_status', columnName: 'statusOptions' },
+    ]
     this.getDicts(dictParams).then((response) => {
       response.data.forEach((element) => {
-        this[element.columnName] = element.list;
-      });
-    });
+        this[element.columnName] = element.list
+      })
+    })
   },
   methods: {
     /** 查询登录日志 */
     getList() {
-      this.loading = true;
-      list(this.addDateRange(this.queryParams, this.dateRange)).then(
-        (response) => {
-          this.loading = false;
-          if (response.code == 200) {
-            this.list = response.data.result;
-            this.total = response.data.totalNum;
-          } else {
-            this.total = 0;
-            this.list = [];
-          }
+      this.loading = true
+      list(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+        this.loading = false
+        if (response.code == 200) {
+          this.list = response.data.result
+          this.total = response.data.totalNum
+        } else {
+          this.total = 0
+          this.list = []
         }
-      );
+      })
     },
     // 操作日志状态字典翻译
     statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.status)
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.operId);
-      this.multiple = !selection.length;
+      this.ids = selection.map((item) => item.operId)
+      this.multiple = !selection.length
     },
     /** 详细按钮操作 */
     handleView(row) {
-      this.open = true;
-      this.form = row;
+      this.open = true
+      this.form = row
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const operIds = row.operId || this.ids;
-      this.$confirm(
-        '是否确认删除日志编号为"' + operIds + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      const operIds = row.operId || this.ids
+      this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
         .then(function () {
-          return delOperlog(operIds);
+          return delOperlog(operIds)
         })
         .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        });
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$confirm("是否确认清空所有操作日志数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确认清空所有操作日志数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(function () {
-          return cleanOperlog();
+          return cleanOperlog()
         })
         .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("清空成功");
-        });
+          this.getList()
+          this.$modal.msgSuccess('清空成功')
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有操作日志?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有操作日志?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       }).then(() => {
         exportOperlog(queryParams).then((response) => {
-          const { code, data } = response;
+          const { code, data } = response
           if (code == 200) {
-            this.$modal.msgSuccess("导出成功");
-            this.download(data.path);
+            this.$modal.msgSuccess('导出成功')
+            this.download(data.path)
           } else {
-            this.$modal.msgError("导出失败");
+            this.$modal.msgError('导出失败')
           }
-        });
-      });
+        })
+      })
     },
   },
-};
+}
 </script>
-
diff --git a/src/views/system/article/articleCategory.vue b/src/views/system/article/articleCategory.vue
index 3927c87..cb4a367 100644
--- a/src/views/system/article/articleCategory.vue
+++ b/src/views/system/article/articleCategory.vue
@@ -98,7 +98,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ $t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
         </div>
       </template>
diff --git a/src/views/system/article/manager.vue b/src/views/system/article/manager.vue
index 289321c..b7c3f47 100644
--- a/src/views/system/article/manager.vue
+++ b/src/views/system/article/manager.vue
@@ -35,26 +35,26 @@
       <el-table-column prop="content" label="文章内容" :show-overflow-tooltip="true"> </el-table-column>
       <el-table-column sortable prop="status" align="center" label="状态" width="90">
         <template #default="scope">
-          <el-tag :type="scope.row.status == '2' ? 'danger' : 'success'" disable-transitions>{{ scope.row.status == '2' ? "草稿":"已发布" }}
+          <el-tag :type="scope.row.status == '2' ? 'danger' : 'success'" disable-transitions
+            >{{ scope.row.status == '2' ? '草稿' : '已发布' }}
           </el-tag>
         </template>
       </el-table-column>
 
       <el-table-column prop="createTime" label="创建时间" width="128" :show-overflow-tooltip="true"> </el-table-column>
-      <el-table-column label="操作" align="center" width="190">
+      <el-table-column label="操作" align="center" width="230">
         <template #default="scope">
-          <el-button type="text" icon="view" @click="handleView(scope.row)">查看</el-button>
-          <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:update']">编辑</el-button>
-          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
+          <el-button text size="small" icon="view" @click="handleView(scope.row)">查看</el-button>
+          <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:update']">编辑</el-button>
+          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left: 10px">
             <template #reference>
-              <el-button type="text" icon="delete" v-hasPermi="['system:article:delete']">删除</el-button>
+              <el-button text size="small" icon="delete" v-hasPermi="['system:article:delete']">删除</el-button>
             </template>
           </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
     <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
   </div>
 </template>
 <script setup name="articleindex">
@@ -99,7 +99,7 @@ function getList() {
 /** 重置查询操作 */
 function resetQuery() {
   proxy.resetForm('queryForm')
-	handleQuery()
+  handleQuery()
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -132,4 +132,4 @@ function handleView(row) {
 }
 
 handleQuery()
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/commonLang/index.vue b/src/views/system/commonLang/index.vue
index 48d97a5..ae3b3a9 100644
--- a/src/views/system/commonLang/index.vue
+++ b/src/views/system/commonLang/index.vue
@@ -88,8 +88,8 @@
 
       <el-table-column :label="$t('btn.operate')" align="center" width="140">
         <template #default="scope">
-          <el-button v-hasPermi="['system:lang:edit']" type="success" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
-          <el-button v-hasPermi="['system:lang:delete']" type="danger" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+          <el-button v-hasPermi="['system:lang:edit']" text size="small" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+          <el-button v-hasPermi="['system:lang:delete']" text size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -112,7 +112,9 @@
 
       <el-table-column :label="$t('btn.operate')" align="center" width="140">
         <template #default="scope">
-          <el-button v-hasPermi="['system:lang:edit']" type="success" icon="edit" title="编辑" @click="handleUpdateP(scope.row)"></el-button>
+          <el-button v-hasPermi="['system:lang:edit']" text size="small" icon="edit" title="编辑" @click="handleUpdateP(scope.row)">
+            {{ $t('btn.edit') }}
+          </el-button>
           <!-- <el-button v-hasPermi="['system:lang:delete']" type="danger" icon="delete" title="删除" @click="handleDeleteP(scope.row)"></el-button> -->
         </template>
       </el-table-column>
@@ -163,7 +165,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ $t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
         </div>
       </template>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ec77d28..76bf1c6 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -13,7 +13,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" size="small" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -23,14 +28,18 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="plus" size="small" @click="handleAdd" v-hasPermi="['system:config:add']">{{ $t('btn.add') }}</el-button>
+        <el-button type="primary" plain icon="plus" size="small" @click="handleAdd" v-hasPermi="['system:config:add']">
+          {{ $t('btn.add') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="edit" size="small" :disabled="single" @click="handleUpdate" v-hasPermi="['system:config:edit']"> {{ $t('btn.edit') }}</el-button>
+        <el-button type="success" plain icon="edit" size="small" :disabled="single" @click="handleUpdate" v-hasPermi="['system:config:edit']">
+          {{ $t('btn.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" size="small" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:config:remove']"
-          >{{ $t('btn.delete') }}
+        <el-button type="danger" plain icon="delete" size="small" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:config:remove']">
+          {{ $t('btn.delete') }}
         </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
@@ -58,8 +67,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button size="small" type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']">{{ $t('btn.edit') }}</el-button>
-          <el-button size="small" type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">{{ $t('btn.delete') }} </el-button>
+          <el-button size="small" text icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']">
+            {{ $t('btn.edit') }}
+          </el-button>
+          <el-button size="small" text icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">
+            {{ $t('btn.delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,8 +102,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">{{$t('btn.submit')}}</el-button>
-          <el-button @click="cancel">{{$t('btn.cancel')}}</el-button>
+          <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+          <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 720479c..1fa013e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -32,8 +32,7 @@
       :data="deptList"
       row-key="deptId"
       :default-expand-all="isExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-    >
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="leader" label="负责人" width="100"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
@@ -49,10 +48,20 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:update']">{{ $t('btn.edit') }}</el-button>
-          <el-button type="text" icon="plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">{{ $t('btn.add') }}</el-button>
-          <el-button v-if="scope.row.parentId != 0" type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']"
-            >{{ $t('btn.delete') }}
+          <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:update']">
+            {{ $t('btn.edit') }}
+          </el-button>
+          <el-button text size="small" icon="plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">
+            {{ $t('btn.add') }}
+          </el-button>
+          <el-button
+            text
+            size="small"
+            v-if="scope.row.parentId != 0"
+            icon="delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']">
+            {{ $t('btn.delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -70,8 +79,7 @@
                 :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
                 value-key="deptId"
                 placeholder="选择上级部门"
-                check-strictly
-              />
+                check-strictly />
             </el-form-item>
           </el-col>
           <el-col :lg="12">
@@ -110,7 +118,7 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ $t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
         </div>
       </template>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 6d5aca9..70766e4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -18,7 +18,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -28,16 +29,22 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="plus" @click="handleAdd" v-hasPermi="['system:dict:add']">{{ $t('btn.add') }}</el-button>
+        <el-button type="primary" plain icon="plus" @click="handleAdd" v-hasPermi="['system:dict:add']"> {{ $t('btn.add') }}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">{{ $t('btn.edit') }} </el-button>
+        <el-button type="success" plain icon="edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:dict:edit']">
+          {{ $t('btn.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">{{ $t('btn.delete') }}</el-button>
+        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:dict:remove']">
+          {{ $t('btn.delete') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['system:dict:export']">{{ $t('btn.export') }}</el-button>
+        <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['system:dict:export']">
+          {{ $t('btn.export') }}
+        </el-button>
       </el-col>
       <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -47,7 +54,7 @@
       <el-table-column label="字典编号" align="center" prop="dictId" width="100" sortable />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template #default="scope">
-          <el-button type="text" @click="showDictData(scope.row)">{{ scope.row.dictType }}</el-button>
+          <el-link type="primary" @click="showDictData(scope.row)">{{ scope.row.dictType }}</el-link>
         </template>
       </el-table-column>
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -64,8 +71,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">{{ $t('btn.edit') }}</el-button>
-          <el-button type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">{{ $t('btn.delete') }}</el-button>
+          <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">
+            {{ $t('btn.edit') }}
+          </el-button>
+          <el-button text size="small" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">
+            {{ $t('btn.delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 8b98c1a..583d9c7 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -32,14 +32,14 @@
       row-key="menuId"
       :default-expand-all="isExpandAll"
       border
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-    >
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <el-table-column prop="icon" label="图标" align="center" width="60">
         <template #default="scope">
           <svg-icon :name="scope.row.icon" />
         </template>
       </el-table-column>
+      <el-table-column prop="menuId" label="菜单id" :show-overflow-tooltip="true" width="60" align="center"></el-table-column>
       <el-table-column prop="menuType" label="类型" align="center" width="80">
         <template #default="scope">
           <el-tag type="danger" v-if="scope.row.menuType == 'M' && scope.row.isFrame == 1">链接</el-tag>
@@ -52,17 +52,21 @@
       <el-table-column prop="orderNum" label="排序" width="90" sortable align="center">
         <template #default="scope">
           <span v-show="editIndex != scope.$index" @click="editCurrRow(scope.$index)">{{ scope.row.orderNum }}</span>
-          <el-input :id="scope.$index" v-show="editIndex == scope.$index" v-model="scope.row.orderNum" @blur="handleChangeSort(scope.row)"></el-input>
+          <el-input
+            :ref="setColumnsRef"
+            v-show="editIndex == scope.$index"
+            v-model="scope.row.orderNum"
+            @blur="handleChangeSort(scope.row)"></el-input>
         </template>
       </el-table-column>
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="visible" label="显示" width="70">
+      <el-table-column prop="visible" label="显示" width="70" align="center">
         <template #default="scope">
           <dict-tag :options="sys_show_hide" :value="scope.row.visible" />
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态" width="80">
+      <el-table-column prop="status" label="状态" width="80" align="center">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
         </template>
@@ -72,11 +76,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="170" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">{{ $t('btn.edit') }}</el-button>
-          <el-button type="text" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">{{ $t('btn.add') }}</el-button>
-          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">{{ $t('btn.delete') }}</el-button>
+          <el-button text size="small" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']"></el-button>
+          <el-button text size="small" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']"></el-button>
+          <el-button text size="small" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']"></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -93,8 +97,7 @@
                 :props="{ checkStrictly: true, value: 'menuId', label: 'menuName', emitPath: false }"
                 placeholder="请选择上级菜单"
                 clearable
-                v-model="form.parentId"
-              >
+                v-model="form.parentId">
                 <template #default="{ node, data }">
                   <span>{{ data.menuName }}</span>
                   <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -444,14 +447,21 @@ function handleDelete(row) {
     .catch(() => {})
 }
 // ******************自定义编辑 start **********************
-
+// 动态ref设置值
+const columnRefs = ref([])
+const setColumnsRef = (el) => {
+  if (el) {
+    columnRefs.value.push(el)
+  }
+}
 const editIndex = ref(-1)
 // 显示编辑排序
 function editCurrRow(rowId) {
   editIndex.value = rowId
 
   setTimeout(() => {
-    document.getElementById(rowId).focus()
+    // document.getElementById(rowId).focus()
+    columnRefs.value[rowId].focus()
   }, 100)
 }
 // 保存排序
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 9cc9b98..28de15e 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -58,9 +58,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="bell" @click="handleNotice(scope.row)" v-hasPermi="['system:notice:edit']">通知</el-button>
-          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
-          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']">删除</el-button>
+          <el-button size="small" text icon="bell" @click="handleNotice(scope.row)" v-hasPermi="['system:notice:edit']"> 通知</el-button>
+          <el-button size="small" text icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']"> 修改</el-button>
+          <el-button size="small" text icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']"> 删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index eabfb10..1c13df9 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -23,10 +23,14 @@
         <el-button type="primary" plain icon="plus" @click="handleAdd" v-hasPermi="['system:post:add']">{{ $t('btn.add') }}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:post:edit']">{{ $t('btn.edit') }}</el-button>
+        <el-button type="success" plain icon="edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:post:edit']">
+          {{ $t('btn.edit') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:post:remove']">{{ $t('btn.delete') }}</el-button>
+        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:post:remove']">
+          {{ $t('btn.delete') }}
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="download" @click="handleExport" v-hasPermi="['system:post:export']">{{ $t('btn.export') }}</el-button>
@@ -52,8 +56,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button type="text" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">{{ $t('btn.edit') }}</el-button>
-          <el-button type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">{{ $t('btn.delete') }}</el-button>
+          <el-button text size="small" icon="edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">
+            {{ $t('btn.edit') }}
+          </el-button>
+          <el-button text size="small" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">
+            {{ $t('btn.delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4bcba14..28c2447 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -38,8 +38,7 @@
             :disabled="scope.row.roleKey == 'admin'"
             active-value="0"
             inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+            @change="handleStatusChange(scope.row)"></el-switch>
         </template>
       </el-table-column>
       <el-table-column label="用户个数" align="center" prop="userNum" width="90" />
@@ -48,18 +47,27 @@
       <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
           <div v-if="scope.row.roleKey != 'admin'">
-            <el-button size="small" type="text" icon="edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
-              {{ $t('btn.edit') }}
+            <el-button
+              size="small"
+              text
+              icon="edit"
+              :title="$t('btn.edit')"
+              @click.stop="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']">
             </el-button>
-            <el-button size="small" type="text" icon="delete" @click.stop="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">
-              {{ $t('btn.delete') }}
+            <el-button
+              size="small"
+              text
+              icon="delete"
+              :title="$t('btn.delete')"
+              @click.stop="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']">
             </el-button>
 
             <el-dropdown
               size="small"
               @command="(command) => handleCommand(command, scope.row)"
-              v-hasPermi="['system:role:edit', 'system:role:authorize', 'system:roleusers:list']"
-            >
+              v-hasPermi="['system:role:edit', 'system:role:authorize', 'system:roleusers:list']">
               <span class="el-dropdown-link">
                 {{ $t('btn.more') }}
                 <el-icon class="el-icon--right">
@@ -101,8 +109,7 @@
             :check-strictly="!form.menuCheckStrictly"
             empty-text="加载中，请稍后"
             :filter-node-method="menuFilterNode"
-            :props="defaultProps"
-          ></el-tree>
+            :props="defaultProps"></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -160,8 +167,7 @@
                 node-key="id"
                 :check-strictly="!form.deptCheckStrictly"
                 empty-text="加载中，请稍候"
-                :props="defaultProps"
-              ></el-tree>
+                :props="defaultProps"></el-tree>
             </el-form-item>
           </el-col>
           <el-col :lg="24">
diff --git a/src/views/system/roleusers/index.vue b/src/views/system/roleusers/index.vue
index 10421ba..76bdea2 100644
--- a/src/views/system/roleusers/index.vue
+++ b/src/views/system/roleusers/index.vue
@@ -13,8 +13,7 @@
           placeholder="请输入用户名称"
           clearable
           prefix-icon="search"
-          @keyup.enter="searchRoleUser"
-        />
+          @keyup.enter="searchRoleUser" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="searchRoleUser">{{ $t('btn.search') }}</el-button>
@@ -45,8 +44,7 @@
       @selection-change="handleCancelSelectionChange"
       row-key="userId"
       stripe
-      border
-    >
+      border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="userId" align="center" label="用户Id" width="150" />
       <el-table-column prop="userName" align="center" label="用户名" width="150" />
@@ -60,12 +58,12 @@
       <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
-            type="text"
+            text
+            size="small"
             icon="el-icon-circle-close"
             @click="handleCancelPerm(scope.row)"
             v-if="scope.row.userId != 1"
-            v-hasPermi="['system:roleusers:del']"
-          >
+            v-hasPermi="['system:roleusers:del']">
             {{ $t('btn.cancel') }}{{ $t('btn.authorize') }}
           </el-button>
         </template>
@@ -75,8 +73,7 @@
       v-model:total="roleUserCount"
       v-model:page="roleUserQueryParams.pageNum"
       v-model:limit="roleUserQueryParams.pageSize"
-      @pagination="getRoleUser"
-    />
+      @pagination="getRoleUser" />
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog title="添加用户" v-model="open" append-to-body @close="cancel">
@@ -87,8 +84,7 @@
             placeholder="请输入用户名称"
             clearable
             prefix-icon="search"
-            @keyup.enter="handleSearchRoleUser"
-          />
+            @keyup.enter="handleSearchRoleUser" />
         </el-form-item>
       </el-form>
       <el-row>
@@ -101,8 +97,7 @@
             row-key="userId"
             stripe
             border
-            :height="tableHeight * 0.5"
-          >
+            :height="tableHeight * 0.5">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column prop="userId" align="center" label="用户编号" width="150" />
             <el-table-column prop="userName" align="center" label="用户名称" width="150" />
@@ -117,8 +112,7 @@
             :total="dataUserCount"
             v-model:page="userQueryParams.pageNum"
             v-model:limit="userQueryParams.pageSize"
-            @pagination="handleGetUserTable"
-          />
+            @pagination="handleGetUserTable" />
         </el-col>
       </el-row>
       <template #footer>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e828ccd..0bd2038 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -14,8 +14,7 @@
             :filter-node-method="filterNode"
             ref="deptTreeRef"
             default-expand-all
-            @node-click="handleNodeClick"
-          />
+            @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
@@ -39,8 +38,7 @@
               type="daterange"
               range-separator="-"
               start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+              end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="search" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -91,23 +89,16 @@
           <el-table-column label="创建时间" align="center" prop="createTime" width="160"></el-table-column>
           <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-button v-if="scope.row.userId !== 1" type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">
+              <el-button v-if="scope.row.userId !== 1" text icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">
+              </el-button>
+              <el-button v-if="scope.row.userId !== 1" text icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">
               </el-button>
               <el-button
                 v-if="scope.row.userId !== 1"
-                type="text"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >
-              </el-button>
-              <el-button
-                v-if="scope.row.userId !== 1"
-                type="text"
+                text
                 icon="Key"
                 @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"
-              ></el-button>
+                v-hasPermi="['system:user:resetPwd']"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -142,8 +133,7 @@
                 :props="{ value: 'id', label: 'label', children: 'children' }"
                 value-key="id"
                 placeholder="请选择归属部门"
-                check-strictly
-              />
+                check-strictly />
             </el-form-item>
           </el-col>
           <el-col :lg="12">
@@ -214,8 +204,7 @@
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
         :auto-upload="false"
-        drag
-      >
+        drag>
         <el-icon class="el-icon--upload">
           <upload-filled />
         </el-icon>
diff --git a/src/views/tool/file/index.vue b/src/views/tool/file/index.vue
index 48e98ca..46751d3 100644
--- a/src/views/tool/file/index.vue
+++ b/src/views/tool/file/index.vue
@@ -12,8 +12,7 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          placeholder="请选择上传时间"
-        ></el-date-picker>
+          placeholder="请选择上传时间"></el-date-picker>
       </el-form-item>
       <el-form-item label="" prop="storeType">
         <el-select v-model="queryParams.storeType" placeholder="请选择存储类型" clearable="">
@@ -58,8 +57,7 @@
             :hide-on-click-modal="true"
             fit="contain"
             lazy
-            class="el-avatar"
-          >
+            class="el-avatar">
             <template #error>
               <i class="document" />
             </template>
@@ -76,19 +74,19 @@
       </el-table-column>
       <el-table-column prop="create_by" label="操作人" align="center" />
       <el-table-column prop="create_time" label="创建日期" align="center" width="150" />
-      <el-table-column label="操作" align="center" width="200">
+      <el-table-column label="操作" align="center" width="230">
         <template #default="scope">
-          <el-button type="text" icon="view" @click="handleView(scope.row)">{{ $t('btn.view') }}</el-button>
+          <el-button text size="small" icon="view" @click="handleView(scope.row)">{{ $t('btn.view') }}</el-button>
           <el-button
             class="copy-btn-main"
             icon="document-copy"
-            type="text"
+            text
+            size="small"
             v-clipboard:copy="scope.row.accessUrl"
-            v-clipboard:success="clipboardSuccess"
-          >
+            v-clipboard:success="clipboardSuccess">
             {{ $t('btn.copy') }}
           </el-button>
-          <el-button v-hasPermi="['tool:file:delete']" type="text" icon="delete" @click="handleDelete(scope.row)">
+          <el-button v-hasPermi="['tool:file:delete']" text size="small" icon="delete" @click="handleDelete(scope.row)">
             {{ $t('btn.delete') }}
           </el-button>
         </template>
@@ -132,14 +130,13 @@
               :drag="true"
               :data="uploadData"
               :autoUpload="false"
-              @success="handleUploadSuccess"
-            />
+              @success="handleUploadSuccess" />
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ $t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitUpload">{{ $t('btn.submit') }}</el-button>
         </div>
       </template>
@@ -188,10 +185,9 @@
               <el-button
                 class="copy-btn-main"
                 icon="document-copy"
-                type="text"
+                text
                 v-clipboard:copy="formView.accessUrl"
-                v-clipboard:success="clipboardSuccess"
-              >
+                v-clipboard:success="clipboardSuccess">
                 {{ $t('btn.copy') }}
               </el-button>
             </el-form-item>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index bdeae53..c0cf964 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -24,8 +24,7 @@
       border
       @selection-change="handleSelectionChange"
       highlight-current-row
-      height="480px"
-    >
+      height="480px">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template #default="scope">
@@ -41,11 +40,11 @@
       <el-table-column prop="updateTime" label="更新时间" sortable />
       <el-table-column label="操作" align="center" width="320">
         <template #default="scope">
-          <el-button type="text" icon="view" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']">预览</el-button>
-          <el-button type="text" icon="edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']">编辑</el-button>
-          <el-button type="text" icon="delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']">删除</el-button>
-          <el-button type="text" icon="refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']">同步</el-button>
-          <el-button type="text" icon="download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']">生成代码 </el-button>
+          <el-link type="primary" icon="view" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']">预览</el-link>
+          <el-link type="primary" icon="edit" class="ml10" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']">编辑</el-link>
+          <el-link type="primary" icon="delete" class="ml10" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']">删除</el-link>
+          <el-link type="primary" icon="refresh" class="ml10" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']">同步</el-link>
+          <el-link type="primary" icon="download" class="ml10" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']">生成代码 </el-link>
         </template>
       </el-table-column>
     </el-table>