feat: 操作日志添加按钮级权限管理

src/api/monitor.ts

@@ -69,22 +69,57 @@ export const deleteUserLoginLogListAPI = (data: { ids: string[] }) => {
 
 // ------------------------操作日志相关----------------------------------------
 
+/**获取操作日志参数 */
+type GetUserOperationParams = {
+  /**页码 */
+  page: number;
+  /**每页数量 */
+  pageSize: number;
+  /**用户账号 */
+  username?: string;
+  /**用户昵称 */
+  nickname?: string;
+  /**部门ID */
+  department_id?: string;
+  /**操作名称 */
+  name?: string;
+  /**操作状态 */
+  status?: number | string;
+  /**操作类型 */
+  type?: number | string;
+  /**开始时间 */
+  startTime?: string | number;
+  /**结束时间 */
+  endTime?: string | number;
+};
+
 /**
  * 获取用户操作日志
  */
-export const getUserOperationsAPI = (params: {
+export const getUserOperationsAPI = (params: GetUserOperationParams) => {
-  page: number;
-  pageSize: number;
-}) => {
   return http.request<QueryListResult<OperationLogInfo>>(
     "GET",
     "/api/log/operation",
     {
-      params
+      params: filterEmptyObject(params)
     }
   );
 };
 
+/**
+ * 删除操作日志
+ * @returns
+ */
+export const deleteUserOperationsAPI = (id: string) => {
+  return http.request<null>("delete", `/api/log/delete/operation/${id}`);
+};
+/**批量删除操作日志 */
+export const deleteUserOperationsListAPI = (data: { ids: string[] }) => {
+  return http.request<null>("delete", `/api/log/deleteList/operation`, {
+    data
+  });
+};
+
 // ------------------------服务相关----------------------------------------
 
 /**

src/views/monitor/login/utils/hook.tsx

@@ -108,7 +108,7 @@ export const useLogin = (tableRef: Ref) => {
       prop: "online",
       minWidth: 100,
       cellRenderer: ({ row, props }) => (
-        <el-tag size={props.size} type={row.online ? "success" : "primary"}>
+        <el-tag size={props.size} type={row.online ? "success" : ""}>
           {row.online ? "在线" : "离线"}
         </el-tag>
       )

src/views/monitor/operation/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import dayjs from "dayjs";
 import { ref, reactive, computed } from "vue";
-import { useOperation } from "./hook";
+import { useOperation } from "./utils/hook";
 import { getPickerShortcuts } from "../utils";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
@@ -12,7 +12,7 @@ import View from "@iconify-icons/ep/view";
 import Delete from "@iconify-icons/ep/delete";
 import Refresh from "@iconify-icons/ep/refresh";
 import { OperationLogInfo } from "types/monitor";
-
+import { hasAuth } from "@/utils/auth";
 defineOptions({
   name: "OperationLog"
 });
@@ -86,11 +86,12 @@ const {
   dataList,
   pagination,
   selectedNum,
+  departments,
   onSearch,
-  clearAll,
   resetForm,
   onbatchDel,
   getOperationName,
+  handleDelete,
   handleSizeChange,
   onSelectionCancel,
   handleCurrentChange,
@@ -106,33 +107,89 @@ const {
       :model="form"
       class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
     >
-      <el-form-item label="所属模块" prop="module">
+      <el-form-item label="操作名称" prop="name">
         <el-input
-          v-model="form.module"
+          v-model="form.name"
-          placeholder="请输入所属模块"
+          placeholder="请输入操作名称"
           clearable
-          class="!w-[170px]"
+          class="!w-[200px]"
+        />
+      </el-form-item>
+      <el-form-item label="操作类型" prop="type">
+        <el-select
+          v-model="form.type"
+          placeholder="请选择操作类型~"
+          clearable
+          class="!w-[200px]"
+        >
+          <el-option label="查询" :value="1" />
+          <el-option label="新增" :value="2" />
+          <el-option label="修改" :value="3" />
+          <el-option label="删除" :value="4" />
+          <el-option label="授权" :value="5" />
+          <el-option label="导出" :value="6" />
+          <el-option label="导入" :value="7" />
+          <el-option label="强退" :value="8" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户账号" prop="username">
+        <el-input
+          v-model="form.username"
+          placeholder="请输入用户账号~"
+          clearable
+          class="!w-[200px]"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="nickname">
+        <el-input
+          v-model="form.nickname"
+          placeholder="请输入用户名称~"
+          clearable
+          class="!w-[200px]"
         />
       </el-form-item>
       <el-form-item label="操作状态" prop="status">
         <el-select
           v-model="form.status"
-          placeholder="请选择"
+          placeholder="请选择操作状态~"
           clearable
-          class="!w-[150px]"
+          class="!w-[200px]"
         >
-          <el-option label="成功" value="1" />
+          <el-option label="成功" :value="1" />
-          <el-option label="失败" value="0" />
+          <el-option label="失败" :value="0" />
         </el-select>
       </el-form-item>
+      <el-form-item label="所属部门：" prop="department_id">
+        <el-cascader
+          v-model="form.department_id"
+          class="!w-[200px]"
+          :options="departments"
+          :props="{
+            value: 'id',
+            label: 'name',
+            emitPath: false,
+            checkStrictly: true
+          }"
+          clearable
+          filterable
+          placeholder="请选择所属部门~"
+        >
+          <template #default="{ node, data }">
+            <span>{{ data.name }}</span>
+            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+          </template>
+        </el-cascader>
+      </el-form-item>
       <el-form-item label="操作时间" prop="operatingTime">
         <el-date-picker
-          v-model="form.operatingTime"
+          v-model="form.operationTime"
           :shortcuts="getPickerShortcuts()"
           type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期时间"
           end-placeholder="结束日期时间"
+          value-format="x"
+          unlink-panels
         />
       </el-form-item>
       <el-form-item>
@@ -151,15 +208,6 @@ const {
     </el-form>
 
     <PureTableBar title="操作日志" :columns="columns" @refresh="onSearch">
-      <template #buttons>
-        <!-- <el-popconfirm title="确定要删除所有日志数据吗？" @confirm="clearAll">
-          <template #reference>
-            <el-button type="danger" :icon="useRenderIcon(Delete)">
-              清空日志
-            </el-button>
-          </template>
-        </el-popconfirm> -->
-      </template>
       <template v-slot="{ size, dynamicColumns }">
         <div
           v-if="selectedNum > 0"
@@ -177,9 +225,18 @@ const {
               {{ t("buttons:Deselect") }}
             </el-button>
           </div>
-          <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
+          <el-popconfirm
+            v-if="hasAuth('operation:btn:delete')"
+            title="是否确认删除?"
+            @confirm="onbatchDel"
+          >
             <template #reference>
-              <el-button type="danger" text class="mr-1">
+              <el-button
+                type="danger"
+                text
+                class="mr-1"
+                :disabled="selectedNum < 0 || !hasAuth('operation:btn:delete')"
+              >
                 {{ t("buttons:DeleteInBatches") }}
               </el-button>
             </template>
@@ -211,11 +268,29 @@ const {
               link
               type="primary"
               :size="size"
+              :disabled="!hasAuth('operation:btn:info')"
               :icon="useRenderIcon(View)"
               @click="onDetailHandle(row)"
             >
               {{ t("buttons:Details") }}
             </el-button>
+            <el-popconfirm
+              :title="`是否删除这条操作记录?`"
+              @confirm="handleDelete(row)"
+            >
+              <template #reference>
+                <el-button
+                  class="reset-margin"
+                  link
+                  type="danger"
+                  :disabled="!hasAuth('operation:btn:delete')"
+                  :size="size"
+                  :icon="useRenderIcon(Delete)"
+                >
+                  {{ t("buttons:Delete") }}
+                </el-button>
+              </template>
+            </el-popconfirm>
           </template>
         </pure-table>
       </template>

src/views/monitor/operation/utils/hook.tsx

@@ -1,19 +1,29 @@
 import dayjs from "dayjs";
-import Detail from "./components/form.vue";
+// import Detail from "../components/form.vue";
 import { message } from "@/utils/message";
-import { addDialog } from "@/components/ReDialog";
+// import { addDialog } from "@/components/ReDialog";
-import { getKeyList } from "@pureadmin/utils";
+import { getKeyList, handleTree } from "@pureadmin/utils";
-import { getUserOperationsAPI } from "@/api/monitor";
+import {
+  getUserOperationsAPI,
+  deleteUserOperationsAPI,
+  deleteUserOperationsListAPI
+} from "@/api/monitor";
 import { usePublicHooks } from "@/views/system/hooks";
 import type { PaginationProps } from "@pureadmin/table";
-import { type Ref, reactive, ref, onMounted, h } from "vue";
+import { type Ref, reactive, ref, onMounted } from "vue";
 import type { OperationLogInfo } from "types/monitor";
+import type { DepartmentInfo } from "types/system";
+import { getDepartmentListAPI } from "@/api/system";
 
 export function useOperation(tableRef: Ref) {
   const form = reactive({
-    module: "",
+    name: "",
+    type: "",
+    username: "",
+    nickname: "",
     status: "",
-    operatingTime: ""
+    department_id: "",
+    operationTime: ""
   });
   const dataList = ref<OperationLogInfo[]>([]);
   const loading = ref(true);
@@ -97,18 +107,19 @@ export function useOperation(tableRef: Ref) {
     },
     {
       label: "操作人员账号",
-      prop: "operator_name",
+      prop: "operator_name"
-      minWidth: 100
     },
     {
       label: "操作人员昵称",
-      prop: "operator_nickname",
+      prop: "operator_nickname"
-      minWidth: 100
+    },
+    {
+      label: "所属部门",
+      prop: "department_name"
     },
     {
       label: "操作名称",
-      prop: "operation_name",
+      prop: "operation_name"
-      minWidth: 100
     },
     {
       label: "操作类型",
@@ -182,7 +193,7 @@ export function useOperation(tableRef: Ref) {
     {
       label: "操作",
       fixed: "right",
-      width: 100,
+      width: 180,
       slot: "operation"
     }
   ];
@@ -190,24 +201,42 @@ export function useOperation(tableRef: Ref) {
   const handleSizeChange = async (val: number) => {
     const res = await getUserOperationsAPI({
       page: pagination.currentPage,
-      pageSize: val
+      pageSize: val,
+      name: form.name,
+      type: form.type,
+      username: form.username,
+      nickname: form.nickname,
+      status: form.status,
+      department_id: form.department_id,
+      startTime: form.operationTime[0] ? form.operationTime[0] : null,
+      endTime: form.operationTime[1] ? form.operationTime[1] : null
     });
     if (res.success) {
       dataList.value = res.data.result;
       pagination.total = res.data.total;
       pagination.currentPage = res.data.page;
+      pagination.pageSize = res.data.pageSize;
     }
   };
 
   const handleCurrentChange = async (val: number) => {
     const res = await getUserOperationsAPI({
       page: val,
-      pageSize: pagination.pageSize
+      pageSize: pagination.pageSize,
+      name: form.name,
+      type: form.type,
+      username: form.username,
+      nickname: form.nickname,
+      status: form.status,
+      department_id: form.department_id,
+      startTime: form.operationTime[0] ? form.operationTime[0] : null,
+      endTime: form.operationTime[1] ? form.operationTime[1] : null
     });
     if (res.success) {
       dataList.value = res.data.result;
       pagination.total = res.data.total;
       pagination.currentPage = res.data.page;
+      pagination.pageSize = res.data.pageSize;
     }
   };
 
@@ -224,38 +253,58 @@ export function useOperation(tableRef: Ref) {
     // 用于多选表格，清空用户的选择
     tableRef.value.getTableRef().clearSelection();
   };
-
+  /**
+   * 处理删除
+   * @param row
+   */
+  const handleDelete = async (row: OperationLogInfo) => {
+    const res = await deleteUserOperationsAPI(row.id);
+    if (res.success) {
+      onSearch();
+    }
+    message(res.msg, {
+      type: res.success ? "success" : "error"
+    });
+  };
   /** 批量删除 */
-  const onbatchDel = () => {
+  const onbatchDel = async () => {
     // 返回当前选中的行
     const curSelected = tableRef.value.getTableRef().getSelectionRows();
-    // 接下来根据实际业务，通过选中行的某项数据，比如下面的id，调用接口进行批量删除
+    const res = await deleteUserOperationsListAPI({
-    message(`已删除序号为 ${getKeyList(curSelected, "id")} 的数据`, {
+      ids: getKeyList(curSelected, "id")
+    });
+    if (res.success) {
+      message(res.msg, {
         type: "success"
       });
       tableRef.value.getTableRef().clearSelection();
       onSearch();
-  };
+    } else {
-
+      message(res.msg, {
-  /** 清空日志 */
+        type: "error"
-  const clearAll = async () => {
-    // 根据实际业务，调用接口删除所有日志数据
-    message("已删除所有日志数据", {
-      type: "success"
       });
-    await onSearch();
+    }
   };
 
   const onSearch = async () => {
     loading.value = true;
     const res = await getUserOperationsAPI({
       page: pagination.currentPage,
-      pageSize: pagination.pageSize
+      pageSize: pagination.pageSize,
+      name: form.name,
+      type: form.type,
+      username: form.username,
+      nickname: form.nickname,
+      status: form.status,
+      department_id: form.department_id,
+      startTime: form.operationTime[0] ? form.operationTime[0] : null,
+      endTime: form.operationTime[1] ? form.operationTime[1] : null
     });
     if (res.success) {
       dataList.value = res.data.result;
       pagination.total = res.data.total;
       pagination.currentPage = res.data.page;
+      pagination.pageSize = res.data.pageSize;
     }
 
     setTimeout(() => {
@@ -269,23 +318,49 @@ export function useOperation(tableRef: Ref) {
     onSearch();
   };
 
-  const onDetailHandle = () => {
+  // const onDetailHandle = () => {
-    addDialog({
+  //   addDialog({
-      title: `详情`,
+  //     title: `详情`,
-      props: {},
+  //     props: {},
-      width: "40%",
+  //     width: "40%",
-      draggable: true,
+  //     draggable: true,
-      fullscreenIcon: true,
+  //     fullscreenIcon: true,
-      closeOnClickModal: false,
+  //     closeOnClickModal: false,
-      contentRenderer: () => h(Detail, {}),
+  //     contentRenderer: () => h(Detail, {}),
-      beforeSure: (done, {}) => {
+  //     beforeSure: (done, {}) => {
-        done();
+  //       done();
+  //     }
+  //   });
+  // };
+
+  /**部门列表 */
+  const departments = ref<DepartmentInfo[]>([]);
+  /**获取部门列表 */
+  const getDepartments = async () => {
+    const res = await getDepartmentListAPI({ page: 1, pageSize: 9999 });
+    if (res.success) {
+      departments.value = formatHigherOptions(
+        handleTree(res.data.result, "id", "parent_id")
+      );
+    } else {
+      departments.value = [];
     }
-    });
+  };
+  const formatHigherOptions = (treeList: any) => {
+    // 根据返回数据的status字段值判断追加是否禁用disabled字段，返回处理后的树结构，用于上级部门级联选择器的展示（实际开发中也是如此，不可能前端需要的每个字段后端都会返回，这时需要前端自行根据后端返回的某些字段做逻辑处理）
+    if (!treeList || !treeList.length) return;
+    const newTreeList = [];
+    for (let i = 0; i < treeList.length; i++) {
+      treeList[i].disabled = treeList[i].status === 0 ? true : false;
+      formatHigherOptions(treeList[i].children);
+      newTreeList.push(treeList[i]);
+    }
+    return newTreeList;
   };
 
   onMounted(async () => {
     await onSearch();
+    await getDepartments();
   });
 
   return {
@@ -295,12 +370,12 @@ export function useOperation(tableRef: Ref) {
     dataList,
     pagination,
     selectedNum,
+    departments,
     onSearch,
-    clearAll,
     resetForm,
     onbatchDel,
     getOperationName,
-    onDetailHandle,
+    handleDelete,
     handleSizeChange,
     onSelectionCancel,
     handleCurrentChange,