src/views/system/menu/index.vue

@@ -137,7 +137,7 @@
 
     <!-- 添加或修改菜单对话框 -->
     <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级菜单">
@@ -205,7 +205,6 @@
                 v-model="form.sort"
                 controls-position="right"
                 :min="0"
-                style="width: 100%"
               />
             </el-form-item>
           </el-col>
@@ -332,8 +331,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </base-dialog>
   </div>
@@ -438,12 +437,6 @@ export default {
         },
       ],
       tableBtn: [
-        this.$auth.hasPermi("system:menu:create")
-          ? {
-              type: "add",
-              btnName: "新增",
-            }
-          : undefined,
         this.$auth.hasPermi("system:menu:update")
           ? {
               type: "edit",
@@ -456,6 +449,12 @@ export default {
               btnName: "删除",
             }
           : undefined,
+        this.$auth.hasPermi("system:menu:create")
+          ? {
+              type: "add",
+              btnName: "新增",
+            }
+          : undefined,
       ].filter((v) => v),
       tableProps,
       heightNum: 210,

src/views/system/operatelog/index.vue

@@ -83,7 +83,7 @@
               {{ parseTime(form.startTime) }} | {{ form.duration }} ms
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="操作结果：">
               <div v-if="form.resultCode === 0">
                 正常 | {{ form.resultData }}

src/views/system/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="user-container">
+  <div class="app-container">
     <!-- <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
     <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
     <doc-alert
@@ -8,10 +8,9 @@
     /> -->
     <!-- 搜索工作栏 -->
 
-    <el-row :gutter="8" class="user-box">
+    <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
-        <div class="user-box-left">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -34,14 +33,12 @@
             @node-click="handleNodeClick"
           />
         </div>
-        </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <div class="user-box-right">
         <search-bar
           :formConfigs="formConfig"
-            ref="userSearchBarForm"
+          ref="searchBarForm"
           @headBtnClick="buttonClick"
         />
         <!-- <el-form
@@ -297,13 +294,12 @@
           :total="total"
           @pagination="getList"
         />
-        </div>
       </el-col>
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
     <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickname">
@@ -416,8 +412,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </base-dialog>
 
@@ -452,7 +448,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >导出模板</el-link
+            >下载模板</el-link
           >
         </div>
       </el-upload>
@@ -610,11 +606,6 @@ export default {
           name: "search",
           color: "primary",
         },
-        {
-          type: "button",
-          btnName: "重置",
-          name: "cancel",
-        },
         {
           type: this.$auth.hasPermiOr([
             "system:user:create",
@@ -624,11 +615,18 @@ export default {
             ? "separate"
             : "",
         },
+        {
+          type: this.$auth.hasPermi("system:user:create") ? "button" : "",
+          btnName: "新增",
+          name: "addNew",
+          color: "success",
+          plain: true,
+        },
         {
           type: this.$auth.hasPermi("system:user:import") ? "button" : "",
           btnName: "导入",
           name: "import",
-          color: "primary",
+          color: "warning",
           plain: true,
         },
         {
@@ -638,27 +636,8 @@ export default {
           color: "primary",
           plain: true,
         },
-        {
-          type: this.$auth.hasPermi("system:user:create") ? "button" : "",
-          btnName: "新增",
-          name: "addNew",
-          color: "success",
-          plain: true,
-        },
       ],
       tableBtn: [
-        this.$auth.hasPermi("system:user:update-password")
-          ? {
-              type: "reset",
-              btnName: "重置密码",
-            }
-          : undefined,
-        this.$auth.hasPermi("system:permission:assign-user-role")
-          ? {
-              type: "role",
-              btnName: "分配角色",
-            }
-          : undefined,
         this.$auth.hasPermi("system:user:update")
           ? {
               type: "edit",
@@ -671,6 +650,18 @@ export default {
               btnName: "删除",
             }
           : undefined,
+        this.$auth.hasPermi("system:user:update-password")
+          ? {
+              type: "reset",
+              btnName: "重置密码",
+            }
+          : undefined,
+        this.$auth.hasPermi("system:permission:assign-user-role")
+          ? {
+              type: "role",
+              btnName: "分配角色",
+            }
+          : undefined,
       ].filter((v) => v),
       tableProps,
       // 遮罩层
@@ -812,15 +803,6 @@ export default {
         case "search":
           this.handleQuery(val);
           break;
-        case "cancel":
-          this.$refs["userSearchBarForm"].resetForm();
-          this.queryParams.pageNo = 1;
-          this.queryParams.username = "";
-          this.queryParams.mobile = "";
-          this.queryParams.status = "";
-          this.queryParams.createTime = [];
-          this.getList();
-          break;
         case "addNew":
           this.handleAdd();
           break;
@@ -1051,7 +1033,7 @@ export default {
       this.upload.title = "用户导入";
       this.upload.open = true;
     },
-    /** 导出模板操作 */
+    /** 下载模板操作 */
     importTemplate() {
       importTemplate().then((response) => {
         this.$download.excel(response, "用户导入模板.xls");
@@ -1108,19 +1090,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.user-container {
+.app-container {
   width: 100%;
   height: calc(100vh - 120px - 8px);
-  background-color: #f2f4f9;
-
-  .user-box {
-    .user-box-left,
-    .user-box-right {
   background-color: #fff;
-      padding: 8px;
   border-radius: 8px;
-      height: calc(100vh - 128px);
-    }
-  }
+  padding: 8px;
 }
 </style>