diff --git a/docs/api/catalog.json b/docs/api/catalog.json
index 0b8ad96..1f25e02 100644
--- a/docs/api/catalog.json
+++ b/docs/api/catalog.json
@@ -11516,65 +11516,6 @@
       }
     ]
   },
-  {
-    "tag": "隐患上报流程",
-    "name": "上传隐患附件文件",
-    "usage": "上传文件到服务器，返回 data 为 HazardAttachment 数组，每个元素包含：id、fileName-文件名、filePath-文件路径、fileSize-文件大小、fileType-MIME类型、attachmentType-附件类型。前端在调用submitFlow时将附件数据传入",
-    "method": "POST",
-    "path": "/gd_dataserver/gd_dataserver/flowable/hazard/uploadAttachment",
-    "operationId": "uploadAttachmentUsingPOST",
-    "parameters": [
-      {
-        "name": "attachmentType",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
-      }
-    ],
-    "requestBodies": [
-      {
-        "contentType": "application/json",
-        "schema": "string / binary"
-      },
-      {
-        "contentType": "application/octet-stream",
-        "schema": "string / binary"
-      }
-    ],
-    "responses": [
-      {
-        "status": "200",
-        "description": "OK",
-        "schemas": [
-          {
-            "contentType": "*/*",
-            "schema": "object<string, object>"
-          }
-        ]
-      },
-      {
-        "status": "201",
-        "description": "Created",
-        "schemas": []
-      },
-      {
-        "status": "401",
-        "description": "Unauthorized",
-        "schemas": []
-      },
-      {
-        "status": "403",
-        "description": "Forbidden",
-        "schemas": []
-      },
-      {
-        "status": "404",
-        "description": "Not Found",
-        "schemas": []
-      }
-    ]
-  },
   {
     "tag": "隐患信息管理",
     "name": "新增",
@@ -11821,6 +11762,111 @@
         "type": "string / date-time",
         "description": "实际完成时间"
       },
+      {
+        "name": "attachments[0].attachmentType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
+      },
+      {
+        "name": "attachments[0].createBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "创建者"
+      },
+      {
+        "name": "attachments[0].createTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "创建时间"
+      },
+      {
+        "name": "attachments[0].fileName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件原始名称"
+      },
+      {
+        "name": "attachments[0].filePath",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件存储路径"
+      },
+      {
+        "name": "attachments[0].fileSize",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "文件大小（字节）"
+      },
+      {
+        "name": "attachments[0].fileType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件MIME类型"
+      },
+      {
+        "name": "attachments[0].id",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "主键ID"
+      },
+      {
+        "name": "attachments[0].remark",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "备注"
+      },
+      {
+        "name": "attachments[0].reportId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "关联隐患ID"
+      },
+      {
+        "name": "attachments[0].sortOrder",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "排序"
+      },
+      {
+        "name": "attachments[0].suffix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件后缀"
+      },
+      {
+        "name": "attachments[0].updateBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "更新者"
+      },
+      {
+        "name": "attachments[0].updateTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "更新时间"
+      },
+      {
+        "name": "attachments[0].uploadUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "上传人用户ID"
+      },
       {
         "name": "auditRemark",
         "in": "query",
@@ -11843,7 +11889,7 @@
         "description": "审核人用户ID"
       },
       {
-        "name": "auditUserNameName",
+        "name": "auditUserName",
         "in": "query",
         "required": false,
         "type": "string",
@@ -11905,6 +11951,20 @@
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "criteriaIds",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准ID（多选，逗号分隔）"
+      },
+      {
+        "name": "criteriaNames",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准名称"
+      },
       {
         "name": "currentFlowLevel",
         "in": "query",
@@ -11961,6 +12021,20 @@
         "type": "string",
         "description": "所属厂区部门名称"
       },
+      {
+        "name": "finalFlowLevel",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审批最终等级名称（如一般-A档）"
+      },
+      {
+        "name": "finalFlowLevelId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "审批最终积分规则ID（关联积分规则表）"
+      },
       {
         "name": "flowInstanceId",
         "in": "query",
@@ -12022,14 +12096,14 @@
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "隐患分类编码"
+        "description": "隐患分类编码（general/major/critical）"
       },
       {
         "name": "hazardCategoryId",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "隐患分类字典ID"
+        "description": "隐患分类根规则ID（关联积分规则表）"
       },
       {
         "name": "hazardCategoryName",
@@ -12495,6 +12569,111 @@
         "type": "string / date-time",
         "description": "实际完成时间"
       },
+      {
+        "name": "attachments[0].attachmentType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
+      },
+      {
+        "name": "attachments[0].createBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "创建者"
+      },
+      {
+        "name": "attachments[0].createTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "创建时间"
+      },
+      {
+        "name": "attachments[0].fileName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件原始名称"
+      },
+      {
+        "name": "attachments[0].filePath",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件存储路径"
+      },
+      {
+        "name": "attachments[0].fileSize",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "文件大小（字节）"
+      },
+      {
+        "name": "attachments[0].fileType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件MIME类型"
+      },
+      {
+        "name": "attachments[0].id",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "主键ID"
+      },
+      {
+        "name": "attachments[0].remark",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "备注"
+      },
+      {
+        "name": "attachments[0].reportId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "关联隐患ID"
+      },
+      {
+        "name": "attachments[0].sortOrder",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "排序"
+      },
+      {
+        "name": "attachments[0].suffix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件后缀"
+      },
+      {
+        "name": "attachments[0].updateBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "更新者"
+      },
+      {
+        "name": "attachments[0].updateTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "更新时间"
+      },
+      {
+        "name": "attachments[0].uploadUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "上传人用户ID"
+      },
       {
         "name": "auditRemark",
         "in": "query",
@@ -12517,7 +12696,7 @@
         "description": "审核人用户ID"
       },
       {
-        "name": "auditUserNameName",
+        "name": "auditUserName",
         "in": "query",
         "required": false,
         "type": "string",
@@ -12579,6 +12758,20 @@
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "criteriaIds",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准ID（多选，逗号分隔）"
+      },
+      {
+        "name": "criteriaNames",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准名称"
+      },
       {
         "name": "currentFlowLevel",
         "in": "query",
@@ -12636,18 +12829,32 @@
         "description": "所属厂区部门名称"
       },
       {
-        "name": "flowInstanceId",
+        "name": "finalFlowLevel",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "流程实例id"
+        "description": "审批最终等级名称（如一般-A档）"
       },
       {
-        "name": "flowStatus",
+        "name": "finalFlowLevelId",
         "in": "query",
         "required": false,
-        "type": "integer / int32",
-        "description": "流程状态（0-未开始 1-进行中 2-已完成）"
+        "type": "integer / int64",
+        "description": "审批最终积分规则ID（关联积分规则表）"
+      },
+      {
+        "name": "flowInstanceId",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "流程实例id"
+      },
+      {
+        "name": "flowStatus",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "流程状态（0-未开始 1-进行中 2-已完成）"
       },
       {
         "name": "fundsSource",
@@ -12696,14 +12903,14 @@
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "隐患分类编码"
+        "description": "隐患分类编码（general/major/critical）"
       },
       {
         "name": "hazardCategoryId",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "隐患分类字典ID"
+        "description": "隐患分类根规则ID（关联积分规则表）"
       },
       {
         "name": "hazardCategoryName",
@@ -13158,6 +13365,111 @@
         "type": "string / date-time",
         "description": "实际完成时间"
       },
+      {
+        "name": "attachments[0].attachmentType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
+      },
+      {
+        "name": "attachments[0].createBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "创建者"
+      },
+      {
+        "name": "attachments[0].createTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "创建时间"
+      },
+      {
+        "name": "attachments[0].fileName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件原始名称"
+      },
+      {
+        "name": "attachments[0].filePath",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件存储路径"
+      },
+      {
+        "name": "attachments[0].fileSize",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "文件大小（字节）"
+      },
+      {
+        "name": "attachments[0].fileType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件MIME类型"
+      },
+      {
+        "name": "attachments[0].id",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "主键ID"
+      },
+      {
+        "name": "attachments[0].remark",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "备注"
+      },
+      {
+        "name": "attachments[0].reportId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "关联隐患ID"
+      },
+      {
+        "name": "attachments[0].sortOrder",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "排序"
+      },
+      {
+        "name": "attachments[0].suffix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件后缀"
+      },
+      {
+        "name": "attachments[0].updateBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "更新者"
+      },
+      {
+        "name": "attachments[0].updateTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "更新时间"
+      },
+      {
+        "name": "attachments[0].uploadUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "上传人用户ID"
+      },
       {
         "name": "auditRemark",
         "in": "query",
@@ -13180,7 +13492,7 @@
         "description": "审核人用户ID"
       },
       {
-        "name": "auditUserNameName",
+        "name": "auditUserName",
         "in": "query",
         "required": false,
         "type": "string",
@@ -13242,6 +13554,20 @@
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "criteriaIds",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准ID（多选，逗号分隔）"
+      },
+      {
+        "name": "criteriaNames",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准名称"
+      },
       {
         "name": "currentFlowLevel",
         "in": "query",
@@ -13298,6 +13624,20 @@
         "type": "string",
         "description": "所属厂区部门名称"
       },
+      {
+        "name": "finalFlowLevel",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审批最终等级名称（如一般-A档）"
+      },
+      {
+        "name": "finalFlowLevelId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "审批最终积分规则ID（关联积分规则表）"
+      },
       {
         "name": "flowInstanceId",
         "in": "query",
@@ -13359,14 +13699,14 @@
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "隐患分类编码"
+        "description": "隐患分类编码（general/major/critical）"
       },
       {
         "name": "hazardCategoryId",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "隐患分类字典ID"
+        "description": "隐患分类根规则ID（关联积分规则表）"
       },
       {
         "name": "hazardCategoryName",
@@ -13846,6 +14186,111 @@
         "type": "string / date-time",
         "description": "实际完成时间"
       },
+      {
+        "name": "attachments[0].attachmentType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
+      },
+      {
+        "name": "attachments[0].createBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "创建者"
+      },
+      {
+        "name": "attachments[0].createTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "创建时间"
+      },
+      {
+        "name": "attachments[0].fileName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件原始名称"
+      },
+      {
+        "name": "attachments[0].filePath",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件存储路径"
+      },
+      {
+        "name": "attachments[0].fileSize",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "文件大小（字节）"
+      },
+      {
+        "name": "attachments[0].fileType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件MIME类型"
+      },
+      {
+        "name": "attachments[0].id",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "主键ID"
+      },
+      {
+        "name": "attachments[0].remark",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "备注"
+      },
+      {
+        "name": "attachments[0].reportId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "关联隐患ID"
+      },
+      {
+        "name": "attachments[0].sortOrder",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "排序"
+      },
+      {
+        "name": "attachments[0].suffix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件后缀"
+      },
+      {
+        "name": "attachments[0].updateBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "更新者"
+      },
+      {
+        "name": "attachments[0].updateTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "更新时间"
+      },
+      {
+        "name": "attachments[0].uploadUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "上传人用户ID"
+      },
       {
         "name": "auditRemark",
         "in": "query",
@@ -13868,7 +14313,7 @@
         "description": "审核人用户ID"
       },
       {
-        "name": "auditUserNameName",
+        "name": "auditUserName",
         "in": "query",
         "required": false,
         "type": "string",
@@ -13930,6 +14375,20 @@
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "criteriaIds",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准ID（多选，逗号分隔）"
+      },
+      {
+        "name": "criteriaNames",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准名称"
+      },
       {
         "name": "currentFlowLevel",
         "in": "query",
@@ -13986,6 +14445,20 @@
         "type": "string",
         "description": "所属厂区部门名称"
       },
+      {
+        "name": "finalFlowLevel",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审批最终等级名称（如一般-A档）"
+      },
+      {
+        "name": "finalFlowLevelId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "审批最终积分规则ID（关联积分规则表）"
+      },
       {
         "name": "flowInstanceId",
         "in": "query",
@@ -14047,14 +14520,14 @@
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "隐患分类编码"
+        "description": "隐患分类编码（general/major/critical）"
       },
       {
         "name": "hazardCategoryId",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "隐患分类字典ID"
+        "description": "隐患分类根规则ID（关联积分规则表）"
       },
       {
         "name": "hazardCategoryName",
@@ -14431,89 +14904,208 @@
         "description": "实际完成时间"
       },
       {
-        "name": "auditRemark",
+        "name": "attachments[0].attachmentType",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "审核备注"
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
       },
       {
-        "name": "auditTime",
+        "name": "attachments[0].createBy",
         "in": "query",
         "required": false,
-        "type": "string / date-time",
-        "description": "审核时间"
+        "type": "string",
+        "description": "创建者"
       },
       {
-        "name": "auditUserId",
+        "name": "attachments[0].createTime",
         "in": "query",
         "required": false,
-        "type": "integer / int64",
-        "description": "审核人用户ID"
+        "type": "string / date-time",
+        "description": "创建时间"
       },
       {
-        "name": "auditUserNameName",
+        "name": "attachments[0].fileName",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "审核人姓名"
+        "description": "文件原始名称"
       },
       {
-        "name": "auditUserUsername",
+        "name": "attachments[0].filePath",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "审核人账号"
+        "description": "文件存储路径"
       },
       {
-        "name": "canApprove",
+        "name": "attachments[0].fileSize",
         "in": "query",
         "required": false,
-        "type": "boolean",
-        "description": "当前用户是否可审批此流程"
+        "type": "integer / int64",
+        "description": "文件大小（字节）"
       },
       {
-        "name": "causeAnalysis",
+        "name": "attachments[0].fileType",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "原因分析"
+        "description": "文件MIME类型"
       },
       {
-        "name": "chargePersonId",
+        "name": "attachments[0].id",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "整改负责人用户ID"
+        "description": "主键ID"
       },
       {
-        "name": "chargePersonName",
+        "name": "attachments[0].remark",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "整改负责人姓名"
+        "description": "备注"
       },
       {
-        "name": "chargePersonUsername",
+        "name": "attachments[0].reportId",
         "in": "query",
         "required": false,
-        "type": "string",
-        "description": "整改负责人账号"
+        "type": "integer / int64",
+        "description": "关联隐患ID"
       },
       {
-        "name": "createBy",
+        "name": "attachments[0].sortOrder",
         "in": "query",
         "required": false,
-        "type": "string",
-        "description": "创建者"
+        "type": "integer / int32",
+        "description": "排序"
       },
       {
-        "name": "createTime",
+        "name": "attachments[0].suffix",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "文件后缀"
+      },
+      {
+        "name": "attachments[0].updateBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "更新者"
+      },
+      {
+        "name": "attachments[0].updateTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "更新时间"
+      },
+      {
+        "name": "attachments[0].uploadUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "上传人用户ID"
+      },
+      {
+        "name": "auditRemark",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审核备注"
+      },
+      {
+        "name": "auditTime",
+        "in": "query",
+        "required": false,
+        "type": "string / date-time",
+        "description": "审核时间"
+      },
+      {
+        "name": "auditUserId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "审核人用户ID"
+      },
+      {
+        "name": "auditUserName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审核人姓名"
+      },
+      {
+        "name": "auditUserUsername",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审核人账号"
+      },
+      {
+        "name": "canApprove",
+        "in": "query",
+        "required": false,
+        "type": "boolean",
+        "description": "当前用户是否可审批此流程"
+      },
+      {
+        "name": "causeAnalysis",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "原因分析"
+      },
+      {
+        "name": "chargePersonId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "整改负责人用户ID"
+      },
+      {
+        "name": "chargePersonName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "整改负责人姓名"
+      },
+      {
+        "name": "chargePersonUsername",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "整改负责人账号"
+      },
+      {
+        "name": "createBy",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "创建者"
+      },
+      {
+        "name": "createTime",
         "in": "query",
         "required": false,
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "criteriaIds",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准ID（多选，逗号分隔）"
+      },
+      {
+        "name": "criteriaNames",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "判定标准名称"
+      },
       {
         "name": "currentFlowLevel",
         "in": "query",
@@ -14570,6 +15162,20 @@
         "type": "string",
         "description": "所属厂区部门名称"
       },
+      {
+        "name": "finalFlowLevel",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "审批最终等级名称（如一般-A档）"
+      },
+      {
+        "name": "finalFlowLevelId",
+        "in": "query",
+        "required": false,
+        "type": "integer / int64",
+        "description": "审批最终积分规则ID（关联积分规则表）"
+      },
       {
         "name": "flowInstanceId",
         "in": "query",
@@ -14631,14 +15237,14 @@
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "隐患分类编码"
+        "description": "隐患分类编码（general/major/critical）"
       },
       {
         "name": "hazardCategoryId",
         "in": "query",
         "required": false,
         "type": "integer / int64",
-        "description": "隐患分类字典ID"
+        "description": "隐患分类根规则ID（关联积分规则表）"
       },
       {
         "name": "hazardCategoryName",
@@ -15189,6 +15795,65 @@
       }
     ]
   },
+  {
+    "tag": "隐患信息管理",
+    "name": "上传隐患附件文件",
+    "usage": "上传文件到服务器，返回 data 为 HazardAttachment 数组，每个元素包含：id、fileName-文件名、filePath-文件路径、fileSize-文件大小、fileType-MIME类型、attachmentType-附件类型。前端在调用 save 或 submitFlow 时将附件数据传入",
+    "method": "POST",
+    "path": "/gd_dataserver/gd_dataserver/business/hazard/uploadAttachment",
+    "operationId": "uploadAttachmentUsingPOST",
+    "parameters": [
+      {
+        "name": "attachmentType",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "附件类型：IMAGE-图片 VIDEO-视频 DOCUMENT-文档 OTHER-其他"
+      }
+    ],
+    "requestBodies": [
+      {
+        "contentType": "application/json",
+        "schema": "string / binary"
+      },
+      {
+        "contentType": "application/octet-stream",
+        "schema": "string / binary"
+      }
+    ],
+    "responses": [
+      {
+        "status": "200",
+        "description": "OK",
+        "schemas": [
+          {
+            "contentType": "*/*",
+            "schema": "object<string, object>"
+          }
+        ]
+      },
+      {
+        "status": "201",
+        "description": "Created",
+        "schemas": []
+      },
+      {
+        "status": "401",
+        "description": "Unauthorized",
+        "schemas": []
+      },
+      {
+        "status": "403",
+        "description": "Forbidden",
+        "schemas": []
+      },
+      {
+        "status": "404",
+        "description": "Not Found",
+        "schemas": []
+      }
+    ]
+  },
   {
     "tag": "隐患信息管理",
     "name": "删除隐患（级联删除附件）",
@@ -17106,11 +17771,11 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "新增",
-    "usage": "新增单条记录，请求体为实体类对象（字段说明见对应实体模型）。成功返回 data 为 null。",
+    "name": "新增积分规则",
+    "usage": "二级管理员自动填充厂区信息，且不可创建全局兜底规则；超级管理员可指定 deptId（为空表示全局兜底规则）。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/business/points/rule/add",
-    "operationId": "addOneUsingPOST_10",
+    "operationId": "addUsingPOST",
     "parameters": [],
     "requestBodies": [
       {
@@ -17153,65 +17818,35 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "批量新增",
-    "usage": "批量新增多条记录，请求体为实体类数组。成功返回 data 为 null。",
-    "method": "POST",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/addBatch",
-    "operationId": "addBatchUsingPOST_10",
-    "parameters": [],
-    "requestBodies": [
-      {
-        "contentType": "application/json",
-        "schema": "array<积分规则配置>"
-      }
-    ],
-    "responses": [
-      {
-        "status": "200",
-        "description": "OK",
-        "schemas": [
-          {
-            "contentType": "*/*",
-            "schema": "object<string, object>"
-          }
-        ]
-      },
-      {
-        "status": "201",
-        "description": "Created",
-        "schemas": []
-      },
+    "name": "计算积分",
+    "usage": "根据厂区、隐患等级和类别查询对应奖励积分。二级管理员调用时 deptId 自动填充为所属厂区，超管可传任意厂区（不传则匹配全局兜底）。返回 data 为 Integer 类型的积分数值。",
+    "method": "GET",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/calculatePoints",
+    "operationId": "calculatePointsUsingGET",
+    "parameters": [
       {
-        "status": "401",
-        "description": "Unauthorized",
-        "schemas": []
+        "name": "deptId",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "厂区部门ID（二级管理员忽略此参数）"
       },
       {
-        "status": "403",
-        "description": "Forbidden",
-        "schemas": []
+        "name": "hazardLevel",
+        "in": "query",
+        "required": true,
+        "type": "string",
+        "description": "隐患等级编码"
       },
       {
-        "status": "404",
-        "description": "Not Found",
-        "schemas": []
-      }
-    ]
-  },
-  {
-    "tag": "积分规则配置",
-    "name": "新增并返回保存的数据",
-    "usage": "新增单条记录并返回保存后的数据（含自增ID），请求体为实体类对象。成功返回 data 为保存的实体对象。",
-    "method": "POST",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/addReturn",
-    "operationId": "addReturnUsingPOST_10",
-    "parameters": [],
-    "requestBodies": [
-      {
-        "contentType": "application/json",
-        "schema": "积分规则配置"
+        "name": "hazardCategory",
+        "in": "query",
+        "required": true,
+        "type": "string",
+        "description": "隐患类别编码"
       }
     ],
+    "requestBodies": [],
     "responses": [
       {
         "status": "200",
@@ -17223,11 +17858,6 @@
           }
         ]
       },
-      {
-        "status": "201",
-        "description": "Created",
-        "schemas": []
-      },
       {
         "status": "401",
         "description": "Unauthorized",
@@ -17247,25 +17877,18 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "计算积分",
-    "usage": "根据隐患等级和类别查询对应奖励积分。返回 data 为 Integer 类型的积分数值，如 50。",
+    "name": "删除积分规则",
+    "usage": "根据主键ID物理删除。二级管理员只能删除本厂区规则；全局兜底规则仅超级管理员可删除。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/calculatePoints",
-    "operationId": "calculatePointsUsingGET",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/deleteById",
+    "operationId": "deleteByIdUsingGET",
     "parameters": [
       {
-        "name": "hazardLevel",
-        "in": "query",
-        "required": true,
-        "type": "string",
-        "description": "隐患等级编码"
-      },
-      {
-        "name": "hazardCategory",
+        "name": "id",
         "in": "query",
         "required": true,
         "type": "string",
-        "description": "隐患类别编码"
+        "description": "主键ID"
       }
     ],
     "requestBodies": [],
@@ -17299,11 +17922,11 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "根据属性删除",
-    "usage": "根据实体属性条件删除记录，请求体为实体类对象。成功返回 data 为 null。",
+    "name": "分页查询积分规则（兼容旧路径）",
+    "usage": "同 /list 接口，保留用于前端旧路径兼容。二级管理员自动过滤本厂区。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/delete",
-    "operationId": "deleteUsingGET_10",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/getListByPage",
+    "operationId": "getListByPageUsingGET_10",
     "parameters": [
       {
         "name": "createTime",
@@ -17312,6 +17935,20 @@
         "type": "string / date-time",
         "description": "创建时间"
       },
+      {
+        "name": "deptId",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "所属厂区部门ID（NULL表示全局兜底规则，二级管理员新增时自动填充）"
+      },
+      {
+        "name": "deptName",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "所属厂区部门名称"
+      },
       {
         "name": "enabled",
         "in": "query",
@@ -17330,8 +17967,8 @@
         "name": "hazardLevel",
         "in": "query",
         "required": false,
-        "type": "integer / int32",
-        "description": "隐患等级"
+        "type": "string",
+        "description": "隐患等级编码（general/major/critical）"
       },
       {
         "name": "id",
@@ -17340,6 +17977,13 @@
         "type": "integer / int64",
         "description": "主键ID"
       },
+      {
+        "name": "pageNum",
+        "in": "query",
+        "required": false,
+        "type": "integer / int32",
+        "description": "页码"
+      },
       {
         "name": "points",
         "in": "query",
@@ -17381,51 +18025,13 @@
         "required": false,
         "type": "string / date-time",
         "description": "更新时间"
-      }
-    ],
-    "requestBodies": [],
-    "responses": [
-      {
-        "status": "200",
-        "description": "OK",
-        "schemas": [
-          {
-            "contentType": "*/*",
-            "schema": "object<string, object>"
-          }
-        ]
       },
       {
-        "status": "401",
-        "description": "Unauthorized",
-        "schemas": []
-      },
-      {
-        "status": "403",
-        "description": "Forbidden",
-        "schemas": []
-      },
-      {
-        "status": "404",
-        "description": "Not Found",
-        "schemas": []
-      }
-    ]
-  },
-  {
-    "tag": "积分规则配置",
-    "name": "主键删除",
-    "usage": "根据主键ID删除单条记录，成功返回 data 为 null。",
-    "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/deleteById",
-    "operationId": "deleteOneUsingGET_10",
-    "parameters": [
-      {
-        "name": "id",
+        "name": "pageSize",
         "in": "query",
-        "required": true,
-        "type": "string",
-        "description": "主键ID"
+        "required": false,
+        "type": "integer / int32",
+        "description": "每页条数"
       }
     ],
     "requestBodies": [],
@@ -17459,18 +18065,18 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "批量删除",
-    "usage": "根据ID列表批量删除记录，成功返回 data 为 null。",
+    "name": "获取积分规则详情",
+    "usage": "根据主键ID查询规则详情。二级管理员访问非本厂区规则或全局兜底规则时返回错误。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/deleteByIds",
-    "operationId": "deleteListUsingGET_21",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/info",
+    "operationId": "infoUsingGET_10",
     "parameters": [
       {
-        "name": "ids",
+        "name": "id",
         "in": "query",
         "required": true,
         "type": "string",
-        "description": "ID列表(逗号分隔)"
+        "description": "主键ID"
       }
     ],
     "requestBodies": [],
@@ -17504,139 +18110,60 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "查询所有",
-    "usage": "查询所有记录（无分页、无条件）。成功返回 data 为实体类数组。",
-    "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/getAll",
-    "operationId": "getAllUsingGET_10",
-    "parameters": [],
-    "requestBodies": [],
-    "responses": [
-      {
-        "status": "200",
-        "description": "OK",
-        "schemas": [
-          {
-            "contentType": "*/*",
-            "schema": "object<string, object>"
-          }
-        ]
-      },
-      {
-        "status": "401",
-        "description": "Unauthorized",
-        "schemas": []
-      },
-      {
-        "status": "403",
-        "description": "Forbidden",
-        "schemas": []
-      },
-      {
-        "status": "404",
-        "description": "Not Found",
-        "schemas": []
-      }
-    ]
-  },
-  {
-    "tag": "积分规则配置",
-    "name": "分页查询",
-    "usage": "分页查询记录列表，查询条件为实体类字段。成功返回 data 为 PageInfo 分页对象，其中 list 为实体类数组。",
+    "name": "分页查询积分规则列表",
+    "usage": "超级管理员返回所有厂区规则（可按deptId筛选，传global表示查询全局兜底规则）；二级管理员自动过滤为所属厂区规则。返回 data 为 PageInfo 分页对象。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/getListByPage",
-    "operationId": "getListByPageUsingGET_10",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/list",
+    "operationId": "listUsingGET_1",
     "parameters": [
       {
-        "name": "createTime",
-        "in": "query",
-        "required": false,
-        "type": "string / date-time",
-        "description": "创建时间"
-      },
-      {
-        "name": "enabled",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "是否启用：0-禁用 1-启用"
-      },
-      {
-        "name": "hazardCategory",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "隐患类别"
-      },
-      {
-        "name": "hazardLevel",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "隐患等级"
-      },
-      {
-        "name": "id",
-        "in": "query",
-        "required": false,
-        "type": "integer / int64",
-        "description": "主键ID"
-      },
-      {
-        "name": "pageNum",
-        "in": "query",
-        "required": true,
-        "type": "integer / int32",
-        "description": "页码"
-      },
-      {
-        "name": "points",
+        "name": "pageNum",
         "in": "query",
-        "required": false,
+        "required": true,
         "type": "integer / int32",
-        "description": "奖励积分"
+        "description": "页码"
       },
       {
-        "name": "priority",
+        "name": "pageSize",
         "in": "query",
-        "required": false,
+        "required": true,
         "type": "integer / int32",
-        "description": "优先级（数字越大优先级越高）"
+        "description": "每页条数"
       },
       {
-        "name": "remark",
+        "name": "deptId",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "备注"
+        "description": "厂区部门ID（超管可传，二级管理员忽略；传 global 表示查询全局兜底规则）"
       },
       {
-        "name": "ruleCode",
+        "name": "hazardLevel",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "规则编码"
+        "description": "隐患等级编码（general/major/critical）"
       },
       {
-        "name": "ruleName",
+        "name": "hazardCategory",
         "in": "query",
         "required": false,
         "type": "string",
-        "description": "规则名称"
+        "description": "隐患类别"
       },
       {
-        "name": "updateTime",
+        "name": "enabled",
         "in": "query",
         "required": false,
-        "type": "string / date-time",
-        "description": "更新时间"
+        "type": "integer / int32",
+        "description": "是否启用：0-禁用 1-启用"
       },
       {
-        "name": "pageSize",
+        "name": "ruleName",
         "in": "query",
-        "required": true,
-        "type": "integer / int32",
-        "description": "每页条数"
+        "required": false,
+        "type": "string",
+        "description": "规则名称（模糊匹配）"
       }
     ],
     "requestBodies": [],
@@ -17670,20 +18197,12 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "详情",
-    "usage": "根据主键ID查询单条记录详情。成功返回 data 为实体类对象，包含该实体所有字段。",
+    "name": "查询当前厂区所有积分规则",
+    "usage": "返回当前登录用户所属厂区的规则列表，同时包含全局兜底规则（dept_id 为 NULL）。返回 data 为 PointsRuleConfig 数组。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/info",
-    "operationId": "infoUsingGET_10",
-    "parameters": [
-      {
-        "name": "id",
-        "in": "query",
-        "required": true,
-        "type": "string",
-        "description": "主键ID"
-      }
-    ],
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/myFactoryRules",
+    "operationId": "myFactoryRulesUsingGET",
+    "parameters": [],
     "requestBodies": [],
     "responses": [
       {
@@ -17715,90 +18234,49 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "条件查询",
-    "usage": "根据实体属性条件查询记录列表。成功返回 data 为实体类数组。",
+    "name": "获取隐患分类根规则列表",
+    "usage": "返回当前用户厂区每个大类（一般/较大/重大）的最高优先级根规则，用于 APP 上报时隐患分类下拉选择。返回 data 为 PointsRuleConfig 数组（最多3条）。",
     "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/list",
-    "operationId": "getListUsingGET_10",
-    "parameters": [
-      {
-        "name": "createTime",
-        "in": "query",
-        "required": false,
-        "type": "string / date-time",
-        "description": "创建时间"
-      },
-      {
-        "name": "enabled",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "是否启用：0-禁用 1-启用"
-      },
-      {
-        "name": "hazardCategory",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "隐患类别"
-      },
-      {
-        "name": "hazardLevel",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "隐患等级"
-      },
-      {
-        "name": "id",
-        "in": "query",
-        "required": false,
-        "type": "integer / int64",
-        "description": "主键ID"
-      },
-      {
-        "name": "points",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "奖励积分"
-      },
-      {
-        "name": "priority",
-        "in": "query",
-        "required": false,
-        "type": "integer / int32",
-        "description": "优先级（数字越大优先级越高）"
-      },
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/rootRules",
+    "operationId": "rootRulesUsingGET",
+    "parameters": [],
+    "requestBodies": [],
+    "responses": [
       {
-        "name": "remark",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "备注"
+        "status": "200",
+        "description": "OK",
+        "schemas": [
+          {
+            "contentType": "*/*",
+            "schema": "object<string, object>"
+          }
+        ]
       },
       {
-        "name": "ruleCode",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "规则编码"
+        "status": "401",
+        "description": "Unauthorized",
+        "schemas": []
       },
       {
-        "name": "ruleName",
-        "in": "query",
-        "required": false,
-        "type": "string",
-        "description": "规则名称"
+        "status": "403",
+        "description": "Forbidden",
+        "schemas": []
       },
       {
-        "name": "updateTime",
-        "in": "query",
-        "required": false,
-        "type": "string / date-time",
-        "description": "更新时间"
+        "status": "404",
+        "description": "Not Found",
+        "schemas": []
       }
-    ],
+    ]
+  },
+  {
+    "tag": "积分规则配置",
+    "name": "获取积分规则树形结构",
+    "usage": "返回当前用户厂区的积分规则树形结构，按大类（一般/较大/重大）分组，每个大类下包含子规则列表，用于审批时选择具体档次。返回 data 为数组，每项含 id/hazardLevel/hazardLevelName/ruleName/points/children。",
+    "method": "GET",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/ruleTree",
+    "operationId": "ruleTreeUsingGET",
+    "parameters": [],
     "requestBodies": [],
     "responses": [
       {
@@ -17830,18 +18308,25 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "逻辑删除",
-    "usage": "根据主键ID逻辑删除单条记录，成功返回 data 为 null。",
-    "method": "GET",
-    "path": "/gd_dataserver/gd_dataserver/business/points/rule/removeById",
-    "operationId": "deleteListUsingGET_20",
+    "name": "启用/禁用积分规则",
+    "usage": "enabled=1 启用，enabled=0 禁用。二级管理员只能操作本厂区规则。",
+    "method": "POST",
+    "path": "/gd_dataserver/gd_dataserver/business/points/rule/toggleEnabled",
+    "operationId": "toggleEnabledUsingPOST",
     "parameters": [
       {
         "name": "id",
         "in": "query",
         "required": true,
-        "type": "string",
-        "description": "主键ID"
+        "type": "integer / int64",
+        "description": "规则ID"
+      },
+      {
+        "name": "enabled",
+        "in": "query",
+        "required": true,
+        "type": "integer / int32",
+        "description": "启用状态：0-禁用 1-启用"
       }
     ],
     "requestBodies": [],
@@ -17856,6 +18341,11 @@
           }
         ]
       },
+      {
+        "status": "201",
+        "description": "Created",
+        "schemas": []
+      },
       {
         "status": "401",
         "description": "Unauthorized",
@@ -17876,11 +18366,18 @@
   {
     "tag": "积分规则配置",
     "name": "积分规则试算",
-    "usage": "模拟积分计算过程，返回匹配的规则详情和计算结果。返回 data 为对象，包含：hazardLevel-输入的隐患等级、hazardCategory-输入的隐患类别、matchedRule-匹配到的规则对象{id,ruleName,points,priority}或null、calculatedPoints-计算得到的积分数值(无匹配时为0)。",
+    "usage": "模拟积分计算过程，返回匹配的规则详情和计算结果。返回 data 为对象：deptId-生效厂区、hazardLevel-输入的隐患等级、hazardCategory-输入的隐患类别、matchedRule-匹配到的规则对象或null、calculatedPoints-计算得到的积分数值(无匹配时为0)、matchScope-命中范围(FACTORY-厂区专属/GLOBAL-全局兜底/NONE-未命中)。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/rule/trialCalculate",
     "operationId": "trialCalculateUsingGET",
     "parameters": [
+      {
+        "name": "deptId",
+        "in": "query",
+        "required": false,
+        "type": "string",
+        "description": "厂区部门ID（二级管理员忽略此参数）"
+      },
       {
         "name": "hazardLevel",
         "in": "query",
@@ -17927,8 +18424,8 @@
   },
   {
     "tag": "积分规则配置",
-    "name": "修改",
-    "usage": "根据主键ID修改记录，请求体为实体类对象（需包含id字段）。成功返回 data 为 null。",
+    "name": "修改积分规则",
+    "usage": "二级管理员只能修改本厂区规则，不可变更所属厂区；超级管理员可任意修改。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/business/points/rule/updateById",
     "operationId": "updateByIdUsingPOST_10",
@@ -17978,7 +18475,7 @@
     "usage": "新增单条记录，请求体为实体类对象（字段说明见对应实体模型）。成功返回 data 为 null。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/add",
-    "operationId": "addOneUsingPOST_11",
+    "operationId": "addOneUsingPOST_10",
     "parameters": [],
     "requestBodies": [
       {
@@ -18025,7 +18522,7 @@
     "usage": "批量新增多条记录，请求体为实体类数组。成功返回 data 为 null。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/addBatch",
-    "operationId": "addBatchUsingPOST_11",
+    "operationId": "addBatchUsingPOST_10",
     "parameters": [],
     "requestBodies": [
       {
@@ -18072,7 +18569,7 @@
     "usage": "新增单条记录并返回保存后的数据（含自增ID），请求体为实体类对象。成功返回 data 为保存的实体对象。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/addReturn",
-    "operationId": "addReturnUsingPOST_11",
+    "operationId": "addReturnUsingPOST_10",
     "parameters": [],
     "requestBodies": [
       {
@@ -18119,7 +18616,7 @@
     "usage": "根据实体属性条件删除记录，请求体为实体类对象。成功返回 data 为 null。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/delete",
-    "operationId": "deleteUsingGET_11",
+    "operationId": "deleteUsingGET_10",
     "parameters": [
       {
         "name": "afterBalance",
@@ -18255,7 +18752,7 @@
     "usage": "根据主键ID删除单条记录，成功返回 data 为 null。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/deleteById",
-    "operationId": "deleteOneUsingGET_11",
+    "operationId": "deleteOneUsingGET_10",
     "parameters": [
       {
         "name": "id",
@@ -18300,7 +18797,7 @@
     "usage": "根据ID列表批量删除记录，成功返回 data 为 null。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/deleteByIds",
-    "operationId": "deleteListUsingGET_23",
+    "operationId": "deleteListUsingGET_21",
     "parameters": [
       {
         "name": "ids",
@@ -18345,7 +18842,7 @@
     "usage": "查询所有记录（无分页、无条件）。成功返回 data 为实体类数组。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/getAll",
-    "operationId": "getAllUsingGET_11",
+    "operationId": "getAllUsingGET_10",
     "parameters": [],
     "requestBodies": [],
     "responses": [
@@ -18577,7 +19074,7 @@
     "usage": "根据实体属性条件查询记录列表。成功返回 data 为实体类数组。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/list",
-    "operationId": "getListUsingGET_11",
+    "operationId": "getListUsingGET_10",
     "parameters": [
       {
         "name": "afterBalance",
@@ -18863,7 +19360,7 @@
     "usage": "根据主键ID逻辑删除单条记录，成功返回 data 为 null。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/points/transaction/removeById",
-    "operationId": "deleteListUsingGET_22",
+    "operationId": "deleteListUsingGET_20",
     "parameters": [
       {
         "name": "id",
@@ -19019,7 +19516,7 @@
     "usage": "支持按条件筛选签字记录",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/flowqz/getList",
-    "operationId": "getListUsingGET_12",
+    "operationId": "getListUsingGET_11",
     "parameters": [
       {
         "name": "comment",
@@ -19195,7 +19692,7 @@
     "usage": "配置某个厂区的某个隐患等级对应的Flowable流程Key。二级管理员无需传deptId/deptName，系统自动填充所属厂区。每个厂区的每个等级只能配置一条（唯一约束）。",
     "method": "POST",
     "path": "/gd_dataserver/gd_dataserver/flowable/hazardFlowConfig",
-    "operationId": "addUsingPOST",
+    "operationId": "addUsingPOST_1",
     "parameters": [],
     "requestBodies": [
       {
@@ -19242,7 +19739,7 @@
     "usage": "系统管理员返回所有配置；二级管理员自动过滤为所属厂区的配置。可选按厂区ID、隐患等级筛选。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/flowable/hazardFlowConfig/list",
-    "operationId": "listUsingGET_1",
+    "operationId": "listUsingGET_2",
     "parameters": [
       {
         "name": "pageNum",
@@ -19503,6 +20000,80 @@
       }
     ]
   },
+  {
+    "tag": "sys-dept-controller",
+    "name": "获取所有厂区级部门列表",
+    "usage": "返回部门树中第二层（二级）的所有部门，供超级管理员在下拉框中选择厂区。厂区级定义：父节点为根级部门（parentId=0）的部门。",
+    "method": "GET",
+    "path": "/gd_dataserver/gd_dataserver/system/dept/factoryList",
+    "operationId": "factoryListUsingGET",
+    "parameters": [],
+    "requestBodies": [],
+    "responses": [
+      {
+        "status": "200",
+        "description": "OK",
+        "schemas": [
+          {
+            "contentType": "*/*",
+            "schema": "object<string, object>"
+          }
+        ]
+      },
+      {
+        "status": "401",
+        "description": "Unauthorized",
+        "schemas": []
+      },
+      {
+        "status": "403",
+        "description": "Forbidden",
+        "schemas": []
+      },
+      {
+        "status": "404",
+        "description": "Not Found",
+        "schemas": []
+      }
+    ]
+  },
+  {
+    "tag": "sys-dept-controller",
+    "name": "获取当前用户所属厂区部门",
+    "usage": "根据当前登录用户的部门信息，向上回溯到厂区级（二级）部门并返回。适用于非超级管理员获取自己所属厂区。返回 data 为 SysDept 对象，包含 deptId、deptName 等字段。",
+    "method": "GET",
+    "path": "/gd_dataserver/gd_dataserver/system/dept/myFactory",
+    "operationId": "myFactoryUsingGET",
+    "parameters": [],
+    "requestBodies": [],
+    "responses": [
+      {
+        "status": "200",
+        "description": "OK",
+        "schemas": [
+          {
+            "contentType": "*/*",
+            "schema": "object<string, object>"
+          }
+        ]
+      },
+      {
+        "status": "401",
+        "description": "Unauthorized",
+        "schemas": []
+      },
+      {
+        "status": "403",
+        "description": "Forbidden",
+        "schemas": []
+      },
+      {
+        "status": "404",
+        "description": "Not Found",
+        "schemas": []
+      }
+    ]
+  },
   {
     "tag": "test-controller-1",
     "name": "获取用户列表",
@@ -19799,7 +20370,7 @@
     "usage": "返回 data 为 Page 分页对象。list 中每条记录为 UserMessage 对象，主要字段：id、userId-用户ID、msgType-消息类型(如points_award/hazard_audit/appeal_result)、title-消息标题、content-消息内容、bizId-关联业务ID、isRead-是否已读(0未读/1已读)、createTime-创建时间。",
     "method": "GET",
     "path": "/gd_dataserver/gd_dataserver/business/message/list",
-    "operationId": "listUsingGET_2",
+    "operationId": "listUsingGET_3",
     "parameters": [
       {
         "name": "msgType",
diff --git a/src/App.vue b/src/App.vue
index 8477cc8..b92ea37 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,26 +1,16 @@
 <template>
-  <!-- 
-    width 宽度 默认 1920
-    height 高度 默认 1080
-    bgc 背景颜色 默认 "transparent"
-    delay自适应缩放防抖延迟时间（ms） 默认 100
-    isFlat是否启用拉伸模式 默认 false
-  -->
-  <ScaleBox :width="1920" :height="1080" :delay="100" :isFlat="true">
-    <div id="app">
-      <router-view />
-      <theme-picker />
-    </div>
-  </ScaleBox>
+  <div id="app">
+    <router-view />
+    <theme-picker />
+  </div>
 </template>
 
 <script>
-import ScaleBox from 'vue2-scale-box'
 import ThemePicker from "@/components/ThemePicker";
 
 export default {
   name: "App",
-  components: { ThemePicker, ScaleBox },
+  components: { ThemePicker },
   metaInfo() {
     return {
       title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
diff --git a/src/api/points/rule.js b/src/api/points/rule.js
new file mode 100644
index 0000000..b20c268
--- /dev/null
+++ b/src/api/points/rule.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+export function listPointsRules(params) {
+  return request({ url: '/business/points/rule/list', method: 'get', params })
+}
+
+export function listFactoryDepartments() {
+  return request({ url: '/system/dept/factoryList', method: 'get' })
+}
+
+export function togglePointsRule(id, enabled) {
+  return request({
+    url: '/business/points/rule/toggleEnabled',
+    method: 'post',
+    params: { id, enabled }
+  })
+}
+
+export function deletePointsRule(id) {
+  return request({ url: '/business/points/rule/deleteById', method: 'get', params: { id }})
+}
+
+export function getPointsRule(id) {
+  return request({ url: '/business/points/rule/info', method: 'get', params: { id }})
+}
+
+export function addPointsRule(data) {
+  return request({ url: '/business/points/rule/add', method: 'post', data })
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index e2c3bf9..7d4d9d1 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -7,14 +7,18 @@
 
 body {
   height: 100%;
+  margin: 0;
+  color: #1a1a2e;
+  background: #f0f2f5;
+  font-size: 13px;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
 }
 
 label {
-  font-weight: 700;
+  font-weight: 500;
 }
 
 html {
@@ -121,11 +125,9 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 15px;
-  height: 100%;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 15px solid #edf2f8;
+  min-height: 100%;
+  padding: 16px 20px 40px;
+  background-color: #f0f2f5;
 }
 
 .components-container {
@@ -250,4 +252,4 @@ aside {
     flex: 1;
     overflow: hidden;
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/prototype-theme.scss b/src/assets/styles/prototype-theme.scss
new file mode 100644
index 0000000..cfa1249
--- /dev/null
+++ b/src/assets/styles/prototype-theme.scss
@@ -0,0 +1,371 @@
+/*
+ * Shared visual baseline derived from the delivered light management prototype.
+ * Keep business-page layout rules local; this file only normalizes the shell
+ * and Element UI components used across the administration system.
+ */
+:root {
+  --prototype-bg: #f0f2f5;
+  --prototype-panel: #ffffff;
+  --prototype-panel-soft: #fafbfc;
+  --prototype-hover: #f5f7fa;
+  --prototype-text: #1a1a2e;
+  --prototype-text-secondary: #5a5a72;
+  --prototype-text-muted: #9898ae;
+  --prototype-border: #e5e7eb;
+  --prototype-divider: #f0f0f2;
+  --prototype-primary: #1890ff;
+  --prototype-radius: 8px;
+}
+
+#app,
+.app-wrapper,
+.main-container,
+.app-main {
+  color: var(--prototype-text);
+  background: var(--prototype-bg);
+}
+
+.el-card {
+  color: var(--prototype-text);
+  border: 1px solid var(--prototype-divider);
+  border-radius: var(--prototype-radius);
+  box-shadow: none;
+}
+
+.el-card__header {
+  min-height: 46px;
+  padding: 14px 16px 10px;
+  border-bottom-color: var(--prototype-divider);
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.el-card__body {
+  padding: 14px 16px 16px;
+}
+
+.el-tabs__header {
+  margin-bottom: 14px;
+}
+
+.el-tabs__nav-wrap::after {
+  height: 1px;
+  background-color: var(--prototype-divider);
+}
+
+.el-tabs__item {
+  height: 36px;
+  padding: 0 16px;
+  color: var(--prototype-text-secondary);
+  font-size: 13px;
+  line-height: 36px;
+}
+
+.el-tabs__item.is-active {
+  color: var(--prototype-primary);
+  font-weight: 600;
+}
+
+.el-tabs__active-bar {
+  height: 2px;
+  background-color: var(--prototype-primary);
+}
+
+.el-table {
+  color: var(--prototype-text);
+  font-size: var(--table-font-size, 12px);
+}
+
+.el-table::before,
+.el-table--border::after,
+.el-table--group::after {
+  background-color: var(--prototype-divider);
+}
+
+.el-table th.el-table__cell {
+  height: 36px;
+  padding: 0;
+  color: var(--prototype-text-secondary);
+  background: var(--prototype-panel-soft);
+  border-bottom-color: var(--prototype-divider);
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.el-table td.el-table__cell {
+  padding: 8px 0;
+  border-bottom-color: var(--prototype-divider);
+}
+
+.el-table .cell {
+  padding-right: 10px;
+  padding-left: 10px;
+  line-height: 19px;
+}
+
+.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+  background: #fcfcfd;
+}
+
+.el-table__body tr.hover-row > td.el-table__cell,
+.el-table__body tr:hover > td.el-table__cell {
+  background-color: var(--prototype-hover);
+}
+
+.el-form-item {
+  margin-bottom: 14px;
+}
+
+.el-form-item__label,
+.el-form-item__content,
+.el-radio,
+.el-checkbox {
+  color: var(--prototype-text-secondary);
+  font-size: 12px;
+}
+
+.el-form-item__label {
+  font-weight: 500;
+}
+
+.el-input,
+.el-select,
+.el-textarea,
+.el-input-number {
+  font-size: 12px;
+}
+
+.el-input__inner,
+.el-textarea__inner {
+  color: var(--prototype-text);
+  border-color: var(--prototype-border);
+  border-radius: 6px;
+  background: var(--prototype-panel-soft);
+}
+
+.el-input__inner {
+  height: 34px;
+  line-height: 34px;
+}
+
+.el-input--medium .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+}
+
+.el-input--small .el-input__inner,
+.el-range-editor--small.el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+
+.el-input__inner:focus,
+.el-textarea__inner:focus,
+.el-select .el-input.is-focus .el-input__inner {
+  border-color: var(--prototype-primary);
+}
+
+.el-button {
+  padding: 9px 16px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.el-button--medium {
+  padding: 9px 16px;
+  font-size: 12px;
+}
+
+.el-button--primary {
+  color: #fff;
+  border-color: #1890ff;
+  background: #1890ff;
+}
+
+.el-button--primary:focus,
+.el-button--primary:hover {
+  border-color: #40a9ff;
+  background: #40a9ff;
+}
+
+.el-button--danger {
+  color: #fff;
+  border-color: #d64550;
+  background: #d64550;
+}
+
+.el-button--danger:focus,
+.el-button--danger:hover {
+  border-color: #e06871;
+  background: #e06871;
+}
+
+.el-button--default {
+  color: var(--prototype-text, #1a1a2e);
+  border-color: var(--prototype-border, #e5e7eb);
+  background: #fff;
+}
+
+.el-button--default:focus,
+.el-button--default:hover {
+  color: #1890ff;
+  border-color: #91d5ff;
+  background: #f0f8ff;
+}
+
+.el-button.is-disabled,
+.el-button.is-disabled:focus,
+.el-button.is-disabled:hover {
+  color: #b8bbc4;
+  border-color: #e5e7eb;
+  background: #f5f5f5;
+}
+
+.el-button--small {
+  padding: 7px 12px;
+  font-size: 12px;
+}
+
+.el-button--mini {
+  padding: 5px 10px;
+  font-size: 11px;
+}
+
+.el-button--text {
+  padding-right: 0;
+  padding-left: 0;
+}
+
+.el-tag {
+  border-radius: 8px;
+  font-weight: 500;
+}
+
+.el-tag--small {
+  height: 20px;
+  padding: 0 8px;
+  font-size: 11px;
+  line-height: 18px;
+}
+
+.el-tag--success {
+  color: #2d8a4e;
+  border-color: #c6e3ce;
+  background: #ebf5ec;
+}
+
+.el-tag--warning {
+  color: #c97e24;
+  border-color: #f5d3a8;
+  background: #fff4ec;
+}
+
+.el-tag--danger {
+  color: #d64550;
+  border-color: #f3c2c6;
+  background: #fef0f0;
+}
+
+.el-tag--info {
+  color: #5a5a72;
+  border-color: #e0e0e0;
+  background: #f5f5f5;
+}
+
+.el-dialog {
+  border: 1px solid var(--prototype-border);
+  border-radius: 12px;
+  box-shadow: 0 16px 48px rgba(0, 0, 0, .18);
+}
+
+.el-dialog__header {
+  padding: 20px 22px 12px;
+}
+
+.el-dialog__title {
+  color: var(--prototype-text);
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-dialog__body {
+  padding: 10px 22px 18px;
+  color: var(--prototype-text-secondary);
+  font-size: 13px;
+}
+
+.el-dialog__footer {
+  padding: 10px 22px 20px;
+}
+
+.el-message-box {
+  border-color: var(--prototype-border);
+  border-radius: 12px;
+}
+
+.el-switch__core {
+  width: 38px !important;
+  height: 22px;
+  border-radius: 11px;
+}
+
+.el-switch__core::after {
+  width: 16px;
+  height: 16px;
+  top: 2px;
+}
+
+.el-switch.is-checked .el-switch__core::after {
+  margin-left: -18px;
+}
+
+.el-pagination,
+.el-pagination button,
+.el-pagination span:not([class*=suffix]) {
+  color: var(--prototype-text-secondary);
+  font-size: 12px;
+  font-weight: 400;
+}
+
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .el-pager li {
+  min-width: 26px;
+  height: 26px;
+  margin: 0 3px;
+  border: 1px solid var(--prototype-border);
+  border-radius: 4px;
+  background: var(--prototype-panel-soft);
+  line-height: 24px;
+}
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  border-color: var(--prototype-primary);
+  background: var(--prototype-primary);
+}
+
+.el-descriptions {
+  color: var(--prototype-text);
+  font-size: 12px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+  color: var(--prototype-text-secondary);
+  background: var(--prototype-panel-soft);
+}
+
+.el-empty__description p {
+  color: var(--prototype-text-muted);
+  font-size: 12px;
+}
+
+@media (max-width: 768px) {
+  .app-container {
+    padding: 12px;
+  }
+
+  .el-dialog {
+    width: calc(100% - 24px) !important;
+  }
+}
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 4e29874..6673921 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -118,10 +118,9 @@
 /** 表格布局 **/
 .pagination-container {
   position: relative;
-  height: 25px;
-  margin-bottom: 10px;
-  margin-top: 15px;
-  padding: 10px 20px !important;
+  min-height: 36px;
+  margin: 12px 0 0;
+  padding: 4px 0 0 !important;
 }
 
 /* tree border */
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 1c54ba8..82d9439 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -24,8 +24,9 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    border-right: 1px solid #f0f0f2;
+    -webkit-box-shadow: none;
+    box-shadow: none;
 
     // reset element-ui css
     .horizontal-collapse-transition {
@@ -46,7 +47,7 @@
 
     &.has-logo {
       .el-scrollbar {
-        height: calc(100% - 50px);
+        height: calc(100% - 52px);
       }
     }
 
@@ -61,7 +62,7 @@
     }
 
     .svg-icon {
-      margin-right: 16px;
+      margin-right: 8px;
     }
 
     .el-menu {
@@ -71,6 +72,11 @@
     }
 
     .el-menu-item, .el-submenu__title {
+      height: 40px;
+      line-height: 40px;
+      padding: 0 16px !important;
+      border-left: 3px solid transparent;
+      font-size: 13px;
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
@@ -84,6 +90,18 @@
       }
     }
 
+    .theme-light {
+      .el-menu-item.is-active {
+        border-left-color: var(--current-color, #1890ff);
+        background-color: rgba(24, 144, 255, .08) !important;
+        font-weight: 600;
+      }
+
+      .el-submenu.is-active > .el-submenu__title {
+        color: var(--current-color, #1890ff) !important;
+      }
+    }
+
     & .theme-dark .is-active > .el-submenu__title {
       color: $base-menu-color-active !important;
     }
@@ -91,6 +109,10 @@
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $base-sidebar-width !important;
+      height: 34px;
+      line-height: 34px;
+      padding-left: 42px !important;
+      font-size: 12px;
 
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 494415b..46d23fb 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -15,7 +15,7 @@ $base-menu-color-active:#f4f4f5;
 $base-menu-background:#0b1026;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color:rgba(0,0,0,.70);
+$base-menu-light-color:#5A5A72;
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
@@ -37,7 +37,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 212px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index ce8af44..6a30661 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -62,12 +62,12 @@ export default {
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
-  font-size: 14px;
-  line-height: 50px;
+  font-size: 12px;
+  line-height: 52px;
   margin-left: 8px;
 
   .no-redirect {
-    color: #97a8be;
+    color: #5a5a72;
     cursor: text;
   }
 }
diff --git a/src/components/DataListPanel/index.vue b/src/components/DataListPanel/index.vue
new file mode 100644
index 0000000..6d7d0ed
--- /dev/null
+++ b/src/components/DataListPanel/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <section class="data-list-panel">
+    <div v-if="$slots.filters || $slots.actions" class="data-list-panel__toolbar">
+      <div v-if="$slots.filters" class="data-list-panel__filters">
+        <slot name="filters" />
+      </div>
+      <div v-if="$slots.actions" class="data-list-panel__actions">
+        <slot name="actions" />
+      </div>
+    </div>
+
+    <div class="data-list-panel__card">
+      <div v-if="$slots.header" class="data-list-panel__header">
+        <slot name="header" />
+      </div>
+      <div class="data-list-panel__table">
+        <slot />
+      </div>
+      <div v-if="$slots.footer" class="data-list-panel__footer">
+        <slot name="footer" />
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'DataListPanel'
+}
+</script>
+
+<style lang="scss" scoped>
+.data-list-panel {
+  width: 100%;
+}
+
+.data-list-panel__toolbar {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+
+.data-list-panel__filters {
+  min-width: 0;
+  flex: 1;
+}
+
+.data-list-panel__actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 0 0 auto;
+}
+
+.data-list-panel__card {
+  overflow: hidden;
+  padding: 14px 16px 10px;
+  border: 1px solid var(--prototype-divider, #f0f0f2);
+  border-radius: 8px;
+  background: #fff;
+}
+
+.data-list-panel__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+  color: var(--prototype-text, #1a1a2e);
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.data-list-panel__footer {
+  min-height: 36px;
+}
+
+::v-deep .data-list-panel__table .el-table,
+::v-deep .data-list-panel__table .el-table__expanded-cell {
+  background: transparent;
+}
+
+::v-deep .data-list-panel__table .el-table--border,
+::v-deep .data-list-panel__table .el-table--group {
+  border: 0;
+}
+
+::v-deep .data-list-panel__table .el-table--border::after,
+::v-deep .data-list-panel__table .el-table--group::after,
+::v-deep .data-list-panel__table .el-table__cell {
+  border-right: 0;
+}
+
+::v-deep .data-list-panel__table .el-table::before {
+  height: 1px;
+  background: var(--prototype-divider, #f0f0f2);
+}
+
+::v-deep .data-list-panel__table th.el-table__cell {
+  background: #fafbfc;
+}
+
+::v-deep .data-list-filter-form {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+::v-deep .data-list-filter-form .el-form-item {
+  margin: 0;
+}
+
+::v-deep .data-list-filter-form .el-form-item__label {
+  display: none;
+}
+
+::v-deep .data-list-filter-form .el-input,
+::v-deep .data-list-filter-form .el-select {
+  width: 168px !important;
+}
+
+::v-deep .data-list-filter-form .el-date-editor {
+  width: 218px !important;
+}
+
+::v-deep .data-list-actions {
+  display: flex;
+  align-items: center;
+  margin: 0 !important;
+  white-space: nowrap;
+}
+
+::v-deep .data-list-actions .el-col {
+  float: none;
+  width: auto;
+  padding-right: 0 !important;
+  padding-left: 6px !important;
+}
+
+::v-deep .data-list-actions .el-col:first-child {
+  padding-left: 0 !important;
+}
+
+::v-deep .data-list-actions .top-right-btn {
+  float: none;
+  margin-left: 8px;
+}
+
+::v-deep .data-list-table .data-list-operation-column .cell {
+  white-space: nowrap;
+}
+
+@media (max-width: 1200px) {
+  .data-list-panel__toolbar {
+    flex-direction: column;
+  }
+
+  .data-list-panel__actions {
+    width: 100%;
+    justify-content: flex-start;
+  }
+}
+
+@media (max-width: 768px) {
+  .data-list-panel__card {
+    padding: 10px;
+  }
+
+  ::v-deep .data-list-filter-form,
+  ::v-deep .data-list-actions {
+    width: 100%;
+  }
+
+  ::v-deep .data-list-actions {
+    flex-wrap: wrap;
+    gap: 8px 0;
+  }
+
+  ::v-deep .data-list-filter-form .el-form-item,
+  ::v-deep .data-list-filter-form .el-input,
+  ::v-deep .data-list-filter-form .el-select,
+  ::v-deep .data-list-filter-form .el-date-editor {
+    width: 100% !important;
+  }
+}
+</style>
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..f830859 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -105,8 +105,10 @@ export default {
 
 <style scoped>
 .pagination-container {
-  background: #fff;
-  padding: 32px 16px;
+  min-height: 36px;
+  margin: 12px 0 0;
+  padding: 4px 0 0;
+  background: transparent;
 }
 .pagination-container.hidden {
   display: none;
diff --git a/src/components/apk/index.vue b/src/components/apk/index.vue
index 847c128..23eb59f 100644
--- a/src/components/apk/index.vue
+++ b/src/components/apk/index.vue
@@ -48,13 +48,13 @@ export default {
 
 <style lang="scss" scoped>
 .right-menu-message {
-  position: relative;
-  top: -42%;
-  left: -30px;
-  transform: translateY(30%);
+  position: static;
+  display: inline-flex;
+  align-items: center;
   .el-dropdown-link {
-    font-size: 18px;
-    color: var(--navbar-text-color, #606266);
+    font-size: 12px;
+    color: var(--navbar-text-color, #5a5a72);
+    cursor: pointer;
   }
   .el-icon-arrow-down {
     font-size: 12px;
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 0d00e83..58ffe0b 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -28,25 +28,24 @@ export default {
 
 <style lang="scss" scoped>
 .app-main {
-  /* 50= navbar  50  */
-  height: calc(100% - 0px);
+  min-height: 100vh;
   width: 100%;
   position: relative;
   overflow-y: auto;
 }
 
 .fixed-header + .app-main {
-  padding-top: 50px;
+  padding-top: 52px;
 }
 
 .hasTagsView {
   .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    /* 86 = navbar + tags-view = 52 + 34 */
+    min-height: calc(100vh - 86px);
   }
 
   .fixed-header + .app-main {
-    padding-top: 84px;
+    padding-top: 86px;
   }
 }
 </style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c0b51c4..e9b63bb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -119,18 +119,19 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  height: 52px;
   overflow: hidden;
   position: relative;
   // background: #000;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  border-bottom: 1px solid #f0f0f2;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, .06);
   width: 100%;
   display: flex;
   align-items: center;
   color: var(--navbar-text-color);
 
   .hamburger-container {
-    line-height: 46px;
+    line-height: 52px;
     height: 100%;
     // float: left;
     cursor: pointer;
@@ -152,9 +153,11 @@ export default {
   }
 
   .right-menu {
-    float: right;
     margin-left: auto;
     height: 100%;
+    display: flex;
+    align-items: center;
+    gap: 14px;
 
     &:focus {
       outline: none;
@@ -164,8 +167,8 @@ export default {
       display: inline-block;
       padding: 0 8px;
       height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
+      font-size: 14px;
+      color: #5a5a72;
       vertical-align: text-bottom;
 
       &.hover-effect {
@@ -179,7 +182,7 @@ export default {
     }
 
     .avatar-container {
-      margin-right: 30px;
+      margin-right: 20px;
 
       .avatar-wrapper {
         position: relative;
@@ -201,8 +204,8 @@ export default {
           }
   
           .user-name {
-            font-size: 20px;
-            margin: 0 10px;
+            font-size: 12px;
+            margin: 0 8px;
             color: var(--navbar-text-color);
           }
   
@@ -220,7 +223,7 @@ export default {
         }
 
         .el-icon-caret-bottom {
-          font-size: 24px;
+          font-size: 12px;
           color: var(--navbar-text-color);
         }
 
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 8c3dcbd..e4b9959 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -164,12 +164,14 @@ export default {
         "layout-setting",
         `{
             "layoutMode":"left-menu",
+            "layoutVersion":"prototype-v1",
             "tagsView":${this.tagsView},
             "fixedHeader":${this.fixedHeader},
             "sidebarLogo":${this.sidebarLogo},
             "dynamicTitle":${this.dynamicTitle},
             "sideTheme":"${this.sideTheme}",
-            "theme":"${this.theme}"
+            "theme":"${this.theme}",
+            "fontSize":${this.fontSize}
           }`
       );
       setTimeout(this.$modal.closeLoading(), 1000)
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index e4b2f23..8216e2a 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -53,8 +53,8 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
-  line-height: 50px;
+  height: 52px;
+  line-height: 52px;
   background: #2b2f3a;
   text-align: center;
   overflow: hidden;
@@ -65,10 +65,12 @@ export default {
 
     & .sidebar-logo {
       max-width: 100%;
-      height: 50px;
+      width: 100%;
+      height: 52px;
       vertical-align: middle;
       margin-right: 0;
-      object-fit: cover;
+      object-fit: contain;
+      padding: 7px 12px;
     }
 
     & .sidebar-title {
@@ -76,7 +78,7 @@ export default {
       margin: 0;
       color: #fff;
       font-weight: 600;
-      line-height: 50px;
+      line-height: 52px;
       font-size: 14px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
diff --git a/src/layout/components/message.vue b/src/layout/components/message.vue
index 51af498..fd86dde 100644
--- a/src/layout/components/message.vue
+++ b/src/layout/components/message.vue
@@ -130,10 +130,16 @@ export default {
 
 <style lang="scss" scoped>
 .right-menu-message {
-  position: relative;
-  top: -50%;
-  left: -80px;
-  transform: translateY(30%);
+  position: static;
+  display: inline-flex;
+  align-items: center;
+
+  ::v-deep .el-button {
+    padding: 5px 10px;
+    border-color: #e5e7eb;
+    color: #5a5a72;
+    background: #fafbfc;
+  }
 }
 
 .right-menu-item {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d34a5f2..1163494 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme, '--table-font-size': fontSize + 'px'}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
@@ -36,6 +36,7 @@ export default {
   computed: {
     ...mapState({
       theme: state => state.settings.theme,
+      fontSize: state => state.settings.fontSize,
       sideTheme: state => state.settings.sideTheme,
       sidebar: state => state.app.sidebar,
       device: state => state.app.device,
diff --git a/src/main.js b/src/main.js
index f22fe3e..917ddac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,7 @@ import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/prototype-theme.scss' // management prototype visual baseline
 import App from './App'
 import store from './store'
 import router from './router'
@@ -33,6 +34,7 @@ import ImageUpload from "@/components/ImageUpload"
 import ImagePreview from "@/components/ImagePreview"
 // 字典标签组件
 import DictTag from '@/components/DictTag'
+import DataListPanel from '@/components/DataListPanel'
 // 头部标签组件
 import VueMeta from 'vue-meta'
 // 字典数据组件
@@ -59,6 +61,7 @@ Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
+Vue.component('DataListPanel', DataListPanel)
 Vue.component('ThreeDictTag', ThreeDictTag)
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
diff --git a/src/settings.js b/src/settings.js
index 5e7b06f..9255b43 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -37,7 +37,7 @@ module.exports = {
   /**
    * 表格字体大小
    */
-  fontSize: 14,
+  fontSize: 12,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 7f8e827..2c50306 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -3,22 +3,22 @@ import defaultSettings from '@/settings'
 const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo, dynamicTitle, fontSize } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
-const isLeftMenuLayout = storageSetting.layoutMode === 'left-menu'
+const isPrototypeLayout = storageSetting.layoutVersion === 'prototype-v1'
 const state = {
   title: '',
-  theme: storageSetting.theme || '#3650da', // #409EFF
+  theme: isPrototypeLayout ? (storageSetting.theme || '#1890ff') : '#1890ff',
   // Old saved settings belong to the former top-navigation layout. Start the
   // new left-menu layout with the light theme, then persist later selections.
-  sideTheme: isLeftMenuLayout ? (storageSetting.sideTheme || sideTheme) : sideTheme,
+  sideTheme: isPrototypeLayout ? (storageSetting.sideTheme || sideTheme) : sideTheme,
   showSettings: showSettings,
   // The project now uses a fixed left navigation layout. Ignore the old
   // persisted TopNav value so existing users are switched to the new layout.
   topNav: false,
-  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
-  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
-  sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
+  tagsView: isPrototypeLayout && storageSetting.tagsView !== undefined ? storageSetting.tagsView : tagsView,
+  fixedHeader: isPrototypeLayout && storageSetting.fixedHeader !== undefined ? storageSetting.fixedHeader : fixedHeader,
+  sidebarLogo: isPrototypeLayout && storageSetting.sidebarLogo !== undefined ? storageSetting.sidebarLogo : sidebarLogo,
   dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle,
-  fontSize: storageSetting.fontSize === undefined ? fontSize : storageSetting.fontSize
+  fontSize: isPrototypeLayout && storageSetting.fontSize !== undefined ? storageSetting.fontSize : fontSize
 }
 const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
diff --git a/src/views/flowable/definition/index.vue b/src/views/flowable/definition/index.vue
index 6d70462..883c03e 100644
--- a/src/views/flowable/definition/index.vue
+++ b/src/views/flowable/definition/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -23,8 +25,10 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="primary"-->
@@ -36,19 +40,15 @@
       <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          type="primary"
+          size="small"
           @click="handleLoadXml"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:deployment:remove']"
@@ -56,6 +56,8 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
+      <template #header>
     <el-alert title="流程设计说明" type="success">
       <template slot='title'>
         <p>流程设计说明:</p>
@@ -65,8 +67,9 @@
         <div>4、id参数设置为{processDefinitionKey}:{processDefinitionVersion}:{generated-id}，其中generated-id是一个唯一数字，用以保证在集群环境下，流程定义缓存中，流程id的唯一性。</div>
       </template>
     </el-alert>
-    <el-table v-loading="loading" fit :data="definitionList" border   @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      </template>
+    <el-table v-loading="loading" fit :data="definitionList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true"/>
       <el-table-column label="流程标识" align="center" prop="flowKey" :show-overflow-tooltip="true" />
       <el-table-column label="流程分类" align="center" prop="category" />
@@ -97,17 +100,18 @@
         </template>
       </el-table-column>
       <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180"/>
-      <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="330" fixed="right" class-name="data-list-operation-column">
         <template slot-scope="scope">
-          <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
-          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>
-          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
-          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
-          <el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
+          <el-button @click="handleLoadXml(scope.row)" size="mini">设计</el-button>
+          <el-button @click="handleAddForm(scope.row)" size="mini" v-if="scope.row.formId == null">配置主表单</el-button>
+          <el-button @click="handleUpdateSuspensionState(scope.row)" size="mini" v-if="scope.row.suspensionState === 1">挂起</el-button>
+          <el-button @click="handleUpdateSuspensionState(scope.row)" type="primary" size="mini" v-if="scope.row.suspensionState === 2">激活</el-button>
+          <el-button @click="handleDelete(scope.row)" type="danger" size="mini" v-hasPermi="['system:deployment:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -115,6 +119,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改流程定义对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/flowable/task/form/index.vue b/src/views/flowable/task/form/index.vue
index ff07f87..febc533 100644
--- a/src/views/flowable/task/form/index.vue
+++ b/src/views/flowable/task/form/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="表单名称" prop="formName">
         <el-input
           v-model="queryParams.formName"
@@ -15,24 +17,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['flowable:form:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['flowable:form:edit']"
@@ -41,9 +41,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['flowable:form:remove']"
@@ -51,41 +49,35 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['flowable:form:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="formList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="formList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="表单主键" align="center" prop="formId" />
       <el-table-column label="表单名称" align="center" prop="formName" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="220" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-view"
             @click="handleDetail(scope.row)"
           >详情</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['flowable:form:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['flowable:form:remove']"
           >删除</el-button>
@@ -93,6 +85,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -100,6 +93,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改流程表单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/hazard/audit/index.vue b/src/views/hazard/audit/index.vue
index 913a8e1..85562ac 100644
--- a/src/views/hazard/audit/index.vue
+++ b/src/views/hazard/audit/index.vue
@@ -181,7 +181,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.hazard-audit-page { min-height: calc(100vh - 84px); padding: 16px; background: #f3f5f8; }
+.hazard-audit-page { min-height: calc(100vh - 52px); padding: 16px 20px 40px; background: #f0f2f5; }
 .page-header { margin-bottom: 14px; padding: 14px 18px; border-radius: 8px; background: #fff; }
 .route-alert { margin-bottom: 14px; }
 .audit-content { display: grid; grid-template-columns: minmax(330px, 1.05fr) minmax(540px, 1.9fr) minmax(280px, .9fr); align-items: start; gap: 14px; min-height: 280px; }
diff --git a/src/views/hazard/ledger/index.vue b/src/views/hazard/ledger/index.vue
index 52b467a..64219d9 100644
--- a/src/views/hazard/ledger/index.vue
+++ b/src/views/hazard/ledger/index.vue
@@ -51,5 +51,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.hazard-ledger { min-height: calc(100vh - 84px); background: #f3f5f8; }.filter-bar { display: flex; align-items: center; flex-wrap: wrap; margin-bottom: 14px; padding: 16px 18px 2px; background: #fff; border-radius: 8px; }.filter-control { width: 170px; }.name-control { width: 210px; }.summary-inline { display: flex; align-items: center; gap: 20px; margin: 0 0 14px auto; padding: 0 6px; color: #909399; font-size: 13px; white-space: nowrap; }.summary-inline b { margin-left: 3px; color: #303133; }.warning-text { color: #e6a23c !important; }.success-text { color: #67c23a !important; }.danger-text { color: #f56c6c !important; }.table-card { border: 0; border-radius: 8px; }.table-note { margin-top: 12px; color: #909399; font-size: 12px; line-height: 1.6; }.retry-button { color: #e6a23c; }.detail-dialog { min-height: 250px; max-height: 68vh; overflow-y: auto; padding: 2px 2px 8px; }.detail-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 14px; }.detail-no { margin-right: 14px; color: #909399; font-size: 13px; }.detail-name { color: #303133; font-size: 18px; font-weight: 600; }.detail-tags { display: flex; gap: 8px; }.detail-section, .text-section, .attachment-section { margin-top: 16px; }.section-title { margin-bottom: 8px; color: #606266; font-weight: 600; }.text-row { display: grid; grid-template-columns: 90px 1fr; gap: 10px; padding: 7px 0; border-bottom: 1px solid #f0f2f5; font-size: 13px; }.text-row > span { color: #909399; }.text-row p { margin: 0; color: #303133; white-space: pre-wrap; word-break: break-word; }.attachment-tag { margin: 0 8px 8px 0; }.muted { color: #c0c4cc; font-size: 13px; }@media (max-width: 800px) { .summary-inline { width: 100%; justify-content: flex-end; flex-wrap: wrap; gap: 8px 16px; margin: 0 0 10px; white-space: normal; }.filter-control, .name-control { width: 100%; }.filter-bar .el-form-item { width: 100%; margin-right: 0; } }
+.hazard-ledger { min-height: calc(100vh - 52px); background: #f0f2f5; }.filter-bar { display: flex; align-items: center; flex-wrap: wrap; margin-bottom: 14px; padding: 14px 16px 0; background: #fff; border: 1px solid #f0f0f2; border-radius: 8px; }.filter-control { width: 170px; }.name-control { width: 210px; }.summary-inline { display: flex; align-items: center; gap: 20px; margin: 0 0 14px auto; padding: 0 6px; color: #9898ae; font-size: 12px; white-space: nowrap; }.summary-inline b { margin-left: 3px; color: #1a1a2e; }.warning-text { color: #c97e24 !important; }.success-text { color: #2d8a4e !important; }.danger-text { color: #d64550 !important; }.table-card { border: 1px solid #f0f0f2; border-radius: 8px; }.table-note { margin-top: 12px; color: #9898ae; font-size: 11px; line-height: 1.5; }.retry-button { color: #c97e24; }.detail-dialog { min-height: 250px; max-height: 68vh; overflow-y: auto; padding: 2px 2px 8px; }.detail-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 14px; }.detail-no { margin-right: 14px; color: #9898ae; font-size: 12px; }.detail-name { color: #1a1a2e; font-size: 16px; font-weight: 600; }.detail-tags { display: flex; gap: 8px; }.detail-section, .text-section, .attachment-section { margin-top: 16px; }.section-title { margin-bottom: 8px; color: #5a5a72; font-size: 13px; font-weight: 600; }.text-row { display: grid; grid-template-columns: 90px 1fr; gap: 10px; padding: 7px 0; border-bottom: 1px solid #f0f0f2; font-size: 12px; }.text-row > span { color: #9898ae; }.text-row p { margin: 0; color: #1a1a2e; white-space: pre-wrap; word-break: break-word; }.attachment-tag { margin: 0 8px 8px 0; }.muted { color: #9898ae; font-size: 12px; }@media (max-width: 800px) { .summary-inline { width: 100%; justify-content: flex-end; flex-wrap: wrap; gap: 8px 16px; margin: 0 0 10px; white-space: normal; }.filter-control, .name-control { width: 100%; }.filter-bar .el-form-item { width: 100%; margin-right: 0; } }
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index de36f7c..2911410 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -13,7 +13,7 @@
             <i class="el-icon-user" style="color: #fff; font-size: 25px;"></i>
           </template>
         </el-input>
-        <el-input show-password v-model="loginForm.password" class="password" type="password" placeholder="请输入密码">
+        <el-input show-password v-model="loginForm.password" id="psd" class="password" type="password" placeholder="请输入密码">
           <template #prepend>
             <i class="el-icon-lock" style="color: #fff; font-size: 25px;"></i>
           </template>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index e2a6d81..dd27604 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="登录地址" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"
@@ -51,14 +53,14 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['monitor:logininfor:remove']"
@@ -67,9 +69,8 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
+          size="small"
           @click="handleClean"
           v-hasPermi="['monitor:logininfor:remove']"
         >清空</el-button>
@@ -77,9 +78,8 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-unlock"
-          size="mini"
+          size="small"
           :disabled="single"
           @click="handleUnlock"
           v-hasPermi="['monitor:logininfor:unlock']"
@@ -87,19 +87,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['monitor:logininfor:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table ref="tables" v-loading="loading" :data="list" class="data-list-table" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
@@ -119,6 +118,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -126,6 +126,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
   </div>
 </template>
 
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 0956a6c..4151804 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="操作地址" prop="operIp">
         <el-input
           v-model="queryParams.operIp"
@@ -75,14 +77,14 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['monitor:operlog:remove']"
@@ -91,27 +93,25 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-delete"
-          size="mini"
+          size="small"
           @click="handleClean"
           v-hasPermi="['monitor:operlog:remove']"
         >清空</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['monitor:operlog:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list" class="data-list-table" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
@@ -138,12 +138,10 @@
           <span>{{ scope.row.costTime }}毫秒</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="90" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-view"
             @click="handleView(scope.row,scope.index)"
             v-hasPermi="['monitor:operlog:query']"
           >详细</el-button>
@@ -151,6 +149,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -158,6 +157,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" :visible.sync="open" width="800px" append-to-body>
diff --git a/src/views/points/management/index.vue b/src/views/points/management/index.vue
index 58ffe0a..4858e91 100644
--- a/src/views/points/management/index.vue
+++ b/src/views/points/management/index.vue
@@ -1,7 +1,612 @@
-<template><div class="app-container points-management"><el-tabs v-model="activeTab"><el-tab-pane label="积分规则" name="rules"><el-card shadow="never"><div slot="header" class="card-header"><span>积分规则配置 · 多档位</span><el-button v-if="isSuperAdmin" type="primary" size="small" icon="el-icon-plus" @click="openAdd">新建</el-button></div><el-form ref="queryForm" :model="queryParams" size="small" :inline="true"><el-form-item v-if="isSuperAdmin" label="厂区" prop="deptId"><el-select v-model="queryParams.deptId" clearable filterable placeholder="全部厂区" @change="handleQuery"><el-option v-for="item in factoryOptions" :key="String(item.deptId || item.id)" :label="item.deptName || item.label || item.name" :value="String(item.deptId || item.id)" /></el-select></el-form-item><el-form-item label="隐患等级" prop="hazardLevel"><el-select v-model="queryParams.hazardLevel" clearable placeholder="全部等级" @change="handleQuery"><el-option v-for="item in levelOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item><el-form-item label="启用状态" prop="enabled"><el-select v-model="queryParams.enabled" clearable placeholder="全部状态" @change="handleQuery"><el-option label="启用" :value="1" /><el-option label="停用" :value="0" /></el-select></el-form-item><el-form-item><el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button><el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></el-form-item></el-form><el-table v-loading="loading" :data="ruleList" stripe border empty-text="暂无积分规则"><el-table-column label="隐患等级"><template slot-scope="scope"><el-tag :type="levelTagType(scope.row)" size="small">{{ levelLabel(scope.row) }}</el-tag></template></el-table-column><el-table-column label="档位" width="120" align="center"><template slot-scope="scope"><span class="tier-text">{{ tierLabel(scope.row) }}</span></template></el-table-column><el-table-column prop="points" label="积分" width="120" align="center" /><el-table-column label="启用" width="120" align="center"><template slot-scope="scope"><el-switch :value="toEnabled(scope.row.enabled)" :active-value="1" :inactive-value="0" @change="toggleEnabled(scope.row, $event)" /></template></el-table-column><el-table-column label="操作" width="160" align="center" fixed="right"><template slot-scope="scope"><el-button type="text" size="small" @click="openDetail(scope.row)">详情</el-button><el-button type="text" size="small" class="danger-text" @click="handleDelete(scope.row)">删除</el-button></template></el-table-column></el-table><div class="card-footer-note">同一隐患等级支持 A/B/C 多档积分标准，档位由后端规则引擎按“等级 × 档位”匹配。</div><div class="card-bottom"><el-button size="small" plain @click="showPendingAction('保存为新版本')">保存为新版本</el-button><el-button size="small" plain @click="showPendingAction('V4历史月份试算')">V4历史月份试算</el-button><span>档位标准业主正在内部商讨，以上为演示配置；档位匹配逻辑由后端规则引擎判定（等级 × 档位 → 积分）。</span></div><pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /></el-card></el-tab-pane><el-tab-pane label="申诉处理" name="appeal" disabled /><el-tab-pane label="手动调整" name="adjust" disabled /><el-tab-pane label="流水冲正" name="reverse" disabled /></el-tabs><el-dialog title="积分规则详情" :visible.sync="detailVisible" width="560px" append-to-body><el-descriptions v-if="detail" :column="2" border size="small"><el-descriptions-item label="厂区">{{ detail.deptName || (detail.deptId ? detail.deptId : '全局规则') }}</el-descriptions-item><el-descriptions-item label="隐患等级">{{ levelLabel(detail) }}</el-descriptions-item><el-descriptions-item label="档位">{{ tierLabel(detail) }}</el-descriptions-item><el-descriptions-item label="积分">{{ detail.points == null ? '—' : detail.points }}</el-descriptions-item><el-descriptions-item label="启用状态">{{ toEnabled(detail.enabled) ? '启用' : '停用' }}</el-descriptions-item><el-descriptions-item label="优先级">{{ detail.priority || '—' }}</el-descriptions-item><el-descriptions-item label="规则编码">{{ detail.ruleCode || '—' }}</el-descriptions-item><el-descriptions-item label="规则名称">{{ detail.ruleName || '—' }}</el-descriptions-item><el-descriptions-item label="备注" :span="2">{{ detail.remark || '—' }}</el-descriptions-item><el-descriptions-item label="创建时间">{{ formatTime(detail.createTime) }}</el-descriptions-item><el-descriptions-item label="更新时间">{{ formatTime(detail.updateTime) }}</el-descriptions-item></el-descriptions><el-empty v-else description="暂无详情" /></el-dialog><el-dialog title="新建积分规则" :visible.sync="addVisible" width="560px" append-to-body><el-form ref="addForm" :model="addForm" :rules="addRules" label-width="92px" size="small"><el-form-item label="所属厂区" prop="deptId"><el-select v-model="addForm.deptId" filterable placeholder="请选择厂区" style="width: 100%"><el-option v-for="item in factoryOptions" :key="String(item.deptId || item.id)" :label="item.deptName || item.label || item.name" :value="String(item.deptId || item.id)" /></el-select></el-form-item><el-form-item label="隐患等级" prop="hazardLevel"><el-select v-model="addForm.hazardLevel" placeholder="请选择隐患等级" style="width: 100%" @change="suggestTier"><el-option v-for="item in levelOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item><el-form-item label="档位" prop="hazardCategory"><el-input v-model.trim="addForm.hazardCategory" maxlength="4" placeholder="如 A、B、C" @input="normalizeTier" /></el-form-item><el-form-item label="积分" prop="points"><el-input-number v-model="addForm.points" :min="0" :precision="0" style="width: 100%" /></el-form-item><el-form-item label="优先级"><el-input-number v-model="addForm.priority" :min="1" :precision="0" style="width: 100%" /></el-form-item><el-form-item label="规则编码"><el-input v-model.trim="addForm.ruleCode" /></el-form-item><el-form-item label="规则名称"><el-input v-model.trim="addForm.ruleName" /></el-form-item><el-form-item label="备注"><el-input v-model.trim="addForm.remark" type="textarea" :rows="2" /></el-form-item></el-form><span slot="footer"><el-button @click="addVisible = false">取消</el-button><el-button type="primary" :loading="saving" @click="submitAdd">确定</el-button></span></el-dialog></div></template>
+<template>
+  <div class="app-container points-management">
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="积分规则" name="rules">
+        <data-list-panel>
+          <template #filters>
+            <el-form
+              ref="queryForm"
+              :model="queryParams"
+              size="small"
+              :inline="true"
+              class="data-list-filter-form"
+            >
+              <el-form-item v-if="isSuperAdmin" label="厂区" prop="deptId">
+                <el-select
+                  v-model="queryParams.deptId"
+                  clearable
+                  filterable
+                  placeholder="全部厂区"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in factoryOptions"
+                    :key="String(item.deptId || item.id)"
+                    :label="item.deptName || item.label || item.name"
+                    :value="String(item.deptId || item.id)"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="隐患等级" prop="hazardLevel">
+                <el-select
+                  v-model="queryParams.hazardLevel"
+                  clearable
+                  placeholder="全部等级"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in levelOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="启用状态" prop="enabled">
+                <el-select
+                  v-model="queryParams.enabled"
+                  clearable
+                  placeholder="全部状态"
+                  @change="handleQuery"
+                >
+                  <el-option label="启用" :value="1" />
+                  <el-option label="停用" :value="0" />
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="handleQuery"
+                >查询</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </template>
+          <template #actions>
+            <div class="data-list-actions">
+              <el-button
+                v-if="isSuperAdmin"
+                type="primary"
+                size="small"
+                icon="el-icon-plus"
+                @click="openAdd"
+              >新建</el-button>
+            </div>
+          </template>
+          <template #header>
+            <div class="rule-heading">
+              <div class="rule-heading__title">积分规则配置 · 多档位</div>
+              <div class="rule-heading__description">
+                同一隐患等级支持 A/B/C 多档积分标准，档位由后端规则引擎按“等级 × 档位”匹配。
+              </div>
+            </div>
+          </template>
+          <el-table
+            v-loading="loading"
+            :data="ruleList"
+            class="data-list-table"
+            empty-text="暂无积分规则"
+          >
+            <el-table-column label="隐患等级" min-width="180">
+              <template slot-scope="scope">
+                <el-tag :type="levelTagType(scope.row)" size="small">
+                  {{ levelLabel(scope.row) }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="档位" width="120" align="center">
+              <template slot-scope="scope">
+                <span class="tier-text">{{ tierLabel(scope.row) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="points" label="积分" width="120" align="center" />
+            <el-table-column label="启用" width="120" align="center">
+              <template slot-scope="scope">
+                <el-switch
+                  :value="toEnabled(scope.row.enabled)"
+                  :active-value="1"
+                  :inactive-value="0"
+                  @change="toggleEnabled(scope.row, $event)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              width="160"
+              align="center"
+              fixed="right"
+              class-name="data-list-operation-column"
+            >
+              <template slot-scope="scope">
+                <el-button size="small" @click="openDetail(scope.row)">详情</el-button>
+                <el-button
+                  type="danger"
+                  size="small"
+                  @click="handleDelete(scope.row)"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <template #footer>
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+            <div class="rule-version">
+              <div class="rule-version__actions">
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="showPendingAction('保存为新版本 V4')"
+                >保存为新版本 V4</el-button>
+                <el-button
+                  size="small"
+                  @click="showPendingAction('历史月份试算')"
+                >历史月份试算</el-button>
+              </div>
+              <div class="rule-version__note">
+                档位标准业主正在内部商讨，以上为演示配置；档位匹配逻辑由后端规则引擎判定（等级 × 档位 → 积分）。
+              </div>
+            </div>
+          </template>
+        </data-list-panel>
+      </el-tab-pane>
+      ><el-tab-pane label="申诉处理" name="appeal" disabled /><el-tab-pane
+        label="手动调整"
+        name="adjust"
+        disabled /><el-tab-pane
+        label="流水冲正"
+        name="reverse"
+        disabled /></el-tabs
+    ><el-dialog
+      title="积分规则详情"
+      :visible.sync="detailVisible"
+      width="560px"
+      append-to-body
+      ><el-descriptions v-if="detail" :column="2" border size="small"
+        ><el-descriptions-item label="厂区">{{
+          detail.deptName || (detail.deptId ? detail.deptId : "全局规则")
+        }}</el-descriptions-item
+        ><el-descriptions-item label="隐患等级">{{
+          levelLabel(detail)
+        }}</el-descriptions-item
+        ><el-descriptions-item label="档位">{{
+          tierLabel(detail)
+        }}</el-descriptions-item
+        ><el-descriptions-item label="积分">{{
+          detail.points == null ? "—" : detail.points
+        }}</el-descriptions-item
+        ><el-descriptions-item label="启用状态">{{
+          toEnabled(detail.enabled) ? "启用" : "停用"
+        }}</el-descriptions-item
+        ><el-descriptions-item label="优先级">{{
+          detail.priority || "—"
+        }}</el-descriptions-item
+        ><el-descriptions-item label="规则编码">{{
+          detail.ruleCode || "—"
+        }}</el-descriptions-item
+        ><el-descriptions-item label="规则名称">{{
+          detail.ruleName || "—"
+        }}</el-descriptions-item
+        ><el-descriptions-item label="备注" :span="2">{{
+          detail.remark || "—"
+        }}</el-descriptions-item
+        ><el-descriptions-item label="创建时间">{{
+          formatTime(detail.createTime)
+        }}</el-descriptions-item
+        ><el-descriptions-item label="更新时间">{{
+          formatTime(detail.updateTime)
+        }}</el-descriptions-item></el-descriptions
+      ><el-empty v-else description="暂无详情" /></el-dialog
+    ><el-dialog
+      title="新建积分规则"
+      :visible.sync="addVisible"
+      width="560px"
+      append-to-body
+      ><el-form
+        ref="addForm"
+        :model="addForm"
+        :rules="addRules"
+        label-width="92px"
+        size="small"
+        ><el-form-item label="所属厂区" prop="deptId"
+          ><el-select
+            v-model="addForm.deptId"
+            filterable
+            placeholder="请选择厂区"
+            style="width: 100%"
+            ><el-option
+              v-for="item in factoryOptions"
+              :key="String(item.deptId || item.id)"
+              :label="item.deptName || item.label || item.name"
+              :value="
+                String(item.deptId || item.id)
+              " /></el-select></el-form-item
+        ><el-form-item label="隐患等级" prop="hazardLevel"
+          ><el-select
+            v-model="addForm.hazardLevel"
+            placeholder="请选择隐患等级"
+            style="width: 100%"
+            @change="suggestTier"
+            ><el-option
+              v-for="item in levelOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value" /></el-select></el-form-item
+        ><el-form-item label="档位" prop="hazardCategory"
+          ><el-input
+            v-model.trim="addForm.hazardCategory"
+            maxlength="4"
+            placeholder="如 A、B、C"
+            @input="normalizeTier" /></el-form-item
+        ><el-form-item label="积分" prop="points"
+          ><el-input-number
+            v-model="addForm.points"
+            :min="0"
+            :precision="0"
+            style="width: 100%" /></el-form-item
+        ><el-form-item label="优先级"
+          ><el-input-number
+            v-model="addForm.priority"
+            :min="1"
+            :precision="0"
+            style="width: 100%" /></el-form-item
+        ><el-form-item label="规则编码"
+          ><el-input v-model.trim="addForm.ruleCode" /></el-form-item
+        ><el-form-item label="规则名称"
+          ><el-input v-model.trim="addForm.ruleName" /></el-form-item
+        ><el-form-item label="备注"
+          ><el-input
+            v-model.trim="addForm.remark"
+            type="textarea"
+            :rows="2" /></el-form-item></el-form
+      ><span slot="footer"
+        ><el-button @click="addVisible = false">取消</el-button
+        ><el-button type="primary" :loading="saving" @click="submitAdd"
+          >确定</el-button
+        ></span
+      ></el-dialog
+    >
+  </div>
+</template>
 <script>
-import { listPointsRules, listFactoryDepartments, togglePointsRule, deletePointsRule, getPointsRule, addPointsRule } from '@/api/points/rule'
-const LEVELS = [{ value: 'general', label: '一般隐患' }, { value: 'major', label: '较大隐患' }, { value: 'critical', label: '重大隐患' }]
-export default { name: 'PointsManagement', data() { const deptRequired = (rule, value, callback) => { if (!value) callback(new Error('请选择所属厂区')); else callback() }; return { activeTab: 'rules', loading: false, saving: false, total: 0, ruleList: [], factoryOptions: [], detail: null, detailVisible: false, addVisible: false, levelOptions: LEVELS, queryParams: { pageNum: 1, pageSize: 10, deptId: undefined, hazardLevel: undefined, enabled: undefined }, addForm: { deptId: '', hazardLevel: '', hazardCategory: '', points: null, priority: 1, ruleCode: '', ruleName: '', remark: '' }, addRules: { deptId: [{ validator: deptRequired, trigger: 'change' }], hazardLevel: [{ required: true, message: '请选择隐患等级', trigger: 'change' }], hazardCategory: [{ required: true, message: '请输入档位', trigger: 'blur' }, { pattern: /^[A-Z]+$/, message: '档位请输入大写英文字母', trigger: 'blur' }], points: [{ required: true, message: '请输入积分', trigger: 'change' }] }} }, computed: { isSuperAdmin() { return (this.$store.getters.roles || []).indexOf('admin') !== -1 } }, created() { this.getList(); if (this.isSuperAdmin) this.getFactories() }, methods: { getList() { this.loading = true; listPointsRules(this.queryParams).then(res => { const page = res.data || res; this.ruleList = this.sortRules(page.list || page.rows || []); this.total = Number(page.total || page.totalCount || this.ruleList.length) }).catch(() => { this.ruleList = []; this.total = 0; this.$modal.msgError('积分规则加载失败') }).finally(() => { this.loading = false }) }, getFactories() { listFactoryDepartments().then(res => { const data = res.data || res; this.factoryOptions = Array.isArray(data) ? data : (data.list || data.rows || []) }).catch(() => { this.factoryOptions = [] }) }, sortRules(rows) { const order = { general: 0, major: 1, critical: 2 }; return rows.slice().sort((a, b) => (order[String(a.hazardLevel).toLowerCase()] == null ? 99 : order[String(a.hazardLevel).toLowerCase()]) - (order[String(b.hazardLevel).toLowerCase()] == null ? 99 : order[String(b.hazardLevel).toLowerCase()]) || this.tierLabel(a).localeCompare(this.tierLabel(b)) || Number(b.priority || 0) - Number(a.priority || 0)) }, handleQuery() { this.queryParams.pageNum = 1; this.getList() }, resetQuery() { this.$refs.queryForm.resetFields(); this.handleQuery() }, openAdd() { this.addForm = { deptId: '', hazardLevel: '', hazardCategory: '', points: null, priority: 1, ruleCode: '', ruleName: '', remark: '' }; this.addVisible = true }, suggestTier() { this.addForm.hazardCategory = this.nextTier(this.addForm.hazardLevel); this.addForm.priority = this.nextPriority(this.addForm.hazardLevel) }, nextPriority(level) { const values = this.ruleList.filter(row => String(row.hazardLevel).toLowerCase() === String(level).toLowerCase()).map(row => Number(row.priority) || 0); return (values.length ? Math.max.apply(null, values) : 0) + 1 }, nextTier(level) { const letters = this.ruleList.filter(row => String(row.hazardLevel).toLowerCase() === String(level).toLowerCase()).map(this.tierLabel); let max = 0; letters.forEach(value => { let n = 0; for (let i = 0; i < value.length; i++) n = n * 26 + value.charCodeAt(i) - 64; max = Math.max(max, n) }); return this.numberToLetters(max + 1) }, numberToLetters(number) { let result = ''; while (number > 0) { result = String.fromCharCode(65 + (number - 1) % 26) + result; number = Math.floor((number - 1) / 26) } return result || 'A' }, normalizeTier(value) { this.addForm.hazardCategory = String(value || '').replace(/[^a-z]/gi, '').toUpperCase() }, submitAdd() { this.$refs.addForm.validate(valid => { if (!valid) return; const payload = { deptId: this.addForm.deptId, hazardLevel: this.addForm.hazardLevel, hazardCategory: this.addForm.hazardCategory, points: this.addForm.points, enabled: 1, priority: this.addForm.priority, ruleCode: this.addForm.ruleCode || undefined, ruleName: this.addForm.ruleName || undefined, remark: this.addForm.remark || undefined }; const item = this.factoryOptions.find(row => String(row.deptId || row.id) === String(payload.deptId)); if (item) payload.deptName = item.deptName || item.label || item.name; this.saving = true; addPointsRule(payload).then(() => { this.$modal.msgSuccess('新增积分规则成功'); this.addVisible = false; this.getList() }).finally(() => { this.saving = false }) }) }, toggleEnabled(row, value) { const old = this.toEnabled(row.enabled); togglePointsRule(row.id, Number(value)).then(() => { row.enabled = Number(value); this.$modal.msgSuccess('操作成功') }).catch(() => { row.enabled = old }) }, handleDelete(row) { this.$confirm('确认删除该积分规则吗？删除后不可恢复。', '删除确认', { type: 'warning' }).then(() => deletePointsRule(row.id)).then(() => { this.$modal.msgSuccess('删除成功'); this.getList() }) }, openDetail(row) { this.detailVisible = true; this.detail = null; getPointsRule(row.id).then(res => { this.detail = res.data || res }) }, showPendingAction(name) { this.$modal.msgInfo(`${name}功能暂未接入接口`) }, toEnabled(value) { return Number(value) === 1 ? 1 : 0 }, tierLabel(row) { return String(row.hazardCategory || '—').toUpperCase() }, levelLabel(row) { return row.hazardLevelName || ((LEVELS.find(item => item.value === String(row.hazardLevel).toLowerCase()) || {}).label) || row.hazardLevel || '—' }, levelTagType(row) { return String(row.hazardLevel).toLowerCase() === 'critical' ? 'danger' : String(row.hazardLevel).toLowerCase() === 'major' ? 'warning' : 'info' }, formatTime(value) { return value ? String(value).replace('T', ' ').slice(0, 19) : '—' } }}
+import {
+  listPointsRules,
+  listFactoryDepartments,
+  togglePointsRule,
+  deletePointsRule,
+  getPointsRule,
+  addPointsRule,
+} from "@/api/points/rule";
+const LEVELS = [
+  { value: "general", label: "一般隐患" },
+  { value: "major", label: "较大隐患" },
+  { value: "critical", label: "重大隐患" },
+];
+export default {
+  name: "PointsManagement",
+  data() {
+    const deptRequired = (rule, value, callback) => {
+      if (!value) callback(new Error("请选择所属厂区"));
+      else callback();
+    };
+    return {
+      activeTab: "rules",
+      loading: false,
+      saving: false,
+      total: 0,
+      ruleList: [],
+      factoryOptions: [],
+      detail: null,
+      detailVisible: false,
+      addVisible: false,
+      levelOptions: LEVELS,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined,
+        hazardLevel: undefined,
+        enabled: undefined,
+      },
+      addForm: {
+        deptId: "",
+        hazardLevel: "",
+        hazardCategory: "",
+        points: null,
+        priority: 1,
+        ruleCode: "",
+        ruleName: "",
+        remark: "",
+      },
+      addRules: {
+        deptId: [{ validator: deptRequired, trigger: "change" }],
+        hazardLevel: [
+          { required: true, message: "请选择隐患等级", trigger: "change" },
+        ],
+        hazardCategory: [
+          { required: true, message: "请输入档位", trigger: "blur" },
+          {
+            pattern: /^[A-Z]+$/,
+            message: "档位请输入大写英文字母",
+            trigger: "blur",
+          },
+        ],
+        points: [{ required: true, message: "请输入积分", trigger: "change" }],
+      },
+    };
+  },
+  computed: {
+    isSuperAdmin() {
+      return (this.$store.getters.roles || []).indexOf("admin") !== -1;
+    },
+  },
+  created() {
+    this.getList();
+    if (this.isSuperAdmin) this.getFactories();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listPointsRules(this.queryParams)
+        .then((res) => {
+          const page = res.data || res;
+          this.ruleList = this.sortRules(page.list || page.rows || []);
+          this.total = Number(
+            page.total || page.totalCount || this.ruleList.length
+          );
+        })
+        .catch(() => {
+          this.ruleList = [];
+          this.total = 0;
+          this.$modal.msgError("积分规则加载失败");
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    getFactories() {
+      listFactoryDepartments()
+        .then((res) => {
+          const data = res.data || res;
+          this.factoryOptions = Array.isArray(data)
+            ? data
+            : data.list || data.rows || [];
+        })
+        .catch(() => {
+          this.factoryOptions = [];
+        });
+    },
+    sortRules(rows) {
+      const order = { general: 0, major: 1, critical: 2 };
+      return rows
+        .slice()
+        .sort(
+          (a, b) =>
+            (order[String(a.hazardLevel).toLowerCase()] == null
+              ? 99
+              : order[String(a.hazardLevel).toLowerCase()]) -
+              (order[String(b.hazardLevel).toLowerCase()] == null
+                ? 99
+                : order[String(b.hazardLevel).toLowerCase()]) ||
+            this.tierLabel(a).localeCompare(this.tierLabel(b)) ||
+            Number(b.priority || 0) - Number(a.priority || 0)
+        );
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.$refs.queryForm.resetFields();
+      this.handleQuery();
+    },
+    openAdd() {
+      this.addForm = {
+        deptId: "",
+        hazardLevel: "",
+        hazardCategory: "",
+        points: null,
+        priority: 1,
+        ruleCode: "",
+        ruleName: "",
+        remark: "",
+      };
+      this.addVisible = true;
+    },
+    suggestTier() {
+      this.addForm.hazardCategory = this.nextTier(this.addForm.hazardLevel);
+      this.addForm.priority = this.nextPriority(this.addForm.hazardLevel);
+    },
+    nextPriority(level) {
+      const values = this.ruleList
+        .filter(
+          (row) =>
+            String(row.hazardLevel).toLowerCase() ===
+            String(level).toLowerCase()
+        )
+        .map((row) => Number(row.priority) || 0);
+      return (values.length ? Math.max.apply(null, values) : 0) + 1;
+    },
+    nextTier(level) {
+      const letters = this.ruleList
+        .filter(
+          (row) =>
+            String(row.hazardLevel).toLowerCase() ===
+            String(level).toLowerCase()
+        )
+        .map(this.tierLabel);
+      let max = 0;
+      letters.forEach((value) => {
+        let n = 0;
+        for (let i = 0; i < value.length; i++)
+          n = n * 26 + value.charCodeAt(i) - 64;
+        max = Math.max(max, n);
+      });
+      return this.numberToLetters(max + 1);
+    },
+    numberToLetters(number) {
+      let result = "";
+      while (number > 0) {
+        result = String.fromCharCode(65 + ((number - 1) % 26)) + result;
+        number = Math.floor((number - 1) / 26);
+      }
+      return result || "A";
+    },
+    normalizeTier(value) {
+      this.addForm.hazardCategory = String(value || "")
+        .replace(/[^a-z]/gi, "")
+        .toUpperCase();
+    },
+    submitAdd() {
+      this.$refs.addForm.validate((valid) => {
+        if (!valid) return;
+        const payload = {
+          deptId: this.addForm.deptId,
+          hazardLevel: this.addForm.hazardLevel,
+          hazardCategory: this.addForm.hazardCategory,
+          points: this.addForm.points,
+          enabled: 1,
+          priority: this.addForm.priority,
+          ruleCode: this.addForm.ruleCode || undefined,
+          ruleName: this.addForm.ruleName || undefined,
+          remark: this.addForm.remark || undefined,
+        };
+        const item = this.factoryOptions.find(
+          (row) => String(row.deptId || row.id) === String(payload.deptId)
+        );
+        if (item) payload.deptName = item.deptName || item.label || item.name;
+        this.saving = true;
+        addPointsRule(payload)
+          .then(() => {
+            this.$modal.msgSuccess("新增积分规则成功");
+            this.addVisible = false;
+            this.getList();
+          })
+          .finally(() => {
+            this.saving = false;
+          });
+      });
+    },
+    toggleEnabled(row, value) {
+      const old = this.toEnabled(row.enabled);
+      togglePointsRule(row.id, Number(value))
+        .then(() => {
+          row.enabled = Number(value);
+          this.$modal.msgSuccess("操作成功");
+        })
+        .catch(() => {
+          row.enabled = old;
+        });
+    },
+    handleDelete(row) {
+      this.$confirm("确认删除该积分规则吗？删除后不可恢复。", "删除确认", {
+        type: "warning",
+      })
+        .then(() => deletePointsRule(row.id))
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getList();
+        });
+    },
+    openDetail(row) {
+      this.detailVisible = true;
+      this.detail = null;
+      getPointsRule(row.id).then((res) => {
+        this.detail = res.data || res;
+      });
+    },
+    showPendingAction(name) {
+      this.$modal.msgInfo(`${name}功能暂未接入接口`);
+    },
+    toEnabled(value) {
+      return Number(value) === 1 ? 1 : 0;
+    },
+    tierLabel(row) {
+      return String(row.hazardCategory || "—").toUpperCase();
+    },
+    levelLabel(row) {
+      return (
+        row.hazardLevelName ||
+        (
+          LEVELS.find(
+            (item) => item.value === String(row.hazardLevel).toLowerCase()
+          ) || {}
+        ).label ||
+        row.hazardLevel ||
+        "—"
+      );
+    },
+    levelTagType(row) {
+      return String(row.hazardLevel).toLowerCase() === "critical"
+        ? "danger"
+        : String(row.hazardLevel).toLowerCase() === "major"
+        ? "warning"
+        : "info";
+    },
+    formatTime(value) {
+      return value ? String(value).replace("T", " ").slice(0, 19) : "—";
+    },
+  },
+};
 </script>
-<style lang="scss" scoped>.points-management{min-height:calc(100vh - 84px);background:#f5f7fa}.card-header{display:flex;align-items:center;justify-content:space-between}.tier-text{display:inline-flex;padding:3px 10px;color:#409eff;background:#ecf5ff;border-radius:12px;font-weight:600}.danger-text{color:#f56c6c}.card-footer-note{margin-top:14px;color:#909399;font-size:12px}.card-bottom{display:flex;align-items:center;gap:10px;margin-top:16px;padding-top:14px;border-top:1px solid #ebeef5}.card-bottom span{color:#a0a4aa;font-size:12px}@media(max-width:800px){.card-bottom{align-items:flex-start;flex-direction:column}}</style>
+<style lang="scss" scoped>
+.points-management {
+  min-height: calc(100vh - 52px);
+  background: #f0f2f5;
+}
+.rule-heading {
+  min-width: 0;
+}
+.rule-heading__title {
+  color: #1a1a2e;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+}
+.rule-heading__description {
+  margin-top: 6px;
+  color: #9898ae;
+  font-size: 11px;
+  font-weight: 400;
+  line-height: 18px;
+}
+.tier-text {
+  display: inline-flex;
+  padding: 1px 8px;
+  color: #3b5fd9;
+  background: #eef1fe;
+  border: 1px solid #c7d2f8;
+  border-radius: 8px;
+  font-size: 11px;
+  line-height: 18px;
+  font-weight: 500;
+}
+.rule-version {
+  margin-top: 12px;
+  padding-top: 16px;
+  border-top: 1px solid #f0f0f2;
+}
+.rule-version__actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.rule-version__actions .el-button + .el-button {
+  margin-left: 0;
+}
+.rule-version__note {
+  margin-top: 10px;
+  color: #9898ae;
+  font-size: 11px;
+  line-height: 18px;
+}
+@media (max-width: 800px) {
+  .rule-version__actions {
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 2a5a5e6..8d07fbc 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"
@@ -45,24 +47,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:config:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:config:edit']"
@@ -71,9 +71,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:config:remove']"
@@ -81,10 +79,8 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['system:config:export']"
         >导出</el-button>
@@ -92,18 +88,18 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-refresh"
-          size="mini"
+          size="small"
           @click="handleRefreshCache"
           v-hasPermi="['system:config:remove']"
         >刷新缓存</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="configList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
       <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
@@ -119,19 +115,16 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:config:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:config:remove']"
           >删除</el-button>
@@ -139,6 +132,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -146,6 +140,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 4782fe5..2fcc0b7 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -24,29 +26,28 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
-          plain
           icon="el-icon-sort"
-          size="mini"
+          size="small"
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
     <el-table
       v-if="refreshTable"
@@ -55,6 +56,7 @@
       row-key="deptId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      class="data-list-table"
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
@@ -63,38 +65,35 @@
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="220" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-plus"
+            type="primary"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
             v-if="scope.row.parentId != 0"
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
+    </data-list-panel>
 
     <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index a67b4c6..71550e1 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -50,24 +52,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:dict:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:dict:edit']"
@@ -76,9 +76,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:dict:remove']"
@@ -86,10 +84,8 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['system:dict:export']"
         >导出</el-button>
@@ -97,18 +93,18 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
           icon="el-icon-refresh"
-          size="mini"
+          size="small"
           @click="handleRefreshCache"
           v-hasPermi="['system:dict:remove']"
         >刷新缓存</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="typeList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
@@ -129,19 +125,16 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>
@@ -149,6 +142,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -156,6 +150,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -344,4 +340,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/expression/index.vue b/src/views/system/expression/index.vue
index 2ec441f..d1c78a6 100644
--- a/src/views/system/expression/index.vue
+++ b/src/views/system/expression/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -24,24 +26,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:expression:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:expression:edit']"
@@ -50,9 +50,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:expression:remove']"
@@ -60,36 +58,32 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['system:expression:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="expressionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="expressionList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="表达式内容" align="center" prop="expression" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:expression:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:expression:remove']"
           >删除</el-button>
@@ -97,6 +91,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -104,6 +99,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改流程达式对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/system/listener/index.vue b/src/views/system/listener/index.vue
index fcb8e09..02e4270 100644
--- a/src/views/system/listener/index.vue
+++ b/src/views/system/listener/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -24,24 +26,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:listener:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:listener:edit']"
@@ -50,9 +50,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:listener:remove']"
@@ -60,19 +58,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['system:listener:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="listenerList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="listenerList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="监听类型" align="center" prop="type">
         <template slot-scope="scope">
@@ -86,19 +83,16 @@
         </template>
       </el-table-column>
       <el-table-column label="执行内容" align="center" prop="value" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:listener:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:listener:remove']"
           >删除</el-button>
@@ -106,6 +100,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -113,6 +108,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改流程监听对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c703fa0..0386c42 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -24,29 +26,28 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:menu:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
-          plain
           icon="el-icon-sort"
-          size="mini"
+          size="small"
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
     <el-table
       v-if="refreshTable"
@@ -55,6 +56,7 @@
       row-key="menuId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      class="data-list-table"
     >
       <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">
@@ -75,32 +77,29 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="220" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-plus"
+            type="primary"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:menu:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
+    </data-list-panel>
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 36b330d..bbb403a 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
@@ -32,24 +34,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:notice:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:notice:edit']"
@@ -58,9 +58,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:notice:remove']"
@@ -68,9 +66,10 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="noticeList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
         label="公告标题"
@@ -94,19 +93,16 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:notice:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:notice:remove']"
           >删除</el-button>
@@ -114,6 +110,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -121,6 +118,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改公告对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 29b8c78..f20f493 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container system-list-page">
+    <data-list-panel>
+      <template #filters>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" class="data-list-filter-form">
       <el-form-item label="岗位编码" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
@@ -32,24 +34,22 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+      </template>
 
-    <el-row :gutter="10" class="mb8">
+      <template #actions>
+    <el-row :gutter="10" class="data-list-actions">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+          size="small"
           @click="handleAdd"
           v-hasPermi="['system:post:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
+          type="primary"
+          size="small"
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:post:edit']"
@@ -58,9 +58,7 @@
       <el-col :span="1.5">
         <el-button
           type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:post:remove']"
@@ -68,19 +66,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
           v-hasPermi="['system:post:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+      </template>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="postList" class="data-list-table" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
@@ -95,19 +92,16 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="150" class-name="data-list-operation-column">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:post:edit']"
           >修改</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
+            type="danger"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:post:remove']"
           >删除</el-button>
@@ -115,6 +109,7 @@
       </el-table-column>
     </el-table>
 
+      <template #footer>
     <pagination
       v-show="total>0"
       :total="total"
@@ -122,6 +117,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7f4fd83..7e1e2f4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,159 +1,166 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="角色状态"
-          clearable
-          style="width: 240px"
+  <div class="app-container role-management-page">
+    <data-list-panel>
+      <template #filters>
+        <el-form
+          v-show="showSearch"
+          ref="queryForm"
+          :model="queryParams"
+          size="small"
+          :inline="true"
+          class="role-filter-form"
         >
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:role:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:role:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:role:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          <el-form-item prop="roleName">
+            <el-input
+              v-model="queryParams.roleName"
+              placeholder="角色名称"
+              clearable
+              class="filter-role-name"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item prop="roleKey">
+            <el-input
+              v-model="queryParams.roleKey"
+              placeholder="权限字符"
+              clearable
+              class="filter-role-key"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="全部状态"
+              clearable
+              class="filter-status"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-date-picker
+              v-model="dateRange"
+              class="filter-date"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item class="filter-buttons">
+            <el-button type="primary" size="small" @click="handleQuery">搜索</el-button>
+            <el-button size="small" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </template>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+      <template #actions>
+        <div class="role-list-actions">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            type="primary"
+            size="small"
+            @click="handleAdd"
+            v-hasPermi="['system:role:add']"
+          >新增</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="single"
+            @click="handleUpdate"
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            type="danger"
+            size="small"
+            :disabled="multiple"
+            @click="handleDelete"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
-                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
-              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
-                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
+          <el-button
+            icon="el-icon-download"
+            size="small"
+            @click="handleExport"
+            v-hasPermi="['system:role:export']"
+          >导出</el-button>
+          <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+        </div>
+      </template>
+
+      <el-table
+        v-loading="loading"
+        :data="roleList"
+        class="role-list-table"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="角色编号" prop="roleId" width="120" />
+        <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" min-width="160" />
+        <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" min-width="160" />
+        <el-table-column label="显示顺序" prop="roleSort" width="120" />
+        <el-table-column label="状态" align="center" width="120">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              active-value="0"
+              inactive-value="1"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="220" class-name="role-operation-column">
+          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+            <el-button
+              size="mini"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']"
+            >删除</el-button>
+            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+              <el-button size="mini" type="primary">更多<i class="el-icon-arrow-down el-icon--right" /></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  command="handleDataScope"
+                  icon="el-icon-circle-check"
+                  v-hasPermi="['system:role:edit']"
+                >数据权限</el-dropdown-item>
+                <el-dropdown-item
+                  command="handleAuthUser"
+                  icon="el-icon-user"
+                  v-hasPermi="['system:role:edit']"
+                >分配用户</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <template #footer>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </template>
+    </data-list-panel>
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -602,4 +609,77 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.role-management-page {
+  min-height: calc(100vh - 52px);
+}
+
+.role-filter-form {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.role-filter-form .el-form-item {
+  margin: 0;
+}
+
+.filter-role-name,
+.filter-role-key {
+  width: 168px;
+}
+
+.filter-status {
+  width: 112px;
+}
+
+.filter-date {
+  width: 218px;
+}
+
+.filter-buttons {
+  white-space: nowrap;
+}
+
+.role-list-actions {
+  display: flex;
+  align-items: center;
+  gap: 0;
+  white-space: nowrap;
+}
+
+::v-deep .role-list-table .role-operation-column .cell {
+  white-space: nowrap;
+}
+
+::v-deep .role-list-table .role-operation-column .el-dropdown {
+  margin-left: 6px;
+}
+
+::v-deep .role-list-actions .top-right-btn {
+  float: none;
+  margin-left: 8px;
+}
+
+@media (max-width: 768px) {
+  .role-filter-form,
+  .role-list-actions {
+    width: 100%;
+  }
+
+  .role-list-actions {
+    flex-wrap: wrap;
+    gap: 8px 0;
+  }
+
+  .filter-role-name,
+  .filter-role-key,
+  .filter-status,
+  .filter-date {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index de1d1d3..1e72084 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,59 +1,59 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
+  <div class="app-container user-management-page">
+    <el-row :gutter="14" class="user-management-layout">
+      <el-col :span="4" :xs="24" class="department-column">
+        <aside class="department-card">
           <el-input
             v-model="deptName"
             placeholder="请输入部门名称"
             clearable
             size="small"
             prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
+            class="department-search"
           />
-        </div>
-        <div class="head-container">
           <el-tree
+            ref="tree"
             :data="deptOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
-            ref="tree"
             node-key="id"
             default-expand-all
             highlight-current
+            class="department-tree"
             @node-click="handleNodeClick"
           />
-        </div>
+        </aside>
       </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+
+      <el-col :span="20" :xs="24" class="user-list-column">
+        <data-list-panel>
+      <template #filters>
+        <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" class="user-filter-form">
+          <el-form-item prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="用户账号"
               clearable
-              style="width: 240px"
+              class="filter-item filter-account"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
+              placeholder="手机号码"
               clearable
-              style="width: 240px"
+              class="filter-item filter-phone"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="状态" prop="status">
+          <el-form-item prop="status">
             <el-select
               v-model="queryParams.status"
-              placeholder="用户状态"
+              placeholder="全部状态"
               clearable
-              style="width: 240px"
+              class="filter-item filter-status"
             >
               <el-option
                 v-for="dict in dict.type.sys_normal_disable"
@@ -63,134 +63,116 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item>
             <el-date-picker
               v-model="dateRange"
-              style="width: 240px"
+              class="filter-date"
               value-format="yyyy-MM-dd"
               type="daterange"
-              range-separator="-"
+              range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="岗位名称" prop="postNames">
+          <el-form-item prop="postNames">
             <el-input
               v-model="queryParams.postNames"
-              placeholder="请输入岗位名称"
+              placeholder="岗位名称"
               clearable
-              style="width: 240px"
+              class="filter-post"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-form-item class="filter-buttons">
+            <el-button type="primary" size="small" @click="handleQuery">搜索</el-button>
+            <el-button size="small" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
+      </template>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+      <template #actions>
+        <div class="user-list-actions">
             <el-button
               type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
+              size="small"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
             >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
+              type="primary"
+              size="small"
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
             >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button
               type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
+              size="small"
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
             >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button
-              type="info"
-              plain
               icon="el-icon-upload2"
-              size="mini"
+              size="small"
               @click="handleImport"
               v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
+            >一键导入</el-button>
             <el-button
-              type="warning"
-              plain
               icon="el-icon-download"
-              size="mini"
+              size="small"
               @click="handleExport"
               v-hasPermi="['system:user:export']"
-            >导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
+            >一键导出</el-button>
+          <right-toolbar :show-search.sync="showSearch" :columns="columns" @queryTable="getList" />
+        </div>
+      </template>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="userList" class="user-list-table" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="岗位" align="center" key="postNames" prop="postNames" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" prop="userId" width="105" />
+          <el-table-column v-if="columns[1].visible" key="userName" label="用户账号" prop="userName" min-width="120" :show-overflow-tooltip="true" />
+          <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" prop="nickName" min-width="120" :show-overflow-tooltip="true" />
+          <el-table-column v-if="columns[3].visible" key="deptName" label="部门" prop="dept.deptName" min-width="180" :show-overflow-tooltip="true" />
+          <el-table-column key="postNames" label="岗位" prop="postNames" min-width="130" :show-overflow-tooltip="true" />
+          <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" prop="phonenumber" width="135" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              <el-popover trigger="hover" placement="top" content="点击切换用户状态">
+                <el-tag
+                  slot="reference"
+                  :type="scope.row.status === '0' ? 'success' : 'info'"
+                  size="small"
+                  class="status-tag"
+                  @click="handleStatusChange(scope.row, true)"
+                >{{ scope.row.status === '0' ? '正常' : '停用' }}</el-tag>
+              </el-popover>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column v-if="columns[6].visible" label="创建时间" prop="createTime" width="170">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
+            width="200"
+            class-name="user-operation-column"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
               <el-button
                 size="mini"
-                type="text"
-                icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
-                type="text"
-                icon="el-icon-delete"
+                type="danger"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-button size="mini" type="primary">更多<i class="el-icon-arrow-down el-icon--right" /></el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
@@ -200,8 +182,9 @@
               </el-dropdown>
             </template>
           </el-table-column>
-        </el-table>
+      </el-table>
 
+      <template #footer>
         <pagination
           v-show="total>0"
           :total="total"
@@ -209,6 +192,8 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+      </template>
+        </data-list-panel>
       </el-col>
     </el-row>
 
@@ -382,7 +367,7 @@ export default {
       deptOptions: undefined,
       // 是否显示弹出层
       open: false,
-      // 部门名称
+      // 左侧部门树搜索名称
       deptName: undefined,
       // 默认密码
       initPassword: undefined,
@@ -420,7 +405,8 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
+        postNames: undefined
       },
       // 列信息
       columns: [
@@ -463,7 +449,7 @@ export default {
     };
   },
   watch: {
-    // 根据名称筛选部门树
+    // 根据名称筛选左侧部门树
     deptName(val) {
       this.$refs.tree.filter(val);
     }
@@ -492,25 +478,29 @@ export default {
         this.deptOptions = response.data;
       });
     },
-    // 筛选节点
+    // 部门树节点过滤
     filterNode(value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
-    // 节点单击事件
+    // 点击部门后按原 deptId 参数查询用户
     handleNodeClick(data) {
       this.queryParams.deptId = data.id;
       this.handleQuery();
     },
     // 用户状态修改
-    handleStatusChange(row) {
+    handleStatusChange(row, toggleStatus) {
+      const previousStatus = row.status;
+      if (toggleStatus) {
+        row.status = row.status === "0" ? "1" : "0";
+      }
       let text = row.status === "0" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
+        row.status = previousStatus;
       });
     },
     // 取消按钮
@@ -546,6 +536,7 @@ export default {
       this.dateRange = [];
       this.resetForm("queryForm");
       this.queryParams.deptId = undefined;
+      this.deptName = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
@@ -677,4 +668,155 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.user-management-page {
+  min-height: calc(100vh - 52px);
+}
+
+.user-management-layout {
+  display: flex;
+  align-items: stretch;
+}
+
+.department-column,
+.user-list-column {
+  min-width: 0;
+}
+
+.department-card {
+  height: 100%;
+  min-height: 420px;
+  margin: 0;
+  padding: 14px 12px;
+  overflow: hidden;
+  border: 1px solid #f0f0f2;
+  border-radius: 8px;
+  background: #fff;
+  line-height: normal;
+}
+
+.department-search {
+  margin-bottom: 12px;
+}
+
+.department-tree {
+  max-height: calc(100vh - 148px);
+  overflow: auto;
+  color: #5a5a72;
+  background: transparent;
+  font-size: 12px;
+}
+
+::v-deep .department-tree .el-tree-node__content {
+  height: 32px;
+  border-radius: 5px;
+}
+
+::v-deep .department-tree .el-tree-node__content:hover {
+  background: #f5f7fa;
+}
+
+::v-deep .department-tree.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  color: #1890ff;
+  background: rgba(24, 144, 255, .08);
+  font-weight: 600;
+}
+
+.user-filter-form {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.user-filter-form .el-form-item {
+  margin: 0;
+}
+
+.filter-account {
+  width: 168px;
+}
+
+.filter-phone {
+  width: 168px;
+}
+
+.filter-status {
+  width: 112px;
+}
+
+.filter-date {
+  width: 218px;
+}
+
+.filter-post {
+  width: 150px;
+}
+
+.filter-buttons {
+  white-space: nowrap;
+}
+
+.user-list-actions {
+  display: flex;
+  align-items: center;
+  gap: 0;
+  white-space: nowrap;
+}
+
+.status-tag {
+  cursor: pointer;
+  user-select: none;
+}
+
+::v-deep .user-list-table .user-operation-column .cell {
+  white-space: nowrap;
+}
+
+::v-deep .user-list-table .user-operation-column .el-dropdown {
+  margin-left: 6px;
+}
+
+::v-deep .user-list-actions .top-right-btn {
+  float: none;
+  margin-left: 8px;
+}
+
+@media (max-width: 768px) {
+  .user-management-layout {
+    display: block;
+  }
+
+  .department-column {
+    margin-bottom: 12px;
+  }
+
+  .department-card {
+    min-height: 0;
+  }
+
+  .department-tree {
+    max-height: 260px;
+  }
+
+  .user-filter-form,
+  .user-list-actions {
+    width: 100%;
+  }
+
+  .user-list-actions {
+    flex-wrap: wrap;
+    gap: 8px 0;
+  }
+
+  .filter-account,
+  .filter-phone,
+  .filter-status,
+  .filter-date,
+  .filter-post {
+    width: 100%;
+  }
+}
+</style>