chore: 更新版本号 2.241123-fix

feat: 添加导出所有学生配置功能，优化提示信息
chore: 更新版本号 2.241123
2025-03-08 10:33:09 +08:00 · 2025-03-08 10:31:54 +08:00 · 2024-11-23 16:43:37 +08:00 · 2024-11-23 16:17:27 +08:00 · 2024-11-23 15:51:31 +08:00 · 2024-11-23 15:16:52 +08:00
288 changed files with 27293 additions and 37740 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 历史路径-哈希带井号标识
-VITE_HISTORY_HASH = true
+VITE_HISTORY_HASH = false

 # 历史路径-前缀URL如：/h5
 VITE_HISTORY_BASE_URL = "/"
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"

 # 应用版本
-VITE_APP_VERSION = "local-dev"
+VITE_APP_VERSION = "2.241123-fix"

 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"

 # 应用版本
-VITE_APP_VERSION = "local-prod"
+VITE_APP_VERSION = "2.241123-fix"

 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,43 +1,5 @@
 # 版本发布日志

-## 2.2510.4-20251024
-
- 修复 AMF配置WhiteList Content导入index0无效问题
- 新增 更新背景图片固定BA的
- 新增 基站状态补充randId列
- 新增 Roaming CDR自定义导出功能
- 优化 基站名称和位置信息改为非必填
- 修复 网元信息更新响应修复
- 新增 UDM鉴权cnFlag添加5G/4G接入选择
- 新增 更新getAllNeConfig函数，支持传入neId参数
- 修复 更新根网管节点处理逻辑，支持无OMC情况
- 优化 移除ID列显示
- 优化 操作日志信息json结构格式美化
- 优化 备份网元日志文件数据查看
- 优化 悬浮标签修改
-
-## 2.2510.2-20251011
-
- 新增 UDM-auth数据导出按钮权限定义
- 新增 SMSC-CDR添加结果原因说明
- 优化 移除CDR/UE/网元版本/授权列表显示ID列
- 修复 MML回车undefined问题，关闭搜索匹配
-
-## 2.2408.1-20250815
-
- 修复 给config.js加随机数避免缓存
- 优化 UDM鉴权用户显示创建时间
- 修复 系统用户登录主页重复刷新问题
- 新增 kpi自定义仪表盘需求更改
- 修复 租户主页暗色模式显示不一致
- 修复 租户和系统用户的主页显示差异
- 修复 图片上传取值fileName失败
- 优化 第三方用户不可删除和修改密码
- 修复 恢复显示快速PLMN修改窗口
- 新增 第三方登录认证功能和管理页
- 修复 回退看板，修复切换upf的流量统计显示
-
-
 ## 2.2404.1-20240402

 - 新增 网元安装流程相关页面与操作相关接口联调
--- a/README.md
+++ b/README.md
@@ -46,31 +46,5 @@ export NODE_OPTIONS=--max-old-space-size=50000

 ```text
 https://192.168.5.23/
-admin
-admin
+admin / admin
 ```
-
-
-
-## 多租户涉及页面 
-ems_frontend_vue3\src\views\dashboard\smfCDR\index.vue
-ems_frontend_vue3\src\views\dashboard\imsCDR\index.vue
-ems_frontend_vue3\src\views\dashboard\amfUE\index.vue
-ems_frontend_vue3\src\views\dashboard\mmeUE\index.vue
-ems_frontend_vue3\src\views\system\user\index.vue
-ems_frontend_vue3\src\views\system\tenant\index.vue
-ems_frontend_vue3\src\views\system\log\operate\index.vue
-ems_frontend_vue3\src\views\neUser\sub\index.vue
-ems_frontend_vue3\src\views\neUser\ims\index.vue
-ems_frontend_vue3\src\views\neUser\ue\index.vue
-ems_frontend_vue3\src\views\neUser\base5G\index.vue
-
-ems_frontend_vue3\src\views\tenant\amfUE\index.vue
-ems_frontend_vue3\src\views\tenant\base5G\index.vue
-ems_frontend_vue3\src\views\tenant\ims\index.vue
-ems_frontend_vue3\src\views\tenant\imsCDR\index.vue
-ems_frontend_vue3\src\views\tenant\mmeUE\index.vue
-ems_frontend_vue3\src\views\tenant\operate\index.vue
-ems_frontend_vue3\src\views\tenant\smfCDR\index.vue
-ems_frontend_vue3\src\views\tenant\sub\index.vue
-ems_frontend_vue3\src\views\tenant\ue\index.vue
--- a/index.html
+++ b/index.html
@@ -2,18 +2,14 @@
 <html lang="zh-CN">
  <head>
    <meta charset="UTF-8" />
-    <meta name="google" content="notranslate" />
+    <meta name="google" content="notranslate">
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>loading...</title>
    <link rel="icon" href="/favicon.ico" />
-    <link rel="preload" href="/loading.js" as="script"/>
+    <link rel="preload" href="/loading.js" as="script">
    <script async src="/loading.js"></script>
-    <script>
-      var script = document.createElement('script');
-      script.src = '/config.js?nocache=' + new Date().getTime();
-      script.async = true;
-      document.head.appendChild(script);
-    </script>
+    <link rel="preload" href="/config.js" as="script">
+    <script async src="/config.js"></script>
  </head>
  <body>
    <div id="app"></div>
--- a/package.json
+++ b/package.json
@@ -8,55 +8,54 @@
  },
  "scripts": {
    "dev": "vite",
-    "build": "vite build",
+    "build": "vue-tsc && vite build",
    "preview": "vite preview"
  },
  "dependencies": {
-    "@ant-design/icons-vue": "7.0.1",
-    "@antv/g6": "4.8.24",
-    "@codemirror/lang-javascript": "6.2.3",
-    "@codemirror/lang-yaml": "6.1.2",
-    "@codemirror/merge": "6.10.0",
-    "@codemirror/theme-one-dark": "6.1.2",
-    "@tato30/vue-pdf": "1.11.3",
-    "@vueuse/core": "13.0.0",
-    "@xterm/addon-fit": "0.10.0",
-    "@xterm/xterm": "5.5.0",
-    "ant-design-vue": "4.2.6",
-    "antdv-pro-layout": "4.2.0",
-    "antdv-pro-modal": "4.0.6",
-    "codemirror": "6.0.1",
-    "crypto-js": "4.2.0",
-    "dayjs": "1.11.13",
-    "echarts": "5.6.0",
-    "echarts-liquidfill": "^3.1.0",
-    "file-saver": "2.0.5",
-    "grid-layout-plus": "1.0.6",
-    "intl-tel-input": "25.2.0",
+    "@ant-design/icons-vue": "^7.0.1",
+    "@antv/g6": "~4.8.24",
+    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-yaml": "^6.1.1",
+    "@codemirror/merge": "^6.7.2",
+    "@codemirror/theme-one-dark": "^6.1.2",
+    "@tato30/vue-pdf": "^1.11.2",
+    "@vueuse/core": "11.2.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/xterm": "^5.5.0",
+    "ant-design-vue": "^4.2.5",
+    "antdv-pro-layout": "^4.1.9",
+    "antdv-pro-modal": "^4.0.5",
+    "codemirror": "^6.0.1",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.11",
+    "echarts": "~5.5.0",
+    "file-saver": "^2.0.5",
+    "grid-layout-plus": "^1.0.5",
+    "intl-tel-input": "^24.6.0",
    "js-base64": "^3.7.7",
    "js-cookie": "^3.0.5",
    "localforage": "^1.10.0",
    "nprogress": "^0.2.0",
-    "p-queue": "8.0.1",
-    "pinia": "2.3.0",
-    "vue": "3.5.13",
-    "vue-i18n": "11.1.2",
-    "vue-router": "4.5.0",
-    "vue3-smooth-dnd": "0.0.6",
-    "xlsx": "0.18.5"
+    "p-queue": "~8.0.1",
+    "pinia": "2.2.6",
+    "vue": "^3.5.12",
+    "vue-i18n": "^10.0.4",
+    "vue-router": "^4.4.5",
+    "vue3-smooth-dnd": "^0.0.6",
+    "xlsx": "~0.18.5"
  },
  "devDependencies": {
-    "@types/crypto-js": "4.2.2",
-    "@types/file-saver": "2.0.7",
-    "@types/js-cookie": "3.0.6",
-    "@types/node": "^18.0.0",
-    "@types/nprogress": "0.2.3",
-    "@vitejs/plugin-vue": "5.2.3",
-    "less": "4.2.2",
-    "typescript": "5.8.2",
-    "unplugin-vue-components": "0.28.0",
-    "vite": "6.2.2",
-    "vite-plugin-compression": "0.5.1",
-    "vue-tsc": "2.2.8"
+    "@types/crypto-js": "^4.2.2",
+    "@types/file-saver": "^2.0.7",
+    "@types/js-cookie": "^3.0.6",
+    "@types/node": "^22.7.7",
+    "@types/nprogress": "^0.2.3",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "less": "^4.2.0",
+    "typescript": "^5.6.3",
+    "unplugin-vue-components": "^0.27.4",
+    "vite": "5.4.10",
+    "vite-plugin-compression": "~0.5.1",
+    "vue-tsc": "^2.1.8"
  }
 }
--- a/practical_training/README.md
+++ b/practical_training/README.md
@@ -0,0 +1,27 @@
+# 实训教学模块
+
+网元固定一套，ne_id 默认使用`001`
+
+## 静态资源
+
+将目录下文件放置到对应目录 替换约18个文件
+
+- i18n 对应覆盖 src\i18n
+- views 对应覆盖 src\views
+
+
+## 涉及文件
+
+- src\i18n\locales\en-US.ts
+- src\i18n\locales\zh-CN.ts 
+- src\views\monitor\topologyArchitecture\index.vue
+- src\views\configManage\configParamTreeTable
+- src\views\configManage\configParamApply
+- src\views\ne\neInfo\index.vue
+- src\plugins\auth-user.ts
+- src\views\dashboard\amfUE\index.vue
+- src\views\dashboard\mmeUE\index.vue
+- src\views\dashboard\imsCDR\index.vue
+- src\views\dashboard\smfCDR\index.vue
+- src\views\dashboard\smscCDR\index.vue
+- src\store\modules\user.ts
--- a/practical_training/api/pt/neConfig.ts
+++ b/practical_training/api/pt/neConfig.ts
@@ -0,0 +1,120 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 保存为示例配置 (仅管理员操作)
+ * @param query 查询参数
+ * @returns object
+ */
+export function ptSaveAsDefault(neType: string, neid: string) {
+  return request({
+    url: `/pt/neConfigData/saveAsDefault`,
+    method: 'post',
+    data: { neType, neid },
+  });
+}
+
+/**
+ * 重置为示例配置 (仅学生/教师操作)
+ * @param query 查询参数
+ * @returns object
+ */
+export function ptResetAsDefault(neType: string) {
+  return request({
+    url: `/pt/neConfigData/resetAsDefault`,
+    method: 'post',
+    data: { neType },
+  });
+}
+
+/**
+ * 数据比较示例
+ * @param params 查询参数
+ * @returns object
+ */
+export function ptContrastAsDefault(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData/contrast`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 配置数据导出Excel
+ * @param student 仅教师 student
+ * @returns object
+ */
+export function ptExport(student: string | undefined) {
+  return request({
+    url: `/pt/neConfigData/export`,
+    method: 'get',
+    params: { student },
+    responseType: 'blob',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 配置数据导出Excel (仅教师全量)
+ * @returns object
+ */
+export function ptExportAll() {
+  return request({
+    url: `/pt/neConfigData/export-all`,
+    method: 'get',
+    responseType: 'blob',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 网元参数配置信息
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigData(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置数据更新
+ * @param data 数据 {neType,paramName:"参数名",paramData:{参数},loc:"层级index仅array"}
+ * @returns object
+ */
+export function editPtNeConfigData(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'put',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置新增（array）
+ * @param data 数据 {neType,paramName:"参数名",paramData:{参数},loc:"层级index"}
+ * @returns object
+ */
+export function addPtNeConfigData(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置删除（array）
+ * @param params 数据 {neType,paramName:"参数名",loc:"层级index"}
+ * @returns object
+ */
+export function delPtNeConfigData(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'delete',
+    params,
+  });
+}
--- a/practical_training/api/pt/neConfigApply.ts
+++ b/practical_training/api/pt/neConfigApply.ts
@@ -0,0 +1,53 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 班级学生列表 (仅教师操作)
+ * @param params 数据 {userName}
+ * @returns object
+ */
+export function getPtClassStudents(params?: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply/students`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置应用申请列表
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigApplyList(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply/list`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置应用申请提交(仅学生操作)
+ * @param data 数据 { "neType": "MME", "status": "1" }
+ * @returns object
+ */
+export function stuPtNeConfigApply(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply`,
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置应用申请状态变更(仅管理员/教师操作)
+ * @param data 数据 { "applyId": "1", "neType": "MME", "status": "3", "backInfo": "sgw参数错误" }
+ * @returns object
+ */
+export function updatePtNeConfigApply(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply`,
+    method: 'put',
+    data: data,
+  });
+}
--- a/practical_training/api/pt/neConfigDataLog.ts
+++ b/practical_training/api/pt/neConfigDataLog.ts
@@ -0,0 +1,27 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 网元参数配置数据变更日志信息
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigDataLogList(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigDataLog`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置数据变更日志还原到数据
+ * @param data 数据 { "id": "1", "value": "old" }
+ * @returns object
+ */
+export function restorePtNeConfigDataLog(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigDataLog/restore`,
+    method: 'put',
+    data: data,
+  });
+}
--- a/practical_training/api/pt/user.ts
+++ b/practical_training/api/pt/user.ts
@@ -0,0 +1,42 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 导入用户模板数据
+ * @param data 表单数据对象
+ * @returns object
+ */
+export function importData(data: FormData) {
+  return request({
+    url: '/pt/system/user/importData',
+    method: 'post',
+    data,
+    dataType: 'form-data',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 导入用户模板下载
+ * @returns bolb
+ */
+export function importTemplate() {
+  return request({
+    url: '/pt/system/user/importTemplate',
+    method: 'get',
+    responseType: 'blob',
+  });
+}
+
+/**
+ * 用户列表导出
+ * @param query 查询参数
+ * @returns bolb
+ */
+export function exportUser(query: Record<string, any>) {
+  return request({
+    url: '/pt/system/user/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob',
+  });
+}
--- a/practical_training/i18n/locales/en-US.ts
+++ b/practical_training/i18n/locales/en-US.ts
--- a/practical_training/i18n/locales/zh-CN.ts
+++ b/practical_training/i18n/locales/zh-CN.ts
--- a/practical_training/plugins/auth-user.ts
+++ b/practical_training/plugins/auth-user.ts
@@ -0,0 +1,66 @@
+import { ADMIN_PERMISSION, ADMIN_ROLE_KEY } from '@/constants/admin-constants';
+import useUserStore from '@/store/modules/user';
+
+/**
+ * 是否系统管理员 
+ * @returns true | false
+ */
+export function isSystemAdmin(): boolean {
+  const userPermissions = useUserStore().permissions;
+  if (userPermissions.includes(ADMIN_PERMISSION)) return true;
+  const userRoles = useUserStore().roles;
+  if (userRoles.includes(ADMIN_ROLE_KEY)) return true;
+  return false;
+}
+
+/**
+ * 只需含有其中权限
+ * @param role 权限字符数组
+ * @returns true | false
+ */
+export function hasPermissions(permissions: string[]): boolean {
+  if (!permissions || permissions.length === 0) return false;
+  const userPermissions = useUserStore().permissions;
+  if (!userPermissions || userPermissions.length === 0) return false;
+  if (userPermissions.includes(ADMIN_PERMISSION)) return true;
+  return permissions.some(p => userPermissions.some(up => up === p));
+}
+
+/**
+ * 同时匹配其中权限
+ * @param role 权限字符数组
+ * @returns true | false
+ */
+export function matchPermissions(permissions: string[]): boolean {
+  if (!permissions || permissions.length === 0) return false;
+  const userPermissions = useUserStore().permissions;
+  if (!userPermissions || userPermissions.length === 0) return false;
+  if (userPermissions.includes(ADMIN_PERMISSION)) return true;
+  return permissions.every(p => userPermissions.some(up => up === p));
+}
+
+/**
+ * 只需含有其中角色
+ * @param role 角色字符数组
+ * @returns true | false
+ */
+export function hasRoles(roles: string[]): boolean {
+  if (!roles || roles.length === 0) return false;
+  const userRoles = useUserStore().roles;
+  if (!userRoles || userRoles.length === 0) return false;
+  if (userRoles.includes(ADMIN_ROLE_KEY)) return true;
+  return roles.some(r => userRoles.some(ur => ur === r));
+}
+
+/**
+ * 同时匹配其中角色
+ * @param role 角色字符数组
+ * @returns true | false
+ */
+export function matchRoles(roles: string[]): boolean {
+  if (!roles || roles.length === 0) return false;
+  const userRoles = useUserStore().roles;
+  if (!userRoles || userRoles.length === 0) return false;
+  if (userRoles.includes(ADMIN_ROLE_KEY)) return true;
+  return roles.every(r => userRoles.some(ur => ur === r));
+}
--- a/practical_training/store/modules/user.ts
+++ b/practical_training/store/modules/user.ts
@@ -0,0 +1,171 @@
+import defaultAvatar from '@/assets/images/default_avatar.png';
+import useLayoutStore from './layout';
+import { login, logout, getInfo } from '@/api/login';
+import { setToken, removeToken } from '@/plugins/auth-token';
+import { defineStore } from 'pinia';
+import { TOKEN_RESPONSE_FIELD } from '@/constants/token-constants';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { parseUrlPath } from '@/plugins/file-static-url';
+
+/**用户信息类型 */
+type UserInfo = {
+  /**用户ID */
+  userId: string;
+  /**登录账号 */
+  userName: string;
+  /**用户角色 字符串数组 */
+  roles: string[];
+  /**用户权限 字符串数组 */
+  permissions: string[];
+  /**用户头像 */
+  avatar: string;
+  /**用户昵称 */
+  nickName: string;
+  /**用户手机号 */
+  phonenumber: string;
+  /**用户邮箱 */
+  email: string;
+  /**用户性别 */
+  sex: string | undefined;
+  /**其他信息 */
+  profile: Record<string, any>;
+};
+
+const useUserStore = defineStore('user', {
+  state: (): UserInfo => ({
+    userId: '',
+    userName: '',
+    roles: [],
+    permissions: [],
+    avatar: '',
+    nickName: '',
+    phonenumber: '',
+    email: '',
+    sex: undefined,
+    profile: {},
+  }),
+  getters: {
+    /**
+     * 获取正确头像地址
+     * @param state 内部属性不用传入
+     * @returns 头像地址url
+     */
+    getAvatar(state) {
+      if (!state.avatar) {
+        return defaultAvatar;
+      }
+      return parseUrlPath(state.avatar);
+    },
+    /**
+     * 获取基础信息属性
+     * @param state 内部属性不用传入
+     * @returns 基础信息
+     */
+    getBaseInfo(state) {
+      return {
+        nickName: state.nickName,
+        phonenumber: state.phonenumber,
+        email: state.email,
+        sex: state.sex,
+      };
+    },
+  },
+  actions: {
+    /**
+     * 更新基础信息属性
+     * @param data 变更信息
+     */
+    setBaseInfo(data: Record<string, any>) {
+      this.nickName = data.nickName;
+      this.phonenumber = data.phonenumber;
+      this.email = data.email;
+      this.sex = data.sex;
+    },
+    /**
+     * 更新头像
+     * @param avatar 上传后的地址
+     */
+    setAvatar(avatar: string) {
+      this.avatar = avatar;
+    },
+    /**
+     * 获取正确头像地址
+     * @param avatar
+     */
+    fnAvatar(avatar: string) {
+      if (!avatar) {
+        return defaultAvatar;
+      }
+      return parseUrlPath(avatar);
+    },
+    // 登录
+    async fnLogin(loginBody: Record<string, string>) {
+      const res = await login(loginBody);
+      if (res.code === RESULT_CODE_SUCCESS && res.data) {
+        const token = res.data[TOKEN_RESPONSE_FIELD];
+        setToken(token);
+      }
+      return res;
+    },
+    // 获取用户信息
+    async fnGetInfo() {
+      const res = await getInfo();
+      if (res.code === RESULT_CODE_SUCCESS && res.data) {
+        const { user, roles, permissions } = res.data;
+        this.userId = user.userId;
+        // 登录账号
+        this.userName = user.userName;
+        // 用户头像
+        this.avatar = user.avatar;
+        // 基础信息
+        this.nickName = user.nickName;
+        this.phonenumber = user.phonenumber;
+        this.email = user.email;
+        this.sex = user.sex;
+
+        // 验证返回的roles是否是一个非空数组
+        if (Array.isArray(roles) && roles.length > 0) {
+          this.roles = roles;
+          this.permissions = permissions;
+        } else {
+          this.roles = ['ROLE_DEFAULT'];
+          this.permissions = [];
+        }
+
+        // 水印文字信息=用户昵称 手机号
+        let waterMarkContent = this.userName;
+        if (this.phonenumber) {
+          waterMarkContent = `${this.userName} ${this.phonenumber}`;
+        }
+        // useLayoutStore().changeWaterMark(waterMarkContent);
+        useLayoutStore().changeWaterMark('');
+        // 学生布局用不一样的
+        if (this.roles.includes('student')) {
+          useLayoutStore().changeConf('layout', 'side');
+          useLayoutStore().changeConf('menuTheme', 'dark');
+          useLayoutStore().changeConf('tabRender', false);
+        }
+      }
+      // 网络错误时退出登录状态
+      if (res.code === 0) {
+        removeToken();
+        window.location.reload();
+      }
+      return res;
+    },
+    // 退出系统
+    async fnLogOut() {
+      try {
+        await logout();
+      } catch (error) {
+        throw error;
+      } finally {
+        this.roles = [];
+        this.permissions = [];
+        removeToken();
+      }
+    },
+  },
+});
+
+export default useUserStore;
--- a/practical_training/views/configManage/configParamApply/index.vue
+++ b/practical_training/views/configManage/configParamApply/index.vue
@@ -1,34 +1,42 @@
 <script setup lang="ts">
-import { reactive, ref, onMounted, toRaw } from 'vue';
+import { reactive, onMounted, toRaw, computed } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
 import { ProModal } from 'antdv-pro-modal';
-import { message, Form } from 'ant-design-vue/es';
+import { Form, message, Modal } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
-import useNeInfoStore from '@/store/modules/neinfo';
+import { parseDateToStr } from '@/utils/date-utils';
 import useDictStore from '@/store/modules/dict';
+import useNeInfoStore from '@/store/modules/neinfo';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
-import { getKPITitleList, updateKPITitle } from '@/api/perfManage/goldTarget';
+import {
+  getPtNeConfigApplyList,
+  stuPtNeConfigApply,
+  updatePtNeConfigApply,
+} from '@/api/pt/neConfigApply';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const { getDict } = useDictStore();
+const neInfoStore = useNeInfoStore();

 /**字典数据 */
 let dict: {
-  sysNormalDisable: DictType[];
+  /**配置申请应用状态 */
+  ptConfigApplyStatus: DictType[];
 } = reactive({
-  sysNormalDisable: [],
+  ptConfigApplyStatus: [],
 });

 /**查询参数 */
 let queryParams = reactive({
-  /**参数名称 */
+  /**网元类型 */
  neType: '',
-  /**参数键名 */
-  title: '',
-  /**系统内置 */
-  statusFlag: undefined,
+  /**申请人 */
+  createBy: '',
+  /**状态 */
+  status: undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -39,8 +47,8 @@ let queryParams = reactive({
 function fnQueryReset() {
  queryParams = Object.assign(queryParams, {
    neType: '',
-    title: '',
-    statusFlag: undefined,
+    createBy: '',
+    status: undefined,
    pageNum: 1,
    pageSize: 20,
  });
@@ -73,51 +81,64 @@ let tableState: TabeStateType = reactive({
 });

 /**表格字段列 */
-let tableColumns = ref<ColumnsType>([
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'left',
-  //   width: 100,
-  // },
+let tableColumns: ColumnsType = [
  {
-    title: 'NE Type',
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'center',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neType'),
    dataIndex: 'neType',
    align: 'left',
    width: 100,
  },
  {
-    title: 'KPI ID',
-    dataIndex: 'kpiId',
+    title: '申请人',
+    dataIndex: 'createBy',
    align: 'left',
-    width: 200,
-  },
-  // {
-  //   title: 'Title',
-  //   dataIndex: 'cnTitle',
-  //   align: 'left',
-  //   width: 200,
-  // },
-  {
-    title: 'Title',
-    dataIndex: 'enTitle',
-    align: 'left',
-    width: 400,
-    ellipsis: true,
+    width: 120,
  },
  {
-    title: 'Status',
-    dataIndex: 'statusFlag',
-    key: 'statusFlag',
+    title: '申请时间',
+    dataIndex: 'createTime',
+    align: 'left',
+    width: 150,
+    customRender(opt) {
+      if (+opt.value <= 0) return '';
+      return parseDateToStr(+opt.value);
+    },
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
    align: 'left',
    width: 100,
  },
+  {
+    title: '处理人',
+    dataIndex: 'updateBy',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: '处理时间',
+    dataIndex: 'updateTime',
+    align: 'left',
+    width: 150,
+    customRender(opt) {
+      if (+opt.value <= 0) return '';
+      return parseDateToStr(+opt.value);
+    },
+  },
  {
    title: t('common.operate'),
    key: 'id',
    align: 'left',
  },
-]);
+];

 /**表格分页器参数 */
 let tablePagination = reactive({
@@ -153,8 +174,49 @@ function fnTableSize({ key }: MenuInfo) {
  tableState.size = key as SizeType;
 }

+/**表格多选 */
+function fnTableSelectedRowKeys(keys: (string | number)[], infos: any) {
+  const arr = [];
+  for (const item of infos) {
+    if (item.status === '0') {
+      arr.push(item.id);
+    }
+  }
+  tableState.selectedRowKeys = arr;
+}
+
+/**查询列表, pageNum初始页数 */
+function fnGetList(pageNum?: number) {
+  if (tableState.loading) return;
+  tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
+  getPtNeConfigApplyList(toRaw(queryParams)).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      // 取消勾选
+      if (tableState.selectedRowKeys.length > 0) {
+        tableState.selectedRowKeys = [];
+      }
+      tablePagination.total = res.total;
+      tableState.data = res.rows;
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
+        tableState.loading = false;
+        fnGetList(queryParams.pageNum - 1);
+      }
+    }
+    tableState.loading = false;
+  });
+}
+
 /**对话框对象信息状态类型 */
 type ModalStateType = {
+  /**详情框是否显示 */
+  openByView: boolean;
  /**新增框或修改框是否显示 */
  openByEdit: boolean;
  /**标题 */
@@ -163,53 +225,60 @@ type ModalStateType = {
  from: Record<string, any>;
  /**确定按钮 loading */
  confirmLoading: boolean;
+  /**cron生成框是否显示 */
+  openByCron: boolean;
 };

 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
+  openByView: false,
  openByEdit: false,
-  title: 'KPI Title',
+  title: '任务',
  from: {
    id: undefined,
-    cnTitle: '',
-    enTitle: '',
-    kpiId: '',
-    statusFlag: '1',
+    createBy: '',
+    createTime: 0,
+    updateBy: '',
+    updateTime: 0,
+    neType: 'MME',
+    status: '0',
+    backInfo: '',
  },
  confirmLoading: false,
+  openByCron: false,
 });

 /**对话框内表单属性和校验规则 */
 const modalStateFrom = Form.useForm(
  modalState.from,
  reactive({
-    enTitle: [
+    status: [
      {
        required: true,
-        message: t('common.pleaseInput'),
-      },
-    ],
-    statusFlag: [
-      {
-        required: true,
-        message: t('common.pleaseSelect'),
+        message: t('common.selectPlease'),
      },
    ],
  })
 );

 /**
- * 对话框弹出显示为 新增或者修改
- * @param configId 参数编号id, 不传为新增
+ * 对话框弹出显示为 查看
+ * @param jobId 任务id
+ */
+function fnModalVisibleByVive(row: Record<string, any>) {
+  modalState.from = Object.assign(modalState.from, row);
+  modalState.title = '查看';
+  modalState.openByView = true;
+}
+
+/**
+ * 对话框弹出显示为 编辑
+ * @param jobId 任务id
 */
 function fnModalVisibleByEdit(row: Record<string, any>) {
-  if (modalState.confirmLoading) return;
-  modalState.from.id = row.id;
-  modalState.from.enTitle = row.enTitle;
-  modalState.from.cnTitle = row.cnTitle;
-  modalState.from.kpiId = row.kpiId;
-  modalState.from.statusFlag = row.statusFlag;
-  modalState.title = 'Update KPI Title Info';
+  Object.assign(modalState.from, row);
+  modalState.from.status = '3';
+  modalState.title = '编辑状态';
  modalState.openByEdit = true;
 }

@@ -223,24 +292,26 @@ function fnModalOk() {
    .then(() => {
      modalState.confirmLoading = true;
      const from = toRaw(modalState.from);
-      const key = 'kpi-title';
-      message.loading({ content: t('common.loading'), key });
-      updateKPITitle(from)
+      updatePtNeConfigApply({
+        applyId: from.id,
+        neType: from.neType,
+        status: from.status,
+        backInfo: from.backInfo,
+      })
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
            message.success({
-              content: t('common.msgSuccess', { msg: modalState.title }),
-              key,
-              duration: 2,
+              content: t('common.operateOk'),
+              duration: 3,
            });
+
            modalState.openByEdit = false;
            modalStateFrom.resetFields();
-            fnGetList(1);
+            fnGetList();
          } else {
            message.error({
              content: `${res.msg}`,
-              key,
-              duration: 2,
+              duration: 3,
            });
          }
        })
@@ -259,47 +330,70 @@ function fnModalOk() {
 */
 function fnModalCancel() {
  modalState.openByEdit = false;
-  modalStateFrom.resetFields();
+  modalState.openByView = false;
+  modalState.from = {};
 }

-/**查询参数配置列表, pageNum初始页数 */
-function fnGetList(pageNum?: number) {
-  if (tableState.loading) return;
-  tableState.loading = true;
-  if (pageNum) {
-    queryParams.pageNum = pageNum;
-  }
-
-  getKPITitleList(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS) {
-      // 取消勾选
-      if (tableState.selectedRowKeys.length > 0) {
-        tableState.selectedRowKeys = [];
+/**批量退回 */
+function fnRecordBack(row?: Record<string, any>) {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: row
+      ? '确认要撤回配置应用申请吗？'
+      : '确认要批量退回学生的配置应用申请吗？',
+    onOk() {
+      let result: any;
+      if (row) {
+        result = stuPtNeConfigApply({ neType: row.neType, status: '1' });
+      } else {
+        result = updatePtNeConfigApply({
+          status: '3',
+          backId: tableState.selectedRowKeys.join(','),
+          backInfo: '请重新检查配置',
+        });
      }
-      tablePagination.total = res.data.total;
-      tableState.data = res.data.rows;
-      if (
-        tablePagination.total <=
-          (queryParams.pageNum - 1) * tablePagination.pageSize &&
-        queryParams.pageNum !== 1
-      ) {
-        tableState.loading = false;
-        fnGetList(queryParams.pageNum - 1);
-      }
-    }
-    tableState.loading = false;
+      result.then((res: any) => {
+        fnGetList();
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('common.operateOk'),
+            duration: 3,
+          });
+        } else {
+          message.error({
+            content: `${res.msg}`,
+            duration: 3,
+          });
+        }
+      });
+    },
  });
 }

+/**应用状态 */
+const applyStatus = computed(() => {
+  if (hasRoles(['student'])) {
+    return dict.ptConfigApplyStatus.filter(s => ['0', '1'].includes(s.value));
+  }
+  let data = dict.ptConfigApplyStatus;
+  if (modalState.openByEdit && modalState.from.id) {
+    data = dict.ptConfigApplyStatus.filter(s => ['2', '3'].includes(s.value));
+  }
+  return data;
+});
+
 onMounted(() => {
  // 初始字典数据
-  Promise.allSettled([getDict('sys_normal_disable')]).then(resArr => {
+  Promise.allSettled([getDict('pt_config_apply_status')]).then(resArr => {
    if (resArr[0].status === 'fulfilled') {
-      dict.sysNormalDisable = resArr[0].value;
+      dict.ptConfigApplyStatus = resArr[0].value;
    }
  });
-  // 获取列表数据
-  fnGetList();
+  // 获取网元列表
+  neInfoStore.fnNelist().finally(() => {
+    // 获取列表数据
+    fnGetList();
+  });
 });
 </script>

@@ -314,36 +408,29 @@ onMounted(() => {
      <a-form :model="queryParams" name="queryParams" layout="horizontal">
        <a-row :gutter="16">
          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="NE Type" name="neType">
+            <a-form-item
+              :label="t('views.configManage.license.neType')"
+              name="neType "
+            >
              <a-auto-complete
                v-model:value="queryParams.neType"
-                :options="useNeInfoStore().getNeSelectOtions"
+                :options="neInfoStore.getNeSelectOtions"
                allow-clear
-                :placeholder="t('common.inputPlease')"
+                :placeholder="t('views.configManage.license.neTypePlease')"
              />
            </a-form-item>
          </a-col>
          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="Title" name="title">
-              <a-input
-                v-model:value="queryParams.title"
-                allow-clear
-                :placeholder="t('common.inputPlease')"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="Status" name="statusFlag">
+            <a-form-item label="状态" name="status">
              <a-select
-                v-model:value="queryParams.statusFlag"
+                v-model:value="queryParams.status"
                allow-clear
                :placeholder="t('common.selectPlease')"
-                :options="dict.sysNormalDisable"
+                :options="applyStatus"
              >
              </a-select>
            </a-form-item>
          </a-col>
-
          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item>
              <a-space :size="8">
@@ -364,11 +451,24 @@ onMounted(() => {

    <a-card :bordered="false" :body-style="{ padding: '0px' }">
      <!-- 插槽-卡片左侧侧 -->
-      <template #title> </template>
+      <template #title>
+        <div class="button-container">
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            @click.prevent="fnRecordBack()"
+            v-roles:has="['admin', 'teacher']"
+          >
+            <template #icon><DeleteOutlined /></template>
+            批量退回
+          </a-button>
+        </div>
+      </template>

      <!-- 插槽-卡片右侧 -->
      <template #extra>
-        <a-space :size="8" align="center">
+        <div class="button-container">
          <a-tooltip>
            <template #title>{{ t('common.searchBarText') }}</template>
            <a-switch
@@ -408,7 +508,7 @@ onMounted(() => {
              </template>
            </a-dropdown>
          </a-tooltip>
-        </a-space>
+        </div>
      </template>

      <!-- 表格列表 -->
@@ -419,19 +519,41 @@ onMounted(() => {
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
-        :pagination="tablePagination"
        :scroll="{ x: tableColumns.length * 120 }"
+        :pagination="tablePagination"
+        :row-selection="{
+          type: 'checkbox',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
      >
        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'statusFlag'">
+          <template v-if="column.key === 'status'">
            <DictTag
-              :options="dict.sysNormalDisable"
-              :value="record.statusFlag"
+              :options="dict.ptConfigApplyStatus"
+              :value="record.status"
            />
          </template>
          <template v-if="column.key === 'id'">
            <a-space :size="8" align="center">
              <a-tooltip>
+                <template #title>{{ t('common.viewText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnModalVisibleByVive(record)"
+                >
+                  <template #icon><ProfileOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip v-if="record.status === '0' && hasRoles(['student'])">
+                <template #title>撤回</template>
+                <a-button type="link" @click.prevent="fnRecordBack(record)">
+                  <template #icon><RollbackOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip
+                v-if="record.status === '0' && hasRoles(['admin', 'teacher'])"
+              >
                <template #title>{{ t('common.editText') }}</template>
                <a-button
                  type="link"
@@ -446,16 +568,81 @@ onMounted(() => {
      </a-table>
    </a-card>

+    <!-- 详情框 -->
+    <ProModal
+      :drag="true"
+      :width="800"
+      :open="modalState.openByView"
+      :title="modalState.title"
+      @cancel="fnModalCancel"
+    >
+      <a-form layout="horizontal" :label-col="{ span: 6 }" :label-wrap="true">
+        <a-row>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
+              {{ modalState.from.neType }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="状态" name="status">
+              <DictTag
+                :options="dict.ptConfigApplyStatus"
+                :value="modalState.from.status"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="申请人" name="createBy">
+              {{ modalState.from.createBy }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="申请时间" name="createTime">
+              {{ parseDateToStr(+modalState.from.createTime) }}
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row v-if="modalState.from.status !== '0'">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="处理人" name="updateBy">
+              {{ modalState.from.updateBy }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="处理时间" name="updateTime">
+              {{ parseDateToStr(+modalState.from.updateTime) }}
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-form-item
+          v-if="modalState.from.status === '3'"
+          label="退回说明"
+          name="backInfo"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          {{ modalState.from.backInfo }}
+        </a-form-item>
+      </a-form>
+      <template #footer>
+        <a-button key="cancel" @click="fnModalCancel">
+          {{ t('common.close') }}
+        </a-button>
+      </template>
+    </ProModal>
+
    <!-- 新增框或修改框 -->
    <ProModal
      :drag="true"
-      :width="500"
-      :destroyOnClose="true"
-      :keyboard="false"
-      :mask-closable="false"
+      :width="800"
      :open="modalState.openByEdit"
      :title="modalState.title"
      :confirm-loading="modalState.confirmLoading"
+      :destroyOnClose="true"
      @ok="fnModalOk"
      @cancel="fnModalCancel"
    >
@@ -465,37 +652,55 @@ onMounted(() => {
        :label-col="{ span: 6 }"
        :label-wrap="true"
      >
-        <a-form-item label="KPI ID" name="kpiId">
-          <a-input
-            v-model:value="modalState.from.kpiId"
-            allow-clear
-            :placeholder="t('common.inputPlease')"
-            :disabled="true"
-          ></a-input>
-        </a-form-item>
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
+              {{ modalState.from.neType }}
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="申请人" name="createBy">
+              {{ modalState.from.createBy }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="申请时间" name="createTime">
+              {{ parseDateToStr(+modalState.from.createTime) }}
+            </a-form-item>
+          </a-col>
+        </a-row>
+
        <a-form-item
-          label="Title"
-          name="Title"
-          v-bind="modalStateFrom.validateInfos.enTitle"
+          label="状态"
+          name="status"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+          v-bind="modalStateFrom.validateInfos.status"
        >
-          <a-input
-            v-model:value="modalState.from.enTitle"
-            allow-clear
-            :placeholder="t('common.inputPlease')"
-          ></a-input>
+          <a-select
+            v-model:value="modalState.from.status"
+            :placeholder="t('common.selectPlease')"
+            :options="applyStatus"
+          >
+          </a-select>
        </a-form-item>

        <a-form-item
-          label="Status"
-          name="statusFlag"
-          v-bind="modalStateFrom.validateInfos.statusFlag"
+          v-if="modalState.from.status === '3'"
+          label="退回说明"
+          name="backInfo"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
        >
-          <a-select
-            v-model:value="modalState.from.statusFlag"
-            :placeholder="t('common.selectPlease')"
-            :options="dict.sysNormalDisable"
-          >
-          </a-select>
+          <a-textarea
+            v-model:value="modalState.from.backInfo"
+            :auto-size="{ minRows: 2, maxRows: 6 }"
+            :maxlength="400"
+            :placeholder="t('common.inputPlease')"
+          />
        </a-form-item>
      </a-form>
    </ProModal>
--- a/practical_training/views/configManage/configParamTreeTable/components/OpeateDrawer.vue
+++ b/practical_training/views/configManage/configParamTreeTable/components/OpeateDrawer.vue
@@ -0,0 +1,327 @@
+<script setup lang="ts">
+import { reactive, onMounted, toRaw, watch } from 'vue';
+import useI18n from '@/hooks/useI18n';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import CodemirrorEditeDiff from '@/components/CodemirrorEditeDiff/index.vue';
+import { parseDateToStr } from '@/utils/date-utils';
+import {
+  getPtNeConfigDataLogList,
+  restorePtNeConfigDataLog,
+} from '@/api/pt/neConfigDataLog';
+import useDictStore from '@/store/modules/dict';
+import { message } from 'ant-design-vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['ok', 'cancel', 'update:open']);
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  /**网元类型 */
+  neType: {
+    type: String,
+    default: '',
+  },
+  /**参数名 */
+  paramName: {
+    type: String,
+    default: '',
+  },
+  /**学生用户账号 */
+  student: {
+    type: String,
+    default: '',
+  },
+});
+
+const { getDict } = useDictStore();
+
+/**字典数据 */
+let dict: {
+  /**业务类型 */
+  sysBusinessType: DictType[];
+} = reactive({
+  sysBusinessType: [],
+});
+
+/**对话框对象信息状态类型 */
+type StateType = {
+  /**新增框或修改框是否显示 */
+  openByList: boolean;
+  /**差异比较框是否显示 */
+  openByDiff: boolean;
+  /**标题 */
+  title: string;
+  /**加载状态 */
+  loading: boolean;
+  /**数据 */
+  data: Record<string, any>[];
+  /**差异数据 */
+  dataDiff: Record<string, any>;
+  /**确定按钮 loading */
+  confirmLoading: boolean;
+};
+
+/**对话框对象信息状态 */
+let state: StateType = reactive({
+  openByList: false,
+  openByDiff: false,
+  title: '操作参数名称-学生账号',
+  loading: false,
+  data: [],
+  dataDiff: {},
+  confirmLoading: false,
+});
+
+function onClose() {
+  state.loading = false;
+  state.openByList = false;
+  state.openByDiff = false;
+  state.data = [];
+  state.dataDiff = {};
+  emit('cancel');
+  emit('update:open', false);
+  queryParams = {
+    neType: '',
+    paramName: '',
+    student: '',
+    pageNum: 1,
+    pageSize: 10,
+  };
+}
+
+/**查询参数 */
+let queryParams = reactive({
+  /**网元类型 */
+  neType: '',
+  /**可用属性值 */
+  paramName: '',
+  /**学生账号 */
+  student: '',
+  /**当前页数 */
+  pageNum: 1,
+  /**每页条数 */
+  pageSize: 10,
+});
+
+/**查询列表, pageNum初始页数 */
+function fnGetList(pageNum?: number) {
+  if (state.loading) return;
+  state.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+    if (pageNum === 1) state.data = [];
+  }
+  getPtNeConfigDataLogList(toRaw(queryParams)).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+      // tablePagination.total = res.total;
+      state.data = state.data.concat(res.rows);
+      // 去首个做标题
+      if (queryParams.pageNum === 1 && state.data.length > 0) {
+        const item = state.data[0];
+        state.title = `${item.paramDisplay} - ${item.createBy}`;
+      }
+      if (state.data.length <= res.total && res.rows.length > 0) {
+        queryParams.pageNum++;
+      }
+    }
+    state.loading = false;
+  });
+}
+
+/**差异比较框打开 */
+function fnMergeCellOpen(row: Record<string, any>) {
+  state.dataDiff = row;
+  state.dataDiff.paramJsonOld = JSON.stringify(
+    JSON.parse(state.dataDiff.paramJsonOld),
+    null,
+    2
+  );
+  state.dataDiff.paramJsonNew = JSON.stringify(
+    JSON.parse(state.dataDiff.paramJsonNew),
+    null,
+    2
+  );
+  state.openByDiff = true;
+}
+
+/**差异比较框关闭 */
+function fnMergeCellClose() {
+  state.openByDiff = false;
+  state.dataDiff = {};
+}
+
+/**差异比较还原 */
+function fnMergeCellRestore(value: 'old' | 'new') {
+  if (state.confirmLoading) return;
+  const id = state.dataDiff.id;
+  restorePtNeConfigDataLog({ id, value })
+    .then((res: any) => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        message.success({
+          content: t('common.operateOk'),
+          duration: 3,
+        });
+        fnMergeCellClose();
+        fnGetList(1);
+      } else {
+        message.error({
+          content: `${res.msg}`,
+          duration: 3,
+        });
+      }
+    })
+    .finally(() => {
+      state.confirmLoading = false;
+    });
+}
+
+/**监听是否显示，初始数据 */
+watch(
+  () => props.open,
+  val => {
+    if (val) {
+      if (props.neType && props.paramName) {
+        state.title = '';
+        state.openByList = true;
+        // 根据条件查询数据
+        queryParams.neType = props.neType;
+        queryParams.paramName = props.paramName;
+        if (props.student) {
+          queryParams.student = props.student;
+        }
+        fnGetList();
+      }
+    }
+  }
+);
+
+onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('sys_oper_type')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.sysBusinessType = resArr[0].value;
+    }
+  });
+});
+</script>
+
+<template>
+  <div>
+    <a-drawer
+      :width="500"
+      :title="state.title"
+      placement="right"
+      :open="state.openByList"
+      @close="onClose"
+    >
+      <a-list
+        class="demo-loadmore-list"
+        item-layout="horizontal"
+        :data-source="state.data"
+      >
+        <template #loadMore>
+          <div
+            :style="{
+              textAlign: 'center',
+              marginTop: '12px',
+              height: '32px',
+              lineHeight: '32px',
+            }"
+          >
+            <a-button @click="fnGetList()" :loading="state.loading">
+              {{ t('views.configManage.configParamForm.ptDiffLoad') }}
+            </a-button>
+          </div>
+        </template>
+        <template #renderItem="{ item }">
+          <a-list-item>
+            <template #actions>
+              <a-tooltip>
+                <template #title>
+                  {{ t('views.configManage.configParamForm.ptDiffMerge') }}
+                </template>
+                <a-button type="primary" @click.prevent="fnMergeCellOpen(item)">
+                  <template #icon><MergeCellsOutlined /></template>
+                </a-button>
+              </a-tooltip>
+            </template>
+            <a-list-item-meta>
+              <template #title>
+                <DictTag
+                  :options="dict.sysBusinessType"
+                  :value="item.operaType"
+                />
+              </template>
+              <template #description>
+                {{ parseDateToStr(item.createTime) }}
+              </template>
+            </a-list-item-meta>
+          </a-list-item>
+        </template>
+      </a-list>
+    </a-drawer>
+
+    <a-modal
+      :width="800"
+      :destroyOnClose="true"
+      :mask-closable="false"
+      v-model:open="state.openByDiff"
+      :footer="null"
+      :body-style="{ padding: 0, maxHeight: '650px', 'overflow-y': 'auto' }"
+      @ok="fnMergeCellClose()"
+      @cancel="fnMergeCellClose()"
+    >
+      <template #title>
+        <DictTag
+          :options="dict.sysBusinessType"
+          :value="state.dataDiff.operaType"
+        />
+        {{ parseDateToStr(state.dataDiff.createTime) }}
+      </template>
+      <div class="diffBack">
+        <div>
+          <a-button
+            type="text"
+            :loading="state.confirmLoading"
+            @click.prevent="fnMergeCellRestore('old')"
+          >
+            <template #icon><MergeCellsOutlined /></template>
+            {{ t('views.configManage.configParamForm.ptDiffRest') }}
+          </a-button>
+        </div>
+        <div>
+          <a-button
+            type="text"
+            :loading="state.confirmLoading"
+            @click.prevent="fnMergeCellRestore('new')"
+          >
+            <template #icon><MergeCellsOutlined /></template>
+            {{ t('views.configManage.configParamForm.ptDiffRest') }}
+          </a-button>
+        </div>
+      </div>
+      <CodemirrorEditeDiff
+        :old-area="state.dataDiff.paramJsonOld"
+        :new-area="state.dataDiff.paramJsonNew"
+      ></CodemirrorEditeDiff>
+    </a-modal>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.diffBack {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  & > div:first-child {
+    flex: 1;
+    background: #fa9;
+  }
+  & > div:last-child {
+    flex: 1;
+    background: #8f8;
+  }
+}
+</style>
--- a/practical_training/views/configManage/configParamTreeTable/hooks/useConfigArray.ts
+++ b/practical_training/views/configManage/configParamTreeTable/hooks/useConfigArray.ts
@@ -0,0 +1,407 @@
+import {
+  addPtNeConfigData,
+  delPtNeConfigData,
+  editPtNeConfigData,
+} from '@/api/pt/neConfig';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { Modal, message } from 'ant-design-vue/es';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { reactive, watch } from 'vue';
+
+/**
+ * 参数配置array类型
+ * @param param 父级传入 { t, treeState, fnActiveConfigNode, ruleVerification, modalState, fnModalCancel}
+ * @returns
+ */
+export default function useConfigArray({
+  t,
+  treeState,
+  fnActiveConfigNode,
+  ruleVerification,
+  modalState,
+  fnModalCancel,
+}: any) {
+  /**多列列表状态类型 */
+  type ArrayStateType = {
+    /**紧凑型 */
+    size: SizeType;
+    /**多列嵌套记录字段 */
+    columns: Record<string, any>[];
+    /**表格字段列排序 */
+    columnsDnd: Record<string, any>[];
+    /**多列记录数据 */
+    columnsData: Record<string, any>[];
+    /**多列嵌套展开key */
+    arrayChildExpandKeys: any[];
+
+    /**多列记录数据 */
+    data: Record<string, any>[];
+    /**多列记录规则 */
+    dataRule: Record<string, any>;
+  };
+
+  /**多列列表状态 */
+  let arrayState: ArrayStateType = reactive({
+    size: 'small',
+    columns: [],
+    columnsDnd: [],
+    columnsData: [],
+    arrayChildExpandKeys: [],
+    data: [],
+    dataRule: {},
+  });
+
+  /**多列表编辑 */
+  function arrayEdit(rowIndex: Record<string, any>) {
+    const item = arrayState.data.find((s: any) => s.key === rowIndex.value);
+    if (!item) return;
+    const from = arrayInitEdit(item, arrayState.dataRule);
+    // 处理信息
+    const row: Record<string, any> = {};
+    for (const v of from.record) {
+      if (Array.isArray(v.array)) {
+        continue;
+      }
+      row[v.name] = Object.assign({}, v);
+    }
+
+    // 特殊SMF-upfid选择
+    if (treeState.neType === 'SMF' && Reflect.has(row, 'upfId')) {
+      const v = row.upfId.value;
+      if (typeof v === 'string') {
+        if (v === '') {
+          row.upfId.value = [];
+        } else if (v.includes(';')) {
+          row.upfId.value = v.split(';');
+        } else if (v.includes(',')) {
+          row.upfId.value = v.split(',');
+        } else {
+          row.upfId.value = [v];
+        }
+      }
+    }
+
+    modalState.from = row;
+    modalState.type = 'arrayEdit';
+    modalState.title = `${treeState.selectNode.paramDisplay} ${from.title}`;
+    modalState.key = from.key;
+    modalState.data = from.record.filter((v: any) => !Array.isArray(v.array));
+    modalState.open = true;
+
+    // 关闭嵌套
+    arrayState.arrayChildExpandKeys = [];
+  }
+
+  /**多列表编辑关闭 */
+  function arrayEditClose() {
+    arrayState.arrayChildExpandKeys = [];
+    fnModalCancel();
+  }
+
+  /**多列表编辑确认 */
+  function arrayEditOk(from: Record<string, any>) {
+    const loc = `${from['index']['value']}`;
+
+    // 特殊SMF-upfid选择
+    if (treeState.neType === 'SMF' && Reflect.has(from, 'upfId')) {
+      const v = from.upfId.value;
+      if (Array.isArray(v)) {
+        from.upfId.value = v.join(';');
+      }
+    }
+
+    // 遍历提取属性和值
+    let data: Record<string, any> = {};
+    for (const key in from) {
+      // 子嵌套的不插入
+      if (from[key]['array']) {
+        continue;
+      }
+      // 检查规则
+      const [ok, msg] = ruleVerification(from[key]);
+      if (!ok) {
+        message.warning({
+          content: `${msg}`,
+          duration: 3,
+        });
+        return;
+      }
+      data[key] = from[key]['value'];
+    }
+
+    // 发送
+    const hide = message.loading(t('common.loading'), 0);
+    editPtNeConfigData({
+      neType: treeState.neType,
+      paramName: treeState.selectNode.paramName,
+      paramData: data,
+      loc: loc,
+    })
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('views.ne.neConfig.updateItem', {
+              num: modalState.title,
+            }),
+            duration: 3,
+          });
+          fnActiveConfigNode('#');
+        } else {
+          message.warning({
+            content: t('views.ne.neConfig.updateItemErr'),
+            duration: 3,
+          });
+        }
+      })
+      .finally(() => {
+        hide();
+        arrayEditClose();
+      });
+  }
+
+  /**多列表删除单行 */
+  function arrayDelete(rowIndex: Record<string, any>) {
+    const loc = `${rowIndex.value}`;
+    const title = `${treeState.selectNode.paramDisplay} Index-${loc}`;
+
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.neConfig.delItemTip', {
+        num: title,
+      }),
+      onOk() {
+        delPtNeConfigData({
+          neType: treeState.neType,
+          paramName: treeState.selectNode.paramName,
+          loc: loc,
+        }).then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('views.ne.neConfig.delItemOk', {
+                num: title,
+              }),
+              duration: 2,
+            });
+            arrayEditClose();
+            fnActiveConfigNode('#');
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 2,
+            });
+          }
+        });
+      },
+    });
+  }
+
+  /**多列表新增单行 */
+  function arrayAdd() {
+    const from = arrayInitAdd(arrayState.data, arrayState.dataRule);
+
+    // 处理信息
+    const row: Record<string, any> = {};
+    for (const v of from.record) {
+      if (Array.isArray(v.array)) {
+        continue;
+      }
+      row[v.name] = Object.assign({}, v);
+    }
+
+    // 特殊SMF-upfid选择
+    if (treeState.neType === 'SMF' && Reflect.has(row, 'upfId')) {
+      const v = row.upfId.value;
+      if (typeof v === 'string') {
+        if (v === '') {
+          row.upfId.value = [];
+        } else if (v.includes(';')) {
+          row.upfId.value = v.split(';');
+        } else if (v.includes(',')) {
+          row.upfId.value = v.split(',');
+        } else {
+          row.upfId.value = [v];
+        }
+      }
+    }
+
+    modalState.from = row;
+    modalState.type = 'arrayAdd';
+    modalState.title = `${treeState.selectNode.paramDisplay} ${from.title}`;
+    modalState.key = from.key;
+    modalState.data = from.record.filter((v: any) => !Array.isArray(v.array));
+    modalState.open = true;
+  }
+
+  /**多列表新增单行确认 */
+  function arrayAddOk(from: Record<string, any>) {
+    // 特殊SMF-upfid选择
+    if (treeState.neType === 'SMF' && Reflect.has(from, 'upfId')) {
+      const v = from.upfId.value;
+      if (Array.isArray(v)) {
+        from.upfId.value = v.join(';');
+      }
+    }
+
+    // 遍历提取属性和值
+    let data: Record<string, any> = {};
+    for (const key in from) {
+      // 子嵌套的不插入
+      if (from[key]['array']) {
+        continue;
+      }
+      // 检查规则
+      const [ok, msg] = ruleVerification(from[key]);
+      if (!ok) {
+        message.warning({
+          content: `${msg}`,
+          duration: 3,
+        });
+        return;
+      }
+      data[key] = from[key]['value'];
+    }
+
+    // 发送
+    const hide = message.loading(t('common.loading'), 0);
+    addPtNeConfigData({
+      neType: treeState.neType,
+      paramName: treeState.selectNode.paramName,
+      paramData: data,
+      loc: `${from['index']['value']}`,
+    })
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('views.ne.neConfig.addItemOk', {
+              num: modalState.title,
+            }),
+            duration: 3,
+          });
+          fnActiveConfigNode('#');
+        } else {
+          message.warning({
+            content: t('views.ne.neConfig.addItemErr'),
+            duration: 3,
+          });
+        }
+      })
+      .finally(() => {
+        hide();
+        arrayEditClose();
+      });
+  }
+
+  /**多列表编辑行数据初始化 */
+  function arrayInitEdit(data: Record<string, any>, dataRule: any) {
+    const dataFrom = data.record;
+    const ruleFrom = Object.assign({}, JSON.parse(JSON.stringify(dataRule)));
+    for (const row of ruleFrom.record) {
+      // 子嵌套的不初始
+      if (row.array) {
+        row.value = [];
+        continue;
+      }
+      // 查找项的值
+      const item = dataFrom.find((s: any) => s.name === row.name);
+      if (!item) {
+        continue;
+      }
+      // 可选的
+      row.optional = 'true';
+      // 根据规则类型转值
+      if (['enum', 'int'].includes(row.type)) {
+        row.value = Number(item.value);
+      } else if ('bool' === row.type) {
+        row.value = Boolean(item.value);
+      } else {
+        row.value = item.value;
+      }
+    }
+    ruleFrom.key = data.key;
+    ruleFrom.title = data.title;
+    return ruleFrom;
+  }
+
+  /**多列表新增行数据初始化 */
+  function arrayInitAdd(data: any[], dataRule: any) {
+    // 有数据时取得最后的index
+    let dataLastIndex = 0;
+    if (data.length !== 0) {
+      const lastFrom = Object.assign(
+        {},
+        JSON.parse(JSON.stringify(data.at(-1)))
+      );
+      if (lastFrom.record.length > 0) {
+        dataLastIndex = parseInt(lastFrom.key);
+        dataLastIndex += 1;
+      }
+    }
+
+    const ruleFrom = Object.assign({}, JSON.parse(JSON.stringify(dataRule)));
+    for (const row of ruleFrom.record) {
+      // 子嵌套的不初始
+      if (row.array) {
+        row.value = [];
+        continue;
+      }
+      // 可选的
+      row.optional = 'true';
+      // index值
+      if (row.name === 'index') {
+        let newIndex =
+          dataLastIndex !== 0 ? dataLastIndex : parseInt(row.value);
+        if (isNaN(newIndex)) {
+          newIndex = 0;
+        }
+        row.value = newIndex;
+        ruleFrom.key = newIndex;
+        ruleFrom.title = `Index-${newIndex}`;
+        continue;
+      }
+      // 根据规则类型转值
+      if (['enum', 'int'].includes(row.type)) {
+        row.value = Number(row.value);
+      }
+      if ('bool' === row.type) {
+        row.value = Boolean(row.value);
+      }
+
+      // 特殊SMF-upfid选择
+      if (treeState.neType === 'SMF' && row.name === 'upfId') {
+        const v = row.value;
+        if (typeof v === 'string') {
+          if (v === '') {
+            row.value = [];
+          } else if (v.includes(';')) {
+            row.value = v.split(';');
+          } else if (v.includes(',')) {
+            row.value = v.split(',');
+          } else {
+            row.value = [v];
+          }
+        }
+      }
+    }
+    return ruleFrom;
+  }
+
+  // 监听表格字段列排序变化关闭展开
+  watch(
+    () => arrayState.columnsDnd,
+    () => {
+      arrayEditClose();
+    }
+  );
+
+  return {
+    arrayState,
+    arrayEdit,
+    arrayEditClose,
+    arrayEditOk,
+    arrayDelete,
+    arrayAdd,
+    arrayAddOk,
+    arrayInitEdit,
+    arrayInitAdd,
+  };
+}
--- a/practical_training/views/configManage/configParamTreeTable/hooks/useConfigArrayChild.ts
+++ b/practical_training/views/configManage/configParamTreeTable/hooks/useConfigArrayChild.ts
@@ -0,0 +1,348 @@
+import {
+  addPtNeConfigData,
+  delPtNeConfigData,
+  editPtNeConfigData,
+} from '@/api/pt/neConfig';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { Modal, message } from 'ant-design-vue/es';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { nextTick, reactive } from 'vue';
+
+/**
+ * 参数配置array类型的嵌套array
+ * @param param 父级传入 { t, treeState, fnActiveConfigNode, ruleVerification, modalState, arrayState, arrayInitEdit, arrayInitAdd, arrayEditClose}
+ * @returns
+ */
+export default function useConfigArrayChild({
+  t,
+  treeState, 
+  fnActiveConfigNode,
+  ruleVerification,
+  modalState,
+  arrayState,
+  arrayInitEdit,
+  arrayInitAdd,
+  arrayEditClose,
+}: any) {
+  /**多列嵌套列表状态类型 */
+  type ArrayChildStateType = {
+    /**标题 */
+    title: string;
+    /**层级index */
+    loc: string;
+    /**紧凑型 */
+    size: SizeType;
+    /**多列嵌套记录字段 */
+    columns: Record<string, any>[];
+    /**表格字段列排序 */
+    columnsDnd: Record<string, any>[];
+    /**多列记录数据 */
+    columnsData: Record<string, any>[];
+
+    /**多列嵌套记录数据 */
+    data: Record<string, any>[];
+    /**多列嵌套记录规则 */
+    dataRule: Record<string, any>;
+  };
+
+  /**多列嵌套表格状态 */
+  let arrayChildState: ArrayChildStateType = reactive({
+    title: '',
+    loc: '',
+    size: 'small',
+    columns: [],
+    columnsDnd: [],
+    columnsData: [],
+    data: [],
+    dataRule: {},
+  });
+
+  /**多列表展开嵌套行 */
+  function arrayChildExpand(
+    indexRow: Record<string, any>,
+    row: Record<string, any>
+  ) {
+    const loc = indexRow.value;
+    if (arrayChildState.loc === `${loc}/${row.name}`) {
+      arrayChildState.loc = '';
+      arrayState.arrayChildExpandKeys = [];
+      return;
+    }
+    arrayChildState.loc = '';
+    arrayState.arrayChildExpandKeys = [];
+    const from = Object.assign({}, JSON.parse(JSON.stringify(row)));
+    // 无数据时
+    if (!Array.isArray(from.value)) {
+      from.value = [];
+    }
+    const dataArr = Object.freeze(from.value);
+    const ruleArr = Object.freeze(from.array);
+
+    // 列表项数据
+    const dataArray: Record<string, any>[] = [];
+    for (const item of dataArr) {
+      const index = item['index'];
+      let record: Record<string, any>[] = [];
+      for (const key of Object.keys(item)) {
+        // 规则为准
+        for (const rule of ruleArr) {
+          if (rule['name'] === key) {
+            const ruleItem = Object.assign({ optional: 'true' }, rule, {
+              value: item[key],
+            });
+            record.push(ruleItem);
+            break;
+          }
+        }
+      }
+      // dataArray.push(record);
+      dataArray.push({ title: `Index-${index}`, key: index, record });
+    }
+    arrayChildState.data = dataArray;
+
+    // 无数据时，用于新增
+    arrayChildState.dataRule = {
+      title: `Index-0`,
+      key: 0,
+      record: ruleArr,
+    };
+
+    // 列表数据
+    const columnsData: Record<string, any>[] = [];
+    for (const v of arrayChildState.data) {
+      const row: Record<string, any> = {};
+      for (const item of v.record) {
+        row[item.name] = item;
+      }
+      columnsData.push(row);
+    }
+    arrayChildState.columnsData = columnsData;
+
+    // 列表字段
+    const columns: Record<string, any>[] = [];
+    for (const rule of arrayChildState.dataRule.record) {
+      columns.push({
+        title: rule.display,
+        dataIndex: rule.name,
+        align: 'left',
+        resizable: true,
+        width: 50,
+        minWidth: 50,
+        maxWidth: 250,
+      });
+    }
+    columns.push({
+      title: t('common.operate'),
+      dataIndex: 'index',
+      key: 'index',
+      align: 'center',
+      fixed: 'right',
+      width: 100,
+    });
+    arrayChildState.columns = columns;
+
+    nextTick(() => {
+      // 设置展开key
+      arrayState.arrayChildExpandKeys = [indexRow];
+      // 层级标识
+      arrayChildState.loc = `${loc}/${from['name']}`;
+      // 设置展开列表标题
+      arrayChildState.title = `${from['display']}`;
+    });
+  }
+
+  /**多列表嵌套行编辑 */
+  function arrayChildEdit(rowIndex: Record<string, any>) {
+    const item = arrayChildState.data.find(
+      (s: any) => s.key === rowIndex.value
+    );
+    if (!item) return;
+    const from = arrayInitEdit(item, arrayChildState.dataRule);
+    // 处理信息
+    const row: Record<string, any> = {};
+    for (const v of from.record) {
+      if (Array.isArray(v.array)) {
+        continue;
+      }
+      row[v.name] = Object.assign({}, v);
+    }
+
+    modalState.from = row;
+    modalState.type = 'arrayChildEdit';
+    modalState.title = `${arrayChildState.title} ${from.title}`;
+    modalState.key = from.key;
+    modalState.data = from.record.filter((v: any) => !Array.isArray(v.array));
+    modalState.open = true;
+  }
+
+  /**多列表嵌套行编辑确认 */
+  function arrayChildEditOk(from: Record<string, any>) {
+    const loc = `${arrayChildState.loc}/${from['index']['value']}`;
+
+    let data: Record<string, any> = {};
+    for (const key in from) {
+      // 子嵌套的不插入
+      if (from[key]['array']) {
+        continue;
+      }
+      // 检查规则
+      const [ok, msg] = ruleVerification(from[key]);
+      if (!ok) {
+        message.warning({
+          content: `${msg}`,
+          duration: 3,
+        });
+        return;
+      }
+      data[key] = from[key]['value'];
+    }
+
+    // 发送
+    const hide = message.loading(t('common.loading'), 0);
+    editPtNeConfigData({
+      neType: treeState.neType,
+      paramName: treeState.selectNode.paramName,
+      paramData: data,
+      loc,
+    })
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('views.ne.neConfig.updateItem', {
+              num: modalState.title,
+            }),
+            duration: 3,
+          });
+          fnActiveConfigNode('#');
+        } else {
+          message.warning({
+            content: t('views.ne.neConfig.updateItemErr'),
+            duration: 3,
+          });
+        }
+      })
+      .finally(() => {
+        hide();
+        arrayEditClose();
+      });
+  }
+
+  /**多列表嵌套行删除单行 */
+  function arrayChildDelete(rowIndex: Record<string, any>) {
+    const index = rowIndex.value;
+    const loc = `${arrayChildState.loc}/${index}`;
+    const title = `${arrayChildState.title} Index-${index}`;
+
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.neConfig.delItemTip', {
+        num: title,
+      }),
+      onOk() {
+        delPtNeConfigData({
+          neType: treeState.neType,
+          paramName: treeState.selectNode.paramName,
+          loc,
+        }).then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('views.ne.neConfig.delItemOk', {
+                num: title,
+              }),
+              duration: 2,
+            });
+            arrayEditClose();
+            fnActiveConfigNode('#');
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 2,
+            });
+          }
+        });
+      },
+    });
+  }
+
+  /**多列表嵌套行新增单行 */
+  function arrayChildAdd() {
+    const from = arrayInitAdd(arrayChildState.data, arrayChildState.dataRule);
+    // 处理信息
+    const row: Record<string, any> = {};
+    for (const v of from.record) {
+      if (Array.isArray(v.array)) {
+        continue;
+      }
+      row[v.name] = Object.assign({}, v);
+    }
+
+    modalState.from = row;
+    modalState.type = 'arrayChildAdd';
+    modalState.title = `${arrayChildState.title} ${from.title}`;
+    modalState.key = from.key;
+    modalState.data = from.record.filter((v: any) => !Array.isArray(v.array));
+    modalState.open = true;
+  }
+
+  /**多列表新增单行确认 */
+  function arrayChildAddOk(from: Record<string, any>) {
+    const loc = `${arrayChildState.loc}/${from['index']['value']}`;
+
+    let data: Record<string, any> = {};
+    for (const key in from) {
+      // 子嵌套的不插入
+      if (from[key]['array']) {
+        continue;
+      }
+      // 检查规则
+      const [ok, msg] = ruleVerification(from[key]);
+      if (!ok) {
+        message.warning({
+          content: `${msg}`,
+          duration: 3,
+        });
+        return;
+      }
+      data[key] = from[key]['value'];
+    }
+
+    // 发送
+    const hide = message.loading(t('common.loading'), 0);
+    addPtNeConfigData({
+      neType: treeState.neType,
+      paramName: treeState.selectNode.paramName,
+      paramData: data,
+      loc,
+    })
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('views.ne.neConfig.addItemOk', {
+              num: modalState.title,
+            }),
+            duration: 3,
+          });
+          fnActiveConfigNode('#');
+        } else {
+          message.warning({
+            content: t('views.ne.neConfig.addItemErr'),
+            duration: 3,
+          });
+        }
+      })
+      .finally(() => {
+        hide();
+        arrayEditClose();
+      });
+  }
+
+  return {
+    arrayChildState,
+    arrayChildExpand,
+    arrayChildEdit,
+    arrayChildEditOk,
+    arrayChildDelete,
+    arrayChildAdd,
+    arrayChildAddOk,
+  };
+}
--- a/practical_training/views/configManage/configParamTreeTable/hooks/useConfigList.ts
+++ b/practical_training/views/configManage/configParamTreeTable/hooks/useConfigList.ts
@@ -0,0 +1,146 @@
+import { editPtNeConfigData } from '@/api/pt/neConfig';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { message } from 'ant-design-vue/es';
+import { reactive, toRaw } from 'vue';
+
+/**
+ * list类型参数处理
+ * @param param 父级传入 {t, treeState, ruleVerification}
+ * @returns
+ */
+export default function useConfigList({ t, treeState, ruleVerification }: any) {
+  /**单列表状态类型 */
+  type ListStateType = {
+    /**紧凑型 */
+    size: SizeType;
+    /**单列记录字段 */
+    columns: Record<string, any>[];
+    /**单列记录数据 */
+    data: Record<string, any>[];
+    /**编辑行记录 */
+    editRecord: Record<string, any>;
+    /**确认提交等待 */
+    confirmLoading: boolean;
+  };
+
+  /**单列表状态 */
+  let listState: ListStateType = reactive({
+    size: 'small',
+    columns: [
+      {
+        title: 'Key',
+        dataIndex: 'display',
+        align: 'left',
+        width: '30%',
+      },
+      {
+        title: 'Value',
+        dataIndex: 'value',
+        align: 'left',
+        width: '70%',
+      },
+    ],
+    data: [],
+    confirmLoading: false,
+    editRecord: {},
+  });
+
+  /**单列表编辑 */
+  function listEdit(row: Record<string, any>) {
+    if (
+      listState.confirmLoading ||
+      ['read-only', 'read', 'ro'].includes(row.access)
+    ) {
+      return;
+    }
+
+    listState.editRecord = Object.assign({}, row);
+  }
+
+  /**单列表编辑关闭 */
+  function listEditClose() {
+    listState.confirmLoading = false;
+    listState.editRecord = {};
+  }
+
+  /**单列表编辑确认 */
+  function listEditOk() {
+    if (listState.confirmLoading) return;
+    const from = toRaw(listState.editRecord);
+    // 检查规则
+    const [ok, msg] = ruleVerification(from);
+    if (!ok) {
+      message.warning({
+        content: `${msg}`,
+        duration: 3,
+      });
+      return;
+    }
+
+    // 发送
+    listState.confirmLoading = true;
+    const hide = message.loading(t('common.loading'), 0);
+    editPtNeConfigData({
+      neType: treeState.neType,
+      paramName: treeState.selectNode.paramName,
+      paramData: {
+        [from['name']]: from['value'],
+      },
+    })
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success({
+            content: t('views.ne.neConfig.updateValue', {
+              num: from['display'],
+            }),
+            duration: 3,
+          });
+          // 改变表格数据
+          const item = listState.data.find(
+            (item: Record<string, any>) => from['name'] === item['name']
+          );
+          if (item) {
+            Object.assign(item, listState.editRecord);
+          }
+        } else {
+          message.warning({
+            content: t('views.ne.neConfig.updateValueErr'),
+            duration: 3,
+          });
+        }
+      })
+      .finally(() => {
+        hide();
+        listState.confirmLoading = false;
+        listState.editRecord = {};
+      });
+  }
+
+  /**表格分页器参数 */
+  let tablePagination = reactive({
+    /**当前页数 */
+    current: 1,
+    /**每页条数 */
+    pageSize: 10,
+    /**默认的每页条数 */
+    defaultPageSize: 10,
+    /**指定每页可以显示多少条 */
+    pageSizeOptions: ['10', '20', '50', '100'],
+    /**只有一页时是否隐藏分页器 */
+    hideOnSinglePage: true,
+    /**是否可以快速跳转至某页 */
+    showQuickJumper: true,
+    /**是否可以改变 pageSize */
+    showSizeChanger: true,
+    /**数据总数 */
+    total: 0,
+    showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
+    onChange: (page: number, pageSize: number) => {
+      tablePagination.current = page;
+      tablePagination.pageSize = pageSize;
+    },
+  });
+
+  return { tablePagination, listState, listEdit, listEditClose, listEditOk };
+}
--- a/practical_training/views/configManage/configParamTreeTable/hooks/useOptions.ts
+++ b/practical_training/views/configManage/configParamTreeTable/hooks/useOptions.ts
@@ -0,0 +1,192 @@
+import { getNeConfigData } from '@/api/ne/neConfig';
+import { regExpIPv4, regExpIPv6, validURL } from '@/utils/regular-utils';
+import { ref } from 'vue';
+
+/**
+ * 参数公共函数
+ * @param param 父级传入 {t}
+ * @returns
+ */
+export default function useOptions({ t }: any) {
+  /**规则校验 */
+  function ruleVerification(row: Record<string, any>): (string | boolean)[] {
+    let result = [true, ''];
+    const type = row.type;
+    const value = row.value;
+    const filter = row.filter;
+    const display = row.display;
+
+    // 子嵌套的不检查
+    if (row.array) {
+      return result;
+    }
+
+    // 可选的同时没有值不检查
+    if (row.optional === 'true' && !value) {
+      return result;
+    }
+    switch (type) {
+      case 'int':
+        // filter: "0~128"
+
+        if (filter && filter.indexOf('~') !== -1) {
+          const filterArr = filter.split('~');
+          const minInt = parseInt(filterArr[0]);
+          const maxInt = parseInt(filterArr[1]);
+          const valueInt = parseInt(value);
+          if (valueInt < minInt || valueInt > maxInt) {
+            return [
+              false,
+              t('views.ne.neConfig.requireInt', {
+                display,
+                filter,
+              }),
+            ];
+          }
+        }
+        break;
+      case 'ipv4':
+        if (!regExpIPv4.test(value)) {
+          return [
+            false,
+            t('views.ne.neConfig.requireIpv4', { display }),
+          ];
+        }
+        break;
+      case 'ipv6':
+        if (!regExpIPv6.test(value)) {
+          return [
+            false,
+            t('views.ne.neConfig.requireIpv6', { display }),
+          ];
+        }
+        break;
+      case 'enum':
+        if (filter && filter.indexOf('{') === 1) {
+          let filterJson: Record<string, any> = {};
+          try {
+            filterJson = JSON.parse(filter); //string---json
+          } catch (error) {
+            console.error(error);
+          }
+
+          if (!Object.keys(filterJson).includes(`${value}`)) {
+            return [
+              false,
+              t('views.ne.neConfig.requireEnum', { display }),
+            ];
+          }
+        }
+        break;
+      case 'bool':
+        // filter: '{"0":"false", "1":"true"}'
+
+        if (filter && filter.indexOf('{') === 1) {
+          let filterJson: Record<string, any> = {};
+          try {
+            filterJson = JSON.parse(filter); //string---json
+          } catch (error) {
+            console.error(error);
+          }
+
+          if (!Object.values(filterJson).includes(`${value}`)) {
+            return [
+              false,
+              t('views.ne.neConfig.requireBool', { display }),
+            ];
+          }
+        }
+        break;
+      case 'string':
+        // filter: "0~128"
+
+        // 字符串长度判断
+        if (filter && filter.indexOf('~') !== -1) {
+          try {
+            const filterArr = filter.split('~');
+            let rule = new RegExp(
+              '^\\S{' + filterArr[0] + ',' + filterArr[1] + '}$'
+            );
+            if (!rule.test(value)) {
+              return [
+                false,
+                t('views.ne.neConfig.requireString', {
+                  display,
+                }),
+              ];
+            }
+          } catch (error) {
+            console.error(error);
+          }
+        }
+        // 字符串http判断
+        if (value.startsWith('http')) {
+          try {
+            if (!validURL(value)) {
+              return [
+                false,
+                t('views.ne.neConfig.requireString', {
+                  display,
+                }),
+              ];
+            }
+          } catch (error) {
+            console.error(error);
+          }
+        }
+
+        break;
+      case 'regex':
+        // filter: "^[0-9]{3}$"
+
+        if (filter) {
+          try {
+            let regex = new RegExp(filter);
+            if (!regex.test(value)) {
+              return [
+                false,
+                t('views.ne.neConfig.requireString', {
+                  display,
+                }),
+              ];
+            }
+          } catch (error) {
+            console.error(error);
+          }
+        }
+        break;
+
+      default:
+        return [
+          false,
+          t('views.ne.neConfig.requireUn', { display }),
+        ];
+    }
+    return result;
+  }
+
+  /**upfId可选择 */
+  const smfByUPFIdOptions = ref<{ value: string; label: string }[]>([]);
+  /**加载smf配置的upfId */
+  function smfByUPFIdLoadData(neId: string) {
+    getNeConfigData({
+      neType: 'SMF',
+      neId: neId,
+      paramName: 'upfConfig',
+    }).then(res => {
+      smfByUPFIdOptions.value = [];
+      for (const s of res.data) {
+        smfByUPFIdOptions.value.push({
+          value: s.id,
+          label: s.id,
+        });
+      }
+    });
+  }
+
+  return {
+    ruleVerification,
+    smfByUPFIdLoadData,
+    smfByUPFIdOptions,
+  };
+}
--- a/practical_training/views/configManage/configParamTreeTable/hooks/usePtOptions.ts
+++ b/practical_training/views/configManage/configParamTreeTable/hooks/usePtOptions.ts
@@ -0,0 +1,243 @@
+import { ptSaveAsDefault, ptResetAsDefault } from '@/api/pt/neConfig';
+import {
+  getPtClassStudents,
+  stuPtNeConfigApply,
+  updatePtNeConfigApply,
+} from '@/api/pt/neConfigApply';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { Modal } from 'ant-design-vue/es';
+import { message } from 'ant-design-vue/lib';
+import { computed, reactive } from 'vue';
+
+/**
+ * 实训教学函数
+ * @param param 父级传入 {t,fnActiveConfigNode}
+ * @returns
+ */
+export default function usePtOptions({ t, fnActiveConfigNode }: any) {
+  const ptConfigState = reactive({
+    saveLoading: false,
+    restLoading: false,
+    applyLoading: false,
+  });
+  /**（管理员）保存网元下所有配置为示例配置 */
+  function ptConfigSave(neType: string) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.configManage.configParamForm.ptLoadTip'),
+      onOk() {
+        ptConfigState.saveLoading = true;
+        ptSaveAsDefault(neType, '001')
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success({
+                content: t('common.operateOk'),
+                duration: 3,
+              });
+            } else {
+              message.error({
+                content: `${res.msg}`,
+                duration: 3,
+              });
+            }
+          })
+          .finally(() => {
+            ptConfigState.saveLoading = false;
+            fnActiveConfigNode('#');
+          });
+      },
+    });
+  }
+
+  /**重置网元下所有配置 */
+  function ptConfigReset(neType: string) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.configManage.configParamForm.ptResetTip'),
+      onOk() {
+        ptConfigState.restLoading = true;
+        ptResetAsDefault(neType)
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success({
+                content: t('common.operateOk'),
+                duration: 3,
+              });
+            } else {
+              message.error({
+                content: `${res.msg}`,
+                duration: 3,
+              });
+            }
+          })
+          .finally(() => {
+            ptConfigState.restLoading = false;
+            fnActiveConfigNode('#');
+          });
+      },
+    });
+  }
+
+  /**配置下方应用(学生)申请撤回和(管理/教师)应用退回 */
+  function ptConfigApply(
+    neType: string,
+    status: '0' | '1' | '2' | '3',
+    student?: string
+  ) {
+    let result: any;
+    if (status === '2' || status === '3') {
+      let from: {
+        neType: string;
+        status: string;
+        student?: string;
+        backInfo?: string;
+      } = {
+        neType,
+        status: '2',
+      };
+      if (student) {
+        if (status === '2') {
+          from = { neType, status, student };
+        }
+        if (status === '3') {
+          from = { neType, status, student, backInfo: '请重新检查配置' };
+        }
+      }
+      result = updatePtNeConfigApply(from);
+    }
+    if (status === '0' || status === '1') {
+      result = stuPtNeConfigApply({ neType, status });
+    }
+    if (!result) return;
+
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.configManage.configParamForm.ptApplyStuTip', {
+        ne: neType,
+      }),
+      onOk() {
+        ptConfigState.applyLoading = true;
+        result
+          .then((res: any) => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success({
+                content: t('common.operateOk'),
+                duration: 3,
+              });
+              // 教师修改学生时改变状态
+              if (student) {
+                const item = classState.studentOptionsDef.find(
+                  s => s.value === classState.student
+                );
+                if (item) {
+                  item.applyStatus = status;
+                }
+              }
+            } else {
+              message.error({
+                content: `${res.msg}`,
+                duration: 3,
+              });
+            }
+          })
+          .finally(() => {
+            ptConfigState.applyLoading = false;
+          });
+      },
+    });
+  }
+
+  const classState = reactive<{
+    /**学生账号 */
+    student: string | undefined;
+    /**学生可选择列表 */
+    studentOptions: {
+      value: string;
+      label: string;
+      applyId: string;
+      applyStatus: string;
+    }[];
+    studentOptionsDef: {
+      value: string;
+      label: string;
+      applyId: string;
+      applyStatus: string;
+    }[];
+  }>({
+    student: undefined,
+    studentOptions: [],
+    studentOptionsDef: [],
+  });
+
+  /**学生选择搜索 */
+  function studentChange(v: any) {
+    if (!v) {
+      Object.assign(classState.studentOptions, classState.studentOptionsDef);
+    }
+    fnActiveConfigNode('#');
+  }
+
+  let timeout: any;
+
+  /**学生选择搜索 */
+  function studentSearch(neType: string, val: string) {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = null;
+    }
+    if (!val) {
+      Object.assign(classState.studentOptions, classState.studentOptionsDef);
+      return;
+    }
+    timeout = setTimeout(() => classStudents(neType, val), 500);
+  }
+
+  /**班级学生列表 */
+  function classStudents(neType: string, val?: string) {
+    getPtClassStudents({ neType, userName: val }).then(res => {
+      classState.studentOptions = [];
+      if (!Array.isArray(res.data) || res.data.length <= 0) {
+        return;
+      }
+      for (const v of res.data) {
+        classState.studentOptions.push({
+          value: v.userName,
+          label: v.userName,
+          applyId: v.applyId,
+          applyStatus: v.applyStatus,
+        });
+        // 设为最新状态
+        const item = classState.studentOptionsDef.find(
+          s => s.value === v.userName
+        );
+        if (item) {
+          item.applyStatus = v.applyStatus;
+        }
+      }
+      if (!val) {
+        Object.assign(classState.studentOptionsDef, classState.studentOptions);
+      }
+    });
+  }
+
+  // 学生状态
+  const studentStatus = computed(() => {
+    const item = classState.studentOptionsDef.find(
+      s => s.value === classState.student
+    );
+    if (item) return item.applyStatus;
+    return '';
+  });
+
+  return {
+    ptConfigState,
+    ptConfigSave,
+    ptConfigReset,
+    ptConfigApply,
+    classState,
+    classStudents,
+    studentStatus,
+    studentSearch,
+    studentChange,
+  };
+}
--- a/practical_training/views/configManage/configParamTreeTable/index.vue
+++ b/practical_training/views/configManage/configParamTreeTable/index.vue
--- a/practical_training/views/configManage/neManage/index.vue
+++ b/practical_training/views/configManage/neManage/index.vue
--- a/practical_training/views/configManage/neOverview/index.vue
+++ b/practical_training/views/configManage/neOverview/index.vue
@@ -2,8 +2,7 @@
 import { PageContainer } from 'antdv-pro-layout';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import { message } from 'ant-design-vue/es';
-import { reactive, toRaw, ref, onMounted, onBeforeUnmount, markRaw } from 'vue';
-import { listMain } from '@/api/index';
+import { reactive, ref, onMounted, onBeforeUnmount, markRaw } from 'vue';
 import useI18n from '@/hooks/useI18n';
 import { TooltipComponent } from 'echarts/components';
 import { GaugeChart } from 'echarts/charts';
@@ -15,6 +14,8 @@ import { LabelLayout } from 'echarts/features';
 import { useRoute } from 'vue-router';
 import useAppStore from '@/store/modules/app';
 import useDictStore from '@/store/modules/dict';
+import { listAllNeInfo } from '@/api/ne/neInfo';
+import { parseDateToStr } from '@/utils/date-utils';
 const { getDict } = useDictStore();
 const appStore = useAppStore();
 const route = useRoute();
@@ -52,54 +53,61 @@ let indexColor = ref<DictType[]>([
 let tableColumns: ColumnsType = [
  {
    title: t('views.index.object'),
-    dataIndex: 'name',
-    align: 'center',
-    key: 'status',
+    dataIndex: 'neName',
+    align: 'left',
  },
  {
    title: t('views.index.realNeStatus'),
-    dataIndex: 'status',
-    align: 'center',
-    customRender(opt) {
-      if (opt.value == 'Normal') return t('views.index.normal');
-      return t('views.index.abnormal');
-    },
+    dataIndex: 'serverState',
+    align: 'left',
+    key: 'status',
  },
  {
    title: t('views.index.reloadTime'),
-    dataIndex: 'refresh',
-    align: 'center',
+    dataIndex: 'serverState',
+    align: 'left',
+    customRender(opt) {
+      if (opt.value?.refreshTime) return parseDateToStr(opt.value?.refreshTime);
+      return '-';
+    },
  },
  {
    title: t('views.index.version'),
-    dataIndex: 'version',
-    align: 'center',
+    dataIndex: 'serverState',
+    align: 'left',
+    customRender(opt) {
+      return opt.value?.version || '-';
+    },
  },
  {
    title: t('views.index.serialNum'),
-    dataIndex: 'serialNum',
-    align: 'center',
+    dataIndex: 'serverState',
+    align: 'left',
+    customRender(opt) {
+      return opt.value?.sn || '-';
+    },
  },
  {
    title: t('views.index.expiryDate'),
-    dataIndex: 'expiryDate',
-    align: 'center',
+    dataIndex: 'serverState',
+    align: 'left',
+    customRender(opt) {
+      return opt.value?.expire || '-';
+    },
  },
  {
    title: t('views.index.ipAddress'),
-    dataIndex: 'ipAddress',
-    key: 'groupName',
-    align: 'center',
+    dataIndex: 'serverState',
+    align: 'left',
+    customRender(opt) {
+      return opt.value?.neIP || '-';
+    },
  },
 ];
 /**表格状态类型 */
 type TabeStateType = {
  /**加载等待 */
  loading: boolean;
-  /**紧凑型 */
-  size: string;
-  /**搜索栏 */
-  seached: boolean;
  /**记录数据 */
  data: object[];
  /**勾选记录 */
@@ -109,8 +117,6 @@ type TabeStateType = {
 /**表格状态 */
 let tableState: TabeStateType = reactive({
  loading: false,
-  size: 'middle',
-  seached: false,
  data: [],
  selectedRowKeys: [],
 });
@@ -130,12 +136,8 @@ type nfStateType = {
  hostName: string;
  /**操作系统信息 */
  osInfo: string;
-  /**数据库信息 */
-  dbInfo: string;
  /**IP地址 */
  ipAddress: string;
-  /**端口 */
-  port: number;
  /**版本 */
  version: string;
  /**CPU利用率 */
@@ -153,11 +155,8 @@ type nfStateType = {
 /**网元详细信息 */
 let pronInfo: nfStateType = reactive({
  hostName: '5gc',
-  osInfo:
-    'Linux 5gc 4.15.0-112-generic #113-Ubuntu SMP Thu Jul 9 23:41:39 UTC 2020 x86_64 GNU/Linux',
-  dbInfo: 'adb v1.0.1',
+  osInfo: 'Linux 5gc 4.15.0-112-generic 2020 x86_64 GNU/Linux',
  ipAddress: '-',
-  port: 3030,
  version: '-',
  cpuUse: '-',
  memoryUse: '-',
@@ -170,20 +169,18 @@ let pronInfo: nfStateType = reactive({
 function fnGetList(one: boolean) {
  if (tableState.loading) return;
  one && (tableState.loading = true);
-  listMain().then(res => {
-    tableState.data = res;
+  listAllNeInfo({ bandStatus: true }).then(res => {
+    tableState.data = res.data;
    tableState.loading = false;
    var rightNum = 0;
    var errorNum = 0;
-    // if (res.length) nfInfo.serialNum = res[0].serialNum;
-    for (let i = 0; i < res.length; i++) {
-      if (res[i].status == '正常' || res[i].status == 'Normal') {
+    res.data.forEach((item: any) => {
+      if (item.serverState.online) {
        rightNum++;
      } else {
        errorNum++;
      }
-    }
-
+    });
    const optionData: any = {
      title: {
        text: '',
@@ -244,9 +241,9 @@ function fnDesign(container: HTMLElement | undefined, option: any) {
 }

 /**抽屉 网元详细信息 */
-const visible = ref(false);
+const open = ref(false);
 const closeDrawer = () => {
-  visible.value = false;
+  open.value = false;
 };
 /**抽屉 网元详细信息 */

@@ -254,17 +251,14 @@ const closeDrawer = () => {
 function rowClick(record: any, index: any) {
  return {
    onClick: (event: any) => {
-      if (
-        toRaw(record).status == '异常' ||
-        toRaw(record).status == 'Abnormal'
-      ) {
+      let pronData = JSON.parse(JSON.stringify(record.serverState));
+      if (!pronData.online) {
        message.error(t('views.index.neStatus'), 2);
        return false;
      } else {
-        let pronData = toRaw(record);
-        const totalMemInKB = pronData.memUsage?.totalMem;
-        const nfUsedMemInKB = pronData.memUsage?.nfUsedMem;
-        const sysMemUsageInKB = pronData.memUsage?.sysMemUsage;
+        const totalMemInKB = pronData.mem?.totalMem;
+        const nfUsedMemInKB = pronData.mem?.nfUsedMem;
+        const sysMemUsageInKB = pronData.mem?.sysMemUsage;

        // 将KB转换为MB
        const totalMemInMB = Math.round((totalMemInKB / 1024) * 100) / 100;
@@ -274,19 +268,17 @@ function rowClick(record: any, index: any) {

        //渲染详细信息
        pronInfo = {
-          hostName: pronData.hostName,
-          osInfo: pronData.osInfo,
-          dbInfo: pronData.dbInfo,
-          ipAddress: pronData.ipAddress,
-          port: pronData.port,
+          hostName: pronData.hostname,
+          osInfo: pronData.os,
+          ipAddress: pronData.neIP,
          version: pronData.version,
          cpuUse:
-            pronData.name +
+            pronData.neName +
            ':' +
-            pronData.cpuUsage?.nfCpuUsage / 100 +
+            pronData.cpu?.nfCpuUsage / 100 +
            '%; ' +
            'SYS:' +
-            pronData.cpuUsage?.sysCpuUsage / 100 +
+            pronData.cpu?.sysCpuUsage / 100 +
            '%',
          memoryUse:
            'Total:' +
@@ -299,11 +291,11 @@ function rowClick(record: any, index: any) {
            sysMemUsageInMB +
            'MB',
          capability: pronData.capability,
-          serialNum: pronData.serialNum,
-          expiryDate: pronData.expiryDate,
+          serialNum: pronData.sn,
+          expiryDate: pronData.expire,
        };
      }
-      visible.value = true;
+      open.value = true;
    },
  };
 }
@@ -344,7 +336,7 @@ onBeforeUnmount(() => {
 <template>
  <PageContainer :breadcrumb="{}">
    <div>
-      <a-drawer :open="visible" @close="closeDrawer" :width="700">
+      <a-drawer :open="open" @close="closeDrawer" :width="700">
        <a-descriptions bordered :column="1" :label-style="{ width: '160px' }">
          <a-descriptions-item :label="t('views.index.hostName')">{{
            pronInfo.hostName
@@ -352,27 +344,21 @@ onBeforeUnmount(() => {
          <a-descriptions-item :label="t('views.index.osInfo')">{{
            pronInfo.osInfo
          }}</a-descriptions-item>
-          <a-descriptions-item :label="t('views.index.dbInfo')">{{
-            pronInfo.dbInfo
-          }}</a-descriptions-item>
          <a-descriptions-item :label="t('views.index.ipAddress')">{{
            pronInfo.ipAddress
          }}</a-descriptions-item>
-          <a-descriptions-item :label="t('views.index.port')">{{
-            pronInfo.port
-          }}</a-descriptions-item>
          <a-descriptions-item :label="t('views.index.version')">{{
            pronInfo.version
          }}</a-descriptions-item>
+          <a-descriptions-item :label="t('views.index.capability')">{{
+            pronInfo.capability
+          }}</a-descriptions-item>
          <a-descriptions-item :label="t('views.index.cpuUse')">{{
            pronInfo.cpuUse
          }}</a-descriptions-item>
          <a-descriptions-item :label="t('views.index.memoryUse')">{{
            pronInfo.memoryUse
          }}</a-descriptions-item>
-          <a-descriptions-item :label="t('views.index.capability')">{{
-            pronInfo.capability
-          }}</a-descriptions-item>
          <a-descriptions-item :label="t('views.index.serialNum')">{{
            pronInfo.serialNum
          }}</a-descriptions-item>
@@ -389,6 +375,7 @@ onBeforeUnmount(() => {
        <a-table
          class="table"
          row-key="id"
+          size="small"
          :columns="tableColumns"
          :loading="tableState.loading"
          :data-source="tableState.data"
@@ -398,24 +385,29 @@ onBeforeUnmount(() => {
        >
          <template #bodyCell="{ column, record }">
            <template v-if="column.key === 'status'">
-              <div v-if="record.status == '正常' || record.status == 'Normal'">
-                <a-tag color="blue">{{ record.name }}</a-tag>
+              <div v-if="record.serverState.online">
+                <a-tag color="blue">{{ t('views.index.normal') }}</a-tag>
              </div>
              <div v-else>
-                <a-tag color="pink">{{ record.name }}</a-tag>
+                <a-tag color="pink">{{ t('views.index.abnormal') }}</a-tag>
              </div>
            </template>
          </template>
        </a-table>
      </a-col>
      <a-col :lg="10" :md="8" :xs="24">
-        <a-card :title="t('views.index.runStatus')" style="margin-bottom: 16px">
-          <div
-            style="width: 100%; min-height: 200px"
-            ref="statusBar"
-          ></div>
+        <a-card
+          :title="t('views.index.runStatus')"
+          style="margin-bottom: 16px"
+          size="small"
+        >
+          <div style="width: 100%; min-height: 200px" ref="statusBar"></div>
        </a-card>
-        <a-card :title="t('views.index.mark')" style="margin-top: 16px">
+        <a-card
+          :title="t('views.index.mark')"
+          style="margin-top: 16px"
+          size="small"
+        >
          <a-descriptions
            bordered
            :column="1"
--- a/practical_training/views/dashboard/amfUE/index.vue
+++ b/practical_training/views/dashboard/amfUE/index.vue
@@ -5,7 +5,6 @@ import { message, Modal } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
-import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useI18n from '@/hooks/useI18n';
 import {
  RESULT_CODE_ERROR,
@@ -16,9 +15,7 @@ import { listAMFDataUE, delAMFDataUE, exportAMFDataUE } from '@/api/neData/amf';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
-import { TENANTADMIN_ROLE_KEY } from '@/constants/admin-constants';
-
-import useUserStore from '@/store/modules/user';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const ws = new WS();
@@ -51,9 +48,9 @@ let queryParams = reactive({
  sortField: 'timestamp',
  sortOrder: 'desc',
  /**开始时间 */
-  startTime: 0,
+  startTime: '',
  /**结束时间 */
-  endTime: 0,
+  endTime: '',
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -110,17 +107,14 @@ let tableState: TabeStateType = reactive({
  selectedRowKeys: [],
 });

-/**表格字段列排序 */
-let tableColumnsDnd = ref<ColumnsType>([]);
-
 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'left',
-  //   width: 100,
-  // },
+  {
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'left',
+    width: 100,
+  },
  {
    title: 'IMSI',
    dataIndex: 'eventJSON',
@@ -152,11 +146,11 @@ let tableColumns: ColumnsType = [
    align: 'left',
    width: 150,
  },
-  // {
-  //   title: t('common.operate'),
-  //   key: 'id',
-  //   align: 'left',
-  // },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
 ];

 /**表格分页器参数 */
@@ -262,8 +256,8 @@ function fnGetList(pageNum?: number) {
  if (!queryRangePicker.value) {
    queryRangePicker.value = ['', ''];
  }
-  queryParams.startTime = Number(queryRangePicker.value[0]);
-  queryParams.endTime = Number(queryRangePicker.value[1]);
+  queryParams.startTime = queryRangePicker.value[0];
+  queryParams.endTime = queryRangePicker.value[1];
  listAMFDataUE(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
      // 取消勾选
@@ -300,18 +294,14 @@ function fnGetList(pageNum?: number) {

 /**列表导出 */
 function fnExportList() {
-  if (modalState.confirmLoading || tablePagination.total === 0) return;
+  if (modalState.confirmLoading) return;
  Modal.confirm({
    title: t('common.tipTitle'),
    content: t('views.dashboard.ue.exportTip'),
    onOk() {
-      modalState.confirmLoading = true;
      const hide = message.loading(t('common.loading'), 0);
      const querys = toRaw(queryParams);
-      querys.pageNum = 1;
-      querys.pageSize = tablePagination.total;
-      querys.startTime = Number(querys.startTime);
-      querys.endTime = Number(querys.endTime);
+      querys.pageSize = 10000;
      exportAMFDataUE(querys)
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
@@ -517,11 +507,7 @@ onBeforeUnmount(() => {
            cancel-text="No"
            @confirm="fnRealTime()"
          >
-            <a-button
-              type="primary"
-              :danger="realTimeData"
-              v-roles:has="[TENANTADMIN_ROLE_KEY]"
-            >
+            <a-button type="primary" :danger="realTimeData">
              <template #icon><FundOutlined /> </template>
              {{
                !realTimeData
@@ -537,7 +523,7 @@ onBeforeUnmount(() => {
            :disabled="tableState.selectedRowKeys.length <= 0"
            :loading="modalState.confirmLoading"
            @click.prevent="fnRecordDelete('0')"
-            v-roles:has="[TENANTADMIN_ROLE_KEY]"
+            v-if="!hasRoles(['student'])"
          >
            <template #icon><DeleteOutlined /></template>
            {{ t('common.deleteText') }}
@@ -568,11 +554,6 @@ onBeforeUnmount(() => {
              <template #icon><ReloadOutlined /></template>
            </a-button>
          </a-tooltip>
-          <TableColumnsDnd
-            cache-id="amfUeData"
-            :columns="tableColumns"
-            v-model:columns-dnd="tableColumnsDnd"
-          ></TableColumnsDnd>
          <a-tooltip>
            <template #title>{{ t('common.sizeText') }}</template>
            <a-dropdown trigger="click" placement="bottomRight">
@@ -604,7 +585,7 @@ onBeforeUnmount(() => {
      <a-table
        class="table"
        row-key="id"
-        :columns="tableColumnsDnd"
+        :columns="hasRoles(['student']) ? tableColumns.filter((s:any)=>s.key !== 'id'): tableColumns"
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
@@ -628,10 +609,7 @@ onBeforeUnmount(() => {
                :value="record.eventJSON.authCode"
              />
            </span>
-            <span
-              v-if="record.eventType === 'detach'"
-              :title="record.eventJSON.detachTime"
-            >
+            <span v-if="record.eventType === 'detach'">
              <span>{{ t('views.dashboard.ue.resultOk') }}</span>
            </span>
            <span v-if="record.eventType === 'cm-state'">
@@ -668,7 +646,6 @@ onBeforeUnmount(() => {
                <a-button
                  type="link"
                  @click.prevent="fnRecordDelete(record.id)"
-                  v-roles:has="[TENANTADMIN_ROLE_KEY]"
                >
                  <template #icon>
                    <DeleteOutlined />
@@ -680,6 +657,17 @@ onBeforeUnmount(() => {
        </template>
        <template #expandedRowRender="{ record }">
          <div style="width: 46%; padding-left: 32px; padding-bottom: 16px">
+            <a-divider orientation="left">
+              {{ t('views.dashboard.ue.ueInfo') }}
+            </a-divider>
+            <div>
+              <span>{{ t('views.ne.common.neName') }}: </span>
+              <span>{{ record.neName }}</span>
+            </div>
+            <div>
+              <span>{{ t('views.ne.common.rmUid') }}: </span>
+              <span>{{ record.rmUID }}</span>
+            </div>
            <a-divider orientation="left">
              {{ t('views.dashboard.ue.rowInfo') }}
            </a-divider>
@@ -717,7 +705,7 @@ onBeforeUnmount(() => {
                />
              </span>
              <span v-if="record.eventType === 'detach'">
-                {{ t('views.dashboard.ue.resultOK') }}
+                {{ t('views.dashboard.ue.resultOk') }}
              </span>
              <span v-if="record.eventType === 'cm-state'">
                <DictTag
--- a/practical_training/views/dashboard/imsCDR/index.vue
+++ b/practical_training/views/dashboard/imsCDR/index.vue
@@ -5,13 +5,13 @@ import { message, Modal } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
-import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useI18n from '@/hooks/useI18n';
 import {
  RESULT_CODE_ERROR,
  RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
+import useNeInfoStore from '@/store/modules/neinfo';
 import {
  delIMSDataCDR,
  exportIMSDataCDR,
@@ -21,8 +21,7 @@ import { parseDateToStr, parseDuration } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
-import { TENANTADMIN_ROLE_KEY } from '@/constants/admin-constants';
-import useUserStore from '@/store/modules/user';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const ws = new WS();
@@ -39,6 +38,9 @@ let dict: {
  cdrCallType: [],
 });

+/**网元可选 */
+let neOtions = ref<Record<string, any>[]>([]);
+
 /**开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);

@@ -115,12 +117,12 @@ let tableState: TabeStateType = reactive({

 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'left',
-  //   width: 100,
-  // },
+  {
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'left',
+    width: 100,
+  },
  {
    title: t('views.dashboard.cdr.recordType'),
    dataIndex: 'cdrJSON',
@@ -138,6 +140,17 @@ let tableColumns: ColumnsType = [
    align: 'left',
    width: 100,
  },
+  {
+    title: t('views.dashboard.cdr.caller'),
+    dataIndex: 'cdrJSON',
+    key: 'callerParty',
+    align: 'left',
+    width: 120,
+    customRender(opt) {
+      const cdrJSON = opt.value;
+      return cdrJSON.callerParty;
+    },
+  },
  {
    title: t('views.dashboard.cdr.called'),
    dataIndex: 'cdrJSON',
@@ -156,17 +169,6 @@ let tableColumns: ColumnsType = [
    align: 'left',
    width: 150,
  },
-  {
-    title: t('views.dashboard.cdr.caller'),
-    dataIndex: 'cdrJSON',
-    key: 'callerParty',
-    align: 'left',
-    width: 120,
-    customRender(opt) {
-      const cdrJSON = opt.value;
-      return cdrJSON.callerParty;
-    },
-  },
  {
    title: t('views.dashboard.cdr.duration'),
    dataIndex: 'cdrJSON',
@@ -203,14 +205,16 @@ let tableColumns: ColumnsType = [
      if (typeof cdrJSON.releaseTime === 'number') {
        return parseDateToStr(+cdrJSON.releaseTime * 1000);
      }
-      return parseDateToStr(cdrJSON.releaseTime);
+      return cdrJSON.releaseTime;
    },
  },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
 ];

-/**表格字段列排序 */
-let tableColumnsDnd = ref<ColumnsType>([]);
-
 /**表格分页器参数 */
 let tablePagination = reactive({
  /**当前页数 */
@@ -244,6 +248,11 @@ function fnTableSize({ key }: MenuInfo) {
  tableState.size = key as SizeType;
 }

+/**表格多选 */
+function fnTableSelectedRowKeys(keys: (string | number)[]) {
+  tableState.selectedRowKeys = keys;
+}
+
 /**对话框对象信息状态类型 */
 type ModalStateType = {
  /**确定按钮 loading */
@@ -341,23 +350,20 @@ function fnGetList(pageNum?: number) {
        modalState.maxId = Number(res.rows[0].id);
      }
    }
-
    tableState.loading = false;
  });
 }

 /**列表导出 */
 function fnExportList() {
-  if (modalState.confirmLoading || tablePagination.total === 0) return;
+  if (modalState.confirmLoading) return;
  Modal.confirm({
    title: t('common.tipTitle'),
    content: t('views.dashboard.cdr.exportTip'),
    onOk() {
-      modalState.confirmLoading = true;
      const hide = message.loading(t('common.loading'), 0);
      const querys = toRaw(queryParams);
-      querys.pageNum = 1;
-      querys.pageSize = tablePagination.total;
+      querys.pageSize = 10000;
      exportIMSDataCDR(querys)
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
@@ -390,6 +396,7 @@ const realTimeData = ref<boolean>(false);
 function fnRealTime() {
  realTimeData.value = !realTimeData.value;
  if (realTimeData.value) {
+    tableState.seached = false;
    // 建立链接
    const options: OptionsType = {
      url: '/ws',
@@ -398,7 +405,7 @@ function fnRealTime() {
         *
         * IMS_CDR会话事件(GroupID:1005)
         */
-        subGroupID: '1005',
+        subGroupID: `1005_${queryParams.neId}`,
      },
      onmessage: wsMessage,
      onerror: wsError,
@@ -406,6 +413,8 @@ function fnRealTime() {
    ws.connect(options);
  } else {
    ws.close();
+    tableState.seached = true;
+    fnGetList(1);
  }
 }

@@ -428,7 +437,7 @@ function wsMessage(res: Record<string, any>) {
    return;
  }
  // cdrEvent CDR会话事件
-  if (data.groupId === '1005') {
+  if (data.groupId === `1005_${queryParams.neId}`) {
    const cdrEvent = data.data;
    queue.add(async () => {
      modalState.maxId += 1;
@@ -451,16 +460,42 @@ function wsMessage(res: Record<string, any>) {

 onMounted(() => {
  // 初始字典数据
-  Promise.allSettled([getDict('cdr_sip_code'), getDict('cdr_call_type')])
-    .then(resArr => {
+  Promise.allSettled([getDict('cdr_sip_code'), getDict('cdr_call_type')]).then(
+    resArr => {
      if (resArr[0].status === 'fulfilled') {
        dict.cdrSipCode = resArr[0].value;
      }
      if (resArr[1].status === 'fulfilled') {
        dict.cdrCallType = resArr[1].value;
      }
+    }
+  );
+  // 获取网元网元列表
+  useNeInfoStore()
+    .fnNelist()
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.data.length > 0) {
+          let arr: Record<string, any>[] = [];
+          res.data.forEach(i => {
+            if (i.neType === 'IMS') {
+              arr.push({ value: i.neId, label: i.neName });
+            }
+          });
+          neOtions.value = arr;
+          if (arr.length > 0) {
+            queryParams.neId = arr[0].value;
+          }
+        }
+      } else {
+        message.warning({
+          content: t('common.noData'),
+          duration: 2,
+        });
+      }
    })
    .finally(() => {
+      // 获取列表数据
      fnGetList();
    });
 });
@@ -482,26 +517,19 @@ onBeforeUnmount(() => {
      <!-- 表格搜索栏 -->
      <a-form :model="queryParams" name="queryParams" layout="horizontal">
        <a-row :gutter="16">
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.dashboard.cdr.recordType')"
-              name="recordType "
-            >
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item label="IMS" name="neId ">
              <a-select
-                v-model:value="recordTypes"
-                mode="multiple"
-                :options="
-                  ['MOC', 'MTC', 'MOSM', 'MTSM'].map(v => ({ value: v }))
-                "
+                v-model:value="queryParams.neId"
+                :options="neOtions"
                :placeholder="t('common.selectPlease')"
-                @change="fnQueryRecordTypeChange"
-              ></a-select>
+              />
            </a-form-item>
          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.called')"
-              name="calledParty "
+              name="calledParty"
            >
              <a-input
                v-model:value="queryParams.calledParty"
@@ -510,7 +538,7 @@ onBeforeUnmount(() => {
              ></a-input>
            </a-form-item>
          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.caller')"
              name="callerParty "
@@ -522,6 +550,34 @@ onBeforeUnmount(() => {
              ></a-input>
            </a-form-item>
          </a-col>
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item>
+              <a-space :size="8">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
+                  <template #icon><SearchOutlined /></template>
+                  {{ t('common.search') }}
+                </a-button>
+                <a-button type="default" @click.prevent="fnQueryReset">
+                  <template #icon><ClearOutlined /></template>
+                  {{ t('common.reset') }}
+                </a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.dashboard.cdr.recordType')"
+              name="recordType"
+            >
+              <a-select
+                v-model:value="recordTypes"
+                mode="multiple"
+                :options="['MOC', 'MTC'].map(v => ({ value: v }))"
+                :placeholder="t('common.selectPlease')"
+                @change="fnQueryRecordTypeChange"
+              ></a-select>
+            </a-form-item>
+          </a-col>
          <a-col :lg="8" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.time')"
@@ -538,20 +594,6 @@ onBeforeUnmount(() => {
              ></a-range-picker>
            </a-form-item>
          </a-col>
-          <a-col :lg="4" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
        </a-row>
      </a-form>
    </a-card>
@@ -571,11 +613,7 @@ onBeforeUnmount(() => {
            cancel-text="No"
            @confirm="fnRealTime()"
          >
-            <a-button
-              type="primary"
-              :danger="realTimeData"
-              v-roles:has="[TENANTADMIN_ROLE_KEY]"
-            >
+            <a-button type="primary" :danger="realTimeData">
              <template #icon><FundOutlined /> </template>
              {{
                !realTimeData
@@ -585,6 +623,18 @@ onBeforeUnmount(() => {
            </a-button>
          </a-popconfirm>

+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+            v-if="!hasRoles(['student'])"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('common.deleteText') }}
+          </a-button>
+
          <a-button type="dashed" @click.prevent="fnExportList()">
            <template #icon><ExportOutlined /></template>
            {{ t('common.export') }}
@@ -602,6 +652,7 @@ onBeforeUnmount(() => {
              :checked-children="t('common.switch.show')"
              :un-checked-children="t('common.switch.hide')"
              size="small"
+              :disabled="realTimeData"
            />
          </a-tooltip>
          <a-tooltip>
@@ -610,11 +661,6 @@ onBeforeUnmount(() => {
              <template #icon><ReloadOutlined /></template>
            </a-button>
          </a-tooltip>
-          <TableColumnsDnd
-            cache-id="imsCdrData"
-            :columns="tableColumns"
-            v-model:columns-dnd="tableColumnsDnd"
-          ></TableColumnsDnd>
          <a-tooltip>
            <template #title>{{ t('common.sizeText') }}</template>
            <a-dropdown trigger="click" placement="bottomRight">
@@ -646,12 +692,18 @@ onBeforeUnmount(() => {
      <a-table
        class="table"
        row-key="id"
-        :columns="tableColumnsDnd"
+        :columns="hasRoles(['student']) ? tableColumns.filter((s:any)=>s.key !== 'id'): tableColumns"
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
        :pagination="tablePagination"
-        :scroll="{ x: tableColumns.length * 120, y: 'calc(100vh - 480px)' }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
+        :row-selection="{
+          type: 'checkbox',
+          columnWidth: '48px',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
      >
        <template #bodyCell="{ column, record }">
          <template v-if="column.key === 'callType'">
@@ -669,9 +721,24 @@ onBeforeUnmount(() => {
              />
            </span>
            <span v-else>
-              {{ t('views.dashboard.overview.userActivity.resultOK') }}
+              {{ t('views.dashboard.cdr.resultOk') }}
            </span>
          </template>
+          <template v-if="column.key === 'id'">
+            <a-space :size="8" align="center">
+              <a-tooltip>
+                <template #title>{{ t('common.deleteText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordDelete(record.id)"
+                >
+                  <template #icon>
+                    <DeleteOutlined />
+                  </template>
+                </a-button>
+              </a-tooltip>
+            </a-space>
+          </template>
        </template>
        <template #expandedRowRender="{ record }">
          <a-row :gutter="16">
@@ -689,7 +756,13 @@ onBeforeUnmount(() => {
              </div>
              <div>
                <span>{{ t('views.dashboard.cdr.time') }}: </span>
-                <span>{{ parseDateToStr(+record.timestamp * 1000) }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.releaseTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.releaseTime * 1000)
+                      : record.cdrJSON.releaseTime
+                  }}
+                </span>
              </div>
            </a-col>
            <a-col :lg="6" :md="12" :xs="24">
@@ -733,11 +806,23 @@ onBeforeUnmount(() => {
              </div>
              <div>
                <span>{{ t('views.dashboard.cdr.seizureTime') }}: </span>
-                <span>{{ record.cdrJSON.seizureTime }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.seizureTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.seizureTime * 1000)
+                      : record.cdrJSON.seizureTime
+                  }}
+                </span>
              </div>
              <div>
                <span>{{ t('views.dashboard.cdr.releaseTime') }}: </span>
-                <span>{{ parseDateToStr(record.cdrJSON.releaseTime) }}</span>
+                <span>
+                  {{
+                    typeof record.cdrJSON.releaseTime === 'number'
+                      ? parseDateToStr(+record.cdrJSON.releaseTime * 1000)
+                      : record.cdrJSON.releaseTime
+                  }}
+                </span>
              </div>
            </a-col>
          </a-row>
--- a/practical_training/views/dashboard/mmeUE/index.vue
+++ b/practical_training/views/dashboard/mmeUE/index.vue
@@ -11,18 +11,20 @@ import {
  RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
+import useNeInfoStore from '@/store/modules/neinfo';
 import { listMMEDataUE, delMMEDataUE, exportMMEDataUE } from '@/api/neData/mme';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });

-
-
+/**网元可选 */
+let neOtions = ref<Record<string, any>[]>([]);

 /**字典数据 */
 let dict: {
@@ -112,12 +114,12 @@ let tableState: TabeStateType = reactive({

 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'left',
-  //   width: 100,
-  // },
+  {
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'left',
+    width: 100,
+  },
  {
    title: 'IMSI',
    dataIndex: 'eventJSON',
@@ -152,12 +154,11 @@ let tableColumns: ColumnsType = [
      return parseDateToStr(+cdrJSON.timestamp * 1000);
    },
  },
-
-  // {
-  //   title: t('common.operate'),
-  //   key: 'id',
-  //   align: 'left',
-  // },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
 ];

 /**表格分页器参数 */
@@ -301,16 +302,14 @@ function fnGetList(pageNum?: number) {

 /**列表导出 */
 function fnExportList() {
-  if (modalState.confirmLoading || tablePagination.total === 0) return;
+  if (modalState.confirmLoading) return;
  Modal.confirm({
    title: t('common.tipTitle'),
    content: t('views.dashboard.ue.exportTip'),
    onOk() {
-      modalState.confirmLoading = true;
      const hide = message.loading(t('common.loading'), 0);
      const querys = toRaw(queryParams);
-      querys.pageNum = 1;
-      querys.pageSize = tablePagination.total;
+      querys.pageSize = 10000;
      exportMMEDataUE(querys)
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
@@ -343,6 +342,7 @@ const realTimeData = ref<boolean>(false);
 function fnRealTime() {
  realTimeData.value = !realTimeData.value;
  if (realTimeData.value) {
+    tableState.seached = false;
    // 建立链接
    const options: OptionsType = {
      url: '/ws',
@@ -351,7 +351,7 @@ function fnRealTime() {
         *
         * MME_UE会话事件(GroupID:1011)
         */
-        subGroupID: '1011',
+        subGroupID: `1011_${queryParams.neId}`,
      },
      onmessage: wsMessage,
      onerror: wsError,
@@ -359,6 +359,8 @@ function fnRealTime() {
    ws.connect(options);
  } else {
    ws.close();
+    tableState.seached = true;
+    fnGetList(1);
  }
 }

@@ -381,7 +383,7 @@ function wsMessage(res: Record<string, any>) {
    return;
  }
  // ueEvent MME_UE会话事件
-  if (data.groupId === '1011') {
+  if (data.groupId === `1011_${queryParams.neId}`) {
    const ueEvent = data.data;
    queue.add(async () => {
      modalState.maxId += 1;
@@ -409,22 +411,46 @@ onMounted(() => {
    getDict('ue_auth_code'),
    getDict('ue_event_type'),
    getDict('ue_event_cm_state'),
-  ])
-    .then(resArr => {
-      if (resArr[0].status === 'fulfilled') {
-        dict.ueAauthCode = resArr[0].value;
-      }
-      if (resArr[1].status === 'fulfilled') {
-        const ueEventType: any[] = JSON.parse(JSON.stringify(resArr[1].value));
+  ]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.ueAauthCode = resArr[0].value;
+    }
+    if (resArr[1].status === 'fulfilled') {
+      const ueEventType: any[] = JSON.parse(JSON.stringify(resArr[1]));
      dict.ueEventType = ueEventType.map(item => {
        if (item.value === 'cm-state') {
          item.label = item.label.replace('CM', 'ECM');
        }
        return item;
      });
-      }
-      if (resArr[2].status === 'fulfilled') {
-        dict.ueEventCmState = resArr[2].value;
+    }
+    if (resArr[2].status === 'fulfilled') {
+      dict.ueEventCmState = resArr[2].value;
+    }
+  });
+
+  // 获取网元网元列表
+  useNeInfoStore()
+    .fnNelist()
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.data.length > 0) {
+          let arr: Record<string, any>[] = [];
+          res.data.forEach(i => {
+            if (i.neType === 'MME') {
+              arr.push({ value: i.neId, label: i.neName });
+            }
+          });
+          neOtions.value = arr;
+          if (arr.length > 0) {
+            queryParams.neId = arr[0].value;
+          }
+        }
+      } else {
+        message.warning({
+          content: t('common.noData'),
+          duration: 2,
+        });
      }
    })
    .finally(() => {
@@ -450,6 +476,15 @@ onBeforeUnmount(() => {
      <!-- 表格搜索栏 -->
      <a-form :model="queryParams" name="queryParams" layout="horizontal">
        <a-row :gutter="16">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item label="MME" name="neId ">
+              <a-select
+                v-model:value="queryParams.neId"
+                :options="neOtions"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
+          </a-col>
          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.ue.eventType')"
@@ -511,6 +546,39 @@ onBeforeUnmount(() => {
      <!-- 插槽-卡片左侧侧 -->
      <template #title>
        <a-space :size="8" align="center">
+          <a-popconfirm
+            placement="bottomLeft"
+            :title="
+              !realTimeData
+                ? t('views.dashboard.ue.realTimeDataStart')
+                : t('views.dashboard.ue.realTimeDataStop')
+            "
+            ok-text="Yes"
+            cancel-text="No"
+            @confirm="fnRealTime()"
+          >
+            <a-button type="primary" :danger="realTimeData">
+              <template #icon><FundOutlined /> </template>
+              {{
+                !realTimeData
+                  ? t('views.dashboard.ue.realTimeDataStart')
+                  : t('views.dashboard.ue.realTimeDataStop')
+              }}
+            </a-button>
+          </a-popconfirm>
+
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+            v-if="!hasRoles(['student'])"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('common.deleteText') }}
+          </a-button>
+
          <a-button type="dashed" @click.prevent="fnExportList()">
            <template #icon><ExportOutlined /></template>
            {{ t('common.export') }}
@@ -528,6 +596,7 @@ onBeforeUnmount(() => {
              :checked-children="t('common.switch.show')"
              :un-checked-children="t('common.switch.hide')"
              size="small"
+              :disabled="realTimeData"
            />
          </a-tooltip>
          <a-tooltip>
@@ -567,7 +636,7 @@ onBeforeUnmount(() => {
      <a-table
        class="table"
        row-key="id"
-        :columns="tableColumns"
+        :columns="hasRoles(['student']) ? tableColumns.filter((s:any)=>s.key !== 'id'): tableColumns"
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
@@ -650,7 +719,7 @@ onBeforeUnmount(() => {
                />
              </span>
              <span v-if="record.eventType === 'detach'">
-                {{ t('views.dashboard.ue.resultOK') }}
+                {{ t('views.dashboard.ue.resultOk') }}
              </span>
              <span v-if="record.eventType === 'cm-state'">
                <DictTag
--- a/practical_training/views/dashboard/overview/components/AlarnTypeBar/index.vue
+++ b/practical_training/views/dashboard/overview/components/AlarnTypeBar/index.vue
@@ -129,123 +129,79 @@ function initPicture() {
      const optionData: EChartsOption = {
        title: [
          {
-            text: 'Top3',
-            left: 'center',
-            top: '36%',
+            show: false,
+          },
+          {
+            text: t('views.dashboard.overview.alarmTypeBar.topTitle'),
            textStyle: {
              color: '#fff',
-              fontSize: 16,
-              fontWeight: 'bold',
+              fontSize: '14',
+              fontWeight: 400,
            },
-          },
-        ],
-        grid: [
-          { // 主图
-            top: '5%',
-            left: '20%',
-            right: '10%',
-            height: '35%'
-          },
-          { // Top3
            top: '50%',
-            left: '20%',
-            right: '10%',
-            height: '30%'
-          }
+            left: '0%',
+          },
        ],
        tooltip: {
-
-          axisPointer: { type: 'shadow' },
+          trigger: 'item',
          formatter: '{b} : {c}',
        },
        legend: {
-          show: false
+          orient: 'vertical',
+          right: '2%',
+          top: '12%',
+          data: alarmTypeType.value.map((item: any) => item.name), //label数组
+          textStyle: {
+            color: '#A7D6F4', // 设置图例文字颜色
+          },
        },
-        xAxis: [
+        grid: [
          {
-            type: 'value',
-            gridIndex: 0,
-            show: false,
+            top: '60%',
+            left: '15%',
+            right: '25%',
+            bottom: '10%',
          },
-          {
-            type: 'value',
-            gridIndex: 1,
-            show: false,
-          }
-        ],
-        yAxis: [
-          {
-            type: 'category',
-            gridIndex: 0,
-            data: alarmTypeType.value.map((item: any) => item.name),
-            axisLabel: { color: '#fff', fontSize: 14,fontWeight: 'bold' },
-            axisLine: { show: false },
-            axisTick: { show: false },
-            inverse: true
-          },
-          {
-            type: 'category',
-            gridIndex: 1,
-            data: alarmTypeTypeTop.value.map((item: any) => item.name),
-            axisLabel: { color: '#fff', fontSize: 14,fontWeight: 'bold' },
-            axisLine: { show: false },
-            axisTick: { show: false },
-            inverse: true
-          }
        ],
        series: [
-          // 四类型告警横向柱状图
+          //饼图:
          {
-            type: 'bar',
-            xAxisIndex: 0,
-            yAxisIndex: 0,
-            barWidth: 18,
-            itemStyle: {
-              borderRadius: [0, 8, 8, 0],
-              color: function (params: any) {
-                // 渐变色
-                const colorArr = [
-                  new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                    { offset: 0, color: '#f5222d' },
-                    { offset: 1, color: '#fa8c16' }
-                  ]),
-                  new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                    { offset: 0, color: '#fa8c16' },
-                    { offset: 1, color: '#fadb14' }
-                  ]),
-                  new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                    { offset: 0, color: '#fadb14' },
-                    { offset: 1, color: '#1677ff' }
-                  ]),
-                  new echarts.graphic.LinearGradient(0, 0, 1, 0, [
-                    { offset: 0, color: '#1677ff' },
-                    { offset: 1, color: '#00fcff' }
-                  ])
-                ];
-                return colorArr[params.dataIndex] || colorArr[3];
-              }
-            },
+            type: 'pie',
+            radius: '35%',
+            color: ['#f5222d', '#fa8c16', '#fadb14', '#1677ff', '#13c2c2'],
            label: {
              show: true,
-              position: 'right',
-              color: '#fff', //淡蓝色
-              fontWeight: 'bold',
-              fontSize: 16,
+              position: 'inner',
              formatter: (params: any) => {
                if (!params.value) return '';
                return `${params.value}`;
              },
            },
-            data: alarmTypeType.value.map((item: any) => item.value),
-            zlevel: 2
+            labelLine: {
+              show: false,
+            },
+            center: ['35%', '25%'],
+            data: alarmTypeType.value,
+            zlevel: 2, // 设置zlevel为1，使得柱状图在下层显示
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)',
+            },
          },
-          // Top3横向柱状图
+          //柱状
          {
-            name: 'Top3',
            type: 'bar',
-            xAxisIndex: 1,
-            yAxisIndex: 1,
-            barWidth: 18,
+            barWidth: 12, // 柱子宽度
+            barCategoryGap: '30%', // 控制同一系列的柱间距离
+            label: {
+              show: true,
+              position: 'right', // 位置
+              color: '#A7D6F4', //淡蓝色
+              fontSize: 14,
+              distance: 14, // label与柱子距离
+              formatter: '{c}',
+            },
            itemStyle: {
              borderRadius: [0, 20, 20, 0], // 圆角（左上、右上、右下、左下）
              color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
@@ -254,19 +210,42 @@ function initPicture() {
                { offset: 1, color: '#2f54eb' },
              ]), // 渐变
            },
-            label: {
-              show: true,
-              position: 'right',
-              color: '#fff', //淡蓝色
-              fontWeight: 'bold',
-              fontSize: 16,
-              formatter: '{c}'
+            data: alarmTypeTypeTop.value,
+          },
+        ],
+        // 柱状图设置
+        xAxis: [
+          {
+            splitLine: {
+              show: false,
            },
-            data: alarmTypeTypeTop.value.map((item: any) => item.value),
-            zlevel: 1
-          }
-        ]
+            type: 'value',
+            show: false,
+          },
+        ],
+        yAxis: [
+          {
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              //y轴
+              show: false,
+            },
+            type: 'category',
+            axisTick: {
+              show: false,
+            },
+            inverse: true,
+            data: alarmTypeTypeTop.value.map((item: any) => item.name),
+            axisLabel: {
+              color: '#A7D6F4',
+              fontSize: 14,
+            },
+          },
+        ],
      };
+
      fnDesign(alarmTypeBar.value, optionData);
    });
 }
--- a/practical_training/views/dashboard/overview/components/NeResources/index.vue
+++ b/practical_training/views/dashboard/overview/components/NeResources/index.vue
@@ -0,0 +1,368 @@
+<script setup lang="ts">
+import { onMounted, ref, nextTick, watch } from 'vue';
+import * as echarts from 'echarts/core';
+import { GridComponent, GridComponentOption } from 'echarts/components';
+import {
+  BarChart,
+  BarSeriesOption,
+  PictorialBarChart,
+  PictorialBarSeriesOption,
+} from 'echarts/charts';
+import { CanvasRenderer } from 'echarts/renderers';
+import { graphNodeClickID, graphNodeState } from '../../hooks/useTopology';
+import useI18n from '@/hooks/useI18n';
+import { markRaw } from 'vue';
+const { t } = useI18n();
+
+echarts.use([GridComponent, BarChart, PictorialBarChart, CanvasRenderer]);
+
+type EChartsOption = echarts.ComposeOption<
+  GridComponentOption | BarSeriesOption | PictorialBarSeriesOption
+>;
+
+/**图DOM节点实例对象 */
+const neResourcesDom = ref<HTMLElement | undefined>(undefined);
+
+/**图实例对象 */
+const neResourcesChart = ref<any>(null);
+
+// 类别
+const category = ref<any>([
+  {
+    name: t('views.dashboard.overview.resources.sysDisk'),
+    value: 1,
+  },
+  {
+    name: t('views.dashboard.overview.resources.sysMem'),
+    value: 1,
+  },
+  {
+    name: t('views.dashboard.overview.resources.sysCpu'),
+    value: 1,
+  },
+  {
+    name: t('views.dashboard.overview.resources.neCpu'),
+    value: 1,
+  },
+]);
+
+// 数据总数
+const total = 100;
+
+/**图数据 */
+const optionData: EChartsOption = {
+  xAxis: {
+    max: total,
+    splitLine: {
+      show: false,
+    },
+    axisLine: {
+      show: false,
+    },
+    axisLabel: {
+      show: false,
+    },
+    axisTick: {
+      show: false,
+    },
+  },
+  grid: {
+    top: '1%', // 设置条形图的边距
+    bottom: '12%',
+    left: '25%',
+    right: '25%',
+  },
+  yAxis: [
+    {
+      type: 'category',
+      inverse: false,
+      data: category.value,
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      // 内
+      type: 'bar',
+      barWidth: 10,
+      legendHoverLink: false,
+      silent: true,
+      itemStyle: {
+        color: function (params) {
+          // 红色
+          if (params.value && +params.value >= 70) {
+            return new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+              { offset: 0, color: '#fff1f0' },
+              { offset: 0.5, color: '#ffa39e' },
+              { offset: 1, color: '#f5222d' },
+            ]);
+          }
+          // 蓝色
+          if (params.value && +params.value >= 30) {
+            return new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+              { offset: 0, color: '#f0f5ff' },
+              { offset: 0.5, color: '#adc6ff' },
+              { offset: 1, color: '#2f54eb' },
+            ]);
+          }
+          // 绿色
+          return new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            { offset: 0, color: '#f6ffed' },
+            { offset: 0.5, color: '#b7eb8f' },
+            { offset: 1, color: '#52c41a' },
+          ]);
+        },
+      },
+      label: {
+        show: true,
+        position: 'left',
+        formatter: '{b}: ',
+        fontSize: 15,
+        color: '#fff',
+      },
+      data: category.value,
+      z: 1,
+      animationEasing: 'elasticOut',
+    },
+    {
+      // 分隔
+      type: 'pictorialBar',
+      itemStyle: {
+        color: '#0a3ca0',
+      },
+      symbolRepeat: 'fixed',
+      symbolMargin: 6,
+      symbol: 'rect',
+      symbolClip: true,
+      symbolSize: [1, 12],
+      symbolPosition: 'start',
+      symbolOffset: [0, -1],
+      symbolBoundingData: total,
+      data: category.value,
+      z: 2,
+      animationEasing: 'elasticOut',
+    },
+    {
+      // 外边框
+      type: 'pictorialBar',
+      symbol: 'rect',
+      symbolBoundingData: total,
+      itemStyle: {
+        color: 'transparent',
+      },
+      label: {
+        formatter: params => {
+          var text = `{a|  ${params.value}%} `;
+          if (params.value && +params.value >= 70) {
+            text = `{c|  ${params.value}%} `;
+          } else if (params.value && +params.value >= 30) {
+            text = `{b|  ${params.value}%} `;
+          }
+          return text;
+        },
+        rich: {
+          a: {
+            color: '#52c41a', // 绿
+            fontSize: 16,
+          },
+          b: {
+            color: '#2f54eb', // 蓝
+            fontSize: 16,
+          },
+          c: {
+            color: '#f5222d', // 红
+            fontSize: 16,
+          },
+          f: {
+            color: '#ffffff', // 默认
+            fontSize: 16,
+          },
+        },
+        position: 'right',
+        distance: 0, // 向右偏移位置
+        show: true,
+      },
+      data: category.value,
+      z: 0,
+      animationEasing: 'elasticOut',
+    },
+    {
+      name: '外框',
+      type: 'bar',
+      barGap: '-120%', // 设置外框粗细
+      data: [total, total, total],
+      barWidth: 14,
+      itemStyle: {
+        color: 'transparent', // 填充色
+        borderColor: '#0a3ca0', // 边框色
+        borderWidth: 1, // 边框宽度
+        borderRadius: 1, //圆角半径
+      },
+      label: {
+        // 标签显示位置
+        show: false,
+        position: 'top', // insideTop 或者横向的 insideLeft
+      },
+      z: 0,
+    },
+  ],
+};
+
+/**图数据渲染 */
+function handleRanderChart(
+  container: HTMLElement | undefined,
+  option: EChartsOption
+) {
+  if (!container) return;
+  neResourcesChart.value = markRaw(echarts.init(container, 'light'));
+  option && neResourcesChart.value.setOption(option);
+
+  // 创建 ResizeObserver 实例
+  var observer = new ResizeObserver(entries => {
+    if (neResourcesChart.value) {
+      neResourcesChart.value.resize();
+    }
+  });
+  // 监听元素大小变化
+  observer.observe(container);
+}
+
+function fnChangeData(data: any[], itemID: string) {
+  let info = data.find((item: any) => item.id === itemID);
+  if (!info || !info.neState.online) return;
+  // if (!info.neState.online) {
+  //   info = data.find((item: any) => item.id === itemID);
+  //   graphNodeClickID.value = itemID;
+  // }
+  // console.log(info.id);
+  // console.log(info.neState.cpu.nfCpuUsage);
+  // console.log(info.neState.cpu.sysCpuUsage);
+  // console.log(info.neState.mem);
+  // console.log(info.neState.disk);
+  let sysCpuUsage = 0;
+  let nfCpuUsage = 0;
+  if (info.neState.cpu) {
+    nfCpuUsage = info.neState.cpu.nfCpuUsage;
+    const nfCpu = +(info.neState.cpu.nfCpuUsage / 100);
+    nfCpuUsage = +nfCpu.toFixed(2);
+    if (nfCpuUsage > 100) {
+      nfCpuUsage = 100;
+    }
+
+    sysCpuUsage = info.neState.cpu.sysCpuUsage;
+    let sysCpu = +(info.neState.cpu.sysCpuUsage / 100);
+    sysCpuUsage = +sysCpu.toFixed(2);
+    if (sysCpuUsage > 100) {
+      sysCpuUsage = 100;
+    }
+  }
+
+  let sysMemUsage = 0;
+  if (info.neState.mem) {
+    const men = info.neState.mem.sysMemUsage;
+    sysMemUsage = +(men / 100).toFixed(2);
+    if (sysMemUsage > 100) {
+      sysMemUsage = 100;
+    }
+  }
+
+  let sysDiskUsage = 0;
+  if (info.neState.disk && Array.isArray(info.neState.disk.partitionInfo)) {
+    let disks: any[] = info.neState.disk.partitionInfo;
+    disks = disks.sort((a, b) => +b.used - +a.used);
+    if (disks.length > 0) {
+      const { total, used } = disks[0];
+      sysDiskUsage = +((used / total) * 100).toFixed(2);
+    }
+  }
+
+  category.value[0].value = sysDiskUsage;
+  category.value[1].value = sysMemUsage;
+  category.value[2].value = sysCpuUsage;
+  category.value[3].value = nfCpuUsage;
+  neResourcesChart.value.setOption({
+    series: [
+      {
+        data: category.value,
+      },
+      {
+        data: category.value,
+      },
+      {
+        data: category.value,
+      },
+      {
+        data: category.value,
+      },
+    ],
+  });
+}
+
+watch(
+  graphNodeState,
+  v => {
+    fnChangeData(v, graphNodeClickID.value);
+  },
+  {
+    deep: true,
+  }
+);
+
+watch(graphNodeClickID, v => {
+  fnChangeData(graphNodeState.value, v);
+});
+
+onMounted(() => {
+  // setInterval(function () {
+  //   var ndata = [
+  //     {
+  //       name: '系统内存',
+  //       value: Math.round(Math.random() * 100),
+  //     },
+  //     {
+  //       name: '系统CPU',
+  //       value: Math.round(Math.random() * 100),
+  //     },
+  //     {
+  //       name: '网元CPU',
+  //       value: Math.round(Math.random() * 100),
+  //     },
+  //   ];
+  //   neResourcesChart.value.setOption({
+  //     series: [
+  //       {
+  //         data: ndata,
+  //       },
+  //       {
+  //         data: ndata,
+  //       },
+  //       {
+  //         data: ndata,
+  //       },
+  //     ],
+  //   });
+  // }, 2000);
+  nextTick(() => {
+    handleRanderChart(neResourcesDom.value, optionData);
+  });
+});
+</script>
+
+<template>
+  <div ref="neResourcesDom" class="chart"></div>
+</template>
+
+<style lang="less" scoped>
+.chart {
+  width: 100%;
+  height: 100%;
+}
+</style>
--- a/practical_training/views/dashboard/overview/components/Topology/index.vue
+++ b/practical_training/views/dashboard/overview/components/Topology/index.vue
@@ -22,25 +22,18 @@ const graphG6Dom = ref<HTMLElement | undefined>(undefined);

 /**图节点展示 */
 const graphNodeTooltip = new Tooltip({
-  offsetX: 10,
+  offsetX: 20,
  offsetY: 20,
  getContent(evt) {
    if (!evt) return t('views.monitor.topologyBuild.graphNotInfo');
-    const { id, label, neState, neInfoList, neStateMap }: any = evt.item?.getModel();
-    //console.log(neInfoList,neState,neInfoList);
+    const { id, label, neState }: any = evt.item?.getModel();
    if (notNeNodes.includes(id)) {
      return `<div><span>${label || id}</span></div>`;
    }
    if (!neState) {
      return `<div><span>${label || id}</span></div>`;
    }
-
-    // 获取同类型网元列表
-    const sameTypeNes = neInfoList || [];
-
-    // 如果没有网元或只有一个网元，显示原来的信息
-    if (sameTypeNes.length <= 1) {
-      return `
+    return `
        <div
        style="
            display: flex;
@@ -63,7 +56,7 @@ const graphNodeTooltip = new Tooltip({
        <div><strong>${t('views.monitor.topology.name')}：</strong><span>
        ${neState.neName ?? '--'}
        </span></div>
-        <div><strong>IP：</strong><span>${neState.neIP ?? '--'}</span></div>
+        <div><strong>IP：</strong><span>${neState.neIP}</span></div>
        <div><strong>${t('views.monitor.topology.version')}：</strong><span>
        ${neState.version ?? '--'}
        </span></div>
@@ -72,71 +65,24 @@ const graphNodeTooltip = new Tooltip({
        </span></div>
        <div><strong>${t('views.monitor.topology.expiryDate')}：</strong><span>
        ${neState.expire ?? '--'}
-        </span></div>
+        </span></div> 
        </div>
        `;
-    }
-
-    // 如果有多个网元，聚合显示
-    let content = `
-      <div
-      style="
-          display: flex;
-          flex-direction: column;
-          width: 300px;
-      "
-      >
-      <div><strong>${t('views.monitor.topology.state')}：</strong><span>
-      ${
-        neState.online
-          ? t('views.monitor.topology.normalcy')
-          : t('views.monitor.topology.exceptions')
-      }
-      </span></div>
-      <div><strong>${t('views.monitor.topology.refreshTime')}：</strong><span>
-      ${neState.refreshTime ?? '--'}
-      </span></div>
-      <div>========================</div>`;
-
-    // 为每个同类型网元添加信息
-    sameTypeNes.forEach((ne: any, index: number) => {
-      // 获取该网元的状态信息
-      const neStateInfo = neStateMap?.[ne.neId] ||
-                         (ne.neId === neState.neId ? neState : {});
-
-      content += `
-      <div style="margin-top: 8px;"><strong>${t('views.monitor.topology.name')}：${ne.neName || id + '_' + ne.neId}</strong></div>
-      <div><strong>ID：</strong><span>${ne.neId || '--'}</span></div>
-      <div><strong>IP：</strong><span>${neStateInfo.neIP || ne.neIP || '--'}</span></div>
-      <div><strong>${t('views.monitor.topology.version')}：</strong><span>
-      ${neStateInfo.version || ne.version || '--'}
-      </span></div>
-      <div><strong>${t('views.monitor.topology.serialNum')}：</strong><span>
-      ${neStateInfo.sn || ne.sn || '--'}
-      </span></div>
-      <div><strong>${t('views.monitor.topology.expiryDate')}：</strong><span>
-      ${neStateInfo.expire || ne.expire || '--'}
-      </span></div>
-      <div><strong>${t('views.monitor.topology.state')}：</strong><span>
-      ${
-        neStateInfo.online !== undefined
-          ? (neStateInfo.online
-              ? t('views.monitor.topology.normalcy')
-              : t('views.monitor.topology.exceptions'))
-          : 'undefined'
-      }
-      </span></div>
-      ${index < sameTypeNes.length - 1 ? '<div>------------------------</div>' : ''}
-      `;
-    });
-
-    content += '</div>';
-    return content;
  },
  itemTypes: ['node'],
 });

-
+/**图绑定事件 */
+function fnGraphEvent(graph: Graph) {
+  // 节点点击
+  graph.on('node:click', evt => {
+    // 获得鼠标当前目标节点
+    const node = evt.item?.getModel();
+    if (node && node.id && !notNeNodes.includes(node.id)) {
+      graphNodeClickID.value = node.id;
+    }
+  });
+}

 /**图数据渲染 */
 function handleRanderGraph(
@@ -158,7 +104,7 @@ function handleRanderGraph(
    fitViewPadding: [20],
    autoPaint: true,
    modes: {
-      // default: ['drag-canvas', 'zoom-canvas'],
+      default: ['drag-canvas', 'zoom-canvas'],
    },
    groupByTypes: false,
    nodeStateStyles: {
@@ -176,6 +122,7 @@ function handleRanderGraph(
  graph.data(data);
  graph.render();

+  fnGraphEvent(graph);

  graphG6.value = graph;

@@ -188,7 +135,7 @@ function handleRanderGraph(
      }
      graphG6.value.changeSize(
        entry.contentRect.width,
-        entry.contentRect.height - 20
+        entry.contentRect.height - 30
      );
      graphG6.value.fitCenter();
    });
@@ -203,14 +150,14 @@ function handleRanderGraph(
 * 获取图组数据渲染到画布
 * @param reload 是否重载数据
 */
- function fnGraphDataLoad(reload: boolean = false) {
+function fnGraphDataLoad(reload: boolean = false) {
  Promise.all([
    getGraphData(graphState.group),
    listAllNeInfo({
      bandStatus: false,
    }),
  ])
-  .then(resArr => {
+    .then(resArr => {
      const graphRes = resArr[0];
      const neRes = resArr[1];
      if (
@@ -236,45 +183,27 @@ function handleRanderGraph(
      if (!res) return;
      const { combos, edges, nodes } = res.graphData;

-      // 按网元类型分组
-      const neTypeMap = new Map();
-      res.neList.forEach(ne => {
-        if (!ne.neType) return;
-        if (!neTypeMap.has(ne.neType)) {
-          neTypeMap.set(ne.neType, []);
-        }
-        neTypeMap.get(ne.neType).push(ne);
-      });
-
      // 节点过滤
      const nf: Record<string, any>[] = nodes.filter(
        (node: Record<string, any>) => {
          Reflect.set(node, 'neState', { online: false });
-          Reflect.set(node, 'neStateMap', {});  // 初始化状态映射
-
          // 图片路径处理
          if (node.img) node.img = parseBasePath(node.img);
-          if (node.icon.show && node.icon?.img){
+          if (node.icon.show && node.icon?.img) {
            node.icon.img = parseBasePath(node.icon.img);
          }
-
          // 遍历是否有网元数据
          const nodeID: string = node.id;
-
-          // 处理非网元节点
+          const hasNe = res.neList.some(ne => {
+            Reflect.set(node, 'neInfo', ne.neType === nodeID ? ne : {});
+            return ne.neType === nodeID;
+          });
+          if (hasNe) {
+            return true;
+          }
          if (notNeNodes.includes(nodeID)) {
            return true;
          }
-        //(neTypeMap.get(nodeID),nodeID,node.neState)
-          // 处理网元节点
-          if (neTypeMap.has(nodeID)) {
-            // all NeInfo
-            Reflect.set(node, 'neInfoList', neTypeMap.get(nodeID));
-
-            Reflect.set(node, 'neInfo', neTypeMap.get(nodeID)[0] || {});
-            return true;
-          }
-
          return false;
        }
      );
@@ -286,6 +215,7 @@ function handleRanderGraph(
          const edgeTarget: string = edge.target;
          const hasNeS = nf.some(n => n.id === edgeSource);
          const hasNeT = nf.some(n => n.id === edgeTarget);
+          // console.log(hasNeS, edgeSource, hasNeT, edgeTarget);
          if (hasNeS && hasNeT) {
            return true;
          }
--- a/practical_training/views/dashboard/overview/components/UPFFlow/index.vue
+++ b/practical_training/views/dashboard/overview/components/UPFFlow/index.vue
@@ -15,9 +15,9 @@ import { UniversalTransition } from 'echarts/features';
 import { CanvasRenderer } from 'echarts/renderers';
 import { markRaw } from 'vue';
 import useI18n from '@/hooks/useI18n';
+import { parseDateToStr } from '@/utils/date-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { upfFlowData, upfFlowParse } from '../../hooks/useUPFTotalFlow';
-import { upfWhoId } from '../../hooks/useWS';

 const { t } = useI18n();

@@ -151,7 +151,7 @@ function handleRanderChart() {
      top: '14%',
      left: '4%',
      right: '4%',
-      bottom: '16%',
+      bottom: '12%',
      containLabel: true,
    },
    xAxis: {
@@ -160,7 +160,7 @@ function handleRanderChart() {
      data: lineXTime,
      axisLabel: {
        formatter: function (params: any) {
-          return params;
+          return params.split(' ')[1];
        },
        fontSize: 14,
      },
@@ -208,10 +208,9 @@ function fnGetInitData() {

  listKPIData({
    neType: 'UPF',
-    neId: upfWhoId.value,
+    neId: '001',
    startTime: nowDate - 5 * 60 * 1000,
    endTime: nowDate,
-
    interval: 5, // 5秒
    sortField: 'timeGroup',
    sortOrder: 'asc',
--- a/practical_training/views/dashboard/overview/components/UserActivity/index.vue
+++ b/practical_training/views/dashboard/overview/components/UserActivity/index.vue
@@ -19,15 +19,12 @@ let dict: {
  ueEventType: DictType[];
  /**UE 事件CM状态 */
  ueEventCmState: DictType[];
-  /**CDR SIP响应代码类别类型 */
-  cdrSipCodeCause: DictType[];
 } = reactive({
  cdrSipCode: [],
  cdrCallType: [],
  ueAauthCode: [],
  ueEventType: [],
  ueEventCmState: [],
-  cdrSipCodeCause: [],
 });

 onMounted(() => {
@@ -38,7 +35,6 @@ onMounted(() => {
    getDict('ue_auth_code'),
    getDict('ue_event_type'),
    getDict('ue_event_cm_state'),
-    getDict('cdr_sip_code_cause'),
  ]).then(resArr => {
    if (resArr[0].status === 'fulfilled') {
      dict.cdrSipCode = resArr[0].value;
@@ -55,9 +51,6 @@ onMounted(() => {
    if (resArr[4].status === 'fulfilled') {
      dict.ueEventCmState = resArr[4].value;
    }
-    if (resArr[5].status === 'fulfilled') {
-      dict.cdrSipCodeCause = resArr[5].value;
-    }
  });
 });
 </script>
@@ -65,6 +58,63 @@ onMounted(() => {
 <template>
  <div class="activty">
    <template v-for="item in eventData" :key="item.eId">
+      <!-- CDR事件IMS -->
+      <div
+        class="card-cdr"
+        :class="{ active: item.eId === eventId }"
+        v-if="item.eType === 'ims_cdr'"
+      >
+        <div class="card-cdr-item">
+          <div>
+            {{ t('views.dashboard.overview.userActivity.type') }}:&nbsp;
+            <span>
+              <DictTag
+                :options="dict.cdrCallType"
+                :value="item.data.callType"
+              />
+            </span>
+          </div>
+          <div></div>
+          <div>
+            {{ t('views.dashboard.overview.userActivity.time') }}:&nbsp;
+            <span :title="parseDateToStr(item.data.releaseTime * 1000)">
+              {{ parseDateToStr(item.data.releaseTime * 1000) }}
+            </span>
+          </div>
+        </div>
+        <div class="card-cdr-item">
+          <div>
+            {{ t('views.dashboard.overview.userActivity.caller') }}:
+            <span :title="item.data.callerParty">
+              {{ item.data.callerParty }}
+            </span>
+          </div>
+          <div>
+            {{ t('views.dashboard.overview.userActivity.called') }}:
+            <span :title="item.data.calledParty">
+              {{ item.data.calledParty }}
+            </span>
+          </div>
+          <div v-if="item.data.callType !== 'sms'">
+            {{ t('views.dashboard.overview.userActivity.duration') }}:&nbsp;
+            <span>{{ parseDuration(item.data.callDuration) }}</span>
+          </div>
+          <div v-else></div>
+        </div>
+        <div>
+          {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
+          <span v-if="item.data.callType !== 'sms'">
+            <DictTag
+              :options="dict.cdrSipCode"
+              :value="item.data.cause"
+              value-default="0"
+            />
+          </span>
+          <span v-else>
+            {{ t('views.dashboard.overview.userActivity.resultOK') }}
+          </span>
+        </div>
+      </div>
      <!-- UE事件AMF -->
      <div
        class="card-ue"
@@ -81,7 +131,21 @@ onMounted(() => {
          <div>
            IMSI: <span :title="item.data.imsi">{{ item.data.imsi }}</span>
          </div>
-          <div></div>
+          <div>
+            {{ t('views.dashboard.overview.userActivity.time') }}:
+            <span
+              v-if="item.type === 'auth-result'"
+              :title="item.data.authTime"
+            >
+              {{ item.data.authTime }}
+            </span>
+            <span v-if="item.type === 'detach'" :title="item.data.detachTime">
+              {{ item.data.detachTime }}
+            </span>
+            <span v-if="item.type === 'cm-state'" :title="item.data.changeTime">
+              {{ item.data.changeTime }}
+            </span>
+          </div>
        </div>

        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
@@ -95,20 +159,11 @@ onMounted(() => {
            TAC ID: <span>{{ item.data.tacID }}</span>
          </div>
        </div>
-        <div>
-          {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{ parseDateToStr(+item.data.timestamp * 1000) }}
-          </template>
-          <template v-else> - </template>
-        </div>
+
        <div v-if="item.type === 'auth-result'">
          {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
          <span>
-            <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
+            <DictTag :options="dict.ueAauthCode" :value="item.data.authCode" />
          </span>
        </div>
        <div v-if="item.type === 'detach'">
@@ -118,7 +173,7 @@ onMounted(() => {
        <div class="card-ue-w33" v-if="item.type === 'cm-state'">
          {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
          <span>
-            <DictTag :options="dict.ueEventCmState" :value="item.data.result" />
+            <DictTag :options="dict.ueEventCmState" :value="item.data.status" />
          </span>
        </div>
      </div>
@@ -143,9 +198,14 @@ onMounted(() => {
            </span>
          </div>
          <div>
-            IMSI: <span :title="item.data?.imsi">{{ item.data?.imsi }}</span>
+            IMSI: <span :title="item.data.imsi">{{ item.data.imsi }}</span>
+          </div>
+          <div>
+            {{ t('views.dashboard.overview.userActivity.time') }}:
+            <span :title="item.data.timestamp">
+              {{ parseDateToStr(+item.data.timestamp * 1000) }}
+            </span>
          </div>
-          <div></div>
        </div>

        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
@@ -159,20 +219,6 @@ onMounted(() => {
            TAC ID: <span>{{ item.data.tacID }}</span>
          </div>
        </div>
-        <div>
-          {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{
-              typeof item.data?.timestamp === 'number'
-                ? parseDateToStr(+item.data?.timestamp * 1000)
-                : parseDateToStr(item.data?.timestamp)
-            }}
-          </template>
-          <template v-else> - </template>
-        </div>
        <div v-if="item.type === 'auth-result'">
          {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
          <span>
--- a/practical_training/views/dashboard/overview/css/index.css
+++ b/practical_training/views/dashboard/overview/css/index.css
@@ -8,100 +8,24 @@
  display: flex;
  padding: 5rem 0.833rem 0;
  line-height: 1.15;
-  background-image:
-    linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.75)),
-    url(../images/bj.png);
+  background-color: #101129;
  height: 100vh;
  margin-bottom: -20px;
-  background-size:80% 80%;
-  background-attachment:fixed;
-  -webkit-background-size: cover;
 }
+
 .column {
  flex: 3;
  position: relative;
-  display: flex;
-  flex-direction: column;
 }

 /* 边框 */
 .panel {
  box-sizing: border-box;
-  border: 2px solid rgba(252, 252, 252, 0);
+  border: 2px solid red;
+  border-image: url(../images/border.png) 51 38 21 132;
  border-width: 2.125rem 1.583rem 0.875rem 5.5rem;
  position: relative;
  margin-bottom: 0.833rem;
-
-}
-/* 使用伪元素创建L形角框 */
-/* 添加L形角框边框效果 */
-.panel::before,
-.panel::after {
-  content: '';
-  position: absolute;
-  pointer-events: none;
-  z-index: 10;
-}
-
-/* 左上角L形 - 相对于inner的实际边界 */
-.panel::before {
-  top: -2.125rem;
-  left: -5.5rem;
-  width: 10px;
-  height: 10px;
-  border-top: 3px solid #4c9bfd;
-  border-left: 3px solid #4c9bfd;
-}
-
-/* 右下角L形 - 相对于inner的实际边界 */
-.panel::after {
-  bottom: -0.875rem;
-  right: -1.583rem;
-  width: 10px;
-  height: 10px;
-  border-bottom: 3px solid #4c9bfd;
-  border-right: 3px solid #4c9bfd;
-}
-
-/* 右上角L形 - 相对于inner的实际边界 */
-.panel .inner::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 10px;
-  height: 10px;
-  border-top: 3px solid #4c9bfd;
-  border-right: 3px solid #4c9bfd;
-  pointer-events: none;
-  z-index: 10;
-}
-
-/* 左下角L形 - 相对于inner的实际边界 */
-.panel .inner::after {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 10px;
-  height: 10px;
-  border-bottom: 3px solid #4c9bfd;
-  border-left: 3px solid #4c9bfd;
-  pointer-events: none;
-  z-index: 10;
-}
-
-/* 为base模块调整角框显示 */
-/* 第一个base模块：只显示上方角框（左上角和右上角） */
-.skim.panel.base:first-of-type::after,
-.skim.panel.base:first-of-type .inner::after {
-  display: none;
-}
-
-/* 第二个base模块：只显示下方角框（左下角和右下角） */
-.skim.panel.base:not(:first-of-type)::before,
-.skim.panel.base:not(:first-of-type) .inner::before {
-  display: none;
 }
 .panel .inner {
  /* 装内容 */
@@ -118,65 +42,9 @@
  color: #fff;
 }

-.leftright {
-  width: 100%;
-  min-height: 2.5rem;
-  /*background: url(../images/title.png) no-repeat center center;*/
-  background-size: 100%;
-  color: #4c9bfd;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-weight: bold;
-  padding: 0.5rem 1.2rem;
-  border-radius: 0.7rem 0.7rem 0 0;
-  margin: 0;
-  box-sizing: border-box;
-  text-shadow: 0 1px 4px #000a;
-  flex-wrap: nowrap;
-  /* 保证内容不换行且居中 */
-}
-
-.leftright .title {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  font-size: 1.2rem;
-  padding-left: 0;
-}
-
-.centerStyle {
-  width: 100%;
-  min-height: 2.5rem;
-  /*background: url(../images/title.png) no-repeat center center;*/
-  background-size: 90%;
-  color: #4c9bfd;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-weight: bold;
-  padding: 0.5rem 1.2rem;
-  border-radius: 0.7rem 0.7rem 0 0;
-  margin: 0;
-  box-sizing: border-box;
-  text-shadow: 0 1px 4px #000a;
-  flex-wrap: nowrap;
-  /* 保证内容不换行且居中 */
-}
-
-.centerStyle .title {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  font-size: 1.2rem;
-  padding-left: 0;
-}
-
 /* 总览标题 */
 .brand {
-  background-image: url(../images/newBrand.png);
+  background-image: url(../images/brand.png);
  background-repeat: no-repeat;
  background-size: cover;
  background-position: center center;
@@ -211,14 +79,13 @@
 .upfFlow .inner .chart {
  width: 100%;
  height: 100%;
-  margin-top: 0rem;
+  margin-top: 1rem;
 }

 /* 网络拓扑 */
 .topology {
  /* min-height: 27.8rem; */
-  height: 46.4%;
-  flex: 1;
+  height: 56.4%;
 }
 .topology .inner h3 {
  display: flex;
@@ -292,7 +159,7 @@

 /* 概览区域 衍生基站信息 */
 .skim.base {
-  height: 11.25%;
+  height: 12%;
 }

 .skim.base .inner .data {
@@ -312,7 +179,6 @@
 .userActivity {
  /* min-height: 35.8rem; */
  height: 54.6%;
-  flex: 1;
 }
 .userActivity .inner .chart {
  width: 100%;
@@ -320,65 +186,6 @@
  margin-top: 1rem;
 }

-/* 流量统计 */
-.upfFlowTotal1 {
-  /* min-height: 7.5rem; */
-  height: 14.4%;
-}
-.upfFlowTotal1 .inner h3 {
-  display: flex;
-  justify-content: space-between;
-}
-.upfFlowTotal1 .inner h3 .filter {
-  display: flex;
-}
-.upfFlowTotal1 .inner h3 .filter span {
-  display: block;
-  height: 0.75rem;
-  line-height: 1;
-  padding: 0 0.75rem;
-  color: #1950c4;
-  font-size: 0.75rem;
-  border-right: 0.083rem solid #00f2f1;
-  cursor: pointer;
-}
-.upfFlowTotal1 .inner h3 .filter span:first-child {
-  padding-left: 0;
-}
-.upfFlowTotal1 .inner h3 .filter span:last-child {
-  border-right: none;
-}
-.upfFlowTotal1 .inner h3 .filter span.active {
-  color: #fff;
-  font-size: 0.833rem;
-}
-.upfFlowTotal1 .inner .chart {
-  width: 100%;
-  height: 100%;
-  margin-top: 0.1rem;
-}
-.upfFlowTotal1 .inner .chart .data {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  height: 60%;
-}
-.upfFlowTotal1 .inner .chart .data .item {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-}
-.upfFlowTotal1 .inner .chart .data .item h4 {
-  font-size: 1.467rem;
-  color: #fff;
-  margin-bottom: 0;
-}
-.upfFlowTotal1 .inner .chart .data .item span {
-  color: #4c9bfd;
-  font-size: 0.867rem;
-}
-
-
 /* 流量统计 */
 .upfFlowTotal {
  /* min-height: 7.5rem; */
@@ -440,7 +247,7 @@
 /* 资源情况 */
 .resources {
  /* min-height: 18rem; */
-  height: 24.4%;
+  height: 34.4%;
 }
 .resources .inner .chart {
  width: 100%;
@@ -448,15 +255,15 @@
  margin-top: 1rem;
 }

-
 /* 告警统计 */
 .alarmType {
  /* min-height: 25rem; */
-  height: 35%;
+  height: 46%;
 }
 .alarmType .inner .chart {
  width: 100%;
  height: 100%;
+  margin-top: 1rem;
 }

 /* 跳转鼠标悬浮 */
--- a/practical_training/views/dashboard/overview/hooks/useTopology.ts
+++ b/practical_training/views/dashboard/overview/hooks/useTopology.ts
@@ -35,20 +35,16 @@ export const graphState = reactive<Record<string, any>>({
 export const graphG6 = ref<any>(null);

 /**图点击选择 */
-export const graphNodeClickID = ref<string>('UPF_001');
+export const graphNodeClickID = ref<string>('UPF');

 /**图节点网元信息状态 */
-export const graphNodeState = computed(() =>{
- return  graphState.data.nodes.map((item: any) => ({
+export const graphNodeState = computed(() =>
+  graphState.data.nodes.map((item: any) => ({
    id: item.id,
    label: item.label,
    neInfo: item.neInfo,
    neState: item.neState,
-    neInfoList:item.neInfoList,
-    neStateMap: item.neStateMap,
  }))
-}
-
 );

 /**图节点网元状态数量 */
@@ -72,69 +68,48 @@ export const graphNodeStateNum = computed(() => {
 export const neStateRequestMap = ref<Map<string, boolean>>(new Map());

 /**neStateParse 网元状态 数据解析 */
-export function neStateParse(neType: string, data: Record<string, any>,neId: string) {
- // console.log('neStateParse',neType, data, neId);
-
+export function neStateParse(neType: string, data: Record<string, any>) {
  const { combos, edges, nodes } = graphState.data;
-
  const node = nodes.find((item: Record<string, any>) => item.id === neType);
-  //console.log('neStateParse',node);
-
-  if (!node) return;
-
-    // 初始化状态映射
-    if (!node.neStateMap) node.neStateMap = {};

  // 更新网元状态
-  const newNeState :any = {
-    ...data,  // 先展开data对象
+  const newNeState = Object.assign(node.neState, data, {
    refreshTime: parseDateToStr(data.refreshTime, 'HH:mm:ss'),
    online: !!data.cpu,
-    neId: neId
-  };
-    // 如果是001，更新节点状态。neInfo为主要的网元信息
-    if (node.neInfo && node.neInfo.neId === neId) {
-      Object.assign(node.neState, newNeState);
-    }
+  });

-    //console.log(node.neState)
-    // 无论是否为主要网元，都更新状态映射
-    node.neStateMap[neId] = {...newNeState};
-      // 通过 ID 查询节点实例
+  // 通过 ID 查询节点实例
  const item = graphG6.value.findById(node.id);
  if (item) {
-    // 检查当前节点下所有网元的状态
-    const allStates = Object.values(node.neStateMap);
-    // 判断状态颜色
-    let stateColor = '#52c41a'; // 默认绿色（所有网元都正常）
-    if (allStates.some((state: any) => !state.online)) {
-      // 如果有任何一个网元不正常
-      stateColor = allStates.every((state: any) => !state.online) ? '#f5222d' : '#faad14'; // 红色（全部不正常）或黄色（部分不正常）
-    }
-
-      // 图片类型不能填充
-      if (node.type && node.type.startsWith('image')) {
-        // 更新节点
-        if (node.label !== newNeState.neType) {
-          graphG6.value.updateItem(item, {
-            label: newNeState.neType,
-          });
-        }
-        // 设置状态
-        graphG6.value.setItemState(item, 'top-right-dot', stateColor);
-      } else {
-        // 更新节点
+    const stateColor = newNeState.online ? '#52c41a' : '#f5222d'; // 状态颜色
+    // 图片类型不能填充
+    if (node.type.startsWith('image')) {
+      // 更新节点
+      if (node.label !== newNeState.neName) {
        graphG6.value.updateItem(item, {
-          label: newNeState.neType,
-          style: {
-            fill: stateColor, // 填充色
-            stroke: stateColor, // 填充色
-          },
+          label: newNeState.neName,
        });
-        // 设置状态
-        graphG6.value.setItemState(item, 'stroke', newNeState.online);
      }
-
+      // 设置状态
+      graphG6.value.setItemState(item, 'top-right-dot', stateColor);
+    } else {
+      // 更新节点
+      graphG6.value.updateItem(item, {
+        label: newNeState.neName,
+        // neState: newNeState,
+        style: {
+          fill: stateColor, // 填充色
+          stroke: stateColor, // 填充色
+        },
+        // labelCfg: {
+        //   style: {
+        //     fill: '#ffffff', // 标签文本色
+        //   },
+        // },
+      });
+      // 设置状态
+      graphG6.value.setItemState(item, 'stroke', newNeState.online);
+    }
  }

  // 设置边状态
@@ -192,6 +167,6 @@ export function topologyReset() {
    nodes: [],
  };
  graphG6.value = null;
-  graphNodeClickID.value = 'UPF_001';
+  graphNodeClickID.value = 'UPF';
  neStateRequestMap.value = new Map();
 }
--- a/practical_training/views/dashboard/overview/hooks/useUPFTotalFlow.ts
+++ b/practical_training/views/dashboard/overview/hooks/useUPFTotalFlow.ts
@@ -1,5 +1,5 @@
 import { parseDateToStr } from '@/utils/date-utils';
-import { parseSizeFromByte, parseSizeFromKbs } from '@/utils/parse-utils';
+import { parseSizeFromBits, parseSizeFromKbs } from '@/utils/parse-utils';
 import { ref } from 'vue';

 type FDType = {
@@ -23,7 +23,7 @@ export const upfFlowData = ref<FDType>({

 /**UPF-流量数据 数据解析 */
 export function upfFlowParse(data: Record<string, string>) {
-  upfFlowData.value.lineXTime.push(parseDateToStr(+data['timeGroup'], 'HH:mm:ss'));
+  upfFlowData.value.lineXTime.push(parseDateToStr(+data['timeGroup']));
  const upN3 = parseSizeFromKbs(+data['UPF.03'], 5);
  upfFlowData.value.lineYUp.push(upN3[0]);
  const downN6 = parseSizeFromKbs(+data['UPF.06'], 5);
@@ -36,6 +36,11 @@ export function upfFlowParse(data: Record<string, string>) {
    upfFlowData.value.lineYDown.shift();
    upfFlowData.value.cap -= 1;
  }
+  // UPF-总流量数0天 当天24小时
+  upfTFParse('0', {
+    up: upfTotalFlow.value['0'].up + +data['UPF.03'],
+    down: upfTotalFlow.value['0'].down + +data['UPF.06'],
+  });
 }

 type TFType = {
@@ -79,9 +84,9 @@ export function upfTFParse(day: string, data: Record<string, number>) {
  let { up, down } = data;
  upfTotalFlow.value[day] = {
    up: up,
-    upFrom: parseSizeFromByte(up),
+    upFrom: parseSizeFromBits(up),
    down: down,
-    downFrom: parseSizeFromByte(down),
+    downFrom: parseSizeFromBits(down),
    requestFlag: false,
  };
 }
--- a/practical_training/views/dashboard/overview/hooks/useUserActivity.ts
+++ b/practical_training/views/dashboard/overview/hooks/useUserActivity.ts
@@ -96,7 +96,11 @@ export function eventListParse(
      eventData.value.push(v);
    }
  }
-  // 激活选中
+
+  // 有数据进行排序
+  if (eventData.value.length > 5) {
+    eventData.value.sort((a, b) => b.eTime - a.eTime);
+  }
  if (eventData.value.length > 0) {
    eventId.value = eventData.value[0].eId;
  }
--- a/practical_training/views/dashboard/overview/hooks/useWS.ts
+++ b/practical_training/views/dashboard/overview/hooks/useWS.ts
@@ -1,8 +1,7 @@
 import { RESULT_CODE_ERROR } from '@/constants/result-constants';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
-import { onBeforeUnmount, ref } from 'vue';
+import { onBeforeUnmount, onMounted } from 'vue';
 import {
-  eventData,
  eventListParse,
  eventItemParseAndPush,
  userActivityReset,
@@ -13,12 +12,9 @@ import {
  upfFlowParse,
  upfTotalFlowReset,
 } from './useUPFTotalFlow';
-import { topologyReset, neStateParse, neStateRequestMap } from './useTopology';
+import { topologyReset, neStateParse } from './useTopology';
 import PQueue from 'p-queue';

-/**UPF-的Id */
-export const upfWhoId = ref<any>('');
-
 /**websocket连接 */
 export default function useWS() {
  const ws = new WS();
@@ -31,40 +27,38 @@ export default function useWS() {

  /**接收数据后回调 */
  function wsMessage(res: Record<string, any>) {
+    // console.log(res);
    const { code, requestId, data } = res;
    if (code === RESULT_CODE_ERROR) {
      console.warn(res.msg);
      return;
    }
+
    // 网元状态
    if (requestId && requestId.startsWith('neState')) {
      const neType = requestId.split('_')[1];
-      const neId = requestId.split('_')[2];
-      neStateParse(neType, data,neId);
+      neStateParse(neType, data);
      return;
    }

    // 普通信息
    switch (requestId) {
      // AMF_UE会话事件
-      case 'amf_1010_001':
+      case 'amf_1010':
        if (Array.isArray(data.rows)) {
          eventListParse('amf_ue', data);
-          eventData.value.sort((a, b) => b.eTime - a.eTime);
        }
        break;
      // MME_UE会话事件
      case 'mme_1011_001':
        if (Array.isArray(data.rows)) {
          eventListParse('mme_ue', data);
-          eventData.value.sort((a, b) => b.eTime - a.eTime);
        }
        break;
      // IMS_CDR会话事件
      case 'ims_1005_001':
        if (Array.isArray(data.rows)) {
          eventListParse('ims_cdr', data);
-          eventData.value.sort((a, b) => b.eTime - a.eTime);
        }
        break;
      //UPF-总流量数
@@ -78,19 +72,20 @@ export default function useWS() {
        upfTFParse('30', data);
        break;
    }
+
    // 订阅组信息
    if (!data?.groupId) {
      return;
    }
    switch (data.groupId) {
      // kpiEvent 指标UPF
-      case '10_UPF_' + upfWhoId.value:
+      case '12_001':
        if (data.data) {
          upfFlowParse(data.data);
        }
        break;
      // AMF_UE会话事件
-      case '1010_001':
+      case '1010':
        if (data.data) {
          queue.add(() => eventItemParseAndPush('amf_ue', data.data));
        }
@@ -133,7 +128,7 @@ export default function useWS() {
  function userActivitySend() {
    // AMF_UE会话事件
    ws.send({
-      requestId: 'amf_1010_001',
+      requestId: 'amf_1010',
      type: 'amf_ue',
      data: {
        neType: 'AMF',
@@ -173,28 +168,18 @@ export default function useWS() {
    });
  }

-  /**重新发送至UPF 10_UPF_neId */
-  function reSendUPF(neId: string) {
-    upfWhoId.value = neId;
-    //初始时时无需还原全部属性以及关闭
-    if (ws.state() === WebSocket.OPEN) {
-      ws.close();
-      // userActivityReset();
-      upfTotalFlowReset();
-      neStateRequestMap.value = new Map();
-      //topologyReset();
-    }
+  onMounted(() => {
    const options: OptionsType = {
      url: '/ws',
      params: {
        /**订阅通道组
         *
-         * 指标UPF (GroupID:10_neType_neId)
-         * AMF_UE会话事件(GroupID:1010_neId)
+         * 指标UPF (GroupID:12_neId)
+         * AMF_UE会话事件(GroupID:1010)
         * MME_UE会话事件(GroupID:1011_neId)
         * IMS_CDR会话事件(GroupID:1005_neId)
         */
-        subGroupID: '10_UPF_' + neId + ',1010_001,1011_001,1005_001',
+        subGroupID: '12_001,1010,1011_001,1005_001',
      },
      onmessage: wsMessage,
      onerror: (ev: any) => {
@@ -202,20 +187,18 @@ export default function useWS() {
      },
    };
    ws.connect(options);
-  }
+  });

  onBeforeUnmount(() => {
    ws.close();
    userActivityReset();
    upfTotalFlowReset();
    topologyReset();
-    upfWhoId.value = '';
  });

  return {
    wsSend,
    userActivitySend,
    upfTFSend,
-    reSendUPF,
  };
 }
--- a/practical_training/views/dashboard/overview/images/border.png
+++ b/practical_training/views/dashboard/overview/images/border.png
--- a/practical_training/views/dashboard/overview/images/brand.png
+++ b/practical_training/views/dashboard/overview/images/brand.png
--- a/practical_training/views/dashboard/overview/images/line.png
+++ b/practical_training/views/dashboard/overview/images/line.png
--- a/practical_training/views/dashboard/overview/images/rect.png
+++ b/practical_training/views/dashboard/overview/images/rect.png
--- a/practical_training/views/dashboard/overview/index.vue
+++ b/practical_training/views/dashboard/overview/index.vue
@@ -0,0 +1,493 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, reactive, ref } from 'vue';
+import svgBase from '@/assets/svg/base.svg';
+import svgUserIMS from '@/assets/svg/userIMS.svg';
+import svgUserSMF from '@/assets/svg/userSMF.svg';
+import useI18n from '@/hooks/useI18n';
+import Topology from './components/Topology/index.vue';
+import NeResources from './components/NeResources/index.vue';
+import UserActivity from './components/UserActivity/index.vue';
+import AlarnTypeBar from './components/AlarnTypeBar/index.vue';
+import UPFFlow from './components/UPFFlow/index.vue';
+import { listUDMSub } from '@/api/neData/udm_sub';
+import { listUENumBySMF } from '@/api/neUser/smf';
+import { listUENumByIMS } from '@/api/neUser/ims';
+import { listBase5G } from '@/api/neUser/base5G';
+import {
+  graphNodeClickID,
+  graphState,
+  notNeNodes,
+  graphNodeStateNum,
+  neStateRequestMap,
+} from './hooks/useTopology';
+import { upfTotalFlow, upfTFActive } from './hooks/useUPFTotalFlow';
+import { useFullscreen } from '@vueuse/core';
+import useWS from './hooks/useWS';
+import useAppStore from '@/store/modules/app';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { useRouter } from 'vue-router';
+import { hasRoles } from '@/plugins/auth-user';
+const router = useRouter();
+const appStore = useAppStore();
+const { t } = useI18n();
+const { wsSend, userActivitySend, upfTFSend } = useWS();
+
+/**概览状态类型 */
+type SkimStateType = {
+  /**UDM签约用户数量 */
+  udmSubNum: number;
+  /**SMF在线用户数 */
+  smfUeNum: number;
+  /**IMS在线用户数 */
+  imsUeNum: number;
+  /**5G基站数量 */
+  gnbNum: number;
+  /**5G在线用户数量 */
+  gnbUeNum: number;
+  /**4G基站数量 */
+  enbNum: number;
+  /**4G在线用户数量 */
+  enbUeNum: number;
+};
+
+/**概览状态信息 */
+let skimState: SkimStateType = reactive({
+  udmSubNum: 0,
+  smfUeNum: 0,
+  imsUeNum: 0,
+  gnbNum: 0,
+  gnbUeNum: 0,
+  enbNum: 0,
+  enbUeNum: 0,
+});
+
+/**总览节点 */
+const viewportDom = ref<HTMLElement | null>(null);
+const { isFullscreen, toggle } = useFullscreen(viewportDom);
+
+/**10s调度器 */
+const interval10s = ref<any>(null);
+
+/**5s调度器 */
+const interval5s = ref<any>(null);
+
+/**查询网元状态 */
+function fnGetNeState() {
+  // 获取节点状态
+  for (const node of graphState.data.nodes) {
+    if (notNeNodes.includes(node.id)) continue;
+    const { neType, neId } = node.neInfo;
+    if (!neType || !neId) continue;
+    // 请求标记检查避免重复发送
+    if (neStateRequestMap.value.get(neType)) continue;
+    neStateRequestMap.value.set(neType, true);
+
+    wsSend({
+      requestId: `neState_${neType}_${neId}`,
+      type: 'ne_state',
+      data: {
+        neType: neType,
+        neId: neId,
+      },
+    });
+  }
+}
+
+/**获取概览信息 */
+async function fnGetSkim() {
+  const resArr = await Promise.allSettled([
+    listUDMSub({
+      neid: '001',
+      pageNum: 1,
+      pageSize: 1,
+    }),
+    listUENumBySMF('001'),
+    listUENumByIMS('001'),
+    listBase5G({
+      neType: 'AMF',
+      neId: '001',
+    }),
+    listBase5G({
+      neType: 'MME',
+      neId: '001',
+    }),
+  ]);
+
+  if (resArr[0].status === 'fulfilled') {
+    const res0 = resArr[0].value;
+    if (res0.code === RESULT_CODE_SUCCESS) {
+      skimState.udmSubNum = res0.total;
+    }
+  }
+  if (resArr[1].status === 'fulfilled') {
+    const res1 = resArr[1].value;
+    if (res1.code === RESULT_CODE_SUCCESS) {
+      skimState.smfUeNum = res1.data;
+    }
+  }
+  if (resArr[2].status === 'fulfilled') {
+    const res2 = resArr[2].value;
+    if (res2.code === RESULT_CODE_SUCCESS) {
+      skimState.imsUeNum = res2.data;
+    }
+  }
+  if (resArr[3].status === 'fulfilled') {
+    const res3 = resArr[3].value;
+    if (res3.code === RESULT_CODE_SUCCESS) {
+      skimState.gnbNum = res3.total;
+      skimState.gnbUeNum = 0;
+      res3.rows.map((item: any) => {
+        skimState.gnbUeNum += item.ueNum;
+      });
+    }
+  }
+  if (resArr[4].status === 'fulfilled') {
+    const res4 = resArr[4].value;
+    if (res4.code === RESULT_CODE_SUCCESS) {
+      skimState.enbNum = res4.total;
+      skimState.enbUeNum = 0;
+      res4.rows.map((item: any) => {
+        skimState.enbUeNum += item.ueNum;
+      });
+    }
+  }
+}
+
+/**初始数据函数 */
+function loadData() {
+  fnGetNeState(); // 获取网元状态
+  userActivitySend();
+  upfTFSend('0');
+  upfTFSend('7');
+  upfTFSend('30');
+
+  clearInterval(interval10s.value);
+  interval10s.value = setInterval(() => {
+    if (!interval10s.value) return
+    if (upfTFActive.value === '0') {
+      upfTFSend('7');
+      upfTFActive.value = '7';
+    } else if (upfTFActive.value === '7') {
+      upfTFSend('30');
+      upfTFActive.value = '30';
+    } else if (upfTFActive.value === '30') {
+      upfTFSend('0');
+      upfTFActive.value = '0';
+    }
+  }, 10_000);
+
+  clearInterval(interval5s.value);
+  interval5s.value = setInterval(() => {
+    if (!interval5s.value) return
+    fnGetSkim(); // 获取概览信息
+    fnGetNeState(); // 获取网元状态
+  }, 5_000);
+}
+
+/**栏目信息跳转 */
+function fnToRouter(name: string, query?: any) {
+  if (hasRoles(['student'])) return;
+  router.push({ name, query });
+}
+
+onMounted(() => {
+  fnGetSkim().then(() => {
+    loadData();
+  });
+});
+
+onBeforeUnmount(() => {
+  clearInterval(interval10s.value);
+  interval10s.value = null;
+  clearInterval(interval5s.value);
+  interval5s.value = null;
+});
+</script>
+
+<template>
+  <div class="viewport" ref="viewportDom">
+    <div class="brand">
+      <div
+        class="brand-title"
+        @click="toggle"
+        :title="t('views.dashboard.overview.fullscreen')"
+      >
+        {{ t('views.dashboard.overview.title') }}
+        <FullscreenExitOutlined v-if="isFullscreen" />
+        <FullscreenOutlined v-else />
+      </div>
+      <div class="brand-desc">{{ appStore.appName }}</div>
+    </div>
+
+    <div class="column">
+      <!--概览-->
+      <div class="skim panel">
+        <div class="inner">
+          <h3>
+            <IdcardOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            {{ t('views.dashboard.overview.skim.userTitle') }}
+          </h3>
+          <div class="data">
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Sub_2010')"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div>
+                <UserOutlined
+                  style="color: #4096ff; margin-right: 8px; font-size: 1.1rem"
+                />
+                {{ skimState.udmSubNum }}
+              </div>
+              <span>
+                {{ t('views.dashboard.overview.skim.users') }}
+              </span>
+            </div>
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Ims_2080')"
+              :title="t('views.dashboard.overview.toRouter')"
+              style="margin: 0 12px"
+            >
+              <div>
+                <img :src="svgUserIMS" style="width: 18px; margin-right: 8px" />
+                {{ skimState.imsUeNum }}
+              </div>
+              <span>
+                {{ t('views.dashboard.overview.skim.imsUeNum') }}
+              </span>
+            </div>
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Ue_2081')"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div>
+                <img :src="svgUserSMF" style="width: 18px; margin-right: 8px" />
+                {{ skimState.smfUeNum }}
+              </div>
+              <span>
+                {{ t('views.dashboard.overview.skim.smfUeNum') }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="skim panel base">
+        <div class="inner">
+          <h3>
+            <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 5G
+            {{ t('views.dashboard.overview.skim.baseTitle') }}
+          </h3>
+          <div class="data">
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Base5G_2082', { neType: 'AMF' })"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div style="align-items: flex-start">
+                <img
+                  :src="svgBase"
+                  style="width: 18px; margin-right: 8px; height: 2rem"
+                />
+                {{ skimState.gnbNum }}
+              </div>
+              <span>{{ t('views.dashboard.overview.skim.gnbBase') }}</span>
+            </div>
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Base5G_2082', { neType: 'AMF' })"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div style="align-items: flex-start">
+                <UserOutlined
+                  style="color: #4096ff; margin-right: 8px; font-size: 1.1rem"
+                />
+                {{ skimState.gnbUeNum }}
+              </div>
+              <span>{{ t('views.dashboard.overview.skim.gnbUeNum') }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="skim panel base">
+        <div class="inner">
+          <h3>
+            <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 4G
+            {{ t('views.dashboard.overview.skim.baseTitle') }}
+          </h3>
+          <div class="data">
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Base5G_2082', { neType: 'MME' })"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div style="align-items: flex-start">
+                <img
+                  :src="svgBase"
+                  style="width: 18px; margin-right: 8px; height: 2rem"
+                />
+                {{ skimState.enbNum }}
+              </div>
+              <span>{{ t('views.dashboard.overview.skim.enbBase') }}</span>
+            </div>
+            <div
+              class="item toRouter"
+              @click="fnToRouter('Base5G_2082', { neType: 'MME' })"
+              :title="t('views.dashboard.overview.toRouter')"
+            >
+              <div style="align-items: flex-start">
+                <UserOutlined
+                  style="color: #4096ff; margin-right: 8px; font-size: 1.1rem"
+                />
+                {{ skimState.enbUeNum }}
+              </div>
+              <span>{{ t('views.dashboard.overview.skim.enbUeNum') }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 用户行为 -->
+      <div class="userActivity panel">
+        <div class="inner">
+          <h3>
+            <WhatsAppOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            {{ t('views.dashboard.overview.userActivity.title') }}
+          </h3>
+          <div class="chart">
+            <UserActivity />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="column" style="flex: 4; margin: 1.333rem 0.833rem 0">
+      <!-- 实时流量 -->
+      <div class="upfFlow panel">
+        <div class="inner">
+          <h3
+            class="toRouter"
+            @click="fnToRouter('GoldTarget_2104')"
+            :title="t('views.dashboard.overview.toRouter')"
+          >
+            <AreaChartOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            {{ t('views.dashboard.overview.upfFlow.title') }}
+          </h3>
+          <div class="chart">
+            <UPFFlow />
+          </div>
+        </div>
+      </div>
+      <!-- 网络拓扑 -->
+      <div class="topology panel">
+        <div class="inner">
+          <h3
+            class="toRouter"
+            @click="fnToRouter('TopologyArchitecture_2128')"
+            :title="t('views.dashboard.overview.toRouter')"
+          >
+            <span>
+              <ApartmentOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+              {{ t('views.dashboard.overview.topology.title') }}
+            </span>
+            <span>
+              {{ t('views.dashboard.overview.topology.normal') }}:
+              <span class="normal"> {{ graphNodeStateNum[0] }} </span>
+              {{ t('views.dashboard.overview.topology.abnormal') }}:
+              <span class="abnormal"> {{ graphNodeStateNum[1] }} </span>
+            </span>
+          </h3>
+          <div class="chart">
+            <Topology />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="column">
+      <!-- 流量统计 -->
+      <div class="upfFlowTotal panel">
+        <div class="inner">
+          <h3>
+            <span>
+              <SwapOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+              {{ t('views.dashboard.overview.upfFlowTotal.title') }}
+            </span>
+
+            <!-- 筛选 -->
+            <div class="filter">
+              <span
+                :data-key="v"
+                :class="{ active: upfTFActive === v }"
+                v-for="v in ['0', '7', '30']"
+                :key="v"
+                @click="
+                  () => {
+                    upfTFActive = v;
+                  }
+                "
+              >
+                {{
+                  v === '0'
+                    ? '24' + t('common.units.hour')
+                    : v + t('common.units.day')
+                }}
+              </span>
+            </div>
+          </h3>
+          <div class="chart">
+            <!-- 数据 -->
+            <div class="data">
+              <div class="item">
+                <span>
+                  <ArrowUpOutlined style="color: #597ef7" />
+                  {{ t('views.dashboard.overview.upfFlowTotal.up') }}
+                </span>
+                <h4>{{ upfTotalFlow[upfTFActive].up }}</h4>
+              </div>
+              <div class="item">
+                <span>
+                  <ArrowDownOutlined style="color: #52c41a" />
+                  {{ t('views.dashboard.overview.upfFlowTotal.down') }}
+                </span>
+                <h4>{{ upfTotalFlow[upfTFActive].down }}</h4>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 告警统计 -->
+      <div class="alarmType panel">
+        <div class="inner">
+          <h3
+            class="toRouter"
+            @click="fnToRouter('HistoryAlarm_2097')"
+            :title="t('views.dashboard.overview.toRouter')"
+          >
+            <PieChartOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            {{ t('views.dashboard.overview.alarmTypeBar.alarmSum') }}
+          </h3>
+          <div class="chart">
+            <AlarnTypeBar />
+          </div>
+        </div>
+      </div>
+      <!-- 资源情况 -->
+      <div class="resources panel">
+        <div class="inner">
+          <h3>
+            <DashboardOutlined style="color: #68d8fe" />&nbsp;&nbsp;
+            {{ t('views.dashboard.overview.resources.title') }}：
+            {{ graphNodeClickID }}
+          </h3>
+          <div class="chart">
+            <NeResources />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="less" scoped>
+@import url('./css/index.css');
+</style>
--- a/practical_training/views/dashboard/smfCDR/index.vue
+++ b/practical_training/views/dashboard/smfCDR/index.vue
@@ -5,6 +5,7 @@ import { Modal, message } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
+import useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
 import {
  RESULT_CODE_ERROR,
@@ -18,11 +19,14 @@ import {
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';
-import { parseDateToStr } from '@/utils/date-utils';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });

+/**网元可选 */
+let neOtions = ref<Record<string, any>[]>([]);
+
 /**开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);

@@ -84,14 +88,14 @@ let tableState: TabeStateType = reactive({

 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'center',
-  //   width: 100,
-  // },
  {
-    title: t('views.dashboard.cdr.chargingID'), // 计费ID
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'center',
+    width: 100,
+  },
+  {
+    title: t('views.dashboard.cdr.smfChargingID'), // 计费ID
    dataIndex: 'cdrJSON',
    align: 'left',
    width: 100,
@@ -184,7 +188,7 @@ let tableColumns: ColumnsType = [
    },
  },
  {
-    title: t('views.dashboard.cdr.durationTime'), // 持续时间
+    title: t('views.dashboard.cdr.smfDuration'), // 持续时间
    dataIndex: 'cdrJSON',
    align: 'left',
    width: 100,
@@ -194,15 +198,20 @@ let tableColumns: ColumnsType = [
    },
  },
  {
-    title: t('views.dashboard.cdr.invocationTime'), // 调用时间
+    title: t('views.dashboard.cdr.smfInvocationTime'), // 调用时间
    dataIndex: 'cdrJSON',
    align: 'left',
    width: 200,
    customRender(opt) {
      const cdrJSON = opt.value;
-      return parseDateToStr(cdrJSON.invocationTimestamp);
+      return cdrJSON.invocationTimestamp;
    },
  },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
 ];

 /**表格分页器参数 */
@@ -238,7 +247,10 @@ function fnTableSize({ key }: MenuInfo) {
  tableState.size = key as SizeType;
 }

-
+/**表格多选 */
+function fnTableSelectedRowKeys(keys: (string | number)[]) {
+  tableState.selectedRowKeys = keys;
+}

 /**对话框对象信息状态类型 */
 type ModalStateType = {
@@ -343,16 +355,14 @@ function fnGetList(pageNum?: number) {

 /**列表导出 */
 function fnExportList() {
-  if (modalState.confirmLoading || tablePagination.total === 0) return;
+  if (modalState.confirmLoading) return;
  Modal.confirm({
    title: t('common.tipTitle'),
    content: t('views.dashboard.cdr.exportTip'),
    onOk() {
-      modalState.confirmLoading = true;
      const hide = message.loading(t('common.loading'), 0);
      const querys = toRaw(queryParams);
-      querys.pageNum = 1;
-      querys.pageSize = tablePagination.total;
+      querys.pageSize = 10000;
      exportSMFDataCDR(querys)
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
@@ -385,6 +395,7 @@ const realTimeData = ref<boolean>(false);
 function fnRealTime() {
  realTimeData.value = !realTimeData.value;
  if (realTimeData.value) {
+    tableState.seached = false;
    // 建立链接
    const options: OptionsType = {
      url: '/ws',
@@ -393,7 +404,7 @@ function fnRealTime() {
         *
         * CDR会话事件-SMF (GroupID:1006)
         */
-        subGroupID: '1006',
+        subGroupID: `1006_${queryParams.neId}`,
      },
      onmessage: wsMessage,
      onerror: wsError,
@@ -401,6 +412,8 @@ function fnRealTime() {
    ws.connect(options);
  } else {
    ws.close();
+    tableState.seached = true;
+    fnGetList(1);
  }
 }

@@ -423,7 +436,7 @@ function wsMessage(res: Record<string, any>) {
    return;
  }
  // cdrEvent CDR会话事件
-  if (data.groupId === '1006') {
+  if (data.groupId === `1006_${queryParams.neId}`) {
    const cdrEvent = data.data;
    queue.add(async () => {
      modalState.maxId += 1;
@@ -445,8 +458,34 @@ function wsMessage(res: Record<string, any>) {
 }

 onMounted(() => {
-  // 获取列表数据
-  fnGetList();
+  // 获取网元网元列表
+  useNeInfoStore()
+    .fnNelist()
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.data.length > 0) {
+          let arr: Record<string, any>[] = [];
+          res.data.forEach(i => {
+            if (i.neType === 'SMF') {
+              arr.push({ value: i.neId, label: i.neName });
+            }
+          });
+          neOtions.value = arr;
+          if (arr.length > 0) {
+            queryParams.neId = arr[0].value;
+          }
+        }
+      } else {
+        message.warning({
+          content: t('common.noData'),
+          duration: 2,
+        });
+      }
+    })
+    .finally(() => {
+      // 获取列表数据
+      fnGetList();
+    });
 });

 onBeforeUnmount(() => {
@@ -466,10 +505,19 @@ onBeforeUnmount(() => {
      <!-- 表格搜索栏 -->
      <a-form :model="queryParams" name="queryParams" layout="horizontal">
        <a-row :gutter="16">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item label="SMF" name="neId ">
+              <a-select
+                v-model:value="queryParams.neId"
+                :options="neOtions"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
+          </a-col>
          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.smfSubscriptionIDData')"
-              name="calledParty "
+              name="subscriberID"
            >
              <a-input
                v-model:value="queryParams.subscriberID"
@@ -517,6 +565,39 @@ onBeforeUnmount(() => {
      <!-- 插槽-卡片左侧侧 -->
      <template #title>
        <a-space :size="8" align="center">
+          <a-popconfirm
+            placement="bottomLeft"
+            :title="
+              !realTimeData
+                ? t('views.dashboard.cdr.realTimeDataStart')
+                : t('views.dashboard.cdr.realTimeDataStop')
+            "
+            ok-text="Yes"
+            cancel-text="No"
+            @confirm="fnRealTime()"
+          >
+            <a-button type="primary" :danger="realTimeData">
+              <template #icon><FundOutlined /> </template>
+              {{
+                !realTimeData
+                  ? t('views.dashboard.cdr.realTimeDataStart')
+                  : t('views.dashboard.cdr.realTimeDataStop')
+              }}
+            </a-button>
+          </a-popconfirm>
+
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+            v-if="!hasRoles(['student'])"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('common.deleteText') }}
+          </a-button>
+
          <a-button type="dashed" @click.prevent="fnExportList()">
            <template #icon><ExportOutlined /></template>
            {{ t('common.export') }}
@@ -534,6 +615,7 @@ onBeforeUnmount(() => {
              :checked-children="t('common.switch.show')"
              :un-checked-children="t('common.switch.hide')"
              size="small"
+              :disabled="realTimeData"
            />
          </a-tooltip>
          <a-tooltip>
@@ -573,13 +655,36 @@ onBeforeUnmount(() => {
      <a-table
        class="table"
        row-key="id"
-        :columns="tableColumns"
+        :columns="hasRoles(['student']) ? tableColumns.filter((s:any)=>s.key !== 'id'): tableColumns"
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
        :pagination="tablePagination"
        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
+        :row-selection="{
+          type: 'checkbox',
+          columnWidth: '48px',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'id'">
+            <a-space :size="8" align="center">
+              <a-tooltip>
+                <template #title>{{ t('common.deleteText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordDelete(record.id)"
+                >
+                  <template #icon>
+                    <DeleteOutlined />
+                  </template>
+                </a-button>
+              </a-tooltip>
+            </a-space>
+          </template>
+        </template>
        <template #expandedRowRender="{ record }">
          <a-row :gutter="16">
            <a-col :lg="8" :md="12" :xs="24" :offset="2">
@@ -596,7 +701,7 @@ onBeforeUnmount(() => {
              </div>
              <div>
                <span>{{ t('views.dashboard.cdr.time') }}: </span>
-                <span>{{ parseDateToStr(record.cdrJSON.invocationTimestamp) }}</span>
+                <span>{{ record.cdrJSON.invocationTimestamp }}</span>
              </div>
              <a-divider orientation="left">
                {{ t('views.dashboard.cdr.rowInfo') }}
@@ -640,7 +745,7 @@ onBeforeUnmount(() => {
                List Of Multiple Unit Usage
              </a-divider>
              <div v-for="u in record.cdrJSON.listOfMultipleUnitUsage">
-                <!-- <div>RatingGroup: {{ u.ratingGroup }}</div> -->
+                <div>RatingGroup: {{ u.ratingGroup }}</div>
                <div v-for="udata in u.usedUnitContainer">
                  <div>
                    <span>Data Total Volume: </span>
@@ -711,10 +816,12 @@ onBeforeUnmount(() => {
              </div>
              <div>
                <span>Network Function IPv4: </span>
-                <span>{{
-                  record.cdrJSON.nFunctionConsumerInformation
-                    .networkFunctionIPv4Address
-                }}</span>
+                <span>
+                  {{
+                    record.cdrJSON.nFunctionConsumerInformation
+                      ?.networkFunctionIPv4Address
+                  }}
+                </span>
              </div>
            </a-col>
          </a-row>
--- a/practical_training/views/dashboard/smscCDR/index.vue
+++ b/practical_training/views/dashboard/smscCDR/index.vue
@@ -5,21 +5,36 @@ import { message, Modal } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
+import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import {
  RESULT_CODE_ERROR,
  RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
-import { exportSMSCDataCDR, listSMSCDataCDR } from '@/api/neData/smsc';
+import {
+  delSMSCDataCDR,
+  exportSMSCDataCDR,
+  listSMSCDataCDR,
+} from '@/api/neData/smsc';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
+import { hasRoles } from '@/plugins/auth-user';
+const { getDict } = useDictStore();
 const { t } = useI18n();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });

+/**字典数据 */
+let dict: {
+  /**CDR 响应原因代码类别类型 */
+  cdrCauseCode: DictType[];
+} = reactive({
+  cdrCauseCode: [],
+});
+
 /**网元可选 */
 let neOtions = ref<Record<string, any>[]>([]);

@@ -37,9 +52,9 @@ let queryParams = reactive({
  sortField: 'timestamp',
  sortOrder: 'desc',
  /**开始时间 */
-  startTime: 0,
+  startTime: '',
  /**结束时间 */
-  endTime: 0,
+  endTime: '',
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -53,8 +68,8 @@ function fnQueryReset() {
    recordType: '',
    callerParty: '',
    calledParty: '',
-    startTime: 0,
-    endTime: 0,
+    startTime: '',
+    endTime: '',
    pageNum: 1,
    pageSize: 20,
  });
@@ -99,12 +114,12 @@ let tableState: TabeStateType = reactive({

 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  // {
-  //   title: t('common.rowId'),
-  //   dataIndex: 'id',
-  //   align: 'left',
-  //   width: 100,
-  // },
+  {
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'left',
+    width: 100,
+  },
  {
    title: t('views.dashboard.cdr.recordType'),
    dataIndex: 'cdrJSON',
@@ -153,27 +168,26 @@ let tableColumns: ColumnsType = [
    dataIndex: 'cdrJSON',
    key: 'cause',
    align: 'left',
-    width: 120,
-    customRender(opt) {
-      const cdrJSON = opt.value;
-      return +cdrJSON.result
-        ? t('views.dashboard.cdr.resultOk')
-        : t('views.dashboard.cdr.resultFail');
-    },
+    width: 200,
  },
  {
    title: t('views.dashboard.cdr.time'),
    dataIndex: 'cdrJSON',
-    align: 'center',
+    align: 'left',
    width: 150,
    customRender(opt) {
      const cdrJSON = opt.value;
      if (typeof cdrJSON.updateTime === 'number') {
        return parseDateToStr(+cdrJSON.updateTime * 1000);
      }
-      return parseDateToStr(cdrJSON.updateTime);
+      return cdrJSON.updateTime;
    },
  },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
 ];

 /**表格分页器参数 */
@@ -209,6 +223,11 @@ function fnTableSize({ key }: MenuInfo) {
  tableState.size = key as SizeType;
 }

+/**表格多选 */
+function fnTableSelectedRowKeys(keys: (string | number)[]) {
+  tableState.selectedRowKeys = keys;
+}
+
 /**对话框对象信息状态类型 */
 type ModalStateType = {
  /**确定按钮 loading */
@@ -223,6 +242,47 @@ let modalState: ModalStateType = reactive({
  maxId: 0,
 });

+/**
+ * 记录删除
+ * @param id  编号
+ */
+function fnRecordDelete(id: string) {
+  if (!id || modalState.confirmLoading) return;
+  let msg = id;
+  if (id === '0') {
+    msg = `${id}...  ${tableState.selectedRowKeys.length}`;
+    id = tableState.selectedRowKeys.join(',');
+  }
+
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.dashboard.cdr.delTip', { msg }),
+    onOk() {
+      modalState.confirmLoading = true;
+      const hide = message.loading(t('common.loading'), 0);
+      delSMSCDataCDR(id)
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('common.operateOk'),
+              duration: 3,
+            });
+            fnGetList(1);
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 3,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    },
+  });
+}
+
 /**查询列表, pageNum初始页数 */
 function fnGetList(pageNum?: number) {
  if (tableState.loading) return;
@@ -233,8 +293,8 @@ function fnGetList(pageNum?: number) {
  if (!queryRangePicker.value) {
    queryRangePicker.value = ['', ''];
  }
-  queryParams.startTime = Number(queryRangePicker.value[0]);
-  queryParams.endTime = Number(queryRangePicker.value[1]);
+  queryParams.startTime = queryRangePicker.value[0];
+  queryParams.endTime = queryRangePicker.value[1];
  listSMSCDataCDR(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
      // 取消勾选
@@ -271,16 +331,14 @@ function fnGetList(pageNum?: number) {

 /**列表导出 */
 function fnExportList() {
-  if (modalState.confirmLoading || tablePagination.total === 0) return;
+  if (modalState.confirmLoading) return;
  Modal.confirm({
    title: t('common.tipTitle'),
    content: t('views.dashboard.cdr.exportTip'),
    onOk() {
-      modalState.confirmLoading = true;
      const hide = message.loading(t('common.loading'), 0);
      const querys = toRaw(queryParams);
-      querys.pageNum = 1;
-      querys.pageSize = tablePagination.total;
+      querys.pageSize = 10000;
      exportSMSCDataCDR(querys)
        .then(res => {
          if (res.code === RESULT_CODE_SUCCESS) {
@@ -376,6 +434,12 @@ function wsMessage(res: Record<string, any>) {
 }

 onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('cdr_cause_code')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.cdrCauseCode = resArr[0].value;
+    }
+  });
  // 获取网元网元列表
  useNeInfoStore()
    .fnNelist()
@@ -423,7 +487,16 @@ onBeforeUnmount(() => {
      <!-- 表格搜索栏 -->
      <a-form :model="queryParams" name="queryParams" layout="horizontal">
        <a-row :gutter="16">
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item label="SMSC" name="neId ">
+              <a-select
+                v-model:value="queryParams.neId"
+                :options="neOtions"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.called')"
              name="calledParty"
@@ -435,7 +508,7 @@ onBeforeUnmount(() => {
              ></a-input>
            </a-form-item>
          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.caller')"
              name="callerParty "
@@ -447,6 +520,20 @@ onBeforeUnmount(() => {
              ></a-input>
            </a-form-item>
          </a-col>
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item>
+              <a-space :size="8">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
+                  <template #icon><SearchOutlined /></template>
+                  {{ t('common.search') }}
+                </a-button>
+                <a-button type="default" @click.prevent="fnQueryReset">
+                  <template #icon><ClearOutlined /></template>
+                  {{ t('common.reset') }}
+                </a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
          <a-col :lg="8" :md="12" :xs="24">
            <a-form-item
              :label="t('views.dashboard.cdr.recordType')"
@@ -477,20 +564,6 @@ onBeforeUnmount(() => {
              ></a-range-picker>
            </a-form-item>
          </a-col>
-          <a-col :lg="4" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
        </a-row>
      </a-form>
    </a-card>
@@ -499,6 +572,38 @@ onBeforeUnmount(() => {
      <!-- 插槽-卡片左侧侧 -->
      <template #title>
        <a-space :size="8" align="center">
+          <a-popconfirm
+            placement="bottomLeft"
+            :title="
+              !realTimeData
+                ? t('views.dashboard.cdr.realTimeDataStart')
+                : t('views.dashboard.cdr.realTimeDataStop')
+            "
+            ok-text="Yes"
+            cancel-text="No"
+            @confirm="fnRealTime()"
+          >
+            <a-button type="primary" :danger="realTimeData">
+              <template #icon><FundOutlined /> </template>
+              {{
+                !realTimeData
+                  ? t('views.dashboard.cdr.realTimeDataStart')
+                  : t('views.dashboard.cdr.realTimeDataStop')
+              }}
+            </a-button>
+          </a-popconfirm>
+
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('common.deleteText') }}
+          </a-button>
+
          <a-button type="dashed" @click.prevent="fnExportList()">
            <template #icon><ExportOutlined /></template>
            {{ t('common.export') }}
@@ -556,13 +661,49 @@ onBeforeUnmount(() => {
      <a-table
        class="table"
        row-key="id"
-        :columns="tableColumns"
+        :columns="hasRoles(['student']) ? tableColumns.filter((s:any)=>s.key !== 'id'): tableColumns"
        :loading="tableState.loading"
        :data-source="tableState.data"
        :size="tableState.size"
        :pagination="tablePagination"
        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
+        :row-selection="{
+          type: 'checkbox',
+          columnWidth: '48px',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'cause'">
+            <span v-if="record.cdrJSON.result === 0">
+              {{ t('views.dashboard.cdr.resultFail') }},
+              <DictTag
+                :options="dict.cdrCauseCode"
+                :value="record.cdrJSON.cause"
+                value-default="0"
+              />
+            </span>
+            <span v-else>
+              {{ t('views.dashboard.cdr.resultOk') }}
+            </span>
+          </template>
+          <template v-if="column.key === 'id'">
+            <a-space :size="8" align="center">
+              <a-tooltip>
+                <template #title>{{ t('common.deleteText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordDelete(record.id)"
+                >
+                  <template #icon>
+                    <DeleteOutlined />
+                  </template>
+                </a-button>
+              </a-tooltip>
+            </a-space>
+          </template>
+        </template>
        <template #expandedRowRender="{ record }">
          <div style="width: 46%; padding-left: 32px; padding-bottom: 16px">
            <a-divider orientation="left">
@@ -582,7 +723,7 @@ onBeforeUnmount(() => {
                {{
                  typeof record.cdrJSON.updateTime === 'number'
                    ? parseDateToStr(+record.cdrJSON.updateTime * 1000)
-                    : parseDateToStr(record.cdrJSON.updateTime)
+                    : record.cdrJSON.updateTime
                }}
              </span>
            </div>
@@ -603,12 +744,16 @@ onBeforeUnmount(() => {
            </div>
            <div>
              <span>{{ t('views.dashboard.cdr.result') }}: </span>
-              <span>
-                {{
-                  +record.cdrJSON.result
-                    ? t('views.dashboard.cdr.resultOk')
-                    : t('views.dashboard.cdr.resultFail')
-                }}
+              <span v-if="record.cdrJSON.result === 0">
+                {{ t('views.dashboard.cdr.resultFail') }},
+                <DictTag
+                  :options="dict.cdrCauseCode"
+                  :value="record.cdrJSON.cause"
+                  value-default="0"
+                />
+              </span>
+              <span v-else>
+                {{ t('views.dashboard.cdr.resultOk') }}
              </span>
            </div>
          </div>
--- a/practical_training/views/monitor/topologyArchitecture/index.vue
+++ b/practical_training/views/monitor/topologyArchitecture/index.vue
@@ -0,0 +1,554 @@
+<script setup lang="ts">
+import { reactive, onMounted, ref, onBeforeUnmount } from 'vue';
+import { PageContainer } from 'antdv-pro-layout';
+import {
+  RESULT_CODE_ERROR,
+  RESULT_CODE_SUCCESS,
+} from '@/constants/result-constants';
+import { listAllNeInfo } from '@/api/ne/neInfo';
+import { message } from 'ant-design-vue/es';
+import { getGraphData } from '@/api/monitor/topology';
+import { parseDateToStr } from '@/utils/date-utils';
+import { Graph, GraphData, Menu, Tooltip } from '@antv/g6';
+import {
+  edgeCubicAnimateCircleMove,
+  edgeCubicAnimateLineDash,
+  edgeLineAnimateState,
+} from '../topologyBuild/hooks/registerEdge';
+import {
+  nodeCircleAnimateShapeR,
+  nodeCircleAnimateShapeStroke,
+  nodeImageAnimateState,
+  nodeRectAnimateState,
+} from '../topologyBuild/hooks/registerNode';
+import useNeOptions from '@/views/ne/neInfo/hooks/useNeOptions';
+import useI18n from '@/hooks/useI18n';
+import { OptionsType, WS } from '@/plugins/ws-websocket';
+import { hasRoles } from '@/plugins/auth-user';
+import { parseBasePath } from '@/plugins/file-static-url';
+const { t } = useI18n();
+const { fnNeRestart, fnNeStop, fnNeLogFile } = useNeOptions();
+const ws = new WS();
+
+/**图DOM节点实例对象 */
+const graphG6Dom = ref<HTMLElement | undefined>(undefined);
+
+/**图状态 */
+const graphState = reactive<Record<string, any>>({
+  /**当前图组名 */
+  group: '5GC System Architecture',
+  /**图数据 */
+  data: {
+    combos: [],
+    edges: [],
+    nodes: [],
+  },
+});
+
+/**非网元元素 */
+const notNeNodes = [
+  '5GC',
+  'DN',
+  'UE',
+  'Base',
+  'lan',
+  'lan1',
+  'lan2',
+  'lan3',
+  'lan4',
+  'lan5',
+  'lan6',
+  'lan7',
+  'LAN',
+  'NR',
+];
+
+/**图实例对象 */
+const graphG6 = ref<any>(null);
+
+/**图节点右击菜单 */
+const graphNodeMenu = new Menu({
+  offsetX: 6,
+  offseY: 10,
+  itemTypes: ['node'],
+  getContent(evt) {
+    if (!evt) return t('views.monitor.topologyBuild.graphNotInfo');
+    const { id, label, neState }: any = evt.item?.getModel();
+    if (notNeNodes.includes(id)) {
+      return `<div><span>${label || id}</span></div>`;
+    }
+    if (!neState) {
+      return `<div><span>${label || id}</span></div>`;
+    }
+    if (hasRoles(['student'])) {
+      return 'Student';
+    }
+    return `
+    <div
+      style="
+        display: flex;
+        flex-direction: column;
+        width: 140px;
+      "
+    >
+      <h3 style="margin-bottom: 8px">
+      ${t('views.monitor.topology.name')}:
+      ${neState.neName ?? '--'}
+      </h3>
+      <div id="restart" style="cursor: pointer; margin-bottom: 4px">
+        > ${t('views.ne.common.restart')}
+      </div>
+      <div id="stop" style="cursor: pointer; margin-bottom: 4px;">
+        > ${t('views.ne.common.stop')}
+      </div>
+      <div id="log" style="cursor: pointer; margin-bottom: 4px;">
+        > ${t('views.ne.common.log')}
+      </div>
+    </div>
+    `;
+  },
+  handleMenuClick(target, item) {
+    const { neInfo }: any = item?.getModel();
+    const { neName, neType, neId } = neInfo;
+    const targetId = target.id;
+    switch (targetId) {
+      case 'restart':
+        fnNeRestart({ neName, neType, neId });
+        break;
+      case 'stop':
+        fnNeStop({ neName, neType, neId });
+        break;
+      case 'log':
+        fnNeLogFile({ neType, neId });
+        break;
+    }
+  },
+});
+
+/**图节点展示 */
+const graphNodeTooltip = new Tooltip({
+  offsetX: 10,
+  offsetY: 20,
+  getContent(evt) {
+    if (!evt) return t('views.monitor.topologyBuild.graphNotInfo');
+    const { id, label, neState }: any = evt.item?.getModel();
+    if (notNeNodes.includes(id)) {
+      return `<div><span>${label || id}</span></div>`;
+    }
+    if (!neState) {
+      return `<div><span>${label || id}</span></div>`;
+    }
+    let notStudentInfo = '';
+    if (hasRoles(['teacher', 'admin'])) {
+      notStudentInfo = `
+        <div><strong>${t('views.monitor.topology.serialNum')}：</strong><span>
+        ${neState.sn ?? '--'}
+        </span></div>
+        <div><strong>${t('views.monitor.topology.expiryDate')}：</strong><span>
+        ${neState.expire ?? '--'}
+        </span></div> `;
+    }
+    return `
+        <div
+        style="
+            display: flex;
+            flex-direction: column;
+            width: 200px;
+        "
+        >
+        <div><strong>${t('views.monitor.topology.state')}：</strong><span>
+        ${
+          neState.online
+            ? t('views.monitor.topology.normalcy')
+            : t('views.monitor.topology.exceptions')
+        }
+        </span></div>
+        <div><strong>${t('views.monitor.topology.refreshTime')}：</strong><span>
+        ${neState.refreshTime ?? '--'}
+        </span></div>
+        <div>========================</div>
+        <div><strong>ID：</strong><span>${neState.neId}</span></div>
+        <div><strong>${t('views.monitor.topology.name')}：</strong><span>
+        ${neState.neName ?? '--'}
+        </span></div>
+        <div><strong>IP：</strong><span>${neState.neIP}</span></div>
+        <div><strong>${t('views.monitor.topology.version')}：</strong><span>
+        ${neState.version ?? '--'}
+        </span></div>
+        ${notStudentInfo}
+        </div>
+        `;
+  },
+  itemTypes: ['node'],
+});
+
+/**注册自定义边或节点 */
+function registerEdgeNode() {
+  // 边
+  edgeCubicAnimateLineDash();
+  edgeCubicAnimateCircleMove();
+  edgeLineAnimateState();
+  // 节点
+  nodeCircleAnimateShapeR();
+  nodeCircleAnimateShapeStroke();
+  nodeRectAnimateState();
+  nodeImageAnimateState();
+}
+
+/**图数据渲染 */
+function handleRanderGraph(
+  container: HTMLElement | undefined,
+  data: GraphData
+) {
+  if (!container) return;
+  const { clientHeight, clientWidth } = container;
+
+  // 注册自定义边或节点
+  registerEdgeNode();
+
+  const graph = new Graph({
+    container: container,
+    width: clientWidth,
+    height: clientHeight,
+    fitCenter: true,
+    fitView: true,
+    fitViewPadding: [40],
+    autoPaint: true,
+    modes: {
+      default: [
+        'drag-combo',
+        'drag-canvas',
+        'zoom-canvas',
+        'collapse-expand-combo',
+      ],
+    },
+    groupByTypes: false,
+    nodeStateStyles: {
+      selected: {
+        fill: 'transparent',
+      },
+    },
+    plugins: [graphNodeMenu, graphNodeTooltip],
+    animate: true, // 是否使用动画过度，默认为 false
+    animateCfg: {
+      duration: 500, // Number，一次动画的时长
+      easing: 'linearEasing', // String，动画函数
+    },
+  });
+  graph.data(data);
+  graph.render();
+
+  graphG6.value = graph;
+
+  // 创建 ResizeObserver 实例
+  var observer = new ResizeObserver(function (entries) {
+    // 当元素大小发生变化时触发回调函数
+    entries.forEach(function (entry) {
+      if (!graphG6.value) {
+        return;
+      }
+      graphG6.value.changeSize(
+        entry.contentRect.width,
+        entry.contentRect.height - 30
+      );
+      graphG6.value.fitCenter();
+    });
+  });
+  // 监听元素大小变化
+  observer.observe(container);
+
+  return graph;
+}
+
+/**
+ * 获取图组数据渲染到画布
+ * @param reload 是否重载数据
+ */
+function fnGraphDataLoad(reload: boolean = false) {
+  Promise.all([
+    getGraphData(graphState.group),
+    listAllNeInfo({
+      bandStatus: false,
+    }),
+  ])
+    .then(resArr => {
+      const graphRes = resArr[0];
+      const neRes = resArr[1];
+      if (
+        graphRes.code === RESULT_CODE_SUCCESS &&
+        Array.isArray(graphRes.data.nodes) &&
+        graphRes.data.nodes.length > 0 &&
+        neRes.code === RESULT_CODE_SUCCESS &&
+        Array.isArray(neRes.data) &&
+        neRes.data.length > 0
+      ) {
+        return {
+          graphData: graphRes.data,
+          neList: neRes.data,
+        };
+      } else {
+        message.warning({
+          content: t('views.monitor.topology.noData'),
+          duration: 5,
+        });
+      }
+    })
+    .then(res => {
+      if (!res) return;
+      const { combos, edges, nodes } = res.graphData;
+
+      // 节点过滤
+      const nf: Record<string, any>[] = nodes.filter(
+        (node: Record<string, any>) => {
+          Reflect.set(node, 'neState', { online: false });
+          // 图片路径处理
+          if (node.img) node.img = parseBasePath(node.img);
+          if (node.icon.show && node.icon?.img)
+            node.icon.img = parseBasePath(node.icon.img);
+          // 遍历是否有网元数据
+          const nodeID: string = node.id;
+          const hasNe = res.neList.some(ne => {
+            Reflect.set(node, 'neInfo', ne.neType === nodeID ? ne : {});
+            return ne.neType === nodeID;
+          });
+          if (hasNe) {
+            return true;
+          }
+          if (notNeNodes.includes(nodeID)) {
+            return true;
+          }
+          return false;
+        }
+      );
+
+      // 边过滤
+      const ef: Record<string, any>[] = edges.filter(
+        (edge: Record<string, any>) => {
+          const edgeSource: string = edge.source;
+          const edgeTarget: string = edge.target;
+          const hasNeS = nf.some(n => n.id === edgeSource);
+          const hasNeT = nf.some(n => n.id === edgeTarget);
+          // console.log(hasNeS, edgeSource, hasNeT, edgeTarget);
+          if (hasNeS && hasNeT) {
+            return true;
+          }
+          if (hasNeS && notNeNodes.includes(edgeTarget)) {
+            return true;
+          }
+          if (hasNeT && notNeNodes.includes(edgeSource)) {
+            return true;
+          }
+          return false;
+        }
+      );
+
+      // 分组过滤
+      combos.forEach((combo: Record<string, any>) => {
+        const comboChildren: Record<string, any>[] = combo.children;
+        combo.children = comboChildren.filter(c => nf.some(n => n.id === c.id));
+        return combo;
+      });
+
+      // 图数据
+      graphState.data = { combos, edges: ef, nodes: nf };
+    })
+    .finally(() => {
+      if (graphState.data.length < 0) return;
+      // 重载数据
+      if (reload) {
+        graphG6.value.read(graphState.data);
+      } else {
+        handleRanderGraph(graphG6Dom.value, graphState.data);
+      }
+      clearInterval(interval10s.value);
+      interval10s.value = null;
+      fnGetState();
+      interval10s.value = setInterval(async () => {
+        if (!interval10s.value) return;
+        fnGetState(); // 获取网元状态
+      }, 20_000);
+    });
+}
+
+/**网元状态调度器 */
+const interval10s = ref<any>(null);
+
+/**查询网元状态 */
+function fnGetState() {
+  // 获取节点状态
+  for (const node of graphState.data.nodes) {
+    if (notNeNodes.includes(node.id)) continue;
+    const { neType, neId } = node.neInfo;
+    if (!neType || !neId) continue;
+    ws.send({
+      requestId: `${neType}_${neId}`,
+      type: 'ne_state',
+      data: {
+        neType: neType,
+        neId: neId,
+      },
+    });
+  }
+}
+
+/**接收数据后回调 */
+function wsError(ev: any) {
+  // 接收数据后回调
+  console.error(ev);
+}
+
+/**接收数据后回调 */
+function wsMessage(res: Record<string, any>) {
+  const { code, requestId, data } = res;
+  if (code === RESULT_CODE_ERROR) {
+    console.warn(res.msg);
+    return;
+  }
+  if (!requestId) return;
+  const [neType, neId] = requestId.split('_');
+  const { combos, edges, nodes } = graphState.data;
+  const node = nodes.find((item: Record<string, any>) => item.id === neType);
+
+  // 更新网元状态
+  const newNeState = Object.assign(node.neState, data, {
+    refreshTime: parseDateToStr(data.refreshTime, 'HH:mm:ss'),
+    online: !!data.cpu,
+  });
+
+  // 通过 ID 查询节点实例
+  const item = graphG6.value.findById(node.id);
+  if (item) {
+    const stateColor = newNeState.online ? '#52c41a' : '#f5222d'; // 状态颜色
+    // 图片类型不能填充
+    if (node.type.startsWith('image')) {
+      // 更新节点
+      if (node.label !== newNeState.neName) {
+        graphG6.value.updateItem(item, {
+          label: newNeState.neName,
+        });
+      }
+      // 设置状态
+      graphG6.value.setItemState(item, 'top-right-dot', stateColor);
+    } else {
+      // 更新节点
+      graphG6.value.updateItem(item, {
+        label: newNeState.neName,
+        // neState: newNeState,
+        style: {
+          fill: stateColor, // 填充色
+          stroke: stateColor, // 填充色
+        },
+        // labelCfg: {
+        //   style: {
+        //     fill: '#ffffff', // 标签文本色
+        //   },
+        // },
+      });
+      // 设置状态
+      graphG6.value.setItemState(item, 'stroke', newNeState.online);
+    }
+  }
+
+  // 设置边状态
+  for (const edge of edges) {
+    const edgeSource: string = edge.source;
+    const edgeTarget: string = edge.target;
+    const neS = nodes.find((n: any) => n.id === edgeSource);
+    const neT = nodes.find((n: any) => n.id === edgeTarget);
+    // console.log(neS, edgeSource, neT, edgeTarget);
+
+    if (neS && neT) {
+      // 通过 ID 查询节点实例
+      // const item = graphG6.value.findById(edge.id);
+      // console.log(
+      //   `${edgeSource} - ${edgeTarget}`,
+      //   neS.neState.online && neT.neState.online
+      // );
+      // const stateColor = neS.neState.online && neT.neState.online ? '#000000' : '#ff4d4f'; // 状态颜色
+      // 更新边
+      // graphG6.value.updateItem(item, {
+      //   label: `${edgeSource} - ${edgeTarget}`,
+      //   style: {
+      //     stroke: stateColor, // 填充色
+      //   },
+      //   labelCfg: {
+      //     style: {
+      //       fill: '#ffffff', // 标签文本色
+      //     },
+      //   },
+      // });
+      // 设置状态
+      graphG6.value.setItemState(
+        edge.id,
+        'circle-move',
+        neS.neState.online && neT.neState.online
+      );
+    }
+    if (neS && notNeNodes.includes(edgeTarget)) {
+      graphG6.value.setItemState(edge.id, 'line-dash', neS.neState.online);
+    }
+    if (neT && notNeNodes.includes(edgeSource)) {
+      graphG6.value.setItemState(edge.id, 'line-dash', neT.neState.online);
+    }
+  }
+}
+
+onMounted(() => {
+  fnGraphDataLoad(false);
+
+  // 建立链接
+  const options: OptionsType = {
+    url: '/ws',
+    onmessage: wsMessage,
+    onerror: wsError,
+  };
+  ws.connect(options);
+});
+
+onBeforeUnmount(() => {
+  ws.close();
+  clearInterval(interval10s.value);
+  interval10s.value = null;
+});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card
+      :bordered="false"
+      :body-style="{ marginBottom: '24px' }"
+      size="small"
+    >
+      <!-- 插槽-卡片左侧侧 -->
+      <template #title>
+        <a-space :size="8" align="center">
+          <span>
+            {{ t('views.monitor.topologyBuild.graphGroup') }}：
+            {{ graphState.group }}
+          </span>
+        </a-space>
+      </template>
+      <!-- 插槽-卡片右侧 -->
+      <template #extra>
+        <a-button
+          type="default"
+          size="small"
+          @click.prevent="fnGraphDataLoad(true)"
+        >
+          <template #icon><ReloadOutlined /></template>
+          {{ t('common.reloadText') }}
+        </a-button>
+      </template>
+
+      <div ref="graphG6Dom" class="chart"></div>
+    </a-card>
+  </PageContainer>
+</template>
+
+<style lang="less" scoped>
+.chart {
+  width: 100%;
+  height: calc(100vh - 300px);
+  background-color: rgb(43, 47, 51);
+}
+</style>
--- a/practical_training/views/ne/neInfo/components/BackConfModal.vue
+++ b/practical_training/views/ne/neInfo/components/BackConfModal.vue
@@ -0,0 +1,374 @@
+<script setup lang="ts">
+import { reactive, toRaw, watch } from 'vue';
+import { ProModal } from 'antdv-pro-modal';
+import { Form, Modal, Upload, message, notification } from 'ant-design-vue/es';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
+import { FileType, UploadFile } from 'ant-design-vue/es/upload/interface';
+import {
+  exportNeConfigBackup,
+  importNeConfigBackup,
+  listNeConfigBackup,
+} from '@/api/ne/neConfigBackup';
+import saveAs from 'file-saver';
+import { uploadFile } from '@/api/tool/file';
+import useI18n from '@/hooks/useI18n';
+const { t } = useI18n();
+const emit = defineEmits(['ok', 'cancel', 'update:open']);
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  /**网元ID */
+  neId: {
+    type: String,
+    default: '',
+  },
+  neType: {
+    type: String,
+    default: '',
+  },
+});
+
+/**导入状态数据 */
+const importState = reactive({
+  typeOption: [
+    { label: t('views.ne.neInfo.backConf.server'), value: 'backup' },
+    { label: t('views.ne.neInfo.backConf.local'), value: 'upload' },
+  ],
+  backupData: <any[]>[],
+});
+
+/**查询网元远程服务器备份文件 */
+function backupSearch(name?: string) {
+  const { neType, neId } = modalState.from;
+  listNeConfigBackup({
+    neType,
+    neId,
+    name,
+    pageNum: 1,
+    pageSize: 20,
+  }).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+      importState.backupData = [];
+      res.rows.forEach((item: any) => {
+        importState.backupData.push({
+          label: item.name,
+          value: item.path,
+        });
+      });
+    }
+  });
+}
+
+/**服务器备份文件选择切换 */
+function backupChange(value: any) {
+  if (!value) {
+    backupSearch();
+  }
+}
+
+/**类型切换 */
+function typeChange(value: any) {
+  modalState.from.path = undefined;
+  if (value === 'backup') {
+    backupSearch();
+  }
+}
+
+/**对话框对象信息状态类型 */
+type ModalStateType = {
+  /**新增框或修改框是否显示 */
+  openByEdit: boolean;
+  /**标题 */
+  title: string;
+  /**表单数据 */
+  from: {
+    neType: string;
+    neId: string;
+    type: 'upload' | 'backup';
+    path: string | undefined;
+  };
+  /**确定按钮 loading */
+  confirmLoading: boolean;
+  /**上传文件 */
+  uploadFiles: any[];
+};
+
+/**对话框对象信息状态 */
+let modalState: ModalStateType = reactive({
+  openByEdit: false,
+  title: '配置文件导入',
+  from: {
+    neType: '',
+    neId: '',
+    type: 'upload',
+    path: undefined,
+  },
+  confirmLoading: false,
+  uploadFiles: [],
+});
+
+/**对话框内表单属性和校验规则 */
+const modalStateFrom = Form.useForm(
+  modalState.from,
+  reactive({
+    path: [
+      {
+        required: true,
+        message: t('views.ne.neInfo.backConf.pathPlease'),
+      },
+    ],
+  })
+);
+
+/**
+ * 对话框弹出确认执行函数
+ * 进行表达规则校验
+ */
+function fnModalOk() {
+  if (modalState.confirmLoading) return;
+  const from = toRaw(modalState.from);
+  modalStateFrom
+    .validate()
+    .then(e => {
+      modalState.confirmLoading = true;
+      const hide = message.loading(t('common.loading'), 0);
+      importNeConfigBackup(from)
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('common.operateOk'), 3);
+            // 返回无引用信息
+            emit('ok', JSON.parse(JSON.stringify(from)));
+            fnModalCancel();
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 3,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    })
+    .catch(e => {
+      message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
+    });
+}
+
+/**
+ * 对话框弹出关闭执行函数
+ * 进行表达规则校验
+ */
+function fnModalCancel() {
+  modalState.openByEdit = false;
+  modalState.confirmLoading = false;
+  modalStateFrom.resetFields();
+  modalState.uploadFiles = [];
+  emit('cancel');
+  emit('update:open', false);
+}
+
+/**表单上传前删除 */
+function fnBeforeRemoveFile(file: UploadFile) {
+  modalState.from.path = undefined;
+  return true;
+}
+
+/**表单上传前检查或转换压缩 */
+function fnBeforeUploadFile(file: FileType) {
+  if (modalState.confirmLoading) return false;
+  if (!file.name.endsWith('.zip')) {
+    const msg = `${t('components.UploadModal.onlyAllow')} .zip`;
+    message.error(msg, 3);
+    return Upload.LIST_IGNORE;
+  }
+  const isLt3M = file.size / 1024 / 1024 < 100;
+  if (!isLt3M) {
+    const msg = `${t('components.UploadModal.allowFilter')} 100MB`;
+    message.error(msg, 3);
+    return Upload.LIST_IGNORE;
+  }
+  return true;
+}
+
+/**表单上传文件 */
+function fnUploadFile(up: UploadRequestOption) {
+  // 发送请求
+  const hide = message.loading(t('common.loading'), 0);
+  modalState.confirmLoading = true;
+  let formData = new FormData();
+  formData.append('file', up.file);
+  formData.append('subPath', 'import');
+  uploadFile(formData)
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        // 改为完成状态
+        const file = modalState.uploadFiles[0];
+        file.percent = 100;
+        file.status = 'done';
+        // 预置到表单
+        const { fileName } = res.data;
+        modalState.from.path = fileName;
+      } else {
+        message.error(res.msg, 3);
+      }
+    })
+    .finally(() => {
+      hide();
+      modalState.confirmLoading = false;
+    });
+}
+
+/**监听是否显示，初始数据 */
+watch(
+  () => props.open,
+  val => {
+    if (val) {
+      if (props.neType && props.neId) {
+        modalState.from.neType = props.neType;
+        modalState.from.neId = props.neId;
+        modalState.title = t('views.ne.neInfo.backConf.title');
+        modalState.openByEdit = true;
+      }
+    }
+  }
+);
+
+/**
+ * 网元导出配置
+ * @param row 网元编号ID
+ */
+function fnExportConf(neType: string, neId: string) {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.ne.neInfo.backConf.exportTip'),
+    onOk() {
+      const hide = message.loading(t('common.loading'), 0);
+      exportNeConfigBackup({ neType, neId })
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            notification.success({
+              message: t('common.tipTitle'),
+              description: t('views.ne.neInfo.backConf.exportMsg'),
+            });
+            saveAs(
+              res.data,
+              `${neType}_${neId}_config_backup_${Date.now()}.zip`
+            );
+          } else {
+            message.error(`${res.msg}`, 3);
+          }
+        })
+        .finally(() => {
+          hide();
+        });
+    },
+  });
+}
+
+// 给组件设置属性 ref="xxxBackConf"
+// setup内使用 const xxxBackConf = ref();
+defineExpose({
+  /**导出文件 */
+  exportConf: fnExportConf,
+});
+</script>
+
+<template>
+  <ProModal
+    :drag="true"
+    :width="800"
+    :keyboard="false"
+    :mask-closable="false"
+    :open="modalState.openByEdit"
+    :title="modalState.title"
+    :confirm-loading="modalState.confirmLoading"
+    @ok="fnModalOk"
+    @cancel="fnModalCancel"
+  >
+    <a-form name="modalStateFrom" layout="horizontal" :label-col="{ span: 6 }">
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item :label="t('views.ne.common.neType')" name="neType">
+            {{ modalState.from.neType }}
+          </a-form-item>
+          <a-form-item
+            :label="t('views.ne.neInfo.backConf.importType')"
+            name="type"
+          >
+            <a-select
+              v-model:value="modalState.from.type"
+              default-value="server"
+              :options="importState.typeOption"
+              @change="typeChange"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item :label="t('views.ne.common.neId')" name="neId">
+            {{ modalState.from.neId }}
+          </a-form-item>
+          <a-form-item
+            :label="t('views.ne.neInfo.backConf.server')"
+            name="fileName"
+            v-bind="modalStateFrom.validateInfos.path"
+            v-if="modalState.from.type === 'backup'"
+          >
+            <a-select
+              v-model:value="modalState.from.path"
+              :options="importState.backupData"
+              :placeholder="t('common.selectPlease')"
+              :show-search="true"
+              :default-active-first-option="false"
+              :show-arrow="false"
+              :allow-clear="true"
+              :filter-option="false"
+              :not-found-content="null"
+              @search="backupSearch"
+              @change="backupChange"
+            >
+            </a-select>
+          </a-form-item>
+
+          <a-form-item
+            :label="t('views.ne.neInfo.backConf.local')"
+            name="file"
+            v-bind="modalStateFrom.validateInfos.path"
+            v-if="modalState.from.type === 'upload'"
+          >
+            <a-upload
+              name="file"
+              v-model:file-list="modalState.uploadFiles"
+              accept=".zip"
+              list-type="text"
+              :max-count="1"
+              :show-upload-list="{
+                showPreviewIcon: false,
+                showRemoveIcon: true,
+                showDownloadIcon: false,
+              }"
+              :remove="fnBeforeRemoveFile"
+              :before-upload="fnBeforeUploadFile"
+              :custom-request="fnUploadFile"
+              :disabled="modalState.confirmLoading"
+            >
+              <a-button type="primary">
+                <template #icon>
+                  <UploadOutlined />
+                </template>
+                {{ t('views.ne.neInfo.backConf.localUpload') }}
+              </a-button>
+            </a-upload>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </ProModal>
+</template>
+
+<style lang="less" scoped></style>
--- a/practical_training/views/ne/neInfo/components/EditModal.vue
+++ b/practical_training/views/ne/neInfo/components/EditModal.vue
@@ -0,0 +1,834 @@
+<script setup lang="ts">
+import { reactive, onMounted, toRaw, watch } from 'vue';
+import { ProModal } from 'antdv-pro-modal';
+import { message, Form, Modal } from 'ant-design-vue/es';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { NE_TYPE_LIST } from '@/constants/ne-constants';
+import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
+import { getNeInfo, addNeInfo, updateNeInfo } from '@/api/ne/neInfo';
+import { neHostAuthorizedRSA, testNeHost } from '@/api/ne/neHost';
+import useDictStore from '@/store/modules/dict';
+import useI18n from '@/hooks/useI18n';
+const { getDict } = useDictStore();
+const { t } = useI18n();
+const emit = defineEmits(['ok', 'cancel', 'update:open']);
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  editId: {
+    type: String,
+    default: '',
+  },
+});
+
+/**字典数据 */
+let dict: {
+  /**主机类型 */
+  neHostType: DictType[];
+  /**分组 */
+  neHostGroupId: DictType[];
+  /**认证模式 */
+  neHostAuthMode: DictType[];
+} = reactive({
+  neHostType: [],
+  neHostGroupId: [],
+  neHostAuthMode: [],
+});
+
+/**
+ * 测试主机连接
+ */
+function fnHostTest(row: Record<string, any>) {
+  if (modalState.confirmLoading || !row.addr || !row.port) return;
+  modalState.confirmLoading = true;
+  const hide = message.loading(t('common.loading'), 0);
+  testNeHost(row)
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        message.success({
+          content: `${row.addr}:${row.port} ${t('views.ne.neHost.testOk')}`,
+          duration: 2,
+        });
+      } else {
+        message.error({
+          content: `${row.addr}:${row.port} ${res.msg}`,
+          duration: 2,
+        });
+      }
+    })
+    .finally(() => {
+      hide();
+      modalState.confirmLoading = false;
+    });
+}
+
+/**测试主机连接-免密直连 */
+function fnHostAuthorized(row: Record<string, any>) {
+  if (modalState.confirmLoading) return;
+
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.ne.neHost.authRSATip'),
+    onOk: () => {
+      modalState.confirmLoading = true;
+      neHostAuthorizedRSA(row).then(res => {
+        modalState.confirmLoading = false;
+        if (res.code === RESULT_CODE_SUCCESS) {
+          message.success(t('common.operateOk'), 3);
+        } else {
+          message.error(t('common.operateErr'), 3);
+        }
+      });
+    },
+  });
+}
+
+/**对话框对象信息状态类型 */
+type ModalStateType = {
+  /**新增框或修改框是否显示 */
+  openByEdit: boolean;
+  /**标题 */
+  title: string;
+  /**表单数据 */
+  from: Record<string, any>;
+  /**确定按钮 loading */
+  confirmLoading: boolean;
+};
+
+/**对话框对象信息状态 */
+let modalState: ModalStateType = reactive({
+  openByEdit: false,
+  title: '网元',
+  from: {
+    id: undefined,
+    neId: '001',
+    neType: 'AMF',
+    neName: '',
+    ip: '',
+    port: 33030,
+    pvFlag: 'PNF',
+    rmUid: '4400HXAMF001',
+    neAddress: '',
+    dn: '',
+    vendorName: '',
+    province: '',
+    remark: '',
+    // 主机
+    hosts: [
+      {
+        hostId: undefined,
+        hostType: 'ssh',
+        groupId: '1',
+        title: 'SSH_NE_22',
+        addr: '',
+        port: 22,
+        user: 'omcuser',
+        authMode: '2',
+        password: '',
+        privateKey: '',
+        passPhrase: '',
+        remark: '',
+      },
+      {
+        hostId: undefined,
+        hostType: 'telnet',
+        groupId: '1',
+        title: 'Telnet_NE_4100',
+        addr: '',
+        port: 4100,
+        user: 'admin',
+        authMode: '0',
+        password: 'admin',
+        remark: '',
+      },
+    ],
+  },
+  confirmLoading: false,
+});
+
+/**对话框内表单属性和校验规则 */
+const modalStateFrom = Form.useForm(
+  modalState.from,
+  reactive({
+    neType: [
+      {
+        required: true,
+        message: t('views.ne.common.neTypePlease'),
+      },
+    ],
+    neId: [
+      {
+        required: true,
+        message: t('views.ne.common.neIdPlease'),
+      },
+    ],
+    rmUid: [
+      {
+        required: true,
+        message: t('views.ne.common.rmUidPlease'),
+      },
+    ],
+    ip: [
+      {
+        required: true,
+        validator: modalStateFromEqualIPV4AndIPV6,
+      },
+    ],
+    neName: [
+      {
+        required: true,
+        message: t('views.ne.common.neNamePlease'),
+      },
+    ],
+  })
+);
+
+/**表单验证IP地址是否有效 */
+function modalStateFromEqualIPV4AndIPV6(
+  rule: Record<string, any>,
+  value: string,
+  callback: (error?: string) => void
+) {
+  if (!value) {
+    return Promise.reject(t('views.ne.common.ipAddrPlease'));
+  }
+
+  if (value.indexOf('.') === -1 && value.indexOf(':') === -1) {
+    return Promise.reject(t('valid.ipPlease'));
+  }
+  if (value.indexOf('.') !== -1 && !regExpIPv4.test(value)) {
+    return Promise.reject(t('valid.ipv4Reg'));
+  }
+  if (value.indexOf(':') !== -1 && !regExpIPv6.test(value)) {
+    return Promise.reject(t('valid.ipv6Reg'));
+  }
+  return Promise.resolve();
+}
+
+/**
+ * 对话框弹出显示为 新增或者修改
+ * @param editId 网元id, 不传为新增
+ */
+function fnModalVisibleByEdit(editId: string) {
+  if (!editId) {
+    modalStateFrom.resetFields();
+    modalState.title = t('views.ne.neInfo.addTitle');
+    modalState.openByEdit = true;
+  } else {
+    if (modalState.confirmLoading) return;
+    const hide = message.loading(t('common.loading'), 0);
+    modalState.confirmLoading = true;
+    getNeInfo(editId).then(res => {
+      modalState.confirmLoading = false;
+      hide();
+      if (res.code === RESULT_CODE_SUCCESS) {
+        Object.assign(modalState.from, res.data);
+        modalState.title = t('views.ne.neInfo.editTitle');
+        modalState.openByEdit = true;
+      } else {
+        message.error(t('common.getInfoFail'), 2);
+      }
+    });
+  }
+}
+
+/**
+ * 对话框弹出确认执行函数
+ * 进行表达规则校验
+ */
+function fnModalOk() {
+  modalStateFrom
+    .validate()
+    .then(e => {
+      modalState.confirmLoading = true;
+      const from = toRaw(modalState.from);
+      const result = from.id ? updateNeInfo(from) : addNeInfo(from);
+      const hide = message.loading(t('common.loading'), 0);
+      result
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('common.operateOk'), 3);
+            // 返回无引用信息
+            emit('ok', JSON.parse(JSON.stringify(from)));
+            fnModalCancel();
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 3,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    })
+    .catch(e => {
+      message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
+    });
+}
+
+/**
+ * 对话框弹出关闭执行函数
+ * 进行表达规则校验
+ */
+function fnModalCancel() {
+  modalState.openByEdit = false;
+  modalState.confirmLoading = false;
+  modalStateFrom.resetFields();
+  emit('cancel');
+  emit('update:open', false);
+}
+
+/**表单修改网元类型 */
+function fnNeTypeChange(v: any) {
+  // 网元默认只含22和4100
+  if (modalState.from.hosts.length === 3) {
+    modalState.from.hosts.pop();
+  }
+  const hostsLen = modalState.from.hosts.length;
+  // UPF标准版本可支持5002
+  if (hostsLen === 2 && v === 'UPF') {
+    modalState.from.hosts.push({
+      hostId: undefined,
+      hostType: 'telnet',
+      groupId: '1',
+      title: 'Telnet_NE_5002',
+      addr: modalState.from.ip,
+      port: 5002,
+      user: 'admin',
+      authMode: '0',
+      password: 'admin',
+      remark: '',
+    });
+  }
+  // UDM可支持6379
+  if (hostsLen === 2 && v === 'UDM') {
+    modalState.from.hosts.push({
+      hostId: undefined,
+      hostType: 'redis',
+      groupId: '1',
+      title: 'REDIS_NE_6379',
+      addr: modalState.from.ip,
+      port: 6379,
+      user: 'udmdb',
+      authMode: '0',
+      password: 'helloearth',
+      dbName: '0',
+      remark: '',
+    });
+  }
+
+  modalState.from.rmUid = `4400HX${v}${modalState.from.neId}`; // 4400HX1AMF001
+}
+
+/**表单修改网元neId */
+function fnNeIdChange(e: any) {
+  const v = e.target.value;
+  if (v.length < 1) return;
+  modalState.from.rmUid = `4400HX${modalState.from.neType}${v}`; // 4400HX1AMF001
+}
+
+/**表单修改网元IP */
+function fnNeIPChange(e: any) {
+  const v = e.target.value;
+  if (v.length < 7) return;
+  for (const host of modalState.from.hosts) {
+    host.addr = v;
+  }
+}
+
+/**监听是否显示，初始数据 */
+watch(
+  () => props.open,
+  val => {
+    if (val) fnModalVisibleByEdit(props.editId);
+  }
+);
+
+onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([
+    getDict('ne_host_type'),
+    getDict('ne_host_groupId'),
+    getDict('ne_host_authMode'),
+  ]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.neHostType = resArr[0].value;
+    }
+    if (resArr[1].status === 'fulfilled') {
+      dict.neHostGroupId = resArr[1].value;
+    }
+    if (resArr[2].status === 'fulfilled') {
+      dict.neHostAuthMode = resArr[2].value;
+    }
+  });
+});
+</script>
+
+<template>
+  <ProModal
+    :drag="true"
+    :width="800"
+    :destroyOnClose="true"
+    :body-style="{ maxHeight: '600px', 'overflow-y': 'auto' }"
+    :keyboard="false"
+    :mask-closable="false"
+    :open="modalState.openByEdit"
+    :title="modalState.title"
+    :confirm-loading="modalState.confirmLoading"
+    @ok="fnModalOk"
+    @cancel="fnModalCancel"
+  >
+    <a-form
+      name="modalStateFrom"
+      layout="horizontal"
+      :label-col="{ span: 6 }"
+      :labelWrap="true"
+    >
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.common.neType')"
+            name="neType"
+            v-bind="modalStateFrom.validateInfos.neType"
+          >
+            <a-auto-complete
+              v-model:value="modalState.from.neType"
+              :options="NE_TYPE_LIST.map(v => ({ value: v }))"
+              @change="fnNeTypeChange"
+            >
+              <a-input
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+                :maxlength="32"
+              >
+                <template #prefix>
+                  <a-tooltip placement="topLeft">
+                    <template #title>
+                      {{ t('views.ne.common.neTypeTip') }}
+                    </template>
+                    <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+                  </a-tooltip>
+                </template>
+              </a-input>
+            </a-auto-complete>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.neInfo.pvflag')"
+            name="pvFlag"
+            v-bind="modalStateFrom.validateInfos.pvFlag"
+          >
+            <a-select
+              v-model:value="modalState.from.pvFlag"
+              default-value="PNF"
+            >
+              <a-select-opt-group :label="t('views.ne.neInfo.pnf')">
+                <a-select-option value="PNF">PNF</a-select-option>
+              </a-select-opt-group>
+              <a-select-opt-group :label="t('views.ne.neInfo.vnf')">
+                <a-select-option value="VNF">VNF</a-select-option>
+              </a-select-opt-group>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.common.neId')"
+            name="neId"
+            v-bind="modalStateFrom.validateInfos.neId"
+          >
+            <a-input
+              v-model:value="modalState.from.neId"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="32"
+              @change="fnNeIdChange"
+            >
+              <template #prefix>
+                <a-tooltip placement="topLeft">
+                  <template #title>
+                    {{ t('views.ne.common.neIdTip') }}
+                  </template>
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+                </a-tooltip>
+              </template>
+            </a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.common.neName')"
+            name="neName"
+            v-bind="modalStateFrom.validateInfos.neName"
+          >
+            <a-input
+              v-model:value="modalState.from.neName"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="64"
+            >
+            </a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.common.ipAddr')"
+            name="ip"
+            v-bind="modalStateFrom.validateInfos.ip"
+          >
+            <a-input
+              v-model:value="modalState.from.ip"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="128"
+              @change="fnNeIPChange"
+            >
+              <template #prefix>
+                <a-tooltip placement="topLeft">
+                  <template #title>
+                    <div>
+                      {{ t('views.ne.common.ipAddrTip') }}
+                    </div>
+                  </template>
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+                </a-tooltip>
+              </template>
+            </a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.common.port')"
+            name="port"
+            v-bind="modalStateFrom.validateInfos.port"
+          >
+            <a-input-number
+              v-model:value="modalState.from.port"
+              style="width: 100%"
+              :min="1"
+              :max="65535"
+              :maxlength="5"
+              placeholder="<=65535"
+            >
+              <template #prefix>
+                <a-tooltip placement="topLeft">
+                  <template #title>
+                    <div>{{ t('views.ne.common.portTip') }}</div>
+                  </template>
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+                </a-tooltip>
+              </template>
+            </a-input-number>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-form-item
+        :label="t('views.ne.common.rmUid')"
+        name="rmUid"
+        v-bind="modalStateFrom.validateInfos.rmUid"
+        :label-col="{ span: 3 }"
+        :labelWrap="true"
+      >
+        <a-input
+          v-model:value="modalState.from.rmUid"
+          allow-clear
+          :placeholder="t('common.inputPlease')"
+          :maxlength="40"
+        >
+          <template #prefix>
+            <a-tooltip placement="topLeft">
+              <template #title>
+                <div>
+                  {{ t('views.ne.common.rmUidTip') }}
+                </div>
+              </template>
+              <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+            </a-tooltip>
+          </template>
+        </a-input>
+      </a-form-item>
+
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item :label="t('views.ne.neInfo.neAddress')" name="neAddress">
+            <a-input
+              v-model:value="modalState.from.neAddress"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="64"
+            >
+              <template #prefix>
+                <a-tooltip placement="topLeft">
+                  <template #title>
+                    <div>{{ t('views.ne.neInfo.neAddressTip') }}</div>
+                  </template>
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
+                </a-tooltip>
+              </template>
+            </a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item :label="t('views.ne.neInfo.dn')" name="dn">
+            <a-input
+              v-model:value="modalState.from.dn"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="255"
+            ></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-row>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item
+            :label="t('views.ne.neInfo.vendorName')"
+            name="vendorName"
+          >
+            <a-input
+              v-model:value="modalState.from.vendorName"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="64"
+            >
+            </a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24">
+          <a-form-item :label="t('views.ne.neInfo.province')" name="province">
+            <a-input
+              v-model:value="modalState.from.province"
+              allow-clear
+              :placeholder="t('common.inputPlease')"
+              :maxlength="32"
+            ></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-form-item
+        :label="t('common.remark')"
+        :label-col="{ span: 3 }"
+        :label-wrap="true"
+      >
+        <a-textarea
+          v-model:value="modalState.from.remark"
+          :auto-size="{ minRows: 1, maxRows: 6 }"
+          :maxlength="450"
+          :show-count="true"
+          :placeholder="t('common.inputPlease')"
+        />
+      </a-form-item>
+
+      <!-- 主机连接配置 -->
+      <a-divider orientation="left">
+        {{ t('views.ne.neInfo.hostConfig') }}
+      </a-divider>
+      <a-collapse class="collapse" ghost>
+        <a-collapse-panel
+          v-for="host in modalState.from.hosts.filter(
+            (s:any) => !(s.hostType === 'telnet' &&  modalState.from.neType === 'OMC')
+          )"
+          :key="host.title"
+        >
+          <template #header>
+            <span v-if="host.hostType === 'redis'"> DB {{ host.port }} </span>
+            <span v-else>
+              {{ `${host.hostType.toUpperCase()} ${host.port}` }}
+            </span>
+          </template>
+          <a-row>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item :label="t('views.ne.neHost.addr')">
+                <a-input
+                  v-model:value="host.addr"
+                  allow-clear
+                  :maxlength="128"
+                  :placeholder="t('common.inputPlease')"
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neHost.port')"
+                name="neHost.port"
+              >
+                <a-input-number
+                  v-model:value="host.port"
+                  :min="10"
+                  :max="65535"
+                  :step="1"
+                  :maxlength="5"
+                  style="width: 100%"
+                ></a-input-number>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-form-item
+            v-if="host.hostType === 'telnet'"
+            :label="t('views.ne.neHost.user')"
+            :label-col="{ span: 3 }"
+            :label-wrap="true"
+          >
+            <a-input
+              v-model:value="host.user"
+              allow-clear
+              :maxlength="32"
+              :placeholder="t('common.inputPlease')"
+            >
+            </a-input>
+          </a-form-item>
+
+          <a-row v-if="host.hostType === 'ssh'">
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item :label="t('views.ne.neHost.user')">
+                <a-input
+                  v-model:value="host.user"
+                  allow-clear
+                  :maxlength="32"
+                  :placeholder="t('common.inputPlease')"
+                >
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item :label="t('views.ne.neHost.authMode')">
+                <a-select
+                  v-model:value="host.authMode"
+                  default-value="0"
+                  :options="dict.neHostAuthMode"
+                >
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-form-item
+            v-if="host.authMode === '0'"
+            :label="t('views.ne.neHost.password')"
+            :label-col="{ span: 3 }"
+            :label-wrap="true"
+          >
+            <a-input-password
+              v-model:value="host.password"
+              :maxlength="128"
+              :placeholder="t('common.inputPlease')"
+            >
+            </a-input-password>
+          </a-form-item>
+          <template v-if="host.authMode === '1'">
+            <a-form-item
+              :label="t('views.ne.neHost.privateKey')"
+              :label-col="{ span: 3 }"
+              :label-wrap="true"
+            >
+              <a-textarea
+                v-model:value="host.privateKey"
+                :auto-size="{ minRows: 4, maxRows: 6 }"
+                :maxlength="3000"
+                :show-count="true"
+                :placeholder="t('views.ne.neHost.privateKeyPlease')"
+              />
+            </a-form-item>
+
+            <a-form-item
+              :label="t('views.ne.neHost.passPhrase')"
+              :label-col="{ span: 3 }"
+              :label-wrap="true"
+            >
+              <a-input-password
+                v-model:value="host.passPhrase"
+                :maxlength="128"
+                :placeholder="t('common.inputPlease')"
+              >
+              </a-input-password>
+            </a-form-item>
+          </template>
+
+          <a-form-item
+            v-if="host.hostType === 'mysql'"
+            :label="t('views.ne.neHost.database')"
+            :label-col="{ span: 3 }"
+            :label-wrap="true"
+          >
+            <a-input
+              v-model:value="host.dbName"
+              allow-clear
+              :maxlength="32"
+              :placeholder="t('common.inputPlease')"
+            >
+            </a-input>
+          </a-form-item>
+
+          <a-form-item
+            :label="t('common.remark')"
+            :label-col="{ span: 3 }"
+            :label-wrap="true"
+          >
+            <a-textarea
+              v-model:value="host.remark"
+              :auto-size="{ minRows: 1, maxRows: 6 }"
+              :maxlength="450"
+              :show-count="true"
+              :placeholder="t('common.inputPlease')"
+            />
+          </a-form-item>
+
+          <!-- 测试 -->
+          <a-form-item
+            :label="t('views.ne.neHost.test')"
+            name="test"
+            :label-col="{ span: 3 }"
+            :label-wrap="true"
+          >
+            <a-button
+              type="primary"
+              shape="round"
+              @click="fnHostTest(host)"
+              :loading="modalState.confirmLoading"
+            >
+              <template #icon><LinkOutlined /></template>
+            </a-button>
+
+            <a-button
+              type="link"
+              @click="fnHostAuthorized(host)"
+              :loading="modalState.confirmLoading"
+              v-if="host.hostType === 'ssh' && host.authMode !== '2'"
+            >
+              {{ t('views.ne.neHost.authRSA') }}
+            </a-button>
+          </a-form-item>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-form>
+  </ProModal>
+</template>
+
+<style lang="less" scoped>
+.collapse :deep(.ant-collapse-item) > .ant-collapse-header {
+  padding-left: 0;
+  padding-right: 0;
+}
+.collapse-header {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+</style>
--- a/practical_training/views/ne/neInfo/components/OAMModal.vue
+++ b/practical_training/views/ne/neInfo/components/OAMModal.vue
@@ -0,0 +1,322 @@
+<script setup lang="ts">
+import { reactive, toRaw, watch } from 'vue';
+import { ProModal } from 'antdv-pro-modal';
+import { message, Form } from 'ant-design-vue/es';
+import useI18n from '@/hooks/useI18n';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { getOAMFile, saveOAMFile } from '@/api/ne/neInfo';
+const { t } = useI18n();
+const emit = defineEmits(['ok', 'cancel', 'update:open']);
+const props = defineProps({
+  open: {
+    type: Boolean,
+    default: false,
+  },
+  /**网元ID */
+  neId: {
+    type: String,
+    default: '',
+  },
+  neType: {
+    type: String,
+    default: '',
+  },
+});
+
+/**对话框对象信息状态类型 */
+type ModalStateType = {
+  /**新增框或修改框是否显示 */
+  openByEdit: boolean;
+  /**标题 */
+  title: string;
+  /**是否同步 */
+  sync: boolean;
+  /**表单数据 */
+  from: Record<string, any>;
+  /**确定按钮 loading */
+  confirmLoading: boolean;
+};
+
+/**对话框对象信息状态 */
+let modalState: ModalStateType = reactive({
+  openByEdit: false,
+  title: 'OAM Configuration',
+  sync: true,
+  from: {
+    omcIP: '',
+    oamEnable: true,
+    oamPort: 33030,
+    snmpEnable: true,
+    snmpPort: 4957,
+    kpiEnable: true,
+    kpiTimer: 60,
+  },
+  confirmLoading: false,
+});
+
+/**对话框内表单属性和校验规则 */
+const modalStateFrom = Form.useForm(
+  modalState.from,
+  reactive({
+    kpiTimer: [
+      {
+        required: true,
+        message: t('views.ne.neInfo.oam.kpiTimerPlease'),
+      },
+    ],
+  })
+);
+
+/**
+ * 对话框弹出显示为 新增或者修改
+ * @param neType 网元类型
+ * @param neId 网元ID
+ */
+function fnModalVisibleByTypeAndId(neType: string, neId: string) {
+  const hide = message.loading(t('common.loading'), 0);
+  getOAMFile(neType, neId)
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        const data = res.data;
+        Object.assign(modalState.from, {
+          omcIP: data.oamConfig[data.oamConfig.ipType],
+          oamEnable: data.oamConfig.enable,
+          oamPort: data.oamConfig.port,
+          snmpEnable: data.snmpConfig.enable,
+          snmpPort: data.snmpConfig.port,
+          kpiEnable: data.kpiConfig.enable,
+          kpiTimer: data.kpiConfig.timer,
+        });
+        modalState.title = t('views.ne.neInfo.oam.title');
+        modalState.openByEdit = true;
+      } else {
+        message.error(res.msg, 3);
+      }
+    })
+    .finally(() => {
+      modalState.confirmLoading = false;
+      hide();
+    });
+}
+
+/**
+ * 对话框弹出确认执行函数
+ * 进行表达规则校验
+ */
+function fnModalOk() {
+  modalStateFrom
+    .validate()
+    .then(e => {
+      modalState.confirmLoading = true;
+      const hide = message.loading(t('common.loading'), 0);
+      const from = toRaw(modalState.from);
+      saveOAMFile({
+        neType: props.neType,
+        neId: props.neId,
+        content: from,
+        sync: modalState.sync,
+      })
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('common.operateOk'), 3);
+            emit('ok');
+            fnModalCancel();
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 3,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    })
+    .catch(e => {
+      message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
+    });
+}
+
+/**
+ * 对话框弹出关闭执行函数
+ * 进行表达规则校验
+ */
+function fnModalCancel() {
+  modalState.openByEdit = false;
+  modalState.confirmLoading = false;
+  modalStateFrom.resetFields();
+  emit('cancel');
+  emit('update:open', false);
+}
+
+/**监听是否显示，初始数据 */
+watch(
+  () => props.open,
+  val => {
+    if (val) {
+      if (props.neType && props.neId) {
+        fnModalVisibleByTypeAndId(props.neType, props.neId);
+      }
+    }
+  }
+);
+</script>
+
+<template>
+  <ProModal
+    :drag="true"
+    :destroyOnClose="true"
+    :body-style="{ maxHeight: '600px', 'overflow-y': 'auto' }"
+    :keyboard="false"
+    :mask-closable="false"
+    :open="modalState.openByEdit"
+    :title="modalState.title"
+    :confirm-loading="modalState.confirmLoading"
+    @ok="fnModalOk"
+    @cancel="fnModalCancel"
+  >
+    <a-form
+      name="modalStateFrom"
+      layout="horizontal"
+      :label-col="{ span: 12 }"
+      :labelWrap="true"
+    >
+      <a-form-item
+        :label="t('views.ne.neInfo.oam.sync')"
+        name="sync"
+        :label-col="{ span: 6 }"
+        :labelWrap="true"
+      >
+        <a-switch
+          :checked-children="t('common.switch.open')"
+          :un-checked-children="t('common.switch.shut')"
+          v-model:checked="modalState.sync"
+        ></a-switch>
+      </a-form-item>
+
+      <a-collapse class="collapse" ghost>
+        <a-collapse-panel header="OAM">
+          <a-row>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.oamEnable')"
+                name="oamEnable"
+              >
+                <a-switch
+                  :checked-children="t('common.switch.open')"
+                  :un-checked-children="t('common.switch.shut')"
+                  v-model:checked="modalState.from.oamEnable"
+                ></a-switch>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.oamPort')"
+                name="oamPort"
+                v-bind="modalStateFrom.validateInfos.oamPort"
+              >
+                <a-input-number
+                  :min="3000"
+                  :max="65535"
+                  :step="1"
+                  :maxlength="5"
+                  v-model:value="modalState.from.oamPort"
+                  style="width: 100%"
+                ></a-input-number>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-form-item
+            :label="t('views.ne.neInfo.oam.omcIP')"
+            name="omcIP"
+            :label-col="{ span: 6 }"
+            :labelWrap="true"
+          >
+            <a-input
+              v-model:value="modalState.from.omcIP"
+              :maxlength="128"
+            ></a-input>
+          </a-form-item>
+        </a-collapse-panel>
+        <a-collapse-panel header="SNMP">
+          <a-row>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.snmpEnable')"
+                name="snmpEnable"
+              >
+                <a-switch
+                  :checked-children="t('common.switch.open')"
+                  :un-checked-children="t('common.switch.shut')"
+                  v-model:checked="modalState.from.snmpEnable"
+                ></a-switch>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.snmpPort')"
+                name="snmpPort"
+                v-bind="modalStateFrom.validateInfos.snmpPort"
+              >
+                <a-input-number
+                  :min="3000"
+                  :max="65535"
+                  :step="1"
+                  :maxlength="5"
+                  v-model:value="modalState.from.snmpPort"
+                  style="width: 100%"
+                ></a-input-number>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-collapse-panel>
+        <a-collapse-panel header="KPI">
+          <a-row>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.kpiEnable')"
+                name="kpiEnable"
+              >
+                <a-switch
+                  :checked-children="t('common.switch.open')"
+                  :un-checked-children="t('common.switch.shut')"
+                  v-model:checked="modalState.from.kpiEnable"
+                ></a-switch>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12" :md="12" :xs="24">
+              <a-form-item
+                :label="t('views.ne.neInfo.oam.kpiTimer')"
+                name="kpiTimer"
+                v-bind="modalStateFrom.validateInfos.kpiTimer"
+              >
+                <a-input-number
+                  :min="5"
+                  :max="3600"
+                  :step="1"
+                  :maxlength="4"
+                  v-model:value="modalState.from.kpiTimer"
+                  style="width: 100%"
+                ></a-input-number>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-form>
+  </ProModal>
+</template>
+
+<style lang="less" scoped>
+.collapse :deep(.ant-collapse-item) > .ant-collapse-header {
+  padding-left: 0;
+  padding-right: 0;
+}
+.collapse-header {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+</style>
--- a/practical_training/views/ne/neInfo/hooks/useNeOptions.ts
+++ b/practical_training/views/ne/neInfo/hooks/useNeOptions.ts
@@ -0,0 +1,153 @@
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { Modal, message } from 'ant-design-vue/es';
+import useI18n from '@/hooks/useI18n';
+import { useRouter } from 'vue-router';
+import { updateNeConfigReload } from '@/api/configManage/configParam';
+import { serviceNeAction } from '@/api/ne/neInfo';
+import useMaskStore from '@/store/modules/mask';
+
+export default function useNeOptions() {
+  const router = useRouter();
+  const { t } = useI18n();
+  const maskStore = useMaskStore();
+
+  /**
+   * 网元启动
+   * @param row {neName,neType,neId}
+   */
+  function fnNeStart(row: Record<string, any>) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.common.startTip'),
+      onOk() {
+        const hide = message.loading(t('common.loading'), 0);
+        serviceNeAction({
+          neType: row.neType,
+          neId: row.neId,
+          action: 'start',
+        })
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success(t('common.operateOk'), 3);
+            } else {
+              message.error(`${res.msg}`, 3);
+            }
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
+  }
+
+  /**
+   * 网元重启
+   * @param row {neName,neType,neId}
+   */
+  function fnNeRestart(row: Record<string, any>) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.common.restartTip'),
+      onOk() {
+        const hide = message.loading(t('common.loading'), 0);
+        serviceNeAction({
+          neType: row.neType,
+          neId: row.neId,
+          action: 'restart',
+        })
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              // OMC自升级
+              if (row.neType.toUpperCase() === 'OMC') {
+                if (res.code === RESULT_CODE_SUCCESS) {
+                  maskStore.handleMaskType('reload');
+                } else {
+                  message.error({
+                    content: `${res.msg}`,
+                    duration: 3,
+                  });
+                }
+                return;
+              }
+              message.success(t('common.operateOk'), 3);
+            } else {
+              message.error(`${res.msg}`, 3);
+            }
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
+  }
+
+  /**
+   * 网元停止
+   * @param row {neName,neType,neId}
+   */
+  function fnNeStop(row: Record<string, any>) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.common.stopTip'),
+      onOk() {
+        const hide = message.loading(t('common.loading'), 0);
+        serviceNeAction({
+          neType: row.neType,
+          neId: row.neId,
+          action: 'stop',
+        })
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success(t('common.operateOk'), 3);
+            } else {
+              message.error(`${res.msg}`, 3);
+            }
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
+  }
+
+  /**
+   * 网元重新加载
+   * @param row {neName,neType,neId}
+   */
+  function fnNeReload(row: Record<string, any>) {
+    Modal.confirm({
+      title: t('common.tipTitle'),
+      content: t('views.ne.common.reloadTip'),
+      onOk() {
+        const hide = message.loading(t('common.loading'), 0);
+        updateNeConfigReload(row.neType, row.neId)
+          .then(res => {
+            if (res.code === RESULT_CODE_SUCCESS) {
+              message.success(t('common.operateOk'), 3);
+            } else {
+              message.error(`${res.msg}`, 3);
+            }
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
+  }
+
+  /**
+   * 跳转网元日志文件页面
+   * @param row {neType,neId}
+   */
+  function fnNeLogFile(row: Record<string, any>) {
+    router.push({
+      name: 'NeFile_2123',
+      query: {
+        neType: row.neType,
+        neId: row.neId,
+      },
+    });
+  }
+
+  return { fnNeStart, fnNeRestart, fnNeStop, fnNeReload, fnNeLogFile };
+}
--- a/practical_training/views/ne/neInfo/index.vue
+++ b/practical_training/views/ne/neInfo/index.vue
@@ -0,0 +1,790 @@
+<script setup lang="ts">
+import { reactive, onMounted, toRaw, defineAsyncComponent, ref } from 'vue';
+import { PageContainer } from 'antdv-pro-layout';
+import { message, Modal } from 'ant-design-vue/es';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
+import { ColumnsType } from 'ant-design-vue/es/table';
+import useI18n from '@/hooks/useI18n';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import useNeInfoStore from '@/store/modules/neinfo';
+import { listNeInfo, delNeInfo, stateNeInfo } from '@/api/ne/neInfo';
+import { NE_TYPE_LIST } from '@/constants/ne-constants';
+import { hasRoles } from '@/plugins/auth-user';
+import useDictStore from '@/store/modules/dict';
+import useNeOptions from './hooks/useNeOptions';
+const { getDict } = useDictStore();
+const { t } = useI18n();
+const { fnNeStart, fnNeRestart, fnNeStop, fnNeReload, fnNeLogFile } =
+  useNeOptions();
+// 异步加载组件
+const EditModal = defineAsyncComponent(
+  () => import('./components/EditModal.vue')
+);
+const OAMModal = defineAsyncComponent(
+  () => import('./components/OAMModal.vue')
+);
+// 配置备份文件导入
+const BackConfModal = defineAsyncComponent(
+  () => import('./components/BackConfModal.vue')
+);
+const backConf = ref(); // 引用句柄，取导出函数
+
+/**字典数据 */
+let dict: {
+  /**网元信息状态 */
+  neInfoStatus: DictType[];
+} = reactive({
+  neInfoStatus: [],
+});
+
+/**查询参数 */
+let queryParams = reactive({
+  /**网元类型 */
+  neType: '',
+  /**带状态信息 */
+  bandStatus: true,
+  /**当前页数 */
+  pageNum: 1,
+  /**每页条数 */
+  pageSize: 20,
+});
+
+/**查询参数重置 */
+function fnQueryReset() {
+  queryParams = Object.assign(queryParams, {
+    neType: '',
+    pageNum: 1,
+    pageSize: 20,
+  });
+  tablePagination.current = 1;
+  tablePagination.pageSize = 20;
+  fnGetList();
+}
+
+/**表格状态类型 */
+type TabeStateType = {
+  /**加载等待 */
+  loading: boolean;
+  /**紧凑型 */
+  size: SizeType;
+  /**搜索栏 */
+  seached: boolean;
+  /**记录数据 */
+  data: Record<string, any>[];
+  /**勾选记录 */
+  selectedRowKeys: (string | number)[];
+};
+
+/**表格状态 */
+let tableState: TabeStateType = reactive({
+  loading: false,
+  size: 'middle',
+  seached: false,
+  data: [],
+  selectedRowKeys: [],
+});
+
+/**表格字段列 */
+let tableColumns: ColumnsType = [
+  {
+    title: t('views.ne.common.neType'),
+    dataIndex: 'neType',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neId'),
+    dataIndex: 'neId',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.rmUid'),
+    dataIndex: 'rmUid',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.ne.common.neName'),
+    dataIndex: 'neName',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.ne.common.ipAddr'),
+    dataIndex: 'ip',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.ne.common.port'),
+    dataIndex: 'port',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.neInfo.state'),
+    dataIndex: 'status',
+    key: 'status',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('common.operate'),
+    key: 'id',
+    align: 'left',
+  },
+];
+
+/**表格分页器参数 */
+let tablePagination = reactive({
+  /**当前页数 */
+  current: 1,
+  /**每页条数 */
+  pageSize: 20,
+  /**默认的每页条数 */
+  defaultPageSize: 20,
+  /**指定每页可以显示多少条 */
+  pageSizeOptions: ['10', '20', '50', '100'],
+  /**只有一页时是否隐藏分页器 */
+  hideOnSinglePage: false,
+  /**是否可以快速跳转至某页 */
+  showQuickJumper: true,
+  /**是否可以改变 pageSize */
+  showSizeChanger: true,
+  /**数据总数 */
+  total: 0,
+  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
+  onChange: (page: number, pageSize: number) => {
+    tablePagination.current = page;
+    tablePagination.pageSize = pageSize;
+    queryParams.pageNum = page;
+    queryParams.pageSize = pageSize;
+    fnGetList();
+  },
+});
+
+/**表格紧凑型变更操作 */
+function fnTableSize({ key }: MenuInfo) {
+  tableState.size = key as SizeType;
+}
+
+/**表格多选 */
+function fnTableSelectedRowKeys(keys: (string | number)[]) {
+  tableState.selectedRowKeys = keys;
+}
+
+/**对话框对象信息状态类型 */
+type ModalStateType = {
+  /**配置备份框是否显示 */
+  openByBackConf: boolean;
+  /**OAM文件配置框是否显示 */
+  openByOAM: boolean;
+  /**新增框或修改框是否显示 */
+  openByEdit: boolean;
+  /**新增框或修改框ID */
+  editId: string;
+  /**OAM框网元类型ID */
+  neId: string;
+  neType: string;
+  /**确定按钮 loading */
+  confirmLoading: boolean;
+};
+
+/**对话框对象信息状态 */
+let modalState: ModalStateType = reactive({
+  openByBackConf: false,
+  openByOAM: false,
+  openByEdit: false,
+  editId: '',
+  neId: '',
+  neType: '',
+  confirmLoading: false,
+});
+
+/**
+ * 对话框弹出显示为 新增或者修改
+ * @param noticeId 网元id, 不传为新增
+ */
+function fnModalVisibleByEdit(row?: Record<string, any>) {
+  if (!row) {
+    modalState.editId = '';
+  } else {
+    modalState.editId = row.id;
+  }
+  modalState.openByEdit = !modalState.openByEdit;
+}
+
+/**
+ * 对话框弹出确认执行函数
+ * 进行表达规则校验
+ */
+function fnModalEditOk(from: Record<string, any>) {
+  // 新增时刷新列表
+  if (!from.id) {
+    fnGetList();
+    return;
+  }
+  // 编辑时局部更新信息
+  stateNeInfo(from.neType, from.neId)
+    .then(res => {
+      // 找到编辑更新的网元
+      const item = tableState.data.find(s => s.id === from.id);
+      if (item && res.code === RESULT_CODE_SUCCESS) {
+        item.neType = from.neType;
+        item.neId = from.neId;
+        item.rmUid = from.rmUid;
+        item.neName = from.neName;
+        item.ip = from.ip;
+        item.port = from.port;
+        if (item.status !== '2') {
+          item.status = res.data.online ? '1' : '0';
+        }
+        Object.assign(item.serverState, res.data);
+        const resouresUsage = parseResouresUsage(item.serverState);
+        Reflect.set(item, 'resoures', resouresUsage);
+      }
+    })
+    .finally(() => {
+      useNeInfoStore().fnRefreshNelist();
+    });
+}
+
+/**
+ * 对话框弹出关闭执行函数
+ * 进行表达规则校验
+ */
+function fnModalEditCancel() {
+  modalState.editId = '';
+  modalState.openByEdit = false;
+  modalState.openByOAM = false;
+  modalState.openByBackConf = false;
+}
+
+/**
+ * 记录删除
+ * @param id  编号
+ */
+function fnRecordDelete(id: string) {
+  if (!id || modalState.confirmLoading) return;
+  let msg = t('views.ne.neInfo.delTip');
+  if (id === '0') {
+    msg = `${msg} ...${tableState.selectedRowKeys.length}`;
+    id = tableState.selectedRowKeys.join(',');
+  }
+
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: msg,
+    onOk() {
+      modalState.confirmLoading = true;
+      const hide = message.loading(t('common.loading'), 0);
+      delNeInfo(id)
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('common.operateOk'), 3);
+            // 过滤掉删除的id
+            tableState.data = tableState.data.filter(item => {
+              if (id.indexOf(',') > -1) {
+                return !tableState.selectedRowKeys.includes(item.id);
+              } else {
+                return item.id !== id;
+              }
+            });
+            // 刷新缓存
+            useNeInfoStore().fnRefreshNelist();
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 3,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    },
+  });
+}
+
+/**
+ * 记录多项选择
+ */
+function fnRecordMore(type: string | number, row: Record<string, any>) {
+  switch (type) {
+    case 'delete':
+      fnRecordDelete(row.id);
+      break;
+    case 'start':
+      fnNeStart(row);
+      break;
+    case 'restart':
+      fnNeRestart(row);
+      break;
+    case 'stop':
+      fnNeStop(row);
+      break;
+    case 'reload':
+      fnNeReload(row);
+      break;
+    case 'log':
+      fnNeLogFile(row);
+      break;
+    case 'oam':
+      modalState.neId = row.neId;
+      modalState.neType = row.neType;
+      modalState.openByOAM = !modalState.openByOAM;
+      break;
+    case 'backConfExport':
+      backConf.value.exportConf(row.neType, row.neId);
+      break;
+    case 'backConfImport':
+      modalState.neId = row.neId;
+      modalState.neType = row.neType;
+      modalState.openByBackConf = !modalState.openByBackConf;
+      break;
+    default:
+      console.warn(type);
+      break;
+  }
+}
+
+/**查询列表, pageNum初始页数 */
+function fnGetList(pageNum?: number) {
+  if (tableState.loading) return;
+  tableState.loading = true;
+  if (pageNum) {
+    queryParams.pageNum = pageNum;
+  }
+  listNeInfo(toRaw(queryParams)).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+      // 取消勾选
+      if (tableState.selectedRowKeys.length > 0) {
+        tableState.selectedRowKeys = [];
+      }
+      tablePagination.total = res.total;
+      // 遍历处理资源情况数值
+      tableState.data = res.rows.map(item => {
+        let resouresUsage = {
+          sysDiskUsage: 0,
+          sysMemUsage: 0,
+          sysCpuUsage: 0,
+          nfCpuUsage: 0,
+        };
+        const neState = item.serverState;
+        if (neState) {
+          resouresUsage = parseResouresUsage(neState);
+        } else {
+          item.serverState = { online: false };
+        }
+        Reflect.set(item, 'resoures', resouresUsage);
+        return item;
+      });
+    }
+    tableState.loading = false;
+  });
+}
+
+/**解析网元状态携带的资源利用率 */
+function parseResouresUsage(neState: Record<string, any>) {
+  let sysCpuUsage = 0;
+  let nfCpuUsage = 0;
+  if (neState.cpu) {
+    nfCpuUsage = neState.cpu.nfCpuUsage;
+    const nfCpu = +(nfCpuUsage / 100);
+    nfCpuUsage = +nfCpu.toFixed(2);
+    if (nfCpuUsage > 100) {
+      nfCpuUsage = 100;
+    }
+
+    sysCpuUsage = neState.cpu.sysCpuUsage;
+    const sysCpu = +(sysCpuUsage / 100);
+    sysCpuUsage = +sysCpu.toFixed(2);
+    if (sysCpuUsage > 100) {
+      sysCpuUsage = 100;
+    }
+  }
+
+  let sysMemUsage = 0;
+  if (neState.mem) {
+    const men = neState.mem.sysMemUsage;
+    sysMemUsage = +(men / 100).toFixed(2);
+    if (sysMemUsage > 100) {
+      sysMemUsage = 100;
+    }
+  }
+
+  let sysDiskUsage = 0;
+  if (neState.disk && Array.isArray(neState.disk.partitionInfo)) {
+    let disks: any[] = neState.disk.partitionInfo;
+    disks = disks.sort((a, b) => +b.used - +a.used);
+    if (disks.length > 0) {
+      const { total, used } = disks[0];
+      sysDiskUsage = +((used / total) * 100).toFixed(2);
+    }
+  }
+
+  return {
+    sysDiskUsage,
+    sysMemUsage,
+    sysCpuUsage,
+    nfCpuUsage,
+  };
+}
+
+onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('ne_info_status')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.neInfoStatus = resArr[0].value;
+    }
+  });
+
+  // 刷新缓存的网元信息
+  useNeInfoStore()
+    .fnRefreshNelist()
+    .finally(() => {
+      // 获取列表数据
+      fnGetList();
+    });
+});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card
+      v-show="tableState.seached"
+      :bordered="false"
+      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
+    >
+      <!-- 表格搜索栏 -->
+      <a-form :model="queryParams" name="queryParams" layout="horizontal">
+        <a-row :gutter="16">
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType ">
+              <a-auto-complete
+                v-model:value="queryParams.neType"
+                :options="NE_TYPE_LIST.map(v => ({ value: v }))"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item>
+              <a-space :size="8">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
+                  <template #icon><SearchOutlined /></template>
+                  {{ t('common.search') }}
+                </a-button>
+                <a-button type="default" @click.prevent="fnQueryReset">
+                  <template #icon><ClearOutlined /></template>
+                  {{ t('common.reset') }}
+                </a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-card>
+
+    <a-card :bordered="false" :body-style="{ padding: '0px' }">
+      <!-- 插槽-卡片左侧侧 -->
+      <template #title>
+        <a-space :size="8" align="center" v-roles:has="['admin']">
+          <a-button type="primary" @click.prevent="fnModalVisibleByEdit()">
+            <template #icon><PlusOutlined /></template>
+            {{ t('common.addText') }}
+          </a-button>
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('common.deleteText') }}
+          </a-button>
+        </a-space>
+      </template>
+
+      <!-- 插槽-卡片右侧 -->
+      <template #extra>
+        <a-space :size="8" align="center">
+          <a-tooltip>
+            <template #title>{{ t('common.searchBarText') }}</template>
+            <a-switch
+              v-model:checked="tableState.seached"
+              :checked-children="t('common.switch.show')"
+              :un-checked-children="t('common.switch.hide')"
+              size="small"
+            />
+          </a-tooltip>
+          <a-tooltip>
+            <template #title>{{ t('common.reloadText') }}</template>
+            <a-button type="text" @click.prevent="fnGetList()">
+              <template #icon><ReloadOutlined /></template>
+            </a-button>
+          </a-tooltip>
+          <a-tooltip>
+            <template #title>{{ t('common.sizeText') }}</template>
+            <a-dropdown trigger="click" placement="bottomRight">
+              <a-button type="text">
+                <template #icon><ColumnHeightOutlined /></template>
+              </a-button>
+              <template #overlay>
+                <a-menu
+                  :selected-keys="[tableState.size as string]"
+                  @click="fnTableSize"
+                >
+                  <a-menu-item key="default">
+                    {{ t('common.size.default') }}
+                  </a-menu-item>
+                  <a-menu-item key="middle">
+                    {{ t('common.size.middle') }}
+                  </a-menu-item>
+                  <a-menu-item key="small">
+                    {{ t('common.size.small') }}
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
+          </a-tooltip>
+        </a-space>
+      </template>
+
+      <!-- 表格列表 -->
+      <a-table
+        class="table"
+        row-key="id"
+        :columns="tableColumns"
+        :loading="tableState.loading"
+        :data-source="tableState.data"
+        :size="tableState.size"
+        :pagination="tablePagination"
+        :scroll="{ x: tableColumns.length * 120 }"
+        :row-selection="{
+          type: 'checkbox',
+          columnWidth: '48px',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'status'">
+            <DictTag :options="dict.neInfoStatus" :value="record.status" />
+          </template>
+          <template v-if="column.key === 'id'">
+            <a-space :size="8" align="center">
+              <span v-roles:has="['admin']">
+                <a-tooltip>
+                  <template #title>{{ t('common.editText') }}</template>
+                  <a-button
+                    type="link"
+                    @click.prevent="fnModalVisibleByEdit(record)"
+                  >
+                    <template #icon><FormOutlined /></template>
+                  </a-button>
+                </a-tooltip>
+              </span>
+              <span v-roles:has="['admin', 'teacher']">
+                <a-tooltip>
+                  <template #title>
+                    {{ t('views.ne.common.restart') }}
+                  </template>
+                  <a-button
+                    type="link"
+                    @click.prevent="fnRecordMore('restart', record)"
+                  >
+                    <template #icon><UndoOutlined /></template>
+                  </a-button>
+                </a-tooltip>
+              </span>
+
+              <a-tooltip placement="left">
+                <template #title>{{ t('common.moreText') }}</template>
+                <a-dropdown placement="bottomRight" trigger="click">
+                  <a-button type="link">
+                    <template #icon><EllipsisOutlined /> </template>
+                  </a-button>
+                  <template #overlay>
+                    <a-menu @click="({ key }:any) => fnRecordMore(key, record)">
+                      <a-menu-item key="log">
+                        <FileTextOutlined />
+                        {{ t('views.ne.common.log') }}
+                      </a-menu-item>
+                      <a-menu-item key="start" v-if="hasRoles(['admin'])">
+                        <ThunderboltOutlined />
+                        {{ t('views.ne.common.start') }}
+                      </a-menu-item>
+                      <a-menu-item key="stop" v-if="hasRoles(['admin'])">
+                        <CloseSquareOutlined />
+                        {{ t('views.ne.common.stop') }}
+                      </a-menu-item>
+                      <a-menu-item
+                        key="reload"
+                        v-if="
+                          !['OMC', 'PCF', 'IMS', 'MME'].includes(
+                            record.neType
+                          ) && hasRoles(['admin'])
+                        "
+                      >
+                        <SyncOutlined />
+                        {{ t('views.ne.common.reload') }}
+                      </a-menu-item>
+                      <a-menu-item key="delete" v-if="hasRoles(['admin'])">
+                        <DeleteOutlined />
+                        {{ t('common.deleteText') }}
+                      </a-menu-item>
+                      <a-menu-item key="oam" v-if="hasRoles(['admin'])">
+                        <FileTextOutlined />
+                        {{ t('views.ne.common.oam') }}
+                      </a-menu-item>
+                      <!-- 配置备份 -->
+                      <a-menu-item key="backConfExport">
+                        <ExportOutlined />
+                        {{ t('views.ne.neInfo.backConf.export') }}
+                      </a-menu-item>
+                      <a-menu-item key="backConfImport">
+                        <ImportOutlined />
+                        {{ t('views.ne.neInfo.backConf.import') }}
+                      </a-menu-item>
+                    </a-menu>
+                  </template>
+                </a-dropdown>
+              </a-tooltip>
+            </a-space>
+          </template>
+        </template>
+        <template #expandedRowRender="{ record }">
+          <a-row :gutter="16">
+            <a-col :offset="2" :lg="8" :md="8" :xs="8">
+              <a-divider orientation="left">
+                {{ t('views.ne.neInfo.info') }}
+              </a-divider>
+              <div>
+                <span>{{ t('views.ne.neInfo.serviceState') }}：</span>
+                <a-tag
+                  :color="record.serverState.online ? 'processing' : 'error'"
+                >
+                  {{
+                    record.serverState.online
+                      ? t('views.ne.common.normalcy')
+                      : t('views.ne.common.exceptions')
+                  }}
+                </a-tag>
+              </div>
+              <div>
+                <span>{{ t('views.ne.neVersion.version') }}：</span>
+                <span>{{ record.serverState.version }}</span>
+              </div>
+              <div>
+                <span>{{ t('views.ne.common.serialNum') }}：</span>
+                <span>{{ record.serverState.sn }}</span>
+              </div>
+              <div>
+                <span>{{ t('views.ne.common.expiryDate') }}：</span>
+                <span>{{ record.serverState.expire }}</span>
+              </div>
+            </a-col>
+            <a-col :offset="2" :lg="8" :md="8" :xs="8">
+              <a-divider orientation="left">
+                {{ t('views.ne.neInfo.resourceInfo') }}
+              </a-divider>
+              <div>
+                <span>{{ t('views.ne.neInfo.neCpu') }}：</span>
+                <a-progress
+                  status="normal"
+                  :stroke-color="
+                    record.resoures.nfCpuUsage < 30
+                      ? '#52c41a'
+                      : record.resoures.nfCpuUsage > 70
+                      ? '#ff4d4f'
+                      : '#1890ff'
+                  "
+                  :percent="record.resoures.nfCpuUsage"
+                />
+              </div>
+              <div>
+                <span>{{ t('views.ne.neInfo.sysCpu') }}：</span>
+                <a-progress
+                  status="normal"
+                  :stroke-color="
+                    record.resoures.sysCpuUsage < 30
+                      ? '#52c41a'
+                      : record.resoures.sysCpuUsage > 70
+                      ? '#ff4d4f'
+                      : '#1890ff'
+                  "
+                  :percent="record.resoures.sysCpuUsage"
+                />
+              </div>
+              <div>
+                <span>{{ t('views.ne.neInfo.sysMem') }}：</span>
+                <a-progress
+                  status="normal"
+                  :stroke-color="
+                    record.resoures.sysMemUsage < 30
+                      ? '#52c41a'
+                      : record.resoures.sysMemUsage > 70
+                      ? '#ff4d4f'
+                      : '#1890ff'
+                  "
+                  :percent="record.resoures.sysMemUsage"
+                />
+              </div>
+              <div>
+                <span>{{ t('views.ne.neInfo.sysDisk') }}：</span>
+                <a-progress
+                  status="normal"
+                  :stroke-color="
+                    record.resoures.sysDiskUsage < 30
+                      ? '#52c41a'
+                      : record.resoures.sysDiskUsage > 70
+                      ? '#ff4d4f'
+                      : '#1890ff'
+                  "
+                  :percent="record.resoures.sysDiskUsage"
+                />
+              </div>
+            </a-col>
+          </a-row>
+        </template>
+      </a-table>
+    </a-card>
+
+    <!-- 新增框或修改框 -->
+    <EditModal
+      v-model:open="modalState.openByEdit"
+      :edit-id="modalState.editId"
+      @ok="fnModalEditOk"
+      @cancel="fnModalEditCancel"
+    ></EditModal>
+
+    <!-- OAM编辑框 -->
+    <OAMModal
+      v-model:open="modalState.openByOAM"
+      :ne-id="modalState.neId"
+      :ne-type="modalState.neType"
+      @cancel="fnModalEditCancel"
+    ></OAMModal>
+
+    <!-- 配置文件备份框 -->
+    <BackConfModal
+      ref="backConf"
+      v-model:open="modalState.openByBackConf"
+      :ne-id="modalState.neId"
+      :ne-type="modalState.neType"
+      @cancel="fnModalEditCancel"
+    ></BackConfModal>
+  </PageContainer>
+</template>
+
+<style lang="less" scoped>
+.table :deep(.ant-pagination) {
+  padding: 0 24px;
+}
+</style>
--- a/practical_training/views/system/user/index.vue
+++ b/practical_training/views/system/user/index.vue
--- a/public/background/dark.jpg
+++ b/public/background/dark.jpg
--- a/public/background/light.jpg
+++ b/public/background/light.jpg
--- a/public/default/config.js
+++ b/public/default/config.js
@@ -10,19 +10,12 @@
 *
 */
 (function () {
-  // baseUrl = protocol://ip:port
-  // baseUrl = 'http://192.168.8.100:33030';
-  const protocol = window.location.protocol
-  let wsprotocol = "ws:"
-  const hostname = window.location.hostname
-  let host = `${hostname}:33030`;
-  if (protocol === 'https:') {
-    host = `${hostname}:33443`;
-    wsprotocol = "wss:"
-  }
+  // host = ip:port
+  // const host = '192.168.8.100:33030';
+  const host = `${window.location.hostname}:33030`;
  
  // Service Address
-  sessionStorage.setItem('baseUrl', `${protocol}//${host}`);
+  sessionStorage.setItem('baseUrl', `http://${host}`);
  // websocket Address
-  sessionStorage.setItem('wsUrl', `${wsprotocol}//${host}`);
+  sessionStorage.setItem('wsUrl', `ws://${host}`);
 })();
--- a/public/nbStateImput/en.xlsx
+++ b/public/nbStateImput/en.xlsx
--- a/public/nbStateImput/zh.xlsx
+++ b/public/nbStateImput/zh.xlsx
--- a/public/neDataImput/import_amf_imeiWhitelist_template.xlsx
+++ b/public/neDataImput/import_amf_imeiWhitelist_template.xlsx
--- a/public/neDataImput/import_amf_whitelist_template.xlsx
+++ b/public/neDataImput/import_amf_whitelist_template.xlsx
--- a/public/neDataImput/import_mme_imeiWhitelist_template.xlsx
+++ b/public/neDataImput/import_mme_imeiWhitelist_template.xlsx
--- a/public/neDataImput/pcf_template.txt
+++ b/public/neDataImput/pcf_template.txt
@@ -1 +0,0 @@
-001012082101039,1234,internet|ims_sig,internet|ims_sig,321321,255,321312,32131,32131
--- a/public/neDataImput/udm_auth_template.txt
+++ b/public/neDataImput/udm_auth_template.txt
@@ -1,2 +0,0 @@
-001011100001157,1234567890ABCDEF1234567890ABCDEF,0,8000,11111111111111111111111111111111
-001011100001158,1234567890ABCDEF1234567890ABCDEF,0,8000,11111111111111111111111111111111
--- a/public/neDataImput/udm_sub_template.txt
+++ b/public/neDataImput/udm_sub_template.txt
@@ -1,2 +0,0 @@
-001011100001157,62357000583,def_ambr,def_nssai,def_arfb,def_sar,0,3,def_snssai,1-000001&internet&ims,1,64,24,65,def_eps,1,010200000000,-
-001011100001158,62357000585,def_ambr,def_nssai,def_arfb,def_sar,0,3,def_snssai,1-000001&internet&ims,1,64,24,65,def_eps,1,010200000000,-
--- a/public/neDataImput/udm_voip_template.txt
+++ b/public/neDataImput/udm_voip_template.txt
@@ -1,2 +0,0 @@
-62357000580,123456
-62357000581,123456
--- a/public/neDataImput/udm_volte_template.txt
+++ b/public/neDataImput/udm_volte_template.txt
@@ -1,2 +0,0 @@
-001012082101039,62357000580,1,ims.mnc001.mcc001.3gppnetwork.org
-62357000581,62357000581,0,ims.mnc001.mcc001.3gppnetwork.org
--- a/public/svg/base4G.svg
+++ b/public/svg/base4G.svg
@@ -1,28 +0,0 @@
-<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg">
- <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="1026" width="1026" y="-1" x="-1"/>
-  <g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid">
-   <rect fill="url(#gridpattern)" stroke-width="0" y="1" x="1" height="768" width="1024"/>
-  </g>
- </g>
- <g>
-  <title>Layer 1</title>
-  <g stroke="null" id="svg_15">
-   <path stroke="null" id="svg_4" fill="#B5D6FB" d="m512.094844,961.632039c-1.327621,0 -2.560412,-0.405439 -3.793202,-1.114958l-405.588164,-251.575028c-2.275921,-1.419037 -3.698372,-4.054392 -3.698372,-6.892467l0,-90.007504c0,-2.838074 1.422451,-5.473429 3.698372,-6.892467l405.588164,-255.426701c1.137961,-0.709519 2.465582,-1.114958 3.793202,-1.114958s2.655242,0.405439 3.793202,1.114958l405.493334,255.426701c2.275921,1.419037 3.698372,4.054392 3.698372,6.892467l0,90.007504c0,2.838074 -1.422451,5.473429 -3.698372,6.892467l-405.588164,251.575028c-1.137961,0.709519 -2.465582,1.114958 -3.698372,1.114958z"/>
-   <path stroke="null" id="svg_5" fill="#0276F7" d="m512.094844,356.615382l405.398504,255.426701l0,90.007504l-66.096551,40.94936l-339.301952,210.625668l-339.491613,-210.625668l-66.096551,-40.94936l0,-90.007504l405.588164,-255.426701m0,-16.014849c-2.655242,0 -5.215653,0.709519 -7.586405,2.229916l-405.588164,255.426701c-4.551843,2.838074 -7.396745,8.108784 -7.396745,13.784933l0,90.007504c0,5.676149 2.844902,10.946859 7.491575,13.886293l66.096551,41.05072l339.491613,210.625668c2.275921,1.419037 4.931163,2.128556 7.491575,2.128556s5.215653,-0.709519 7.491575,-2.128556l339.301952,-210.625668l66.096551,-40.94936c4.646673,-2.838074 7.491575,-8.108784 7.491575,-13.886293l0,-90.007504c0,-5.676149 -2.844902,-10.946859 -7.396745,-13.784933l-405.398504,-255.426701c-2.370751,-1.520397 -5.025993,-2.331275 -7.586405,-2.331275z"/>
-   <path stroke="null" id="svg_6" fill="#FFFFFF" d="m106.50668,612.042083l405.493334,253.298145l405.493334,-253.298145l-405.398504,-255.426701l-405.588164,255.426701z"/>
-   <path stroke="null" id="svg_7" fill="#D4E4FC" d="m501.473877,64.192353l-254.9032,498.487506l263.343075,161.162085l266.662127,-162.074323l-275.102002,-497.575268z"/>
-   <path stroke="null" id="svg_8" fill="#0276F7" d="m229.975417,602.311542c-1.232791,0 -2.465582,-0.304079 -3.698372,-1.013598c-3.603542,-2.128556 -4.931163,-6.993826 -2.844902,-10.845499l279.653845,-532.13896c1.327621,-2.533995 3.793202,-4.054392 6.543274,-4.054392c2.655242,0 5.120823,1.520397 6.543274,4.054392l284.395348,532.13896c2.086261,3.851672 0.75864,8.716943 -2.750072,10.946859c-3.603542,2.128556 -8.155385,0.810878 -10.241646,-2.939434l-277.852074,-519.874424l-273.205401,519.671704c-1.422451,2.635355 -3.982862,4.054392 -6.543274,4.054392z"/>
-   <path stroke="null" id="svg_9" fill="#0276F7" d="m509.913752,755.567562c-4.172523,0 -7.491575,-3.547593 -7.491575,-8.007424l0,-666.744777c0,-4.459831 3.319052,-8.007424 7.491575,-8.007424s7.491575,3.547593 7.491575,8.007424l0,666.846137c0,4.358471 -3.413882,7.906065 -7.491575,7.906065z"/>
-   <path stroke="null" id="svg_10" fill="#0276F7" d="m509.913752,731.849369c-1.327621,0 -2.560412,-0.405439 -3.698372,-1.013598l-263.343075,-161.162085c-3.603542,-2.229916 -4.836333,-7.095186 -2.750072,-10.946859c2.086261,-3.851672 6.638104,-5.16935 10.241646,-2.939434l259.549873,158.83081l262.963755,-159.844408c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.946859l-266.662127,162.074323c-1.137961,0.709519 -2.465582,1.013598 -3.698372,1.013598z"/>
-   <path stroke="null" id="svg_11" fill="#0276F7" d="m509.913752,579.708306c-1.327621,0 -2.560412,-0.405439 -3.793202,-1.114958l-201.988026,-125.686154c-3.603542,-2.229916 -4.741503,-7.095186 -2.750072,-10.946859c2.086261,-3.851672 6.638104,-5.16935 10.241646,-2.838074l198.289654,123.354879l201.798366,-122.138561c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.845499l-205.496739,124.469837c-1.137961,0.709519 -2.465582,1.013598 -3.698372,1.013598zm-2.465582,-157.513132c-1.232791,0 -2.370751,-0.304079 -3.508712,-0.912238l-140.917468,-79.668804c-3.698372,-2.128556 -5.025993,-6.892467 -3.129392,-10.845499c1.896601,-3.953032 6.448444,-5.37207 10.146816,-3.344873l137.503586,77.742968l143.00373,-79.871524c3.698372,-2.027196 8.155385,-0.506799 10.146816,3.344873c1.896601,3.953032 0.47415,8.716943 -3.129392,10.845499l-146.512442,81.79736c-1.232791,0.608159 -2.370751,0.912238 -3.603542,0.912238zm2.465582,-148.49211c-1.232791,0 -2.465582,-0.304079 -3.508712,-0.912238l-82.312492,-47.436387c-3.603542,-2.128556 -5.025993,-6.993826 -3.034562,-10.845499c1.991431,-3.953032 6.543274,-5.27071 10.146816,-3.243514l78.708949,45.409191l78.329629,-47.537747c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.946859l-81.933171,49.666303c-1.232791,0.608159 -2.560412,0.912238 -3.793202,0.912238z"/>
-   <path stroke="null" id="svg_12" fill="#0276F7" d="m509.913752,579.708306l-0.28449,0l-263.248245,-9.021022c-4.172523,-0.10136 -7.396745,-3.851672 -7.207085,-8.210144c0.09483,-4.459831 4.077693,-7.703345 7.681235,-7.703345l263.343075,9.021022c4.172523,0.10136 7.396745,3.851672 7.207085,8.210144c-0.18966,4.257112 -3.508712,7.703345 -7.491575,7.703345zm0,152.141063c-1.612111,0 -3.224222,-0.608159 -4.646673,-1.723117c-3.224222,-2.736715 -3.793202,-7.804705 -1.232791,-11.250938l205.496739,-276.610899c2.560412,-3.446233 7.301915,-4.054392 10.526137,-1.317677c3.224222,2.736715 3.793202,7.804705 1.232791,11.250938l-205.496739,276.610899c-1.517281,2.027196 -3.698372,3.040794 -5.879464,3.040794z"/>
-   <path stroke="null" id="svg_13" fill="#0276F7" d="m509.913752,579.708306c-1.422451,0 -2.750072,-0.405439 -4.077693,-1.216318c-3.508712,-2.432635 -4.457013,-7.297906 -2.275921,-11.048218l144.14169,-239.310492c2.275921,-3.750313 6.922594,-4.763911 10.336476,-2.432635c3.508712,2.432635 4.457013,7.297906 2.275921,11.048218l-144.14169,239.310492c-1.422451,2.331275 -3.793202,3.648953 -6.258784,3.648953zm-2.465582,-157.513132c-1.043131,0 -2.086261,-0.20272 -3.129392,-0.709519c-3.793202,-1.824476 -5.405313,-6.588387 -3.698372,-10.642779l84.398753,-198.158413c1.706941,-4.054392 6.069124,-5.777509 9.957156,-3.953032c3.793202,1.824476 5.405313,6.588387 3.698372,10.642779l-84.303923,198.158413c-1.327621,2.939434 -4.077693,4.662551 -6.922594,4.662551z"/>
-   <path stroke="null" id="svg_14" fill="#0276F7" d="m591.846924,375.062866c-2.750072,0 -5.405313,-1.621757 -6.732934,-4.459831c-1.801771,-3.953032 -0.28449,-8.716943 3.413882,-10.642779l129.253371,-67.302908l-365.759539,-178.089172l20.862613,208.091673l133.994874,-64.262114c3.698372,-1.824476 8.155385,0 9.862326,4.054392c1.706941,4.054392 0,8.716943 -3.793202,10.541419l-143.38305,68.823305c-2.181091,1.013598 -4.646673,0.912238 -6.827764,-0.405439c-2.086261,-1.317677 -3.413882,-3.547593 -3.698372,-6.081588l-23.328195,-233.026185c-0.28449,-2.838074 0.853471,-5.676149 3.034562,-7.297906c2.181091,-1.621757 5.025993,-2.027196 7.491575,-0.810878l392.217126,190.961867c2.655242,1.317677 4.362183,4.054392 4.362183,7.196546c0,3.142154 -1.612111,5.980228 -4.172523,7.297906l-143.57271,74.600814c-1.043131,0.608159 -2.181091,0.810878 -3.224222,0.810878zm-283.921198,78.959286c-3.603542,0 -6.827764,-2.838074 -7.396745,-6.791107c-0.56898,-4.358471 2.181091,-8.412864 6.258784,-9.122382l199.617275,-31.826978c4.077693,-0.608159 7.870895,2.331275 8.534705,6.689747c0.56898,4.358471 -2.181091,8.412864 -6.258784,9.122382l-199.617275,31.826978c-0.47415,0.10136 -0.853471,0.10136 -1.137961,0.10136z"/>
-  </g>
-  <text stroke="null" font-style="italic" transform="matrix(6.577099502228161,0,0,7.449448263868419,-1073.2057632249744,-908.8606073938396) " xml:space="preserve" text-anchor="start" font-family="Arvo, sans-serif" font-size="24" id="svg_16" y="177.898525" x="178.621382" stroke-width="0" fill="#B5D6FB">4G</text>
- </g>
-</svg>
--- a/public/svg/base5G.svg
+++ b/public/svg/base5G.svg
@@ -1,28 +0,0 @@
-<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg">
- <!-- Created with Method Draw - http://github.com/duopixel/Method-Draw/ -->
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="1026" width="1026" y="-1" x="-1"/>
-  <g display="none" overflow="visible" y="0" x="0" height="100%" width="100%" id="canvasGrid">
-   <rect fill="url(#gridpattern)" stroke-width="0" y="1" x="1" height="768" width="1024"/>
-  </g>
- </g>
- <g>
-  <title>Layer 1</title>
-  <g stroke="null" id="svg_15">
-   <path stroke="null" id="svg_4" fill="#B5D6FB" d="m512.094844,961.632039c-1.327621,0 -2.560412,-0.405439 -3.793202,-1.114958l-405.588164,-251.575028c-2.275921,-1.419037 -3.698372,-4.054392 -3.698372,-6.892467l0,-90.007504c0,-2.838074 1.422451,-5.473429 3.698372,-6.892467l405.588164,-255.426701c1.137961,-0.709519 2.465582,-1.114958 3.793202,-1.114958s2.655242,0.405439 3.793202,1.114958l405.493334,255.426701c2.275921,1.419037 3.698372,4.054392 3.698372,6.892467l0,90.007504c0,2.838074 -1.422451,5.473429 -3.698372,6.892467l-405.588164,251.575028c-1.137961,0.709519 -2.465582,1.114958 -3.698372,1.114958z"/>
-   <path stroke="null" id="svg_5" fill="#0276F7" d="m512.094844,356.615382l405.398504,255.426701l0,90.007504l-66.096551,40.94936l-339.301952,210.625668l-339.491613,-210.625668l-66.096551,-40.94936l0,-90.007504l405.588164,-255.426701m0,-16.014849c-2.655242,0 -5.215653,0.709519 -7.586405,2.229916l-405.588164,255.426701c-4.551843,2.838074 -7.396745,8.108784 -7.396745,13.784933l0,90.007504c0,5.676149 2.844902,10.946859 7.491575,13.886293l66.096551,41.05072l339.491613,210.625668c2.275921,1.419037 4.931163,2.128556 7.491575,2.128556s5.215653,-0.709519 7.491575,-2.128556l339.301952,-210.625668l66.096551,-40.94936c4.646673,-2.838074 7.491575,-8.108784 7.491575,-13.886293l0,-90.007504c0,-5.676149 -2.844902,-10.946859 -7.396745,-13.784933l-405.398504,-255.426701c-2.370751,-1.520397 -5.025993,-2.331275 -7.586405,-2.331275z"/>
-   <path stroke="null" id="svg_6" fill="#FFFFFF" d="m106.50668,612.042083l405.493334,253.298145l405.493334,-253.298145l-405.398504,-255.426701l-405.588164,255.426701z"/>
-   <path stroke="null" id="svg_7" fill="#D4E4FC" d="m501.473877,64.192353l-254.9032,498.487506l263.343075,161.162085l266.662127,-162.074323l-275.102002,-497.575268z"/>
-   <path stroke="null" id="svg_8" fill="#0276F7" d="m229.975417,602.311542c-1.232791,0 -2.465582,-0.304079 -3.698372,-1.013598c-3.603542,-2.128556 -4.931163,-6.993826 -2.844902,-10.845499l279.653845,-532.13896c1.327621,-2.533995 3.793202,-4.054392 6.543274,-4.054392c2.655242,0 5.120823,1.520397 6.543274,4.054392l284.395348,532.13896c2.086261,3.851672 0.75864,8.716943 -2.750072,10.946859c-3.603542,2.128556 -8.155385,0.810878 -10.241646,-2.939434l-277.852074,-519.874424l-273.205401,519.671704c-1.422451,2.635355 -3.982862,4.054392 -6.543274,4.054392z"/>
-   <path stroke="null" id="svg_9" fill="#0276F7" d="m509.913752,755.567562c-4.172523,0 -7.491575,-3.547593 -7.491575,-8.007424l0,-666.744777c0,-4.459831 3.319052,-8.007424 7.491575,-8.007424s7.491575,3.547593 7.491575,8.007424l0,666.846137c0,4.358471 -3.413882,7.906065 -7.491575,7.906065z"/>
-   <path stroke="null" id="svg_10" fill="#0276F7" d="m509.913752,731.849369c-1.327621,0 -2.560412,-0.405439 -3.698372,-1.013598l-263.343075,-161.162085c-3.603542,-2.229916 -4.836333,-7.095186 -2.750072,-10.946859c2.086261,-3.851672 6.638104,-5.16935 10.241646,-2.939434l259.549873,158.83081l262.963755,-159.844408c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.946859l-266.662127,162.074323c-1.137961,0.709519 -2.465582,1.013598 -3.698372,1.013598z"/>
-   <path stroke="null" id="svg_11" fill="#0276F7" d="m509.913752,579.708306c-1.327621,0 -2.560412,-0.405439 -3.793202,-1.114958l-201.988026,-125.686154c-3.603542,-2.229916 -4.741503,-7.095186 -2.750072,-10.946859c2.086261,-3.851672 6.638104,-5.16935 10.241646,-2.838074l198.289654,123.354879l201.798366,-122.138561c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.845499l-205.496739,124.469837c-1.137961,0.709519 -2.465582,1.013598 -3.698372,1.013598zm-2.465582,-157.513132c-1.232791,0 -2.370751,-0.304079 -3.508712,-0.912238l-140.917468,-79.668804c-3.698372,-2.128556 -5.025993,-6.892467 -3.129392,-10.845499c1.896601,-3.953032 6.448444,-5.37207 10.146816,-3.344873l137.503586,77.742968l143.00373,-79.871524c3.698372,-2.027196 8.155385,-0.506799 10.146816,3.344873c1.896601,3.953032 0.47415,8.716943 -3.129392,10.845499l-146.512442,81.79736c-1.232791,0.608159 -2.370751,0.912238 -3.603542,0.912238zm2.465582,-148.49211c-1.232791,0 -2.465582,-0.304079 -3.508712,-0.912238l-82.312492,-47.436387c-3.603542,-2.128556 -5.025993,-6.993826 -3.034562,-10.845499c1.991431,-3.953032 6.543274,-5.27071 10.146816,-3.243514l78.708949,45.409191l78.329629,-47.537747c3.603542,-2.229916 8.155385,-0.810878 10.241646,3.040794c2.086261,3.851672 0.75864,8.716943 -2.844902,10.946859l-81.933171,49.666303c-1.232791,0.608159 -2.560412,0.912238 -3.793202,0.912238z"/>
-   <path stroke="null" id="svg_12" fill="#0276F7" d="m509.913752,579.708306l-0.28449,0l-263.248245,-9.021022c-4.172523,-0.10136 -7.396745,-3.851672 -7.207085,-8.210144c0.09483,-4.459831 4.077693,-7.703345 7.681235,-7.703345l263.343075,9.021022c4.172523,0.10136 7.396745,3.851672 7.207085,8.210144c-0.18966,4.257112 -3.508712,7.703345 -7.491575,7.703345zm0,152.141063c-1.612111,0 -3.224222,-0.608159 -4.646673,-1.723117c-3.224222,-2.736715 -3.793202,-7.804705 -1.232791,-11.250938l205.496739,-276.610899c2.560412,-3.446233 7.301915,-4.054392 10.526137,-1.317677c3.224222,2.736715 3.793202,7.804705 1.232791,11.250938l-205.496739,276.610899c-1.517281,2.027196 -3.698372,3.040794 -5.879464,3.040794z"/>
-   <path stroke="null" id="svg_13" fill="#0276F7" d="m509.913752,579.708306c-1.422451,0 -2.750072,-0.405439 -4.077693,-1.216318c-3.508712,-2.432635 -4.457013,-7.297906 -2.275921,-11.048218l144.14169,-239.310492c2.275921,-3.750313 6.922594,-4.763911 10.336476,-2.432635c3.508712,2.432635 4.457013,7.297906 2.275921,11.048218l-144.14169,239.310492c-1.422451,2.331275 -3.793202,3.648953 -6.258784,3.648953zm-2.465582,-157.513132c-1.043131,0 -2.086261,-0.20272 -3.129392,-0.709519c-3.793202,-1.824476 -5.405313,-6.588387 -3.698372,-10.642779l84.398753,-198.158413c1.706941,-4.054392 6.069124,-5.777509 9.957156,-3.953032c3.793202,1.824476 5.405313,6.588387 3.698372,10.642779l-84.303923,198.158413c-1.327621,2.939434 -4.077693,4.662551 -6.922594,4.662551z"/>
-   <path stroke="null" id="svg_14" fill="#0276F7" d="m591.846924,375.062866c-2.750072,0 -5.405313,-1.621757 -6.732934,-4.459831c-1.801771,-3.953032 -0.28449,-8.716943 3.413882,-10.642779l129.253371,-67.302908l-365.759539,-178.089172l20.862613,208.091673l133.994874,-64.262114c3.698372,-1.824476 8.155385,0 9.862326,4.054392c1.706941,4.054392 0,8.716943 -3.793202,10.541419l-143.38305,68.823305c-2.181091,1.013598 -4.646673,0.912238 -6.827764,-0.405439c-2.086261,-1.317677 -3.413882,-3.547593 -3.698372,-6.081588l-23.328195,-233.026185c-0.28449,-2.838074 0.853471,-5.676149 3.034562,-7.297906c2.181091,-1.621757 5.025993,-2.027196 7.491575,-0.810878l392.217126,190.961867c2.655242,1.317677 4.362183,4.054392 4.362183,7.196546c0,3.142154 -1.612111,5.980228 -4.172523,7.297906l-143.57271,74.600814c-1.043131,0.608159 -2.181091,0.810878 -3.224222,0.810878zm-283.921198,78.959286c-3.603542,0 -6.827764,-2.838074 -7.396745,-6.791107c-0.56898,-4.358471 2.181091,-8.412864 6.258784,-9.122382l199.617275,-31.826978c4.077693,-0.608159 7.870895,2.331275 8.534705,6.689747c0.56898,4.358471 -2.181091,8.412864 -6.258784,9.122382l-199.617275,31.826978c-0.47415,0.10136 -0.853471,0.10136 -1.137961,0.10136z"/>
-  </g>
-  <text stroke="null" font-style="italic" transform="matrix(6.577099502228161,0,0,7.449448263868419,-1073.2057632249744,-908.8606073938396) " xml:space="preserve" text-anchor="start" font-family="Arvo, sans-serif" font-size="24" id="svg_16" y="177.898525" x="178.621382" stroke-width="0" fill="#D4E4FC">5G</text>
- </g>
-</svg>
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,8 +9,6 @@ import advancedFormat from 'dayjs/plugin/advancedFormat';
 import useLayoutStore from '@/store/modules/layout';
 import useAppStore from '@/store/modules/app';
 import useI18n from '@/hooks/useI18n';
-import { CACHE_LOCAL_PROCONFIG } from './constants/cache-keys-constants';
-import { localRemove } from './utils/cache-local-utils';
 const { t, currentLocale } = useI18n();
 const { themeConfig, initPrimaryColor, changeConf } = useLayoutStore();
 dayjs.extend(advancedFormat);
@@ -36,7 +34,6 @@ onBeforeMount(() => {
    maxCount: 15,
  });
  initPrimaryColor();
-  localRemove(CACHE_LOCAL_PROCONFIG);

  // 输出应用版本号
  const appStore = useAppStore();
--- a/src/api/faultManage/actAlarm.ts
+++ b/src/api/faultManage/actAlarm.ts
@@ -1,7 +1,7 @@
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
-import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } from '@/utils/date-utils';
+import { parseDateToStr } from '@/utils/date-utils';
 import useUserStore from '@/store/modules/user';

 /**
@@ -122,7 +122,7 @@ export function updateConfirm(data: Record<string, any>) {
  const userName = useUserStore().userName;
  let finalData = {
    alarm: {
-      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
+      ack_time: parseDateToStr(time),
      ack_user: userName,
      ack_state: '1',
    },
@@ -145,7 +145,7 @@ export function cancelConfirm(data: (string | number)[]) {
  const userName = useUserStore().userName;
  let finalData = {
    alarm: {
-      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
+      ack_time: parseDateToStr(time),
      ack_user: '',
      ack_state: '0',
    },
@@ -211,12 +211,12 @@ export function getPass() {
 * @param data 鉴权对象
 * @returns object
 */
-export function clearAlarm2(data: Record<string, any>) {
+export function clearAlarm(data: Record<string, any>) {
  var time = new Date();
  const userName = useUserStore().userName;
  let finalData = {
    data: {
-      clear_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
+      clear_time: parseDateToStr(time),
      clear_type: '2',
      alarm_status: '0',
      clear_user: userName,
@@ -232,19 +232,6 @@ export function clearAlarm2(data: Record<string, any>) {
  });
 }

-/**
- * 清除告警信息
- * @param ids 记录ID
- * @returns object
- */
-export function clearAlarm(ids: string[]) {
-  return request({
-    url: `/neData/alarm/clear`,
-    method: 'PUT',
-    data: { ids },
-  });
-}
-
 /**
 * 手工同步
 * @param data 鉴权对象
@@ -373,137 +360,3 @@ export async function top3Sel(filterFlag?: string) {
  }
  return result;
 }
-
-
-export async function alarmDashGetAct() {
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='1'  `;
-  let rowsSQL = `select ne_type,alarm_id,alarm_title,orig_severity,event_time from alarm WHERE alarm_status='1'  and orig_severity!='Event'  order by event_time desc limit 0,10  `;
-  // 查询
-
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
-    method: 'get',
-    params: {
-      SQL: totalSQL,
-      rowsSQL: rowsSQL,
-    },
-  });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data: DataList = {
-      total: 0,
-      rows: [],
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.total = itemData[0]['total'];
-        } else {
-          data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
-}
-
-export async function alarmDashGetHis() {
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='0'  `;
-  let rowsSQL = `select ne_type,alarm_id,alarm_title,orig_severity,event_time from alarm WHERE alarm_status='0'  and orig_severity!='Event'  order by event_time desc limit 0,10  `;
-  // 查询
-
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
-    method: 'get',
-    params: {
-      SQL: totalSQL,
-      rowsSQL: rowsSQL,
-    },
-  });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data: DataList = {
-      total: 0,
-      rows: [],
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.total = itemData[0]['total'];
-        } else {
-          data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
-}
-export async function getAlarmTrend(params: any) {
-  const days = Number(params.days || 1);
-  let groupFormat = days === 1 ? '%H:00' : '%Y-%m-%d';
-  let timeCondition = days === 1
-    ? `event_time >= DATE_SUB(NOW(), INTERVAL 1 DAY)`
-    : `event_time >= DATE_SUB(CURDATE(), INTERVAL ${days} DAY)`;
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='0' `;
-
-  let rowsSQL = `  SELECT
-    DATE_FORMAT(event_time, '${groupFormat}') AS time,
-    SUM(CASE WHEN orig_severity='Critical' THEN 1 ELSE 0 END) AS Critical,
-    SUM(CASE WHEN orig_severity='Major' THEN 1 ELSE 0 END) AS Major,
-    SUM(CASE WHEN orig_severity='Minor' THEN 1 ELSE 0 END) AS Minor,
-    SUM(CASE WHEN orig_severity='Warning' THEN 1 ELSE 0 END) AS Warning
-  FROM alarm
-  WHERE alarm_status='0'
-    AND ${timeCondition}
-  GROUP BY time
-  ORDER BY time ASC  `;
-  // 查询
-
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
-    method: 'get',
-    params: {
-      SQL: totalSQL,
-      rowsSQL: rowsSQL,
-    },
-  });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data: DataList = {
-      total: 0,
-      rows: [],
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.total = itemData[0]['total'];
-        } else {
-          data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
-}
-
--- a/src/api/faultManage/eventAlarm.ts
+++ b/src/api/faultManage/eventAlarm.ts
@@ -1,6 +1,8 @@
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
+import { parseDateToStr } from '@/utils/date-utils';
+import useUserStore from '@/store/modules/user';

 /**
 * 查询列表
--- a/src/api/faultManage/faultSetting.ts
+++ b/src/api/faultManage/faultSetting.ts
@@ -63,11 +63,7 @@ export async function getAlarmSet() {
      }
    }
    if (Object.keys(resultData).length === 0) {
-      return {
-        code: RESULT_CODE_ERROR,
-        msg: RESULT_MSG_ERROR[language],
-        data: {},
-      };
+      return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: {} };
    }
    return {
      code: RESULT_CODE_SUCCESS,
@@ -121,11 +117,7 @@ export async function updateAlarmSet(data: Record<string, any>) {
    }
    // 无变更时
    if (resultNum === 0) {
-      return {
-        code: RESULT_CODE_ERROR,
-        msg: RESULT_MSG_ERROR[language],
-        data: 0,
-      };
+      return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: 0 };
    }
    return {
      code: RESULT_CODE_SUCCESS,
@@ -174,10 +166,11 @@ export async function getForwardSet() {
 */
 export async function updateForwardSet(data: Record<string, any>) {
  // return false;
-  let obj: any = [
-    { interface: 'Email', to_user: data.emailObj },
-    { interface: 'SMS', to_user: data.smsObj },
-  ];
+  console.log(data)
+  let obj:any=[
+    {interface:"Email",to_user:data.emailObj},
+    {interface:"SMS",to_user:data.smsObj}
+  ]
  const result = await request({
    url: `/api/rest/databaseManagement/v1/omc_db/config?WHERE=config_tag='forwardAlarm'`,
    method: 'put',
--- a/src/api/faultManage/historyAlarm.ts
+++ b/src/api/faultManage/historyAlarm.ts
@@ -1,7 +1,7 @@
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
-import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } from '@/utils/date-utils';
+import { parseDateToStr } from '@/utils/date-utils';
 import useUserStore from '@/store/modules/user';

 /**
@@ -79,7 +79,7 @@ export function updateConfirm(data: Record<string, any>) {
  const userName = useUserStore().userName;
  let finalData = {
    alarm: {
-      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
+      ack_time: parseDateToStr(time),
      ack_user: userName,
      ack_state: '1',
    },
@@ -101,7 +101,7 @@ export function cancelConfirm(data: (string | number)[]) {
  var time = new Date();
  let finalData = {
    alarm: {
-      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
+      ack_time: parseDateToStr(time),
      ack_user: '',
      ack_state: '0',
    },
--- a/src/api/logManage/exportFile.ts
+++ b/src/api/logManage/exportFile.ts
@@ -1,5 +1,3 @@
-import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
-import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

 /**
@@ -53,43 +51,3 @@ export function delFile(query: Record<string, any>) {
    params: query,
  });
 }
-
-/**
- * 更新FTP信息
- * @param data 数据
- * @returns object
- */
-export function updateFTPInfo(data: Record<string, any>) {
-  return request({
-    url: `/lm/table/ftp`,
-    method: 'post',
-    data: data,
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
-  });
-}
-
-/**
- * 获取FTP信息
- * @param data 数据
- * @returns object
- */
-export function getFTPInfo() {
-  return request({
-    url: `/lm/table/ftp`,
-    method: 'get',
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
-  });
-}
-
-/**
- * 发送FTP文件
- * @param data 数据
- * @returns object
- */
-export function putFTPInfo(filePath: string, fileName: string) {
-  return request({
-    url: `/lm/table/ftp`,
-    method: 'put',
-    data: { filePath, fileName },
-  });
-}
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,5 +1,3 @@
-import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
-import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

 // 登录方法
@@ -9,7 +7,7 @@ export function login(data: Record<string, string>) {
    method: 'post',
    data: data,
    whithToken: false,
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
+    crypto: true,
  });
 }

@@ -24,7 +22,7 @@ export function register(data: Record<string, any>) {
    method: 'post',
    data: data,
    whithToken: false,
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
+    crypto: true,
  });
 }

@@ -61,69 +59,3 @@ export function getCaptchaImage() {
    whithToken: false,
  });
 }
-
-/**
- * 登录认证源
- * @returns object
- */
-export function getLoginSource() {
-  return request({
-    url: '/auth/login/source',
-    method: 'GET',
-    whithToken: false,
-  });
-}
-
-/**
- * LDAP登录
- * @returns object
- */
-export function loginLDAP(data: Record<string, string>) {
-  return request({
-    url: '/auth/login/ldap',
-    method: 'POST',
-    data: data,
-    whithToken: false,
-  });
-}
-
-/**
- * SMTP登录
- * @returns object
- */
-export function loginSMTP(data: Record<string, string>) {
-  return request({
-    url: '/auth/login/smtp',
-    method: 'POST',
-    data: data,
-    whithToken: false,
-  });
-}
-
-/**
- * 登录认证源OAuth2跳转登录URL
- * @returns object
- */
-export function loginOAuth2URL(state: string): string {
-  // 兼容旧前端可改配置文件
-  const baseUrl = import.meta.env.PROD
-    ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
-    : import.meta.env.VITE_API_BASE_URL;
-  return `${baseUrl}/auth/login/oauth2/authorize?state=${state}`;
-}
-
-/**
- * 登录认证源OAuth2认证登录
- * @returns object
- */
-export function loginOAuth2Token(code: string, state: string) {
-  return request({
-    url: '/auth/login/oauth2/token',
-    method: 'POST',
-    data: {
-      code,
-      state,
-    },
-    whithToken: false,
-  });
-}
--- a/src/api/ne/neConfig.ts
+++ b/src/api/ne/neConfig.ts
@@ -5,11 +5,10 @@ import { request } from '@/plugins/http-fetch';
 * @param query 查询参数
 * @returns object
 */
-export function getAllNeConfig(neType: string, neId: string) {
+export function getAllNeConfig(neType: string) {
  return request({
    url: `/ne/config/list/${neType}`,
    method: 'get',
-    params: { neId },
    timeout: 60_000,
  });
 }
--- a/src/api/ne/neInfo.ts
+++ b/src/api/ne/neInfo.ts
@@ -1,5 +1,3 @@
-import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
-import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

 /**
@@ -38,7 +36,7 @@ export function addNeInfo(data: Record<string, any>) {
    url: `/ne/info`,
    method: 'post',
    data: data,
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
+    crypto: true,
    timeout: 30_000,
  });
 }
@@ -53,7 +51,7 @@ export function updateNeInfo(data: Record<string, any>) {
    url: `/ne/info`,
    method: 'put',
    data: data,
-    crypto: sessionGet(CACHE_SESSION_CRYPTO_API) !== 'false',
+    crypto: true,
    timeout: 30_000,
  });
 }
--- a/src/api/neData/amf.ts
+++ b/src/api/neData/amf.ts
@@ -10,7 +10,6 @@ export function listAMFDataUE(query: Record<string, any>) {
    url: '/neData/amf/ue/list',
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
 }

@@ -38,93 +37,6 @@ export function exportAMFDataUE(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-
-/**
- * AMF-接入基站信息列表
- * @param query 查询参数 neId=001&id=1
- * @returns object
- */
-export function listAMFNblist(query: Record<string, any>) {
-  return request({
-    url: '/neData/amf/nb/list',
-    method: 'get',
-    params: query,
    timeout: 60_000,
  });
 }
-
-/**
- * AMF-接入基站状态信息列表
- * @param query 查询参数 neId=001&state=1
- * @returns object
- */
-export function listAMFNbStatelist(query: Record<string, any>) {
-  return request({
-    url: '/neData/amf/nb/list-cfg',
-    method: 'get',
-    params: query,
-    timeout: 60_000,
-  });
-}
-
-/**
- * AMF-接入基站状态信息新增
- * @param neId 网元ID
- * @param data 数据 { "index": 1, "name": "Gnb", "address": "192.168.8.1", "position": "Area-B" }
- * @returns object
- */
-export function addAMFNbState(neId: string, data: Record<string, any>) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'post',
-    data: {
-      neType: 'AMF',
-      neId: neId,
-      paramName: 'gnbList',
-      paramData: data,
-      loc: `${data.index}`,
-    },
-  });
-}
-
-/**
- * AMF-接入基站状态信息修改
- * @param neId 网元ID
- * @param data 数据 { "index": 1, "name": "Gnb", "address": "192.168.8.1", "position": "Area-B" }
- * @returns object
- */
-export function editAMFNbState(neId: string, data: Record<string, any>) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'put',
-    data: {
-      neType: 'AMF',
-      neId: neId,
-      paramName: 'gnbList',
-      paramData: data,
-      loc: `${data.index}`,
-    },
-  });
-}
-
-/**
- * AMF-接入基站状态信息删除
- * @param neId 网元ID
- * @param index 数据index
- * @returns object
- */
-export function delAMFNbState(neId: string, index: string | number) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'delete',
-    params: {
-      neType: 'AMF',
-      neId: neId,
-      paramName: 'gnbList',
-      loc: `${index}`,
-    },
-  });
-}
--- a/src/api/neData/backup.ts
+++ b/src/api/neData/backup.ts
@@ -1,68 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 备份文件-获取FTP配置
- * @returns object
- */
-export function getBackupFTP() {
-  return request({
-    url: '/neData/backup/ftp',
-    method: 'GET',
-  });
-}
-
-/**
- * 备份文件-文件FTP发送
- * @param data 对象
- * @returns object
- */
-export function pushBackupFTP(data: Record<string, any>) {
-  return request({
-    url: '/neData/backup/ftp',
-    method: 'POST',
-    data,
-  });
-}
-
-/**
- * 备份文件-更新FTP配置
- * @param data 对象
- * @returns object
- */
-export function updateBackupFTP(data: Record<string, any>) {
-  return request({
-    url: '/neData/backup/ftp',
-    method: 'PUT',
-    data,
-  });
-}
-
-/**
- * 备份文件-导出OMC
- * @returns object
- */
-export function exportBackupOMC() {
-  return request({
-    url: '/neData/backup/export-omc',
-    method: 'POST',
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-
-/**
- * 备份文件-导入OMC
- * @param filePath 备份文件上传返回的/upload 路径
- * @returns object
- */
-export function importBackupOMC(filePath: string) {
-  return request({
-    url: '/neData/backup/import-omc',
-    method: 'POST',
-    data: {
-      neType: 'OMC',
-      path: filePath,
-    },
-    timeout: 180_000,
-  });
-}
--- a/src/api/neData/ims.ts
+++ b/src/api/neData/ims.ts
@@ -10,7 +10,6 @@ export function listIMSDataCDR(query: Record<string, any>) {
    url: '/neData/ims/cdr/list',
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
 }

@@ -38,6 +37,6 @@ export function exportIMSDataCDR(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 180_000,
+    timeout: 60_000,
  });
 }
--- a/src/api/neData/ims_sub.ts
+++ b/src/api/neData/ims_sub.ts
@@ -1,148 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * UDM签约用户重载数据
- * @param neId 网元ID
- * @returns object
- */
-export function resetIMSSub(neId: string) {
-  return request({
-    url: `/ue/udm/imsuser/resetData/${neId}`,
-    method: 'put',
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户列表
- * @param query 查询参数
- * @returns object
- */
-export function listIMSSub(query: Record<string, any>) {
-  return request({
-    url: '/ue/udm/imsuser/list',
-    method: 'get',
-    params: query,
-    timeout: 30_000,
-  });
-}
-
-/**
- * UDM签约用户信息
- * @param neId 网元ID
- * @param imsi IMSI
- * @returns object
- */
-export function getIMSSub(neId: string, imsi: string) {
-  return request({
-    url: `/ue/udm/imsuser/${neId}/${imsi}`,
-    method: 'get',
-  });
-}
-
-/**
- * UDM签约用户新增
- * @param data 签约对象
- * @returns object
- */
-export function addIMSSub(data: Record<string, any>) {
-  return request({
-    url: `/ue/udm/imsuser/${data.neId}`,
-    method: 'post',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户批量新增
- * @param data 签约对象
- * @param num 数量
- * @returns object
- */
-export function batchAddIMSSub(data: Record<string, any>, num: number) {
-  return request({
-    url: `/ue/udm/imsuser/${data.neId}/${num}`,
-    method: 'post',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户修改
- * @param data 签约对象
- * @returns object
- */
-// export function updateIMSSub(data: Record<string, any>) {
-//   return request({
-//     url: `/ue/udm/imsuser/${data.neId}`,
-//     method: 'put',
-//     data: data,
-//     timeout: 180_000,
-//   });
-// }
-
-/**
- * UDM签约用户删除
- * @param data 签约对象
- * @returns object
- */
-export function delIMSSub(neId: string, imsi_msisdn: string, tag: string) {
-  return request({
-    url: `/ue/udm/imsuser/${neId}/${imsi_msisdn}`,
-    method: 'delete',
-    params: { volte: tag },
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户批量删除
- * @param neId 网元ID
- * @param imsi IMSI
- * @param num 数量
- * @returns object
- */
-export function batchDelIMSSub(
-  neId: string,
-  imsi: string,
-  num: number,
-  tag: string
-) {
-  return request({
-    url: `/ue/udm/imsuser/${neId}/${imsi}/${num}`,
-    method: 'delete',
-    params: { volte: tag },
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户导出
- * @param data 数据参数
- * @returns bolb
- */
-export function exportIMSSub(data: Record<string, any>) {
-  return request({
-    url: '/ue/udm/imsuser/export',
-    method: 'post',
-    data,
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM签约用户导入
- * @param data 表单数据对象
- * @returns object
- */
-export function importIMSSub(data: Record<string, any>) {
-  return request({
-    url: `/ue/udm/imsuser/import`,
-    method: 'post',
-    data,
-    timeout: 180_000,
-  });
-}
--- a/src/api/neData/mme.ts
+++ b/src/api/neData/mme.ts
@@ -10,7 +10,6 @@ export function listMMEDataUE(query: Record<string, any>) {
    url: '/neData/mme/ue/list',
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
 }

@@ -38,93 +37,6 @@ export function exportMMEDataUE(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-
-/**
- * MME-接入基站信息列表
- * @param query 查询参数 neId=001&id=1
- * @returns object
- */
-export function listMMENblist(query: Record<string, any>) {
-  return request({
-    url: '/neData/mme/nb/list',
-    method: 'get',
-    params: query,
    timeout: 60_000,
  });
 }
-
-/**
- * MME-接入基站状态信息列表
- * @param query 查询参数 neId=001&state=1
- * @returns object
- */
-export function listMMENbStatelist(query: Record<string, any>) {
-  return request({
-    url: '/neData/mme/nb/list-cfg',
-    method: 'get',
-    params: query,
-    timeout: 60_000,
-  });
-}
-
-/**
- * MME-接入基站状态信息新增
- * @param neId 网元ID
- * @param data 数据 { "index": 1, "name": "Enb", "address": "192.168.8.1", "position": "Area-B" }
- * @returns object
- */
-export function addMMENbState(neId: string, data: Record<string, any>) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'post',
-    data: {
-      neType: 'MME',
-      neId: neId,
-      paramName: 'enbList',
-      paramData: data,
-      loc: `${data.index}`,
-    },
-  });
-}
-
-/**
- * MME-接入基站状态信息修改
- * @param neId 网元ID
- * @param data 数据 { "index": 1, "name": "Enb", "address": "192.168.8.1", "position": "Area-B" }
- * @returns object
- */
-export function editMMENbState(neId: string, data: Record<string, any>) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'put',
-    data: {
-      neType: 'MME',
-      neId: neId,
-      paramName: 'enbList',
-      paramData: data,
-      loc: `${data.index}`,
-    },
-  });
-}
-
-/**
- * MME-接入基站状态信息删除
- * @param neId 网元ID
- * @param index 数据index
- * @returns object
- */
-export function delMMENbState(neId: string, index: string | number) {
-  return request({
-    url: `/ne/config/data`,
-    method: 'delete',
-    params: {
-      neType: 'MME',
-      neId: neId,
-      paramName: 'enbList',
-      loc: `${index}`,
-    },
-  });
-}
--- a/src/api/neData/nb-state.ts
+++ b/src/api/neData/nb-state.ts
@@ -1,30 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 历史记录列表
- * @param query 查询参数
- * @returns object
- */
-export function listNBState(query: Record<string, any>) {
-  return request({
-    url: '/neData/nb-state/list',
-    method: 'get',
-    params: query,
-    timeout: 60_000,
-  });
-}
-
-/**
- * 历史记录列表导出
- * @param data 查询列表条件
- * @returns object
- */
-export function exportNBState(data: Record<string, any>) {
-  return request({
-    url: '/neData/nb-state/export',
-    method: 'post',
-    data,
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
--- a/src/api/neData/sgwc.ts
+++ b/src/api/neData/sgwc.ts
@@ -1,43 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 查询SGWC-CDR会话事件
- * @param query 查询参数
- * @returns object
- */
-export function listSGWCDataCDR(query: Record<string, any>) {
-  return request({
-    url: '/neData/sgwc/cdr/list',
-    method: 'get',
-    params: query,
-    timeout: 60_000,
-  });
-}
-
-/**
- * SGWC-CDR会话删除
- * @param id 信息ID
- * @returns object
- */
-export function delSGWCDataCDR(cdrIds: string | number) {
-  return request({
-    url: `/neData/sgwc/cdr/${cdrIds}`,
-    method: 'delete',
-    timeout: 60_000,
-  });
-}
-
-/**
- * SGWC-CDR会话列表导出
- * @param data 查询列表条件
- * @returns object
- */
-export function exportSGWCDataCDR(data: Record<string, any>) {
-  return request({
-    url: '/neData/sgwc/cdr/export',
-    method: 'post',
-    data,
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
--- a/src/api/neData/smf.ts
+++ b/src/api/neData/smf.ts
@@ -10,7 +10,6 @@ export function listSMFDataCDR(query: Record<string, any>) {
    url: '/neData/smf/cdr/list',
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
 }

@@ -38,20 +37,7 @@ export function exportSMFDataCDR(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-
-/**
- * SMF-在线订阅用户数量
- * @param query 查询参数
- * @returns object
- */
-export function listSMFSubNum(neId: string) {
-  return request({
-    url: '/neData/smf/sub/num',
-    method: 'get',
-    params: { neId },
+    timeout: 60_000,
  });
 }

@@ -60,9 +46,9 @@ export function listSMFSubNum(neId: string) {
 * @param query 查询参数
 * @returns object
 */
-export function listSMFSubList(query: Record<string, any>) {
+export function listSMFSubscribers(query: Record<string, any>) {
  return request({
-    url: '/neData/smf/sub/list',
+    url: '/neData/smf/subscribers',
    method: 'get',
    params: query,
  });
--- a/src/api/neData/smsc.ts
+++ b/src/api/neData/smsc.ts
@@ -10,7 +10,6 @@ export function listSMSCDataCDR(query: Record<string, any>) {
    url: '/neData/smsc/cdr/list',
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
 }

@@ -38,6 +37,6 @@ export function exportSMSCDataCDR(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 180_000,
+    timeout: 60_000,
  });
 }
--- a/src/api/neData/udm_auth.ts
+++ b/src/api/neData/udm_auth.ts
@@ -140,17 +140,3 @@ export function exportUDMAuth(data: Record<string, any>) {
    timeout: 180_000,
  });
 }
-
-/**
- * UDM鉴权用户导出DecAuth
- * @param neId 网元ID
- * @returns bolb
- */
-export function exportUDMDecAuth(neId: string) {
-  return request({
-    url: `/neData/udm/auth/export-dec?neId=${neId}`,
-    method: 'get',
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
--- a/src/api/neData/voip_auth.ts
+++ b/src/api/neData/voip_auth.ts
@@ -1,142 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * UDM鉴权用户重载数据
- * @param neId 网元ID
- * @returns object
- */
-export function resetUDMAuth(neId: string) {
-  return request({
-    url: `/ue/udm/voipauth/resetData/${neId}`,
-    method: 'put',
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户列表
- * @param query 查询参数
- * @returns object
- */
-export function listUDMAuth(query: Record<string, any>) {
-  return request({
-    url: '/ue/udm/voipauth/list',
-    method: 'get',
-    params: query,
-    timeout: 30_000,
-  });
-}
-
-/**
- * UDM鉴权用户信息
- * @param neId 网元ID
- * @param userName 用户名
- * @returns object
- */
-export function getUDMAuth(neId: string, userName: string) {
-  return request({
-    url: `/ue/udm/voipauth/${neId}/${userName}`,
-    method: 'get',
-  });
-}
-
-/**
- * UDM鉴权用户新增
- * @param data 鉴权对象
- * @returns object
- */
-export function addUDMAuth(data: Record<string, any>) {
-  return request({
-    url: `/ue/udm/voipauth/${data.neId}`,
-    method: 'post',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户批量新增
- * @param data 鉴权对象
- * @param num 数量
- * @returns object
- */
-export function batchAddUDMAuth(data: Record<string, any>, num: number) {
-  return request({
-    url: `/ue/udm/voipauth/${data.neId}/${num}`,
-    method: 'post',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户修改
- * @param data 鉴权对象
- * @returns object
- */
-export function updateUDMAuth(data: Record<string, any>) {
-  return request({
-    url: `/ue/udm/voipauth/${data.neId}`,
-    method: 'put',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户删除
- * @param neId 网元ID
- * @param imsi IMSI
- * @returns object
- */
-export function delUDMAuth(neId: string, imsi: string) {
-  return request({
-    url: `/ue/udm/voipauth/${neId}/${imsi}`,
-    method: 'delete',
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户批量删除
- * @param neId 网元ID
- * @param imsi IMSI
- * @param num 数量
- * @returns object
- */
-export function batchDelUDMAuth(neId: string, imsi: string, num: number) {
-  return request({
-    url: `/ue/udm/voipauth/${neId}/${imsi}/${num}`,
-    method: 'delete',
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户导入
- * @param data 表单数据对象
- * @returns object
- */
-export function importUDMAuth(data: Record<string, any>) {
-  return request({
-    url: `/ue/udm/voipauth/import`,
-    method: 'post',
-    data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * UDM鉴权用户导出
- * @param data 数据参数
- * @returns bolb
- */
-export function exportUDMAuth(data: Record<string, any>) {
-  return request({
-    url: '/ue/udm/voipauth/export',
-    method: 'post',
-    data,
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
--- a/src/api/neUser/exportFile.ts
+++ b/src/api/neUser/exportFile.ts
@@ -1,51 +0,0 @@
-import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
-import { sessionGet } from '@/utils/cache-session-utils';
-import { request } from '@/plugins/http-fetch';
-/**
- * 获取下拉框数据
- * @returns object
- */
-export function getBakFile() {
-  return request({
-    url: '/ue/table/list',
-    method: 'get',
-  });
-}
-/**
- * 获取对应类型的文件列表
- * @param query 查询参数
- * @returns object
- */
-export function getBakFileList(query: Record<string, any>) {
-  return request({
-    url: '/ue/file/list',
-    method: 'get',
-    params: query,
-  });
-}
-/**
- * 下载远端文件
- * @param query 查询参数
- * @returns object
- */
-export function downFile(query: Record<string, any>) {
-  return request({
-    url: `/ue/file/${query.fileName}`,
-    method: 'get',
-    params: query,
-    responseType: 'blob',
-    timeout: 180_000,
-  });
-}
-/**
- * 删除远端获取文件
- * @param query 查询参数
- * @returns object
- */
-export function delFile(query: Record<string, any>) {
-  return request({
-    url: `/ue/file/${query.fileName}`,
-    method: 'delete',
-    params: query,
-  });
-}
--- a/src/api/neUser/smf.ts
+++ b/src/api/neUser/smf.ts
@@ -21,14 +21,12 @@ export async function listUEInfoBySMF(query: Record<string, any>) {
  };
  // 解析数据
  if (result.code === RESULT_CODE_SUCCESS && result.data) {
-    if (result.data.total && result.data.data) {
-      data.total = result.data.total;
-      data.rows = result.data.data;
+    if (Array.isArray(result.data.data)) {
+      const rows = result.data.data;
+      data.total = rows.length;
+      data.rows = rows;
    } else {
-      Object.assign(data, {
-        total: result.data.length,
-        rows: result.data,
-      });
+      Object.assign(data, result.data);
    }
  }

--- a/src/api/perfManage/customData.ts
+++ b/src/api/perfManage/customData.ts
@@ -1,4 +1,7 @@
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
+import { parseObjLineToHump } from '@/utils/parse-utils';
+import { parseDateToStr } from '@/utils/date-utils';

 /**
 * 新 查询自定义指标数据
@@ -11,7 +14,6 @@ export async function listCustomData(query: Record<string, any>) {
    url: `/pm/kpiC/report`,
    method: 'get',
    params: query,
-    timeout: 60_000,
  });
  return result;
 }
--- a/src/api/perfManage/customTarget.ts
+++ b/src/api/perfManage/customTarget.ts
@@ -1,4 +1,7 @@
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
+import { parseObjLineToHump } from '@/utils/parse-utils';
+import { parseDateToStr } from '@/utils/date-utils';

 /**
 * 查询自定义指标
--- a/src/api/perfManage/goldTarget.ts
+++ b/src/api/perfManage/goldTarget.ts
@@ -110,52 +110,78 @@ export async function getKPITitle(neType: string) {
 }

 /**
- * 查询黄金指标数据kpi.id转换title
- * @param neType 网元类型
+ * Todo 废弃
+ * 查询UPF上下行速率数据
+ * @param query 查询参数
 * @returns object
 */
-export async function getKPITitleList(query: Record<string, any>) {
-  return request({
-    url: '/neData/kpi/title/list',
-    method: 'get',
-    params: query,
-  });
-}
+export async function listUPFData(timeArr: any) {
+  const initTime: Date = new Date();
+  const twentyFourHoursAgo: Date = new Date(
+    initTime.getTime() - 10 * 60 * 1000
+  );

-/**
- * 修改指标标题
- * @param data 指标标题对象
- * @returns object
- */
-export function updateKPITitle(data: Record<string, any>) {
-  return request({
-    url: '/neData/kpi/title',
-    method: 'put',
-    data: data,
-  });
-}
-//忙时呼叫
-export async function getbusyhour(query: Record<string, any>) {
-  return request({
-    url: '/neData/ims/kpi/busy-hour',
-    method: 'get',
-    params: query,
-  });
-}
-//MOS指标
-export async function getMosHour(query: Record<string, any>) {
-  return request({
-    url: '/neData/ims/cdr/mos-hour',
-    method: 'get',
-    params: query,
-  });
-}
+  return await Promise.allSettled([
+    // 获取参数规则
+    request({
+      url: `/api/rest/databaseManagement/v1/select/omc_db/gold_kpi`,
+      method: 'get',
+      params: {
+        SQL: `SELECT gold_kpi.*,kpi_title.en_title FROM gold_kpi LEFT JOIN kpi_title on gold_kpi.kpi_id=kpi_title.kpi_id where 1=1 and gold_kpi.kpi_id ='UPF.03' AND timestamp BETWEEN DATE_SUB(NOW(), INTERVAL 10 MINUTE) AND NOW()`,
+      },
+      timeout: 60_000,
+    }),
+    // 获取对应信息
+    request({
+      url: `/api/rest/databaseManagement/v1/select/omc_db/gold_kpi`,
+      method: 'get',
+      params: {
+        SQL: `SELECT gold_kpi.*,kpi_title.en_title FROM gold_kpi LEFT JOIN kpi_title on gold_kpi.kpi_id=kpi_title.kpi_id where 1=1 and gold_kpi.kpi_id ='UPF.06' AND timestamp BETWEEN DATE_SUB(NOW(), INTERVAL 10 MINUTE) AND NOW()`,
+      },
+      timeout: 60_000,
+    }),
+  ]).then(resArr => {
+    let upData: any = [];
+    let downData: any = [];

-//CCT指标
-export async function getCctHour(query: Record<string, any>) {
-  return request({
-    url: '/neData/ims/cdr/cct-hour',
-    method: 'get',
-    params: query,
+    // 规则数据
+    if (resArr[0].status === 'fulfilled') {
+      const itemV: any = resArr[0].value;
+      // 解析数据
+      if (
+        itemV.code === RESULT_CODE_SUCCESS &&
+        Array.isArray(itemV.data?.data)
+      ) {
+        let itemData = itemV.data.data;
+        let data = itemData[0]['gold_kpi'];
+        if (Array.isArray(data)) {
+          try {
+            upData = data.map(v => parseObjLineToHump(v));
+          } catch (error) {
+            console.error(error);
+          }
+        }
+      }
+    }
+
+    if (resArr[1].status === 'fulfilled') {
+      const itemV = resArr[1].value;
+      // 解析数据
+      if (
+        itemV.code === RESULT_CODE_SUCCESS &&
+        Array.isArray(itemV.data?.data)
+      ) {
+        let itemData = itemV.data.data;
+        const data = itemData[0]['gold_kpi'];
+        if (Array.isArray(data)) {
+          try {
+            downData = data.map(v => parseObjLineToHump(v));
+          } catch (error) {
+            console.error(error);
+          }
+        }
+      }
+    }
+    return { upData, downData };
  });
 }
--- a/src/api/perfManage/perfThreshold.ts
+++ b/src/api/perfManage/perfThreshold.ts
@@ -1,6 +1,7 @@
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
+import { parseDateToStr } from '@/utils/date-utils';

 /**
 * 查询任务列表
--- a/src/api/pt/neConfig.ts
+++ b/src/api/pt/neConfig.ts
@@ -0,0 +1,120 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 保存为示例配置 (仅管理员操作)
+ * @param query 查询参数
+ * @returns object
+ */
+export function ptSaveAsDefault(neType: string, neid: string) {
+  return request({
+    url: `/pt/neConfigData/saveAsDefault`,
+    method: 'post',
+    data: { neType, neid },
+  });
+}
+
+/**
+ * 重置为示例配置 (仅学生/教师操作)
+ * @param query 查询参数
+ * @returns object
+ */
+export function ptResetAsDefault(neType: string) {
+  return request({
+    url: `/pt/neConfigData/resetAsDefault`,
+    method: 'post',
+    data: { neType },
+  });
+}
+
+/**
+ * 数据比较示例
+ * @param params 查询参数
+ * @returns object
+ */
+export function ptContrastAsDefault(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData/contrast`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 配置数据导出Excel
+ * @param student 仅教师 student
+ * @returns object
+ */
+export function ptExport(student: string | undefined) {
+  return request({
+    url: `/pt/neConfigData/export`,
+    method: 'get',
+    params: { student },
+    responseType: 'blob',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 配置数据导出Excel (仅教师全量)
+ * @returns object
+ */
+export function ptExportAll() {
+  return request({
+    url: `/pt/neConfigData/export-all`,
+    method: 'get',
+    responseType: 'blob',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 网元参数配置信息
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigData(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置数据更新
+ * @param data 数据 {neType,paramName:"参数名",paramData:{参数},loc:"层级index仅array"}
+ * @returns object
+ */
+export function editPtNeConfigData(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'put',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置新增（array）
+ * @param data 数据 {neType,paramName:"参数名",paramData:{参数},loc:"层级index"}
+ * @returns object
+ */
+export function addPtNeConfigData(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置删除（array）
+ * @param params 数据 {neType,paramName:"参数名",loc:"层级index"}
+ * @returns object
+ */
+export function delPtNeConfigData(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigData`,
+    method: 'delete',
+    params,
+  });
+}
--- a/src/api/pt/neConfigApply.ts
+++ b/src/api/pt/neConfigApply.ts
@@ -0,0 +1,53 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 班级学生列表 (仅教师操作)
+ * @param params 数据 {userName}
+ * @returns object
+ */
+export function getPtClassStudents(params?: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply/students`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置应用申请列表
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigApplyList(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply/list`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置应用申请提交(仅学生操作)
+ * @param data 数据 { "neType": "MME", "status": "1" }
+ * @returns object
+ */
+export function stuPtNeConfigApply(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply`,
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 网元参数配置应用申请状态变更(仅管理员/教师操作)
+ * @param data 数据 { "applyId": "1", "neType": "MME", "status": "3", "backInfo": "sgw参数错误" }
+ * @returns object
+ */
+export function updatePtNeConfigApply(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigApply`,
+    method: 'put',
+    data: data,
+  });
+}
--- a/src/api/pt/neConfigDataLog.ts
+++ b/src/api/pt/neConfigDataLog.ts
@@ -0,0 +1,27 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 网元参数配置数据变更日志信息
+ * @param params 数据 {neType,paramName}
+ * @returns object
+ */
+export function getPtNeConfigDataLogList(params: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigDataLog`,
+    params,
+    method: 'get',
+  });
+}
+
+/**
+ * 网元参数配置数据变更日志还原到数据
+ * @param data 数据 { "id": "1", "value": "old" }
+ * @returns object
+ */
+export function restorePtNeConfigDataLog(data: Record<string, any>) {
+  return request({
+    url: `/pt/neConfigDataLog/restore`,
+    method: 'put',
+    data: data,
+  });
+}
--- a/src/api/pt/user.ts
+++ b/src/api/pt/user.ts
@@ -0,0 +1,42 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 导入用户模板数据
+ * @param data 表单数据对象
+ * @returns object
+ */
+export function importData(data: FormData) {
+  return request({
+    url: '/pt/system/user/importData',
+    method: 'post',
+    data,
+    dataType: 'form-data',
+    timeout: 180_000,
+  });
+}
+
+/**
+ * 导入用户模板下载
+ * @returns bolb
+ */
+export function importTemplate() {
+  return request({
+    url: '/pt/system/user/importTemplate',
+    method: 'get',
+    responseType: 'blob',
+  });
+}
+
+/**
+ * 用户列表导出
+ * @param query 查询参数
+ * @returns bolb
+ */
+export function exportUser(query: Record<string, any>) {
+  return request({
+    url: '/pt/system/user/export',
+    method: 'post',
+    data: query,
+    responseType: 'blob',
+  });
+}
--- a/src/api/system/login-source.ts
+++ b/src/api/system/login-source.ts
@@ -1,64 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 查询登录源列表
- * @param query 查询参数
- * @returns object
- */
-export function listLoginSource(query: Record<string, any>) {
-  return request({
-    url: '/system/login-source/list',
-    method: 'GET',
-    params: query,
-  });
-}
-
-/**
- * 查询登录源详细
- * @param id 登录源ID
- * @returns object
- */
-export function getLoginSource(id: string | number) {
-  return request({
-    url: `/system/login-source/${id}`,
-    method: 'GET',
-  });
-}
-
-/**
- * 新增登录源
- * @param data 登录源对象
- * @returns object
- */
-export function addLoginSource(data: Record<string, any>) {
-  return request({
-    url: '/system/login-source',
-    method: 'POST',
-    data: data,
-  });
-}
-
-/**
- * 修改登录源
- * @param data 登录源对象
- * @returns object
- */
-export function updateLoginSource(data: Record<string, any>) {
-  return request({
-    url: '/system/login-source',
-    method: 'PUT',
-    data: data,
-  });
-}
-
-/**
- * 认证源删除
- * @param id 登录源ID
- * @returns object
- */
-export function delLoginSource(id: string | number) {
-  return request({
-    url: `/system/login-source/${id}`,
-    method: 'DELETE',
-  });
-}
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,99 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 查询部门列表
- * @param query 查询参数
- * @returns object
- */
-export function listTenant(query: Record<string, any>) {
-  return request({
-    url: '/system/tenant/list',
-    method: 'get',
-    params: query,
-  });
-}
-
-/**
- * 查询部门列表（排除节点）
- * @param tenantId 部门ID
- * @returns object
- */
-export function listTenantExcludeChild(tenantId: string | number) {
-  return request({
-    url: `/system/tenant/list/exclude/${tenantId}`,
-    method: 'get',
-  });
-}
-
-/**
- * 查询部门详细
- * @param tenantId 部门ID
- * @returns object
- */
-export function getTenant(tenantId: string | number) {
-  return request({
-    url: `/system/tenant/${tenantId}`,
-    method: 'get',
-  });
-}
-
-/**
- * 新增部门
- * @param data 部门对象
- * @returns object
- */
-export function addTenant(data: Record<string, any>) {
-  return request({
-    url: '/system/tenant',
-    method: 'post',
-    data: data,
-  });
-}
-
-/**
- * 修改部门
- * @param data 部门对象
- * @returns object
- */
-export function updateTenant(data: Record<string, any>) {
-  return request({
-    url: '/system/tenant',
-    method: 'put',
-    data: data,
-  });
-}
-
-/**
- * 删除部门
- * @param TenantId 部门ID
- * @returns object
- */
-export function delTenant(TenantId: string | number) {
-  return request({
-    url: `/system/tenant/${TenantId}`,
-    method: 'delete',
-  });
-}
-
-/**
- * 查询部门下拉树结构
- * @returns object
- */
-export function tenantTreeSelect() {
-  return request({
-    url: '/system/tenant/treeSelect',
-    method: 'get',
-  });
-}
-
-/**
- * 部门树结构列表（指定角色）
- * @param roleId 角色ID
- * @returns object
- */
-export function roleTenantTreeSelect(roleId: string | number) {
-  return request({
-    url: `/system/tenant/roleDeptTreeSelect/${roleId}`,
-    method: 'get',
-  });
-}
--- a/src/api/tool/file.ts
+++ b/src/api/tool/file.ts
@@ -15,7 +15,7 @@ import { encode } from 'js-base64';
 export async function downloadFile(filePath: string, range?: string) {
  return request({
    url: `/file/download/${encode(filePath)}`,
-    method: 'GET',
+    method: 'get',
    headers: range ? { range } : {},
    responseType: 'blob',
    timeout: 60_000,
@@ -76,8 +76,8 @@ export async function downloadFileChunk(
 */
 export function uploadFile(data: FormData) {
  return request({
-    url: '/file/upload2',
-    method: 'POST',
+    url: '/file/upload',
+    method: 'post',
    data,
    dataType: 'form-data',
    timeout: 180_000,
@@ -169,7 +169,7 @@ export async function uploadFileChunk(
 export function chunkCheck(identifier: string, fileName: string) {
  return request({
    url: '/file/chunkCheck',
-    method: 'POST',
+    method: 'post',
    data: { identifier, fileName },
    timeout: 60_000,
  });
@@ -189,7 +189,7 @@ export function chunkMerge(
 ) {
  return request({
    url: '/file/chunkMerge',
-    method: 'POST',
+    method: 'post',
    data: { identifier, fileName, subPath },
    timeout: 60_000,
  });
@@ -203,57 +203,13 @@ export function chunkMerge(
 export function chunkUpload(data: FormData) {
  return request({
    url: '/file/chunkUpload',
-    method: 'POST',
+    method: 'post',
    data,
    dataType: 'form-data',
    timeout: 60_000,
  });
 }

-/**
- * 本地文件列表
- * @param path 文件路径
- * @param search search prefix
- * @returns object
- */
-export async function listFile(query: Record<string, any>) {
-  return request({
-    url: `/file/list`,
-    method: 'GET',
-    params: query,
-  });
-}
-
-/**
- * 本地文件获取下载
- * @param path 文件路径
- * @param fileName 文件名
- * @returns object
- */
-export async function getFile(path: string, fileName: string) {
-  return request({
-    url: `/file`,
-    method: 'GET',
-    params: { path, fileName },
-    responseType: 'blob',
-    timeout: 60_000,
-  });
-}
-
-/**
- * 本地文件删除
- * @param path 文件路径
- * @param fileName 文件名
- * @returns object
- */
-export async function delFile(path: string, fileName: string) {
-  return request({
-    url: `/file`,
-    method: 'DELETE',
-    params: { path, fileName },
-  });
-}
-
 /**
 * 转存上传文件到静态资源
 * @returns object
@@ -261,7 +217,7 @@ export async function delFile(path: string, fileName: string) {
 export function transferStaticFile(data: Record<string, any>) {
  return request({
    url: `/file/transferStaticFile`,
-    method: 'POST',
+    method: 'post',
    data,
    timeout: 60_000,
  });
@@ -285,12 +241,11 @@ export async function uploadFileToNE(
  if (uploadChunkRes.code === RESULT_CODE_SUCCESS) {
    const transferToNeFileRes = await request({
      url: `/ne/action/pushFile`,
-      method: 'POST',
+      method: 'post',
      data: {
        uploadPath: uploadChunkRes.data.fileName,
        neType,
        neId,
-        delTemp: true,
      },
      timeout: 60_000,
    });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TsMask	3dac294b48	chore: 更新版本号 2.241123-fix	2025-03-08 10:33:09 +08:00
TsMask	20007f4732	feat: 添加导出所有学生配置功能，优化提示信息	2025-03-08 10:31:54 +08:00
TsMask	0cb892e7f3	chore: 更新版本号 2.241123	2024-11-23 16:43:37 +08:00
TsMask	88d4b0cbb6	style: 修复样式	2024-11-23 16:17:27 +08:00
TsMask	729d5518e8	style: 修复样式	2024-11-23 15:51:31 +08:00
TsMask	cb510d9fdb	style: 修复样式	2024-11-23 15:16:52 +08:00
TsMask	f310ae4f38	style: 修复样式	2024-11-23 14:44:49 +08:00
TsMask	f070764b69	feat: 添加实训教学	2024-11-23 12:25:06 +08:00
TsMask	0c96b4d130	feat: 添加实训教学	2024-11-23 11:20:45 +08:00
TsMask	285c9b660b	feat: 实训教学模块	2024-11-23 11:18:40 +08:00
TsMask	2fb3467fb5	mager: 合并11.2版本	2024-11-23 10:57:55 +08:00
TsMask	63d7d11350	Merge remote-tracking branch 'origin/main' into practical-training	2024-08-03 14:11:19 +08:00
TsMask	2bd98540be	Merge remote-tracking branch 'origin/main' into practical-training	2024-08-01 17:53:53 +08:00
TsMask	630c63e23f	feat: 配置数据导出成表格，多语言翻译	2024-08-01 16:07:17 +08:00
TsMask	ada1f388fc	fix: 参数配置array展开显示异常	2024-07-30 09:32:52 +08:00
TsMask	b9cf34714f	feat: 网元信息允许教师备份操作权限控制	2024-07-29 15:28:22 +08:00
TsMask	53200d5f41	feat: 网元配置备份操作权限控制删除/编辑按钮	2024-07-29 15:27:50 +08:00
TsMask	52d5b9b732	style: 学生关闭右击样式	2024-07-27 16:14:59 +08:00
TsMask	292488f20c	fix: 配置载入时禁用切换网元	2024-07-27 16:13:08 +08:00
TsMask	b0b844f0f6	fix: 学生禁止操作删除日志CDR/Event	2024-07-27 16:11:59 +08:00
TsMask	0819fbdb44	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-27 15:03:16 +08:00
TsMask	a88ae826cc	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-27 14:16:15 +08:00
TsMask	76499d98e0	fix: 参数数据与示例对比差异显示功能	2024-07-22 18:16:48 +08:00
TsMask	94ccb45f8c	style: 配置历史记录抽屉展开的title初始为空避免显示错误	2024-07-22 18:14:29 +08:00
TsMask	79e2b4ac26	feat: 添加是否系统管理员的权限判断函数	2024-07-22 11:46:23 +08:00
TsMask	b2510c0eb3	fix: 班级学生列表搜索时刷新合并申请状态，可直接应用和退回操作	2024-07-22 11:45:15 +08:00
TsMask	f977b6ea53	style: 添加用户水印，学生菜单布局侧边栏显示	2024-07-19 17:32:58 +08:00
TsMask	1e9c6a51be	fix: 教师只能重启网元，禁止操作网元信息	2024-07-19 17:31:45 +08:00
TsMask	d68a773214	feat: 历史记录抽屉查看数据对比差异	2024-07-19 16:23:01 +08:00
TsMask	f60f26ae89	fix: 参数配置列表编辑切换属性回显错误	2024-07-19 16:22:15 +08:00
TsMask	c35a5a9c33	fix: 参数配置教师操作学生应用和退回	2024-07-18 15:04:51 +08:00
TsMask	4d755cea5d	feat: 参数应用申请操作和查看功能	2024-07-17 17:04:13 +08:00
TsMask	c87458bc23	feat: 参数配置教师应用和切换学生功能	2024-07-17 17:03:32 +08:00
TsMask	cfd04ba1b6	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-16 10:01:32 +08:00
TsMask	4af02693a4	feat: 教师选择学生进行切换查看学生配置数据信息	2024-07-15 17:59:30 +08:00
TsMask	66eb27813f	feat: 新增网元应用申请提交列表操作	2024-07-15 17:56:28 +08:00
TsMask	65c8c6f809	perf: 参数配置页面函数重构	2024-07-11 14:49:26 +08:00
TsMask	ecaa0ce077	fix: 参数配置接入实训调整网元类型选择，权限按钮	2024-07-11 10:24:27 +08:00
TsMask	99140f0641	feat: 接入实训接口调试参数配置	2024-07-11 10:23:18 +08:00
TsMask	f3c46976ae	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-09 19:09:04 +08:00
TsMask	efa8764bd1	feat: 配置参数直连数据获取优化	2024-07-09 10:05:43 +08:00
TsMask	bc0e463191	fix: 用户岗位和角色指定只能选一个	2024-07-08 11:25:10 +08:00
TsMask	45bf9fe115	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-08 10:57:22 +08:00
TsMask	4c85c61f05	fix: 右上角告警和帮助图标仅教师和管理员看见	2024-07-06 14:22:04 +08:00
TsMask	318f84504f	fix: 看板数字活动连接禁止学生角色跳转页面	2024-07-06 14:20:06 +08:00
TsMask	53fa36eace	Merge remote-tracking branch 'origin/main' into practical-training	2024-07-03 15:33:26 +08:00
TsMask	9123484bf5	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-28 12:04:57 +08:00
TsMask	e7e4557e96	style: 个人信息隐藏手机号和邮箱的输入	2024-06-27 16:07:55 +08:00
TsMask	6b1fe4a582	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-27 15:36:40 +08:00
TsMask	2610ab17ad	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-26 17:25:33 +08:00
TsMask	b84a08d825	fix: 教师不能管理分配部门，屏蔽电话邮箱	2024-06-24 17:13:09 +08:00
TsMask	824c38593b	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-24 11:18:30 +08:00
TsMask	69fb3df7ec	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-20 14:56:37 +08:00
TsMask	42827796c7	fix: 用户管理内教师角色只能新增学生	2024-06-20 10:28:01 +08:00
TsMask	eb38211e3b	style: 部门改为班级	2024-06-20 10:27:28 +08:00
TsMask	fd1d2a5bad	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-20 10:19:01 +08:00
TsMask	2d5bfb9842	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-20 09:34:54 +08:00
TsMask	c0a7f28958	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-19 14:26:24 +08:00
TsMask	5f4e47e998	Merge remote-tracking branch 'origin/main' into practical-training	2024-06-19 12:04:40 +08:00
TsMask	19a91936de	style: 默认菜单主题色dark	2024-06-19 12:03:59 +08:00
				`@@ -1 +0,0 @@`
				`001012082101039,1234,internet\|ims_sig,internet\|ims_sig,321321,255,321312,32131,32131`