From d27e56cd7fb64c503de8aa81bc9a639c1734ca24 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 27 Jun 2024 16:55:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../completionStatusIntrBM/components/bmBarComplete.vue  | 9 ++++++++-
 src/views/report/components/bmLineBar.vue                | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/report/completionStatusIntrBM/components/bmBarComplete.vue b/src/views/report/completionStatusIntrBM/components/bmBarComplete.vue
index 460d48a..535636e 100644
--- a/src/views/report/completionStatusIntrBM/components/bmBarComplete.vue
+++ b/src/views/report/completionStatusIntrBM/components/bmBarComplete.vue
@@ -30,7 +30,14 @@
     </div>
     <!-- 图 -->
     <div>
-      <div style="display: inline-block; width: 79%; vertical-align: top">
+      <div
+        style="
+          display: inline-block;
+          width: 79%;
+          vertical-align: top;
+          padding-right: 20px;
+        "
+      >
         <base-chart
           v-show="this.chartMsg1.series[0].data.length > 0"
           :chartHeight="chartHeight"
diff --git a/src/views/report/components/bmLineBar.vue b/src/views/report/components/bmLineBar.vue
index 378142a..d1d69c7 100644
--- a/src/views/report/components/bmLineBar.vue
+++ b/src/views/report/components/bmLineBar.vue
@@ -71,7 +71,7 @@ export default {
                 "<br/>" +
                 `${
                   params[i].seriesType === "line"
-                    ? '<img width="10" height="10" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                    ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
                     : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
                 }` +
                 `<span style='display:inline-block;width:180px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +

From fc21359f8f7d1508c7364427e70a252b566c6416 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 28 Jun 2024 11:09:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue       |  17 +--
 src/views/system/operatelog/index.vue |   2 +-
 src/views/system/user/index.vue       | 192 +++++++++++++++-----------
 3 files changed, 119 insertions(+), 92 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f629800..9fdefa6 100644
--- a/src/views/system/menu/index.vue
+++ b/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="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级菜单">
@@ -205,6 +205,7 @@
                 v-model="form.sort"
                 controls-position="right"
                 :min="0"
+                style="width: 100%"
               />
             </el-form-item>
           </el-col>
@@ -331,8 +332,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </base-dialog>
   </div>
@@ -437,6 +438,12 @@ export default {
         },
       ],
       tableBtn: [
+        this.$auth.hasPermi("system:menu:create")
+          ? {
+              type: "add",
+              btnName: "新增",
+            }
+          : undefined,
         this.$auth.hasPermi("system:menu:update")
           ? {
               type: "edit",
@@ -449,12 +456,6 @@ export default {
               btnName: "删除",
             }
           : undefined,
-        this.$auth.hasPermi("system:menu:create")
-          ? {
-              type: "add",
-              btnName: "新增",
-            }
-          : undefined,
       ].filter((v) => v),
       tableProps,
       heightNum: 210,
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 127073a..719e9a5 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -83,7 +83,7 @@
               {{ parseTime(form.startTime) }} | {{ form.duration }} ms
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="操作结果：">
               <div v-if="form.resultCode === 0">
                 正常 | {{ form.resultData }}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 27feab5..35261d7 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="user-container">
     <!-- <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
     <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
     <doc-alert
@@ -8,40 +8,43 @@
     /> -->
     <!-- 搜索工作栏 -->
 
-    <el-row :gutter="20">
+    <el-row :gutter="8" class="user-box">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
+        <div class="user-box-left">
+          <div class="head-container">
+            <el-input
+              v-model="deptName"
+              placeholder="请输入部门名称"
+              clearable
+              size="small"
+              prefix-icon="el-icon-search"
+              style="margin-bottom: 20px"
+            />
+          </div>
+          <div class="head-container">
+            <el-tree
+              :data="deptOptions"
+              :props="defaultProps"
+              :expand-on-click-node="false"
+              :filter-node-method="filterNode"
+              ref="tree"
+              default-expand-all
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </div>
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <search-bar
-          :formConfigs="formConfig"
-          ref="searchBarForm"
-          @headBtnClick="buttonClick"
-        />
-        <!-- <el-form
+        <div class="user-box-right">
+          <search-bar
+            :formConfigs="formConfig"
+            ref="userSearchBarForm"
+            @headBtnClick="buttonClick"
+          />
+          <!-- <el-form
           :model="queryParams"
           ref="queryForm"
           size="small"
@@ -104,7 +107,7 @@
           </el-form-item>
         </el-form> -->
 
-        <!-- <el-row :gutter="10" class="mb8">
+          <!-- <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -144,25 +147,25 @@
           ></right-toolbar>
         </el-row> -->
 
-        <!-- 列表 -->
-        <base-table
-          :page="queryParams.pageNo"
-          :limit="queryParams.pageSize"
-          :table-props="tableProps"
-          :table-data="userList"
-          :max-height="tableH"
-          @emitFun="handleStatusChange"
-        >
-          <method-btn
-            v-if="tableBtn.length"
-            slot="handleBtn"
-            :width="220"
-            label="操作"
-            :method-list="tableBtn"
-            @clickBtn="handleClick"
-          />
-        </base-table>
-        <!-- <el-table v-loading="loading" :data="userList">
+          <!-- 列表 -->
+          <base-table
+            :page="queryParams.pageNo"
+            :limit="queryParams.pageSize"
+            :table-props="tableProps"
+            :table-data="userList"
+            :max-height="tableH"
+            @emitFun="handleStatusChange"
+          >
+            <method-btn
+              v-if="tableBtn.length"
+              slot="handleBtn"
+              :width="220"
+              label="操作"
+              :method-list="tableBtn"
+              @clickBtn="handleClick"
+            />
+          </base-table>
+          <!-- <el-table v-loading="loading" :data="userList">
           <el-table-column
             label="用户编号"
             align="center"
@@ -288,18 +291,19 @@
           </el-table-column>
         </el-table> -->
 
-        <pagination
-          :page.sync="queryParams.pageNo"
-          :limit.sync="queryParams.pageSize"
-          :total="total"
-          @pagination="getList"
-        />
+          <pagination
+            :page.sync="queryParams.pageNo"
+            :limit.sync="queryParams.pageSize"
+            :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="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickname">
@@ -412,8 +416,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </base-dialog>
 
@@ -448,7 +452,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >下载模板</el-link
+            >导出模板</el-link
           >
         </div>
       </el-upload>
@@ -606,6 +610,11 @@ export default {
           name: "search",
           color: "primary",
         },
+        {
+          type: "button",
+          btnName: "重置",
+          name: "cancel",
+        },
         {
           type: this.$auth.hasPermiOr([
             "system:user:create",
@@ -615,18 +624,11 @@ 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: "warning",
+          color: "primary",
           plain: true,
         },
         {
@@ -636,20 +638,15 @@ 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")
-          ? {
-              type: "edit",
-              btnName: "修改",
-            }
-          : undefined,
-        this.$auth.hasPermi("system:user:delete")
-          ? {
-              type: "delete",
-              btnName: "删除",
-            }
-          : undefined,
         this.$auth.hasPermi("system:user:update-password")
           ? {
               type: "reset",
@@ -662,6 +659,18 @@ export default {
               btnName: "分配角色",
             }
           : undefined,
+        this.$auth.hasPermi("system:user:update")
+          ? {
+              type: "edit",
+              btnName: "修改",
+            }
+          : undefined,
+        this.$auth.hasPermi("system:user:delete")
+          ? {
+              type: "delete",
+              btnName: "删除",
+            }
+          : undefined,
       ].filter((v) => v),
       tableProps,
       // 遮罩层
@@ -803,6 +812,15 @@ 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;
@@ -1033,7 +1051,7 @@ export default {
       this.upload.title = "用户导入";
       this.upload.open = true;
     },
-    /** 下载模板操作 */
+    /** 导出模板操作 */
     importTemplate() {
       importTemplate().then((response) => {
         this.$download.excel(response, "用户导入模板.xls");
@@ -1090,11 +1108,19 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.app-container {
+.user-container {
   width: 100%;
   height: calc(100vh - 120px - 8px);
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 8px;
+  background-color: #f2f4f9;
+
+  .user-box {
+    .user-box-left,
+    .user-box-right {
+      background-color: #fff;
+      padding: 8px;
+      border-radius: 8px;
+      height: calc(100vh - 128px);
+    }
+  }
 }
 </style>