diff --git a/src/api/generatedApi/system.js b/src/api/generatedApi/system.js
new file mode 100644
index 0000000..26e516a
--- /dev/null
+++ b/src/api/generatedApi/system.js
@@ -0,0 +1,298 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+// 用户新增
+export function addUser(data) {
+  return request({
+    url: getUrl('/sysUser/create'),
+    method: 'post',
+    data
+  })
+}
+//用户编辑
+export function updateUser(data) {
+  return request({
+    url: getUrl('/sysUser/update'),
+    method: 'post',
+    data
+  })
+}
+// 用户删除
+export function deleteUser(data) {
+  return request({
+    url: getUrl('/sysUser/delete'),
+    method: 'post',
+    data
+  })
+}
+// 查询用户详情
+export function queryUserDetail(params) {
+  return request({
+    url: getUrl('/sysUser/query'),
+    method: 'get',
+    params: params
+  })
+}
+// 用户分页查询
+export function getUserPage(data) {
+  return request({
+    url: getUrl('/sysUser/page'),
+    method: 'post',
+    data
+  })
+}
+// 修改用户状态
+export function changeUserStatus(params) {
+  return request({
+    url: getUrl('/sysUserEx/changeUserStatus'),
+    method: 'get',
+    params: params
+  })
+}
+// 重置密码
+export function updatePassword(data) {
+  return request({
+    url: getUrl(`/sysUser/updatePassword`),
+    method: 'post',
+    data
+  })
+}
+
+export function datasetsExTaskPages(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/taskPage`),
+    method: 'post',
+    data
+  })
+}
+
+//minerU  获取bbox
+export function minerUBbox(params) {
+  return request({
+    url: getUrl('/document/mineru/bbox_json'),
+    method: 'get',
+    params: params
+  })
+}
+//minerU  重试
+export function minerURetry(params) {
+  return request({
+    url: getUrl('/document/mineru/retry'),
+    method: 'get',
+    params: params,
+    noLoading: true
+  })
+}
+//minerU  获取文档处理状态
+export function minerUQuery(params) {
+  return request({
+    url: getUrl('/dataset/document/query'),
+    method: 'get',
+    params: params,
+    noLoading: true
+  })
+}
+//minerU 获取markdown
+export function minerUMarkDown(params) {
+  return getUrl(`/document/mineru/md?documentId=${params.documentId}`)
+}
+
+// minerU 获取pdf
+export function getPdfUrl(params) {
+  return getUrl(`/datasetDocumentEx/preview?id=${params.documentId}`)
+}
+
+export function minerUMarkDownUpdate(data) {
+  return request({
+    url: getUrl(`/document/mineru/md/update`),
+    method: 'post',
+    data
+  })
+}
+// 规则分页
+export function getRulesPage(data) {
+  return request({
+    url: getUrl(`/rules/page`),
+    method: 'post',
+    data
+  })
+}
+export function getRulesList(data) {
+  return request({
+    url: getUrl(`/rules/list`),
+    method: 'post',
+    data
+  })
+}
+// 拆分规则-新增
+export function addRuleSplit(data) {
+  return request({
+    url: getUrl(`/ruleDocSplitEx/create`),
+    method: 'post',
+    data
+  })
+}
+// 拆分规则-详情
+export function getRuleDetail(id) {
+  return request({
+    url: getUrl(`/rulesEx/query?id=${id}`),
+    method: 'get'
+  })
+}
+// 拆分规则-编辑
+export function updateRuleSplit(data) {
+  return request({
+    url: getUrl(`/ruleDocSplitEx/update`),
+    method: 'post',
+    data
+  })
+}
+// 拆分规则-下一步校验
+export function execSplit(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/execSplit`),
+    method: 'post',
+    data
+  })
+}
+// 拆分结果预览
+export function splitResultPreview(params) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/split/preview`),
+    method: 'get',
+    params: params
+  })
+}
+// 题词-新增
+export function addRuleExtract(data) {
+  return request({
+    url: getUrl(`/ruleAttributeExtractEx/create`),
+    method: 'post',
+    data
+  })
+}
+// 题词-编辑
+export function updateRuleExtractSplit(data) {
+  return request({
+    url: getUrl(`/ruleAttributeExtractEx/update`),
+    method: 'post',
+    data
+  })
+}
+// 题词-下一步校验
+export function execExtract(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/execExtract`),
+    method: 'post',
+    data
+  })
+}
+
+// 题词-查询题词结果详情
+export function getExtractResultList(data) {
+  return request({
+    url: getUrl(`/document/attribute/extract/result/list`),
+    method: 'post',
+    data
+  })
+}
+
+// 题词-保存
+export function saveContentToDocument(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/saveContentToDocument`),
+    method: 'post',
+    data
+  })
+}
+//知识库文件上传-自定义
+export function uploadFileByCustom(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/uploadFileByCustom`),
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+//知识库文件上传-通用
+export function uploadFileByTemplate(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/uploadFileByTemplate`),
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 知识库文件详情
+export function datasetQuerySegments(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/querySegments`),
+    method: 'get',
+    params: data
+  })
+}
+// 知识文档详情查询（包含json的题词和拆分规则）
+export function datasetDocumentEx(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/query`),
+    method: 'get',
+    params: data
+  })
+}
+// 任务轨迹查看详情
+export function getTaskDetail(params) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/query`),
+    method: 'get',
+    params
+  })
+}
+// 知识库文件删除
+export function datasetQueryDelete(data) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/delete?documentId=${data.id}`),
+    method: 'delete'
+  })
+}
+
+export function queryTask(params) {
+  return request({
+    url: getUrl(`/datasetDocumentEx/queryTask`),
+    method: 'get',
+    params
+  })
+}
+
+// 识别页面表格
+
+export function imageRetry(data) {
+  return request({
+    url: getUrl(`/document/mineru/img/retry`),
+    method: 'post',
+    data,
+    noLoading: true
+  })
+}
+
+export function getMd_info(params) {
+  return request({
+    url: getUrl(`/document/mineru/md_info`),
+    method: 'get',
+    params,
+    noLoading: true
+  })
+}
+export function mdIndex(params) {
+  return request({
+    url: getUrl(`/document/mineru/md`),
+    method: 'get',
+    params,
+    noLoading: true,
+    back: true
+  })
+}
diff --git a/src/api/intelligent-agent/list.js b/src/api/intelligent-agent/list.js
new file mode 100644
index 0000000..d47da84
--- /dev/null
+++ b/src/api/intelligent-agent/list.js
@@ -0,0 +1,81 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+/**
+ * 获取智能体列表
+ * @param {Object} data - 请求参数, 默认为空对象
+ * @returns {Promise} - 返回 Promise 对象
+ */
+const agentList = (data = {}) => {
+  return request({
+    url: getUrl('/ebiz/intelligentAgent/list'),
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 查看智能体详情
+ * @param {string} id - 请求 ID
+ */
+function agentDetail(id) {
+  return request({
+    url: getUrl('/ebiz/intelligentAgent/query'),
+    method: 'get',
+    params: { id }
+  })
+}
+
+/**
+ * 增加智能体
+ * @param {Object} data - 请求参数, 默认为空对象
+ * @returns {Promise} - 返回 Promise 对象
+ */
+const agentAdd = (data) => {
+  if (!data) {
+    console.warn('need data', data)
+    return
+  }
+  return request({
+    url: getUrl('/ebiz/intelligentAgent/create'),
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 删除智能体
+ * @param {Array} data - 请求参数, 默认为空对象
+ * @returns {Promise} - 返回 Promise 对象
+ */
+const agentDelete = (data) => {
+  if (!data || !data.length) {
+    console.warn('need data', data)
+    return
+  }
+  return request({
+    url: getUrl('/ebiz/intelligentAgent/delete'),
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 编辑智能体
+ * @param {Object} data - 请求参数, 默认为空对象
+ * @returns {Promise} - 返回 Promise 对象
+ */
+const agentEdit = (data) => {
+  if (!data || !data.id) {
+    console.warn('need data', data)
+    return
+  }
+
+  return request({
+    url: getUrl('/ebiz/intelligentAgent/update'),
+    method: 'post',
+    data
+  })
+}
+
+export { agentList, agentEdit, agentDelete, agentAdd, agentDetail }
diff --git a/src/api/system/role.js b/src/api/system/role.js
new file mode 100644
index 0000000..8fda311
--- /dev/null
+++ b/src/api/system/role.js
@@ -0,0 +1,44 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+// 角色新增
+export function addRole(data) {
+  return request({
+    url: getUrl('/sysRole/create'),
+    method: 'post',
+    data
+  })
+}
+
+//角色编辑
+export function updateRole(data) {
+  return request({
+    url: getUrl('/sysRole/update'),
+    method: 'post',
+    data
+  })
+}
+// 角色删除
+export function deleteRole(data) {
+  return request({
+    url: getUrl('/sysRole/delete'),
+    method: 'post',
+    data
+  })
+}
+// 查询角色详情
+export function queryRoleDetail(params) {
+  return request({
+    url: getUrl('/sysRole/query'),
+    method: 'get',
+    params: params
+  })
+}
+// 角色分页查询
+export function getRolePage(data) {
+  return request({
+    url: getUrl('/sysRole/page'),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/assets/sass/public.scss b/src/assets/sass/public.scss
index 99347e8..e69de29 100644
--- a/src/assets/sass/public.scss
+++ b/src/assets/sass/public.scss
@@ -1,419 +0,0 @@
-.el-input__suffix {
-  height: unset;
-}
-.el-collapse {
-  border: none;
-}
-
-[class*='el-col-'] {
-  min-height: 1px;
-}
-#RenderTable-container {
-  margin-bottom: 20px;
-}
-#RenderTable-container,
-.el-table {
-  .el-button--mini {
-    padding: 5px;
-    color: #409eff;
-    border-color: transparent !important;
-    background: transparent !important;
-    //padding-left: 0;
-    //padding-right: 0;
-  }
-  .el-button--danger.el-button--mini {
-    color: #f56c6c;
-  }
-  .el-button--primary.el-button--mini:focus,
-  .el-button--primary.el-button--mini:hover {
-    color: #b3d8ff;
-  }
-  .el-button--danger.el-button--mini:focus,
-  .el-button--danger.el-button--mini:hover {
-    color: #fbc4c4;
-  }
-  .el-button--primary.el-button--mini.is-disabled,
-  .el-button--primary.el-button--mini.is-disabled:active,
-  .el-button--primary.el-button--mini.is-disabled:focus,
-  .el-button--primary.el-button--mini.is-disabled:hover {
-    color: #ccc;
-  }
-  .el-button--danger.el-button--mini.is-disabled,
-  .el-button--danger.el-button--mini.is-disabled:active,
-  .el-button--danger.el-button--mini.is-disabled:focus,
-  .el-button--danger.el-button--mini.is-disabled:hover {
-    color: #ccc;
-  }
-}
-
-.el-button--medium {
-  padding: 8px 15px;
-  margin-top: 3px;
-}
-.el-button--danger {
-  //color:#F56C6C!important;
-}
-.el-upload__input {
-  display: none;
-}
-.el-dialog {
-  //.el-input{
-  //  width: 100%!important;
-  //  max-width: 100%;
-  //}
-}
-.footer {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  background: white;
-  padding: 15px 30px;
-  z-index: 10;
-  border-top: 1px solid #f0f0f0;
-  .flex {
-    display: flex;
-    justify-content: flex-end;
-    button {
-      margin-left: 20px;
-    }
-  }
-}
-.is-fullscreen {
-  .el-dialog__header {
-    //padding: unset;
-  }
-  .el-dialog__body {
-    padding: unset;
-    width: 95vw;
-    margin: auto;
-    max-height: 100%;
-    overflow: hidden;
-  }
-}
-//.el-dialog__body {
-//  padding: 30px 15px;
-//  width: 96%;
-//  margin: auto;
-//  max-height: 55vh;
-//  overflow: auto;
-//}
-//.el-dialog__footer {
-//  text-align: right;
-//}
-//.el-dialog__header {
-//  font-weight: 600;
-//  .el-dialog__title {
-//    font-size: 20px;
-//    color: #0096fd;
-//    line-height: 28px;
-//  }
-//}
-
-.el-collapse-item__header.is-active {
-  border-bottom: 1px solid #ebeef5;
-}
-// to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  border-radius: 10px;
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
-.table-container {
-  padding-top: 15px;
-}
-.container-title {
-  height: 30px;
-  //border-bottom: 2px  solid  #0096FD;
-  //margin-bottom: 20px;
-}
-.container-title .title {
-  padding: 8px 15px;
-  font-weight: 500;
-  color: #fff;
-  background: #0096fd;
-  border-radius: 0 15px 0 0;
-}
-//[class*=" el-icon-"], [class^=el-icon-]{
-//  line-height: unset;
-//}
-.lineH35 {
-  line-height: 35px;
-}
-.lineH25 {
-  line-height: 25px;
-}
-.lineH40 {
-  line-height: 40px;
-}
-.search_btn_s .el-button {
-  padding: 5px 8px;
-  margin-top: 6px;
-}
-.el-date-editor.el-input,
-.el-input,
-.el-select,
-.el-cascader {
-  width: 100%;
-  //max-width: 350px;
-}
-/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
-::-webkit-scrollbar {
-  width: 7px;
-  height: 7px;
-}
-
-/*定义滚动条轨道 内阴影+圆角*/
-::-webkit-scrollbar-track {
-  border-radius: 10px;
-}
-
-/*定义滑块 内阴影+圆角*/
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
-  background-color: #c8c8c8;
-}
-.el-tooltip__popper {
-  max-width: 500px;
-}
-body .el-collapse-item__wrap {
-  padding-top: 30px !important;
-}
-.AdditionalInsurance .cell {
-  color: #409eff;
-}
-.cellClassNo .cell {
-  color: #f56c6c;
-}
-.cellClassYes .cell {
-  color: #409eff;
-}
-.mainInsurance .cell {
-  color: #67c23a;
-}
-.el-form-item__label {
-  width: 120px;
-  display: flex !important;
-  align-items: center;
-  height: 40px;
-  justify-content: flex-end;
-  line-height: 20px;
-}
-.el-select__tags {
-  white-space: nowrap !important;
-  overflow: hidden !important;
-  // text-overflow: ellipsis!important;
-  display: inline-block !important;
-}
-.el-loading-mask {
-  z-index: 9999;
-}
-
-.toolBox {
-  display: inline-flex;
-}
-.ellipsis {
-  display: inline;
-  /*margin: auto;*/
-  max-width: 215px;
-  height: 24px;
-  font-size: 14px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.el-table th {
-  background: #ecf5ff;
-}
-//.el-form-item__content {
-//  line-height: 1.7692;
-//}
-.el-table th > .cell {
-  display: block;
-}
-.el-table th.el-table__cell {
-  background: #ecf5ff;
-}
-
-.el-card {
-  border-radius: 10px;
-}
-
-.danger {
-  color: #f56c6c !important;
-  & :disabled {
-    color: rgba(0, 0, 0, 0.25);
-  }
-  & :hover {
-    color: #dd6161;
-  }
-  & :focus {
-    color: #dd6161;
-  }
-  & :active {
-    color: #dd6161;
-  }
-}
-.default {
-  color: #000 !important;
-  background: #f1f3f5 !important;
-  border-color: #f1f3f5 !important;
-  & :disabled {
-    color: rgba(0, 0, 0, 0.25);
-  }
-  & :hover {
-    color: #000;
-  }
-  & :focus {
-    color: #000;
-  }
-  & :active {
-    color: #000;
-  }
-}
-.cursor-pointer {
-  cursor: pointer;
-}
-.view-body {
-  text-align: left;
-  font-size: 14px;
-  padding: 10px;
-
-  div {
-    outline: unset;
-  }
-
-  /* 添加一些基本的样式以美化 Markdown 内容 */
-
-  p {
-    font-size: 16px;
-    line-height: 1.6;
-    margin-bottom: 16px;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    margin-top: 24px;
-    margin-bottom: 12px;
-    border-bottom: 1px dashed #cecece;
-    padding: 5px;
-  }
-
-  ul,
-  ol {
-    margin: 16px 0;
-    padding-left: 32px;
-  }
-
-  li {
-    margin-bottom: 8px;
-  }
-
-  a {
-    color: #007bff;
-    text-decoration: none;
-  }
-
-  a:hover {
-    text-decoration: underline;
-  }
-
-  code {
-    background-color: #f1f1f1;
-    padding: 4px 8px;
-    border-radius: 4px;
-    font-family: 'Courier New', Courier, monospace;
-  }
-
-  img {
-    max-width: 100%;
-  }
-
-  pre {
-    background-color: #f1f1f1;
-    padding: 16px;
-    border-radius: 4px;
-    overflow-x: auto;
-    font-family: 'Courier New', Courier, monospace;
-  }
-
-  pre code {
-    background-color: transparent;
-    padding: 0;
-  }
-
-  table {
-    border: 1px solid #f9f9f9;
-    position: relative;
-    width: 100%;
-    margin: 5px;
-    border-collapse: collapse;
-    background: linear-gradient(to bottom, #ffffff, #f9f9f9);
-  }
-
-  th,
-  td {
-    border: 1px solid #ccc;
-    padding: 8px;
-    text-align: left;
-  }
-
-  th {
-    background-color: #f2f2f2;
-  }
-
-  // 添加斑马条纹效果
-  tr:nth-child(even) {
-    background-color: #f9fafc;
-  }
-}
-
-.m-view {
-  position: relative;
-  padding: 10px;
-  // 离开后还原
-  &:after {
-    content: '';
-    position: absolute;
-    width: calc(100% + 10px);
-    height: calc(100% + 10px);
-    top: -5px;
-    left: -5px;
-    background: rgba(201, 203, 255, 0.3);
-    transition: all 0.3s ease-in-out;
-    opacity: 0; // 初始状态下透明
-    border: 2px solid rgb(201, 203, 255);
-    border-radius: 5px;
-    overflow: hidden;
-  }
-
-  &:hover:after {
-    opacity: 1; // 悬停时显示
-  }
-}
-
-.editor-button {
-  position: relative;
-}
-
-.public-icon {
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.public-icon + .public-icon {
-  margin-left: 10px;
-}
-
-//去除滚动条
-.view-body::-webkit-scrollbar {
-  width: 0px;
-  height: 0px;
-}
diff --git a/src/assets/sass/renderSass/button.scss b/src/assets/sass/renderSass/button.scss
index 529ac50..4641b53 100644
--- a/src/assets/sass/renderSass/button.scss
+++ b/src/assets/sass/renderSass/button.scss
@@ -23,6 +23,40 @@
     background: transparent;
     color: var(--color-primary);
   }
+  &.normal-button {
+    padding: 5px;
+    background: unset;
+    border: unset;
+    color: $--color-primary-desc-text;
+    &:hover {
+      background: $--color-primary-table-button-hover;
+      border-color: #ebeef2;
+    }
+    &:focus {
+      background: $--color-primary-table-button-hover;
+      border-color: #ebeef2;
+    }
+    &:active {
+      background: $--color-primary-table-button-hover;
+      border-color: #ebeef2;
+    }
+    &.popver-button {
+      padding: 13px 5px;
+      text-align: left;
+      font-size: 14px;
+      font-family: PingFangSC, PingFang SC;
+      &:hover {
+        background: $--color-primary-table-button-hover;
+        color: rgba(79, 71, 245, 1);
+      }
+      & i {
+        color: #000;
+      }
+    }
+    &.popver-button + .popver-button {
+      margin: 0;
+    }
+  }
 }
 
 .el-button--text {
diff --git a/src/assets/sass/renderSass/table.scss b/src/assets/sass/renderSass/table.scss
new file mode 100644
index 0000000..46dec45
--- /dev/null
+++ b/src/assets/sass/renderSass/table.scss
@@ -0,0 +1,38 @@
+.el-table--small {
+  td,
+  th {
+    padding: 17px 0;
+  }
+}
+
+.el-table__header-wrapper {
+  .el-table__header {
+    th {
+      padding: 17px 0;
+    }
+  }
+}
+.el-table--enable-row-hover {
+  .el-table__body {
+    tr:hover {
+      td {
+        background-color: $--color-primary-table-hover;
+      }
+    }
+  }
+}
+
+.el-table {
+  .el-button + .el-button {
+    margin-left: 5px;
+  }
+}
+
+.table-popver {
+  display: inline-flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  margin-left: 5px;
+  border-radius: 5px;
+  padding: 5px;
+}
diff --git a/src/assets/sass/renderSass/theme.scss b/src/assets/sass/renderSass/theme.scss
index 740b714..741a05f 100644
--- a/src/assets/sass/renderSass/theme.scss
+++ b/src/assets/sass/renderSass/theme.scss
@@ -7,6 +7,9 @@ $--color-primary-danger-light: lighten($--color-primary-danger, 5%); //高亮颜
 $--color-primary-danger-disabled: #ff000024;
 $--color-primary-desc-text: #51525d;
 $--color-primary-desc-text-drank: #999;
+$--color-primary-table-hover: #eff0f8;
+$--color-primary-table-button-hover: #e3e5f1;
+
 :root {
   --swiper-theme-color: #0a6dff;
   --color-primary: #0a6dff;
diff --git a/src/assets/sass/renderUi.scss b/src/assets/sass/renderUi.scss
index 8c385e8..09f48d8 100644
--- a/src/assets/sass/renderUi.scss
+++ b/src/assets/sass/renderUi.scss
@@ -2,6 +2,7 @@
 @import 'renderSass/button';
 @import 'renderSass/dialog';
 @import 'renderSass/input';
+@import 'renderSass/table';
 
 html,
 body,
@@ -9,8 +10,185 @@ body,
 .app-main {
   background: rgba(240, 244, 250, 1);
 }
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.danger {
+  color: #f56c6c !important;
+  & :disabled {
+    color: rgba(0, 0, 0, 0.25);
+  }
+  & :hover {
+    color: #dd6161;
+  }
+  & :focus {
+    color: #dd6161;
+  }
+  & :active {
+    color: #dd6161;
+  }
+}
+.default {
+  color: #000 !important;
+  background: #f1f3f5 !important;
+  border-color: #f1f3f5 !important;
+  & :disabled {
+    color: rgba(0, 0, 0, 0.25);
+  }
+  & :hover {
+    color: #000;
+  }
+  & :focus {
+    color: #000;
+  }
+  & :active {
+    color: #000;
+  }
+}
 
 .container {
   padding: 20px 10px;
   //background-image: url('../images/backimage.png');
 }
+
+.view-body {
+  text-align: left;
+  font-size: 14px;
+  padding: 10px;
+
+  div {
+    outline: unset;
+  }
+
+  /* 添加一些基本的样式以美化 Markdown 内容 */
+
+  p {
+    font-size: 16px;
+    line-height: 1.6;
+    margin-bottom: 16px;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin-top: 24px;
+    margin-bottom: 12px;
+    border-bottom: 1px dashed #cecece;
+    padding: 5px;
+  }
+
+  ul,
+  ol {
+    margin: 16px 0;
+    padding-left: 32px;
+  }
+
+  li {
+    margin-bottom: 8px;
+  }
+
+  a {
+    color: #007bff;
+    text-decoration: none;
+  }
+
+  a:hover {
+    text-decoration: underline;
+  }
+
+  code {
+    background-color: #f1f1f1;
+    padding: 4px 8px;
+    border-radius: 4px;
+    font-family: 'Courier New', Courier, monospace;
+  }
+
+  img {
+    max-width: 100%;
+  }
+
+  pre {
+    background-color: #f1f1f1;
+    padding: 16px;
+    border-radius: 4px;
+    overflow-x: auto;
+    font-family: 'Courier New', Courier, monospace;
+  }
+
+  pre code {
+    background-color: transparent;
+    padding: 0;
+  }
+
+  table {
+    border: 1px solid #f9f9f9;
+    position: relative;
+    width: 100%;
+    margin: 5px;
+    border-collapse: collapse;
+    background: linear-gradient(to bottom, #ffffff, #f9f9f9);
+  }
+
+  th,
+  td {
+    border: 1px solid #ccc;
+    padding: 8px;
+    text-align: left;
+  }
+
+  th {
+    background-color: #f2f2f2;
+  }
+
+  // 添加斑马条纹效果
+  tr:nth-child(even) {
+    background-color: #f9fafc;
+  }
+}
+
+.m-view {
+  position: relative;
+  padding: 10px;
+  // 离开后还原
+  &:after {
+    content: '';
+    position: absolute;
+    width: calc(100% + 10px);
+    height: calc(100% + 10px);
+    top: -5px;
+    left: -5px;
+    background: rgba(201, 203, 255, 0.3);
+    transition: all 0.3s ease-in-out;
+    opacity: 0; // 初始状态下透明
+    border: 2px solid rgb(201, 203, 255);
+    border-radius: 5px;
+    overflow: hidden;
+  }
+
+  &:hover:after {
+    opacity: 1; // 悬停时显示
+  }
+}
+
+.editor-button {
+  position: relative;
+}
+
+.public-icon {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.public-icon + .public-icon {
+  margin-left: 10px;
+}
+
+//去除滚动条
+.view-body::-webkit-scrollbar {
+  width: 0px;
+  height: 0px;
+}
diff --git a/src/components/RenderMinerU/index.vue b/src/components/RenderMinerU/index.vue
index f2678d8..032eda7 100644
--- a/src/components/RenderMinerU/index.vue
+++ b/src/components/RenderMinerU/index.vue
@@ -64,6 +64,7 @@ export default {
   name: 'index',
   data() {
     return {
+      endEmit: false,
       tab: '0',
       mdPges: 0,
       tableIdCounter: 0,
@@ -171,6 +172,10 @@ export default {
     }
   },
   props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
     documentId: {
       type: String,
       default: '1361351897324294144'
@@ -563,6 +568,7 @@ ${text}`
     },
     // 重试方法
     retryMiner() {
+      this.endEmit = true
       minerURetry({ documentId: this.documentId })
         .then(res => {
           this.$message({
diff --git a/src/components/RenderTable/component/bodySlot/index.vue b/src/components/RenderTable/component/bodySlot/index.vue
index 717f2b6..c5b141d 100644
--- a/src/components/RenderTable/component/bodySlot/index.vue
+++ b/src/components/RenderTable/component/bodySlot/index.vue
@@ -12,12 +12,88 @@ const RenderSlot = {
     }
   },
   render: (h, data) => {
+    const renderTooltip = first => {
+      return h(
+        'el-tooltip',
+        {
+          props: {
+            placement: 'bottom-end',
+            content: first[0].data.props.title
+            // effect: 'light'
+          }
+        },
+        first
+      )
+    }
+    const renderPopver = other => {
+      return h(
+        'el-popover',
+        {
+          props: {
+            placement: 'bottom-end',
+            width: '100',
+            trigger: 'hover',
+            popperClass: 'table-popver'
+          },
+          class: 'table-popver',
+          scopedSlots: {
+            reference: () =>
+              h('el-button', {
+                props: {
+                  size: 'mini',
+                  type: 'text',
+                  icon: 'el-icon-more'
+                },
+                class: 'normal-button'
+              })
+          }
+        },
+        other
+      )
+    }
     const params = {
       row: data.props.row,
       index: data.props.index
     }
-    if (data.props.column) params.column = data.props.column
-    return data.props.render(h, params)
+    if (data.props.column) {
+      params.column = data.props.column
+    }
+    if (params.column.isRedraw) {
+      let content = data.props.render(h, params)
+      let contentDiv = content.children
+      if (contentDiv.length > 2) {
+        console.log(content)
+        // 切割掉第一个div
+        const first = contentDiv.splice(0, 1)
+        const other = contentDiv.splice(0, contentDiv.length)
+        first[0].data.class = 'normal-button'
+        first[0].data.props.type = null
+        first[0].data.props.size = null
+        other.forEach(item => {
+          item.data.class = 'normal-button popver-button'
+        })
+
+        content.children = [renderTooltip(first), renderPopver(other)]
+        return content
+      } else {
+        // const first = contentDiv.splice(0, contentDiv)
+
+        contentDiv = contentDiv.map(item => {
+          console.log(item)
+          item.data.class = 'normal-button'
+          item.data.props.type = null
+          item.data.props.size = null
+          return renderTooltip([item])
+        })
+        content.children = contentDiv
+        return content
+      }
+      // let div =
+    } else {
+      return data.props.render(h, params)
+    }
+
+    // return data.props.render(h, params)
   }
 }
 export default {
diff --git a/src/components/RenderTable/index.vue b/src/components/RenderTable/index.vue
index 6cf1770..86ba9a2 100644
--- a/src/components/RenderTable/index.vue
+++ b/src/components/RenderTable/index.vue
@@ -44,8 +44,8 @@
               <!--</el-form>-->
               <!--自带的btn 不能有prop 属性-->
               <div v-if="!item.selfBtn && !item.prop && !item.type && !item.render" :fixed="item.fixed ? item.fixed : fixed">
-                <el-button type="primary" size="mini" plain :disabled="disabled" @click="edit(scope.row, scope.$index)">编辑</el-button>
-                <el-button type="danger" size="mini" plain :disabled="disabled" @click="del(scope.row, scope.$index)">删除</el-button>
+                <el-button class="normal-button" :disabled="disabled" icon="el-icon-delete" @click="del(scope.row, scope.$index)"></el-button>
+                <el-button class="normal-button" icon="el-icon-edit-outline" :disabled="disabled" @click="edit(scope.row, scope.$index)"></el-button>
               </div>
               <!--如果渲染的是selfBtn-->
               <div v-if="item.selfBtn && !item.render">
@@ -193,7 +193,7 @@ export default {
     //表格边框 border
     border: {
       type: Boolean,
-      default: true
+      default: false
     },
     // 是否剧中 align
     align: {
diff --git a/src/router/generatedRouter/index.js b/src/router/generatedRouter/index.js
index a5fc85e..bde1536 100644
--- a/src/router/generatedRouter/index.js
+++ b/src/router/generatedRouter/index.js
@@ -191,5 +191,66 @@ export default [
         }
       }
     ]
+  },
+  {
+    path: '/system',
+    name: 'system',
+    component: layout,
+    redirect: '/system/user',
+    meta: {
+      title: '系统管理',
+      icon: 'el-icon-setting',
+      affix: true
+    },
+    children: [
+      {
+        path: '/system/user',
+        name: 'system-user',
+        component: () => import('@/views/system/user/index.vue'),
+        meta: {
+          title: '用户管理',
+          icon: 'el-icon-user'
+        }
+      },
+      {
+        path: '/system/department',
+        name: 'system-department',
+        component: () => import('@/views/system/department/index.vue'),
+        meta: {
+          title: '部门管理',
+          icon: 'el-icon-office-building'
+        }
+      },
+      {
+        path: '/system/role',
+        name: 'system-role',
+        component: () => import('@/views/system/role/index.vue'),
+        meta: {
+          title: '角色管理',
+          icon: 'el-icon-s-custom'
+        }
+      }
+    ]
+  }, {
+    path: '/intelligentAgent',
+    name: 'intelligentAgent',
+    component: layout,
+    redirect: '/intelligentAgent/list',
+    meta: {
+      title: '智能体',
+      icon: 'el-icon-home',
+      affix: true
+    },
+    children: [
+      {
+        path: '/intelligentAgent/list',
+        name: 'intelligentAgent-list',
+        component: () => import('@/views/intelligent-agent/index.vue'),
+        meta: {
+          title: '智能体',
+          icon: 'el-icon-home'
+        }
+      }
+    ]
   }
 ]
diff --git a/src/views/intelligent-agent/components/info/index.vue b/src/views/intelligent-agent/components/info/index.vue
new file mode 100644
index 0000000..a87d8a4
--- /dev/null
+++ b/src/views/intelligent-agent/components/info/index.vue
@@ -0,0 +1,51 @@
+<script>
+import { agentEdit, agentAdd } from '@/api/intelligent-agent/list'
+
+export default {
+  name: 'info',
+  inject: ['dialog', 'fetchAgentList'],
+  data() {
+    return {
+      rules: {
+        name: [{ required: true, message: '请输入智能体名称', trigger: 'blur' }],
+        description: [{ required: false, message: '请输入智能体描述', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    /**
+     * 提交表单
+     */
+    async handleSubmit() {
+      // 更新表单之后重新获取列表，然后退出 dialog
+      await this.dialog.type === 'edit' ? agentEdit(this.dialog.agent) : agentAdd(this.dialog.agent)
+      this.fetchAgentList()
+      this.dialog.visible = false
+    },
+    validateForm() {
+      this.$refs.form.validate(valid => {
+        if (valid) this.handleSubmit()
+      })
+    }
+  }
+}
+
+</script>
+
+<template>
+  <div>
+    <el-form :model="dialog.agent" :rules="rules" ref="form">
+      <el-form-item label="名称" prop="name" label-width="100px">
+        <el-input v-model="dialog.agent.name" />
+      </el-form-item>
+      <el-form-item label="描述" prop="description" label-width="100px">
+        <el-input type="textarea" :rows="8" v-model="dialog.agent.description" />
+      </el-form-item>
+
+      <el-row type="flex" justify="end">
+        <el-button type="primary" @click="validateForm">保存</el-button>
+        <el-button type="default" @click="dialog.visible = false">取消</el-button>
+      </el-row>
+    </el-form>
+  </div>
+</template>
diff --git a/src/views/intelligent-agent/index.vue b/src/views/intelligent-agent/index.vue
new file mode 100644
index 0000000..d5ac28a
--- /dev/null
+++ b/src/views/intelligent-agent/index.vue
@@ -0,0 +1,179 @@
+<script>
+import { agentList, agentDelete, agentDetail } from '@/api/intelligent-agent/list'
+import Info from '@/views/intelligent-agent/components/info'
+
+export default {
+  name: 'intelligent-agent',
+  components: {
+    Info
+  },
+  data() {
+    return {
+      searchOption: {
+        nameLike: '',
+        handleSearch: async () => {
+          this.fetchAgentList({ nameLike: this.searchOption.nameLike })
+        }
+      },
+      /**
+       * @type {{name: string, url: string, id: string}[]}
+       */
+      list: [],
+      dialog: {
+        visible: false,
+        title: '',
+        agent: void 0,
+        component: 'info',
+        type: "edit"
+      }
+    }
+  },
+  provide() {
+    return {
+      dialog: this.dialog,
+      fetchAgentList: this.fetchAgentList
+    }
+  },
+  methods: {
+    /**
+     * 获取所有的智能体列表
+     */
+    async fetchAgentList(params = {}) {
+      const { content } = await agentList(params)
+      this.list = content.content
+    },
+    /**
+     * 编辑智能体
+     */
+    async handleEditAgent(id) {
+      const { content } = await agentDetail(id)
+      this.dialog.agent = content.content
+      this.dialog.type = "edit"
+      this.dialog.title = "编辑智能体"
+      // 获取数据之后打开内容详情
+      this.dialog.visible = true
+    },
+    /**
+     * 删除智能体
+     */
+    async handleDeleteAgent(id) {
+      // 删除之后重新获取内容
+      await agentDelete([id])
+      this.fetchAgentList()
+    },
+    /**
+     * 创建智能体
+     */
+    async createdIntelligentAgent() {
+      this.dialog.type = "add"
+      // 重置状态，防止其他状态影响导致表单内容异常
+      this.dialog.agent = { name: '', description: '' }
+      this.dialog.title = "创建智能体"
+      this.dialog.visible = true
+    },
+
+  },
+  created() {
+    this.fetchAgentList()
+  }
+}
+</script>
+
+<template>
+  <div class="container">
+
+    <!-- header 头部 -->
+    <nav v-if="true">
+      <div class="flex align-items-c justify-content-b">
+        <el-input placeholder="输入智能体名称" clearable v-model="searchOption.nameLike" size="medium" class="underBorder"
+          @keydown.enter.native="searchOption.handleSearch">
+          <template slot="prepend">
+            <el-button slot="append" icon="el-icon-search"></el-button>
+          </template>
+        </el-input>
+        <el-button class="render-button line-button pv8 ph10" icon="el-icon-plus"
+          @click="createdIntelligentAgent()">创建智能体</el-button>
+      </div>
+      <h3>智能体</h3>
+
+    </nav>
+
+    <!-- 智能体的列表 -->
+    <article>
+      <el-row class="agent-item" :gutter="10">
+        <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" v-for="listItem in list" :key="listItem.id">
+          <el-card>
+            <section class="agent-item__info">
+              <el-avatar shape="square" :src="listItem.url">{{ listItem.name[0] }}</el-avatar>
+              <span>
+                <h4>{{ listItem.name }}</h4>
+                <p class="dataset-desc">{{ listItem.description }}</p>
+              </span>
+            </section>
+
+            <el-row type="flex" justify="end">
+              <el-button class="default render-button" size="small" icon="el-icon-delete"
+                @click.stop="handleDeleteAgent(listItem.id)">删除</el-button>
+              <el-button class="render-button line-button" size="small" icon="el-icon-edit"
+                @click.stop="handleEditAgent(listItem.id)" type="primary">修改</el-button>
+            </el-row>
+          </el-card>
+        </el-col>
+      </el-row>
+    </article>
+
+    <!-- dialog 内容。 现在主要是编辑 -->
+    <el-dialog :visible.sync="dialog.visible" :title="dialog.title" :close-on-click-modal="false">
+      <component :is="dialog.component" />
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.container {
+  font-family: PingFangSC, PingFang SC;
+
+  * {
+    transition: all 0.3s ease;
+  }
+}
+
+.agent-item {
+
+
+  &>.el-col {
+    margin: 7px auto;
+  }
+
+  &__info {
+    display: flex;
+
+    &>span:nth-child(2) {
+      margin-left: 15px;
+
+      &>p {
+        margin-top: 10px;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.dataset-desc {
+
+  font-weight: 400;
+  font-size: 13px;
+  color: #666666;
+  line-height: 18px;
+  text-align: left;
+  font-style: normal;
+
+  height: 35px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/knowledge/detail/components/split/CustomSplitDialog.vue b/src/views/knowledge/detail/components/split/CustomSplitDialog.vue
index 3a0f842..20d74b0 100644
--- a/src/views/knowledge/detail/components/split/CustomSplitDialog.vue
+++ b/src/views/knowledge/detail/components/split/CustomSplitDialog.vue
@@ -112,36 +112,33 @@ export default {
           prop: 'knowledgeDesc',
           width: '150px',
           align: 'center',
+          isRedraw: true,
           render: (h, params) => {
             return h('span', {}, [
-              h(
-                'el-button',
-                {
-                  class: 'floatSpan',
-                  props: {
-                    type: 'primary',
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => this.handleEdit(params.row)
-                  }
+              h('el-button', {
+                class: 'floatSpan',
+                props: {
+                  type: 'primary',
+                  size: 'medium',
+                  title: '修改',
+                  icon: 'el-icon-edit-outline'
                 },
-                '修改'
-              ),
-              h(
-                'el-button',
-                {
-                  class: 'floatSpan',
-                  props: {
-                    type: 'primary',
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => this.handlePreview(params.row)
-                  }
+                on: {
+                  click: () => this.handleEdit(params.row)
+                }
+              }),
+              h('el-button', {
+                class: 'floatSpan',
+                props: {
+                  type: 'primary',
+                  size: 'medium',
+                  title: '预览',
+                  icon: 'el-icon-view'
                 },
-                '预览'
-              )
+                on: {
+                  click: () => this.handlePreview(params.row)
+                }
+              })
             ])
           }
         }
diff --git a/src/views/knowledge/detail/components/words/CustomWords.vue b/src/views/knowledge/detail/components/words/CustomWords.vue
index e57e44b..968b029 100644
--- a/src/views/knowledge/detail/components/words/CustomWords.vue
+++ b/src/views/knowledge/detail/components/words/CustomWords.vue
@@ -118,36 +118,33 @@ export default {
           prop: 'knowledgeDesc',
           width: '150px',
           align: 'center',
+          isRedraw: true,
           render: (h, params) => {
             return h('span', {}, [
-              h(
-                'el-button',
-                {
-                  class: 'floatSpan',
-                  props: {
-                    type: 'primary',
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => this.handleEdit(params.row)
-                  }
+              h('el-button', {
+                class: 'floatSpan',
+                props: {
+                  type: 'primary',
+                  size: 'medium',
+                  title: '修改',
+                  icon: 'el-icon-edit-outline'
                 },
-                '修改'
-              ),
-              h(
-                'el-button',
-                {
-                  class: 'floatSpan',
-                  props: {
-                    type: 'primary',
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => this.handlePreview(params.row)
-                  }
+                on: {
+                  click: () => this.handleEdit(params.row)
+                }
+              }),
+              h('el-button', {
+                class: 'floatSpan',
+                props: {
+                  type: 'primary',
+                  size: 'medium',
+                  title: '预览',
+                  icon: 'el-icon-view'
                 },
-                '预览'
-              )
+                on: {
+                  click: () => this.handlePreview(params.row)
+                }
+              })
             ])
           }
         }
diff --git a/src/views/knowledge/detail/create.vue b/src/views/knowledge/detail/create.vue
index 6c771fb..b8176b1 100644
--- a/src/views/knowledge/detail/create.vue
+++ b/src/views/knowledge/detail/create.vue
@@ -37,9 +37,9 @@
     </el-card>
 
     <!-- 添加预处理结果预览对话框 -->
-    <el-drawer :visible.sync="visible" size="80%" title="预处理结果预览">
+    <el-drawer :visible.sync="visible" size="80%" title="预处理结果预览" :wrapperClosable="false" :destroy-on-close="true">
       <div style="height:calc(100% - 55px);">
-        <r-miner-u :documentId="documentId" @saveMarkDown="saveMarkDown"></r-miner-u>
+        <r-miner-u :documentId="documentId" @saveMarkDown="saveMarkDown" :visible="visible"></r-miner-u>
       </div>
     </el-drawer>
   </div>
diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue
index e65263f..1370174 100644
--- a/src/views/knowledge/detail/index.vue
+++ b/src/views/knowledge/detail/index.vue
@@ -381,28 +381,28 @@ export default {
           key: '操作',
           prop: 'knowledgeDesc',
           width: '200px',
+          isRedraw: true,
           render: (h, params) => {
             return h('div', [
-              h(
-                'el-button',
-                {
-                  class: 'floatSpan',
-                  props: {
-                    type: 'primary',
-                    size: 'mini',
-                    disabled: true
-                  },
-                  on: {}
+              h('el-button', {
+                class: 'normal-button',
+                props: {
+                  type: 'primary',
+                  size: 'mini',
+                  disabled: true,
+                  icon: 'el-icon-edit-outline',
+                  title: '编辑'
                 },
-                '修改(暂不支持)'
-              ),
+                on: {}
+              }),
               h(
                 'el-button',
                 {
                   class: 'floatSpan',
                   props: {
                     type: 'danger',
-                    size: 'mini'
+                    size: 'mini',
+                    icon: 'el-icon-delete'
                   },
                   on: {
                     click: () => this.deleteKnowledge(params.row)
@@ -416,7 +416,8 @@ export default {
                   class: 'floatSpan',
                   props: {
                     type: 'primary',
-                    size: 'mini'
+                    size: 'mini',
+                    icon: 'el-icon-tickets'
                   },
                   on: {
                     click: () => this.viewDocumentDetail(params.row)
diff --git a/src/views/knowledge/index.vue b/src/views/knowledge/index.vue
index 755023e..31ac158 100644
--- a/src/views/knowledge/index.vue
+++ b/src/views/knowledge/index.vue
@@ -2,7 +2,7 @@
   <div id="index-container" class="container index-container">
     <el-row>
       <el-col :span="8">
-        <el-input placeholder="输入知识库名称" clearable v-model="nameLike" size="medium" class="underBorder">
+        <el-input placeholder="输入知识库名称" clearable v-model="nameLike" size="medium" class="underBorder" @keydown.enter.native="getList">
           <template slot="prepend">
             <el-button slot="append" icon="el-icon-search" @click="getList"></el-button>
           </template>
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
new file mode 100644
index 0000000..632fb7d
--- /dev/null
+++ b/src/views/system/department/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="department-manage">
+    <el-card>
+      <div class="filter-container">
+        <el-form :model="queryParams" label-width="100px" class="demo-form-inline">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="部门类型">
+                <el-select v-model="queryParams.deptType" placeholder="全部规则" clearable style="width: 100%" size="small">
+                  <el-option label="总部" value="headquarters" />
+                  <el-option label="分部" value="branch" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门名称">
+                <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable size="small" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="queryParams.dateRange"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" size="medium" @click="handleQuery">查询</el-button>
+                <el-button type="primary" plain size="medium" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <el-table v-loading="loading" :data="departmentList" row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+        <el-table-column prop="name" label="部门名称" />
+        <el-table-column prop="leader" label="负责人" />
+        <el-table-column prop="phone" label="联系电话" />
+        <el-table-column prop="email" label="邮箱" />
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">
+              {{ scope.row.status === 1 ? '启用' : '禁用' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNum" label="排序" />
+        <el-table-column label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DepartmentManage',
+  data() {
+    return {
+      loading: false,
+      departmentList: [],
+      queryParams: {
+        deptType: '',
+        name: '',
+        dateRange: []
+      }
+    }
+  },
+  methods: {
+    handleQuery() {
+      // TODO: 实现查询逻辑
+    },
+    resetQuery() {
+      this.queryParams.deptType = ''
+      this.queryParams.name = ''
+      this.queryParams.dateRange = []
+      this.handleQuery()
+    },
+    handleEdit(row) {
+      // TODO: 实现编辑逻辑
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.department-manage {
+  padding: 20px;
+
+  .filter-container {
+    margin-bottom: 20px;
+
+    .el-form-item {
+      margin-bottom: 10px;
+      margin-right: 10px;
+
+      .el-form-item__label {
+        padding-right: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/role/components/RoleDialog.vue b/src/views/system/role/components/RoleDialog.vue
new file mode 100644
index 0000000..7210772
--- /dev/null
+++ b/src/views/system/role/components/RoleDialog.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="角色名称" prop="roleName">
+            <el-input v-model="form.roleName" placeholder="请输入角色名称" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="角色编码" prop="roleCode">
+            <el-input v-model="form.roleCode" placeholder="请输入角色编码" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="角色描述" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入角色描述" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer" v-if="!isView">
+      <el-button type="primary" size="small" :loading="loading" @click="submitForm">确 定</el-button>
+      <el-button size="small" @click="handleClose">取 消</el-button>
+    </div>
+    <div slot="footer" class="dialog-footer" v-else>
+      <el-button size="small" @click="handleClose">关 闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addRole, updateRole } from '@/api/system/role'
+
+export default {
+  name: 'RoleDialog',
+  props: {
+    title: {
+      type: String,
+      default: '添加角色'
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    roleData: {
+      type: Object,
+      default: () => ({})
+    },
+    isEdit: {
+      type: Boolean,
+      default: false
+    },
+    isView: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        roleName: '',
+        roleCode: '',
+        remark: ''
+      },
+      rules: {
+        roleCode: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
+        roleName: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
+      },
+      loading: false
+    }
+  },
+  watch: {
+    roleData: {
+      handler(val) {
+        if (val && Object.keys(val).length > 0) {
+          this.form = { ...val }
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$refs.form.resetFields()
+      this.$emit('update:visible', false)
+    },
+    submitForm() {
+      // 查看模式下不允许提交
+      if (this.isView) {
+        return
+      }
+
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          const submitData = { ...this.form }
+
+          // 根据是否是编辑模式调用不同的API
+          const apiRequest = this.isEdit ? updateRole(submitData) : addRole(submitData)
+
+          apiRequest
+            .then(response => {
+              if (response.code === '0') {
+                this.$message.success(this.isEdit ? '修改成功' : '添加成功')
+                this.$emit('submit', submitData)
+                this.handleClose()
+                this.form = {}
+              } else {
+                this.$message.error(response.msg || (this.isEdit ? '修改失败' : '添加失败'))
+                this.form = {}
+              }
+            })
+            .catch(error => {
+              this.$message.error(this.isEdit ? '修改角色出错' : '添加角色出错')
+            })
+            .finally(() => {
+              this.loading = false
+            })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
new file mode 100644
index 0000000..7949112
--- /dev/null
+++ b/src/views/system/role/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="role-manage">
+    <el-card>
+      <div class="filter-container">
+        <el-form :model="queryParams" label-width="100px" class="demo-form-inline">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="角色名称">
+                <el-input v-model="queryParams.roleNameLike" placeholder="请输入角色名称" clearable size="small" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="角色编码">
+                <el-input v-model="queryParams.roleCodeLike" placeholder="请输入角色编码" clearable size="small" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" size="medium" @click="handleQuery">查询</el-button>
+                <el-button type="primary" plain size="medium" @click="resetQuery">重置</el-button>
+                <el-button type="primary" plain size="medium" @click="handleAdd">新增</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <r-table
+        :columns="tableConfig.columns"
+        :data="tableData"
+        :deletion="false"
+        :total="tableConfig.total"
+        @currentChange="handleCurrentChange"
+        @sizeChange="handleSizeChange"
+        :currentPage="tableConfig.currentPage"
+        :pageSize="tableConfig.pageSize"
+      />
+    </el-card>
+
+    <!-- 角色新增弹窗 -->
+    <role-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :role-data="currentRoleData" @submit="handleSubmit" />
+  </div>
+</template>
+
+<script>
+import { getRolePage, deleteRole, queryRoleDetail } from '@/api/system/role'
+import RoleDialog from '@/views/system/role/components/RoleDialog'
+
+export default {
+  name: 'RoleManage',
+  components: {
+    RoleDialog
+  },
+  data() {
+    return {
+      loading: false,
+      dialogVisible: false,
+      resetPasswordVisible: false,
+      dialogTitle: '添加角色',
+      isEdit: false,
+      isView: false,
+      currentRoleData: {},
+      total: 0,
+      roleList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleCodeLike: '',
+        roleNameLike: ''
+      },
+      // 表格配置项
+      tableConfig: {
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+        columns: [
+          { prop: 'roleCode', key: '角色编码' },
+          { prop: 'roleName', key: '角色名称' },
+          { prop: 'remark', key: '角色描述' },
+          {
+            key: '操作',
+            render: (h, params) => {
+              return h('div', [
+                h(
+                  'el-button',
+                  {
+                    props: { type: 'text', size: 'mini' },
+                    on: { click: () => this.handleEdit(params.row) }
+                  },
+                  '编辑'
+                ),
+                // h(
+                //   'el-button',
+                //   {
+                //     props: { type: 'text', size: 'mini' },
+                //     on: { click: () => this.handleInfoVisible(params.row) }
+                //   },
+                //   '查看详情'
+                // ),
+                h(
+                  'el-button',
+                  {
+                    props: { type: 'text', size: 'mini', style: 'color: #F56C6C' },
+                    on: { click: () => this.handleDelete(params.row) }
+                  },
+                  '删除'
+                )
+              ])
+            }
+          }
+        ]
+      },
+      tableData: []
+    }
+  },
+  created() {
+    this.getRoleList()
+  },
+  methods: {
+    // 获取角色列表
+    getRoleList() {
+      this.loading = true
+      const params = { ...this.queryParams }
+
+      getRolePage(params)
+        .then(response => {
+          if (response.code === '0') {
+            this.tableData = response.content.content.list || []
+            this.tableConfig.total = response.content.content.total || 0
+          } else {
+            this.$message.error(response.msg || '获取角色列表失败')
+          }
+        })
+        .catch(error => {
+          this.$message.error('获取用户列表出错', error)
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleQuery() {
+      this.queryParams.page = 1
+      this.getRoleList()
+    },
+    resetQuery() {
+      this.queryParams.roleCodeLike = ''
+      this.queryParams.roleNameLike = ''
+      this.handleQuery()
+    },
+    handleAdd() {
+      this.isEdit = false
+      this.isView = false
+      this.currentRoleData = {}
+      this.dialogVisible = true
+      this.dialogTitle = '添加角色'
+    },
+    handleEdit(row) {
+      this.isEdit = true
+      this.isView = false
+      this.dialogTitle = '编辑角色'
+      this.loading = true
+
+      // 获取用户详情
+      queryRoleDetail({ id: row.id })
+        .then(response => {
+          if (response.code === '0') {
+            this.currentRoleData = response.content.content || {}
+            this.dialogVisible = true
+          } else {
+            this.$message.error(response.msg || '获取角色详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取角色详情出错：', error)
+          this.$message.error('获取角色详情出错')
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleSubmit() {
+      this.getRoleList() // 提交后刷新列表
+    },
+    handlePermission(row) {
+      // TODO: 实现权限设置逻辑
+    },
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.handleQuery()
+    },
+    handleCurrentChange(val) {
+      this.queryParams.pageNum = val
+      this.handleQuery()
+    },
+    handleDelete(row) {
+      this.$confirm('确认删除该角色吗？', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.loading = true
+          // 将id放入数组中传递
+          deleteRole([row.id])
+            .then(response => {
+              if (response.code === '0') {
+                this.$message.success('删除成功')
+                this.getRoleList()
+              } else {
+                this.$message.error(response.msg || '删除失败')
+              }
+            })
+            .catch(error => {
+              this.$message.error('删除角色出错', error)
+            })
+            .finally(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {
+          this.$message.info('已取消删除')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.role-manage {
+  padding: 20px;
+
+  .filter-container {
+    margin-bottom: 20px;
+
+    .el-form-item {
+      margin-bottom: 10px;
+      margin-right: 10px;
+
+      .el-form-item__label {
+        padding-right: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/user/components/ResetPasswordDialog.vue b/src/views/system/user/components/ResetPasswordDialog.vue
new file mode 100644
index 0000000..faf7e54
--- /dev/null
+++ b/src/views/system/user/components/ResetPasswordDialog.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog title="重置密码" :visible.sync="visible" width="500px" append-to-body @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" status-icon>
+      <el-form-item label="旧密码" prop="userPassword">
+        <el-input v-model="form.userPassword" placeholder="请输入旧密码" type="password" show-password clearable size="small" />
+      </el-form-item>
+      <el-form-item label="新密码" prop="newPassword">
+        <el-input v-model="form.newPassword" placeholder="请输入新密码" type="password" show-password clearable size="small" />
+      </el-form-item>
+      <el-form-item label="确认新密码" prop="confirmPassword">
+        <el-input v-model="form.confirmPassword" placeholder="请再次输入新密码" type="password" show-password clearable size="small" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" size="small" :loading="loading" @click="submitForm">确 定</el-button>
+      <el-button size="small" @click="handleClose">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updatePassword } from '@/api/generatedApi/system'
+
+export default {
+  name: 'ResetPasswordDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    userId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    // 确认密码验证
+    const validateConfirmPassword = (rule, value, callback) => {
+      if (value !== this.form.newPassword) {
+        callback(new Error('两次输入的密码不一致'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      form: {
+        userPassword: '',
+        newPassword: '',
+        confirmPassword: ''
+      },
+      rules: {
+        userPassword: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
+        newPassword: [{ required: true, message: '请输入新密码', trigger: 'blur' }, { min: 6, message: '密码长度不能少于6个字符', trigger: 'blur' }],
+        confirmPassword: [{ required: true, message: '请再次输入新密码', trigger: 'blur' }, { validator: validateConfirmPassword, trigger: 'blur' }]
+      },
+      loading: false
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$refs.form.resetFields()
+      this.$emit('update:visible', false)
+    },
+    submitForm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          const data = {
+            userId: this.userId,
+            userPassword: this.form.userPassword,
+            newPassword: this.form.newPassword
+          }
+
+          updatePassword(data)
+            .then(response => {
+              if (response.code === '0') {
+                this.$message.success('密码重置成功')
+                this.handleClose()
+                this.$emit('success')
+              } else {
+                this.$message.error(response.msg || '密码重置失败')
+              }
+            })
+            .catch(error => {
+              console.error('密码重置出错：', error)
+              this.$message.error('密码重置出错')
+            })
+            .finally(() => {
+              this.loading = false
+            })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/src/views/system/user/components/UserDialog.vue b/src/views/system/user/components/UserDialog.vue
new file mode 100644
index 0000000..68ba45d
--- /dev/null
+++ b/src/views/system/user/components/UserDialog.vue
@@ -0,0 +1,162 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" width="800px" append-to-body @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="用户编码" prop="userCode">
+            <el-input v-model="form.userCode" placeholder="请输入用户编码" clearable size="small" :disabled="isView || isEdit" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input v-model="form.userName" placeholder="请输入用户名称" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="真实姓名" prop="realName">
+            <el-input v-model="form.realName" placeholder="请输入真实姓名" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机号" prop="mobile">
+            <el-input v-model="form.mobile" placeholder="请输入手机号" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="form.email" placeholder="请输入邮箱" clearable size="small" :disabled="isView" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用户角色" prop="userRoles">
+            <el-select v-model="form.userRoles" placeholder="请选择用户角色" clearable size="small" :disabled="isView">
+              <el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer" v-if="!isView">
+      <el-button type="primary" size="small" :loading="loading" @click="submitForm">确 定</el-button>
+      <el-button size="small" @click="handleClose">取 消</el-button>
+    </div>
+    <div slot="footer" class="dialog-footer" v-else>
+      <el-button size="small" @click="handleClose">关 闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addUser, updateUser } from '@/api/generatedApi/system'
+
+export default {
+  name: 'UserDialog',
+  props: {
+    title: {
+      type: String,
+      default: '添加用户'
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    userData: {
+      type: Object,
+      default: () => ({})
+    },
+    isEdit: {
+      type: Boolean,
+      default: false
+    },
+    isView: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        userRoles: '',
+        userCode: '',
+        userName: '',
+        status: 0,
+        dingtalkId: '',
+        password: '',
+        realName: '',
+        jobNo: '',
+        mobile: '',
+        email: '',
+        sysUserRoleDTOs: []
+      },
+      rules: {
+        userCode: [{ required: true, message: '请输入用户编码', trigger: 'blur' }],
+        userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }]
+      },
+      roleOptions: [{ value: 'admin', label: '管理员' }, { value: 'user', label: '普通用户' }],
+      loading: false
+    }
+  },
+  watch: {
+    userData: {
+      handler(val) {
+        if (val && Object.keys(val).length > 0) {
+          this.form = { ...val }
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$refs.form.resetFields()
+      this.$emit('update:visible', false)
+    },
+    submitForm() {
+      // 查看模式下不允许提交
+      if (this.isView) {
+        return
+      }
+
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          const submitData = { ...this.form }
+
+          // 根据是否是编辑模式调用不同的API
+          const apiRequest = this.isEdit ? updateUser(submitData) : addUser(submitData)
+
+          apiRequest
+            .then(response => {
+              if (response.code === '0') {
+                this.$message.success(this.isEdit ? '修改成功' : '添加成功')
+                this.$emit('submit', submitData)
+                this.handleClose()
+              } else {
+                this.$message.error(response.msg || (this.isEdit ? '修改失败' : '添加失败'))
+              }
+            })
+            .catch(error => {
+              console.error(this.isEdit ? '修改用户出错：' : '添加用户出错：', error)
+              this.$message.error(this.isEdit ? '修改用户出错' : '添加用户出错')
+            })
+            .finally(() => {
+              this.loading = false
+            })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
new file mode 100644
index 0000000..023025c
--- /dev/null
+++ b/src/views/system/user/index.vue
@@ -0,0 +1,379 @@
+<template>
+  <div class="user-manage">
+    <el-card>
+      <div class="filter-container">
+        <el-form :model="queryParams" label-width="100px" class="demo-form-inline">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="用户类型">
+                <el-select v-model="queryParams.userRoles" placeholder="请选择用户类型" clearable size="small">
+                  <el-option label="管理员" value="admin" />
+                  <el-option label="普通用户" value="user" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用户编码">
+                <el-input v-model="queryParams.userCodeLike" placeholder="请输入用户编码" clearable size="small" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用户名称">
+                <el-input v-model="queryParams.userNameLike" placeholder="请输入用户名称" clearable size="small" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="queryParams.dateRange"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button type="primary" size="medium" @click="handleQuery">查询</el-button>
+                <el-button type="primary" plain size="medium" @click="resetQuery">重置</el-button>
+                <el-button type="primary" size="medium" @click="handleAdd">新增</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <r-table
+        :columns="tableConfig.columns"
+        :data="tableData"
+        :deletion="false"
+        :total="tableConfig.total"
+        @currentChange="handleCurrentChange"
+        @sizeChange="handleSizeChange"
+        :currentPage="tableConfig.currentPage"
+        :pageSize="tableConfig.pageSize"
+      />
+    </el-card>
+
+    <!-- 用户新增弹窗 -->
+    <user-dialog :visible.sync="dialogVisible" :title="dialogTitle" :is-edit="isEdit" :is-view="isView" :user-data="currentUserData" @submit="handleSubmit" />
+
+    <!-- 重置密码弹窗 -->
+    <reset-password-dialog :visible.sync="resetPasswordVisible" :user-id="currentUserId" @success="getUserList" />
+  </div>
+</template>
+
+<script>
+import UserDialog from './components/UserDialog.vue'
+import ResetPasswordDialog from './components/ResetPasswordDialog.vue'
+import { getUserPage, queryUserDetail, deleteUser, changeUserStatus, updatePassword } from '@/api/generatedApi/system'
+
+export default {
+  name: 'UserManage',
+  components: {
+    UserDialog,
+    ResetPasswordDialog
+  },
+  data() {
+    return {
+      loading: false,
+      dialogVisible: false,
+      resetPasswordVisible: false,
+      dialogTitle: '添加用户',
+      isEdit: false,
+      isView: false,
+      currentUserData: {},
+      currentUserId: '',
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        userRoles: '',
+        userCodeLike: '',
+        userNameLike: '',
+        status: '',
+        dateRange: []
+      },
+      // 表格配置项
+      tableConfig: {
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+        columns: [
+          { prop: 'userCode', key: '用户编码' },
+          { prop: 'userName', key: '用户名称' },
+          { prop: 'realName', key: '真实姓名' },
+          { prop: 'mobile', key: '手机号' },
+          { prop: 'email', key: '邮箱' },
+          { prop: 'userRoles', key: '用户角色' },
+          {
+            prop: 'status',
+            key: '状态',
+            render: (h, params) => {
+              return h(
+                'el-tag',
+                {
+                  props: {
+                    type: params.row.status === 0 ? 'success' : 'danger',
+                    size: 'small'
+                  }
+                },
+                params.row.status === 0 ? '启用' : '停用'
+              )
+            }
+          },
+          {
+            key: '操作',
+            render: (h, params) => {
+              return h('div', [
+                h(
+                  'el-button',
+                  {
+                    props: { type: 'text', size: 'mini' },
+                    on: { click: () => this.handleEdit(params.row) }
+                  },
+                  '编辑'
+                ),
+                // h(
+                //   'el-button',
+                //   {
+                //     props: { type: 'text', size: 'mini' },
+                //     on: { click: () => this.handleInfoVisible(params.row) }
+                //   },
+                //   '查看详情'
+                // ),
+                h(
+                  'el-button',
+                  {
+                    props: {
+                      type: 'text',
+                      size: 'mini',
+                      style: params.row.status === 0 ? 'color: #F56C6C' : 'color: #67C23A'
+                    },
+                    on: { click: () => this.handleToggleStatus(params.row) }
+                  },
+                  params.row.status === 0 ? '停用' : '启用'
+                ),
+                h(
+                  'el-button',
+                  {
+                    props: { type: 'text', size: 'mini', style: 'color: #409EFF' },
+                    on: { click: () => this.handleResetPassword(params.row) }
+                  },
+                  '重置密码'
+                ),
+                h(
+                  'el-button',
+                  {
+                    props: { type: 'text', size: 'mini', style: 'color: #F56C6C' },
+                    on: { click: () => this.handleDelete(params.row) }
+                  },
+                  '删除'
+                )
+              ])
+            }
+          }
+        ]
+      },
+      tableData: []
+    }
+  },
+  created() {
+    this.getUserList()
+  },
+  methods: {
+    // 获取用户列表
+    getUserList() {
+      this.loading = true
+      const params = { ...this.queryParams }
+
+      // 处理日期范围
+      if (params.dateRange && params.dateRange.length === 2) {
+        params.startDate = params.dateRange[0]
+        params.endDate = params.dateRange[1]
+      }
+      delete params.dateRange
+
+      getUserPage(params)
+        .then(response => {
+          console.log(response)
+          if (response.code === '0') {
+            this.tableData = response.content.content.list || []
+            this.tableConfig.total = response.content.content.total || 0
+          } else {
+            this.$message.error(response.msg || '获取用户列表失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取用户列表出错：', error)
+          this.$message.error('获取用户列表出错')
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleQuery() {
+      this.queryParams.page = 1
+      this.getUserList()
+    },
+    resetQuery() {
+      this.queryParams.userRoles = ''
+      this.queryParams.userCodeLike = ''
+      this.queryParams.userNameLike = ''
+      this.queryParams.dateRange = []
+      this.handleQuery()
+    },
+    handleAdd() {
+      this.isEdit = false
+      this.isView = false
+      this.currentUserData = {}
+      this.dialogVisible = true
+      this.dialogTitle = '添加用户'
+    },
+    handleEdit(row) {
+      this.isEdit = true
+      this.isView = false
+      this.dialogTitle = '编辑用户'
+      this.loading = true
+
+      // 获取用户详情
+      queryUserDetail({ id: row.id })
+        .then(response => {
+          if (response.code === '0') {
+            this.currentUserData = response.content.content || {}
+            this.dialogVisible = true
+          } else {
+            this.$message.error(response.msg || '获取用户详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取用户详情出错：', error)
+          this.$message.error('获取用户详情出错')
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleInfoVisible(row) {
+      // 查看详情逻辑
+      this.isView = true
+      this.isEdit = false
+      this.dialogTitle = '查看用户详情'
+      this.loading = true
+
+      // 获取用户详情
+      queryUserDetail({ id: row.id })
+        .then(response => {
+          if (response.code === '0') {
+            this.currentUserData = response.content.content || {}
+            this.dialogVisible = true
+          } else {
+            this.$message.error(response.msg || '获取用户详情失败')
+          }
+        })
+        .catch(error => {
+          console.error('获取用户详情出错：', error)
+          this.$message.error('获取用户详情出错')
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    handleSubmit(formData) {
+      this.getUserList() // 提交后刷新列表
+    },
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val
+      this.getUserList()
+    },
+    handleCurrentChange(val) {
+      this.queryParams.page = val
+      this.getUserList()
+    },
+    handleDelete(row) {
+      this.$confirm('确认删除该用户吗？', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.loading = true
+          // 将id放入数组中传递
+          deleteUser([row.id])
+            .then(response => {
+              if (response.code === '0') {
+                this.$message.success('删除成功')
+                this.getUserList()
+              } else {
+                this.$message.error(response.msg || '删除失败')
+              }
+            })
+            .catch(error => {
+              console.error('删除用户出错：', error)
+              this.$message.error('删除用户出错')
+            })
+            .finally(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {
+          this.$message.info('已取消删除')
+        })
+    },
+    handleToggleStatus(row) {
+      const statusText = row.status === 0 ? '停用' : '启用'
+      this.$confirm(`确认${statusText}该用户吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 调用changeUserStatus接口
+        const newStatus = row.status === 0 ? 1 : 0 // 切换状态
+        changeUserStatus({
+          userId: row.id,
+          status: newStatus
+        })
+          .then(response => {
+            if (response.code === '0') {
+              this.$message.success(`${statusText}成功`)
+              this.getUserList() // 刷新列表
+            } else {
+              this.$message.error(response.msg || `${statusText}失败`)
+            }
+          })
+          .catch(error => {
+            console.error(`${statusText}用户出错：`, error)
+            this.$message.error(`${statusText}用户出错`)
+          })
+      })
+    },
+    handleResetPassword(row) {
+      this.currentUserId = row.id
+      this.resetPasswordVisible = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.user-manage {
+  padding: 20px;
+
+  .filter-container {
+    margin-bottom: 20px;
+
+    .el-form-item {
+      margin-bottom: 10px;
+      margin-right: 10px;
+
+      .el-form-item__label {
+        padding-right: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/track/Index.vue b/src/views/track/Index.vue
index cd81095..4f7c08c 100644
--- a/src/views/track/Index.vue
+++ b/src/views/track/Index.vue
@@ -47,16 +47,14 @@ export default {
           { prop: 'createdDate', key: '上传时间', width: '200' },
           {
             key: '操作',
+            isRedraw: true,
             render: (h, params) => {
               return h('div', [
-                h(
-                  'el-button',
-                  {
-                    props: { type: 'text', size: 'mini' },
-                    on: { click: () => this.handleActiveInfo(params) }
-                  },
-                  '查看详情'
-                )
+                h('el-button', {
+                  props: { icon: 'el-icon-tickets', title: '查看详情' },
+                  class: 'normal-button',
+                  on: { click: () => this.handleActiveInfo(params) }
+                })
               ])
             }
           }