fix: 租户管理表格操作去掉按钮权限

chore: 更新版本号 2.2510.4
fix: AMF配置WhiteList Content导入index0无效问题
2025-10-27 15:50:44 +08:00 · 2025-10-24 19:59:47 +08:00 · 2025-10-24 17:57:21 +08:00 · 2025-10-23 14:31:43 +08:00 · 2025-10-23 14:16:09 +08:00 · 2025-10-20 17:32:16 +08:00
319 changed files with 47622 additions and 11673 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 历史路径-哈希带井号标识
-VITE_HISTORY_HASH = false
+VITE_HISTORY_HASH = true

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

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

 # 接口基础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 = "2.241102"
+VITE_APP_VERSION = "local-prod"

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

+## 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
@@ -5,13 +5,6 @@
 - 图标来源 [@ant-design/icons-vue](https://ant.design/components/icon)
 - 菜单图标使用自定义 iconfont `font_8d5l8fzk5b87iudi.js`图标文件

-## 测试环境
-
-```text
-Nginx: http://192.168.2.166:3188/#/index
-后端暴露端口: http://192.168.2.166:33030
-```
-
 ## 程序命令

 项目目录下 `.env.[环境]` 文件对应环境的一些配置，启动前请检查文件内是否配置正确。
@@ -53,5 +46,31 @@ 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,14 +2,18 @@
 <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>
-    <link rel="preload" href="/config.js" as="script">
-    <script async src="/config.js"></script>
+    <script>
+      var script = document.createElement('script');
+      script.src = '/config.js?nocache=' + new Date().getTime();
+      script.async = true;
+      document.head.appendChild(script);
+    </script>
  </head>
  <body>
    <div id="app"></div>
--- a/package.json
+++ b/package.json
@@ -8,54 +8,55 @@
  },
  "scripts": {
    "dev": "vite",
-    "build": "vue-tsc && vite build",
+    "build": "vite build",
    "preview": "vite preview"
  },
  "dependencies": {
-    "@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.6.3",
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@tato30/vue-pdf": "^1.10.0",
-    "@vueuse/core": "~10.10.1",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/xterm": "^5.5.0",
-    "ant-design-vue": "^3.2.20",
-    "antdv-pro-layout": "~3.3.5",
-    "antdv-pro-modal": "^3.1.0",
-    "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": "^23.8.1",
+    "@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",
    "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.1.7",
-    "vue": "~3.3.13",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0",
-    "vue3-smooth-dnd": "^0.0.6",
-    "xlsx": "~0.18.5"
+    "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"
  },
  "devDependencies": {
-    "@types/crypto-js": "^4.2.2",
-    "@types/file-saver": "^2.0.7",
-    "@types/js-cookie": "^3.0.6",
+    "@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.0.5",
-    "less": "^4.2.0",
-    "typescript": "~5.4.5",
-    "unplugin-vue-components": "~0.26.0",
-    "vite": "~5.3.1",
-    "vite-plugin-compression": "~0.5.1",
-    "vue-tsc": "~2.0.22"
+    "@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"
  }
 }
--- 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,12 +10,19 @@
 *
 */
 (function () {
-  // host = ip:port
-  // const host = '192.168.8.100:33030';
-  const host = `${window.location.hostname}:33030`;
+  // 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:"
+  }
  
  // Service Address
-  sessionStorage.setItem('baseUrl', `http://${host}`);
+  sessionStorage.setItem('baseUrl', `${protocol}//${host}`);
  // websocket Address
-  sessionStorage.setItem('wsUrl', `ws://${host}`);
+  sessionStorage.setItem('wsUrl', `${wsprotocol}//${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
@@ -0,0 +1 @@
+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
@@ -0,0 +1,2 @@
+001011100001157,1234567890ABCDEF1234567890ABCDEF,0,8000,11111111111111111111111111111111
+001011100001158,1234567890ABCDEF1234567890ABCDEF,0,8000,11111111111111111111111111111111
--- a/public/neDataImput/udm_sub_template.txt
+++ b/public/neDataImput/udm_sub_template.txt
@@ -0,0 +1,2 @@
+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
@@ -0,0 +1,2 @@
+62357000580,123456
+62357000581,123456
--- a/public/neDataImput/udm_volte_template.txt
+++ b/public/neDataImput/udm_volte_template.txt
@@ -0,0 +1,2 @@
+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
@@ -0,0 +1,28 @@
+<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
@@ -0,0 +1,28 @@
+<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/public/wiregasm/worker.js
+++ b/public/wiregasm/worker.js
@@ -1,7 +1,7 @@
 // load the Wiregasm library
 importScripts(
-  '/wiregasm/wiregasm_new.js', // self-compilation es5
-  '/wiregasm/wiregasm_load.js'
+  'wiregasm_new.js', // self-compilation es5
+  'wiregasm_load.js'
  // 'https://cdn.jsdelivr.net/npm/@goodtools/wiregasm/dist/wiregasm.js'
 );

@@ -16,11 +16,11 @@ const fetchPackages = async () => {
  console.log('Fetching packages');
  let [wasmBuffer, dataBuffer] = await Promise.all([
    await inflateRemoteBuffer(
-      '/wiregasm/wiregasm.wasm'
+      'wiregasm.wasm'
      // 'https://cdn.jsdelivr.net/npm/@goodtools/wiregasm/dist/wiregasm.wasm'
    ),
    await inflateRemoteBuffer(
-      '/wiregasm/wiregasm.data'
+      'wiregasm.data'
      // 'https://cdn.jsdelivr.net/npm/@goodtools/wiregasm/dist/wiregasm.data'
    ),
  ]);
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,22 +1,51 @@
 <script setup lang="ts">
-import { ConfigProvider } from 'ant-design-vue/lib';
-import { usePrimaryColor } from '@/hooks/useTheme';
-import zhCN from 'ant-design-vue/lib/locale/zh_CN';
-import enUS from 'ant-design-vue/lib/locale/en_US';
+import { onBeforeMount, ref, watch } from 'vue';
+import { message } from 'ant-design-vue/es';
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
+import enUS from 'ant-design-vue/es/locale/en_US';
+import { usePrefersColorScheme, viewTransitionTheme } from 'antdv-pro-layout';
 import dayjs from 'dayjs';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
-import 'dayjs/locale/zh-cn';
-import { ref, watch } from 'vue';
+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 appStore = useAppStore();
-
+const { themeConfig, initPrimaryColor, changeConf } = useLayoutStore();
 dayjs.extend(advancedFormat);
-dayjs.locale('zh-cn'); // 默认中文
-usePrimaryColor(); // 载入用户自定义主题色
+// dayjs.locale('zh-cn'); // 默认中文
+let locale = ref(enUS); // 国际化初始中文

-let locale = ref(zhCN); // 国际化初始中文
+// 偏好设置
+const colorScheme = usePrefersColorScheme();
+watch(
+  () => colorScheme.value,
+  themeMode => {
+    viewTransitionTheme(() => {
+      changeConf('theme', themeMode);
+    });
+  }
+);
+
+onBeforeMount(() => {
+  // 全局message提示
+  message.config({
+    top: '100px', // 距离顶部位置100px
+    duration: 3,
+    maxCount: 15,
+  });
+  initPrimaryColor();
+  localRemove(CACHE_LOCAL_PROCONFIG);
+
+  // 输出应用版本号
+  const appStore = useAppStore();
+  console.info(
+    `%c ${t('common.desc')} %c ${appStore.appCode} - ${appStore.appVersion} `,
+    'color: #fadfa3; background: #030307; padding: 4px 0;',
+    'color: #030307; background: #fadfa3; padding: 4px 0;'
+  );
+});

 // 国际化切换语言
 function fnChangeLocale(v: string) {
@@ -37,26 +66,18 @@ fnChangeLocale(currentLocale.value);
 watch(currentLocale, val => {
  fnChangeLocale(val);
 });
-
-// 输出应用版本号
-console.info(
-  `%c ${t('common.title')} %c ${appStore.appCode} - ${appStore.appVersion} `,
-  'color: #fadfa3; background: #030307; padding: 4px 0;',
-  'color: #030307; background: #fadfa3; padding: 4px 0;'
-);
 </script>

 <template>
-  <ConfigProvider :locale="locale">
+  <a-config-provider :theme="themeConfig" :locale="locale">
    <RouterView />
-  </ConfigProvider>
+  </a-config-provider>
 </template>

 <style lang="css">
 #app {
  height: 100%;
 }
-
 body .ant-pro-basicLayout {
  display: flex;
  flex-direction: column;
@@ -86,56 +107,23 @@ body .ant-pro-basicLayout {
  transform: translate(-2em, 0);
 }

-/**强制改表格边距 */
-.ant-table.ant-table-small .ant-table-tbody > tr > td,
-.ant-table.ant-table-small .ant-table-thead > tr > th {
-  padding: 6px !important;
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none;
+  mix-blend-mode: normal;
 }

-/** ==== 表格头按钮区域 S === **/
-/* 默认 */
-.button-container {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-  align-items: center;
+[data-theme='dark']::view-transition-old(root) {
+  z-index: 1;
+}
+[data-theme='dark']::view-transition-new(root) {
+  z-index: 999;
 }

-.button-container > button,
-.button-container > span {
-  margin-right: 12px;
-  margin-bottom: 12px;
+::view-transition-old(root) {
+  z-index: 999;
 }
-
-.button-container > button:last-child,
-.button-container > span:last-child {
-  margin-right: 0;
+::view-transition-new(root) {
+  z-index: 1;
 }
-/* 平板端  */
-@media (max-width: 992px) {
-  .button-container {
-    flex-direction: row;
-    align-items: flex-start;
-    align-items: left;
-  }
-  .button-container > button,
-  .button-container > span {
-    margin-right: 12px;
-    margin-bottom: 12px;
-  }
-}
-/* 手机端  */
-@media (max-width: 576px) {
-  .button-container {
-    flex-direction: column;
-    align-items: flex-start;
-    align-items: left;
-  }
-  .button-container > button,
-  .button-container > span {
-    margin-right: 0px;
-    margin-bottom: 12px;
-  }
-}
-/** ==== 表格头按钮区域 E === **/
 </style>
--- 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 } from '@/utils/date-utils';
+import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } 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),
+      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
      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),
+      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
      ack_user: '',
      ack_state: '0',
    },
@@ -211,12 +211,12 @@ export function getPass() {
 * @param data 鉴权对象
 * @returns object
 */
-export function clearAlarm(data: Record<string, any>) {
+export function clearAlarm2(data: Record<string, any>) {
  var time = new Date();
  const userName = useUserStore().userName;
  let finalData = {
    data: {
-      clear_time: parseDateToStr(time),
+      clear_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
      clear_type: '2',
      alarm_status: '0',
      clear_user: userName,
@@ -232,6 +232,19 @@ export function clearAlarm(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 鉴权对象
@@ -360,3 +373,137 @@ 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,8 +1,6 @@
 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,7 +63,11 @@ 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,
@@ -117,7 +121,11 @@ 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,
@@ -166,11 +174,10 @@ export async function getForwardSet() {
 */
 export async function updateForwardSet(data: Record<string, any>) {
  // return false;
-  console.log(data)
-  let obj:any=[
-    {interface:"Email",to_user:data.emailObj},
-    {interface:"SMS",to_user:data.smsObj}
-  ]
+  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 } from '@/utils/date-utils';
+import { parseDateToStr, YYYY_MM_DD_HH_MM_SS } 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),
+      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
      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),
+      ack_time: parseDateToStr(time, YYYY_MM_DD_HH_MM_SS),
      ack_user: '',
      ack_state: '0',
    },
--- a/src/api/logManage/exportFile.ts
+++ b/src/api/logManage/exportFile.ts
@@ -1,3 +1,5 @@
+import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
+import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

 /**
@@ -51,3 +53,43 @@ 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,3 +1,5 @@
+import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
+import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

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

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

@@ -59,3 +61,69 @@ 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,10 +5,11 @@ import { request } from '@/plugins/http-fetch';
 * @param query 查询参数
 * @returns object
 */
-export function getAllNeConfig(neType: string) {
+export function getAllNeConfig(neType: string, neId: 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,3 +1,5 @@
+import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
+import { sessionGet } from '@/utils/cache-session-utils';
 import { request } from '@/plugins/http-fetch';

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

@@ -37,6 +38,93 @@ 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
@@ -0,0 +1,68 @@
+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,6 +10,7 @@ export function listIMSDataCDR(query: Record<string, any>) {
    url: '/neData/ims/cdr/list',
    method: 'get',
    params: query,
+    timeout: 60_000,
  });
 }

@@ -37,6 +38,6 @@ export function exportIMSDataCDR(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 60_000,
+    timeout: 180_000,
  });
 }
--- a/src/api/neData/ims_sub.ts
+++ b/src/api/neData/ims_sub.ts
@@ -0,0 +1,148 @@
+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,6 +10,7 @@ export function listMMEDataUE(query: Record<string, any>) {
    url: '/neData/mme/ue/list',
    method: 'get',
    params: query,
+    timeout: 60_000,
  });
 }

@@ -37,6 +38,93 @@ 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
@@ -0,0 +1,30 @@
+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
@@ -0,0 +1,43 @@
+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,6 +10,7 @@ export function listSMFDataCDR(query: Record<string, any>) {
    url: '/neData/smf/cdr/list',
    method: 'get',
    params: query,
+    timeout: 60_000,
  });
 }

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

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

@@ -37,6 +38,6 @@ export function exportSMSCDataCDR(data: Record<string, any>) {
    method: 'post',
    data,
    responseType: 'blob',
-    timeout: 60_000,
+    timeout: 180_000,
  });
 }
--- a/src/api/neData/udm_auth.ts
+++ b/src/api/neData/udm_auth.ts
@@ -23,6 +23,7 @@ export function listUDMAuth(query: Record<string, any>) {
    url: '/neData/udm/auth/list',
    method: 'get',
    params: query,
+    timeout: 30_000,
  });
 }

@@ -139,3 +140,17 @@ 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/udm_sub.ts
+++ b/src/api/neData/udm_sub.ts
@@ -23,6 +23,7 @@ export function listUDMSub(query: Record<string, any>) {
    url: '/neData/udm/sub/list',
    method: 'get',
    params: query,
+    timeout: 30_000,
  });
 }

--- a/src/api/neData/voip_auth.ts
+++ b/src/api/neData/voip_auth.ts
@@ -0,0 +1,142 @@
+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
@@ -0,0 +1,51 @@
+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,12 +21,14 @@ export async function listUEInfoBySMF(query: Record<string, any>) {
  };
  // 解析数据
  if (result.code === RESULT_CODE_SUCCESS && result.data) {
-    if (Array.isArray(result.data.data)) {
-      const rows = result.data.data;
-      data.total = rows.length;
-      data.rows = rows;
+    if (result.data.total && result.data.data) {
+      data.total = result.data.total;
+      data.rows = result.data.data;
    } else {
-      Object.assign(data, result.data);
+      Object.assign(data, {
+        total: result.data.length,
+        rows: result.data,
+      });
    }
  }

--- a/src/api/perfManage/customData.ts
+++ b/src/api/perfManage/customData.ts
@@ -1,7 +1,4 @@
-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';

 /**
 * 新 查询自定义指标数据
@@ -14,6 +11,7 @@ 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,7 +1,4 @@
-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,78 +110,52 @@ export async function getKPITitle(neType: string) {
 }

 /**
- * Todo 废弃
- * 查询UPF上下行速率数据
- * @param query 查询参数
+ * 查询黄金指标数据kpi.id转换title
+ * @param neType 网元类型
 * @returns object
 */
-export async function listUPFData(timeArr: any) {
-  const initTime: Date = new Date();
-  const twentyFourHoursAgo: Date = new Date(
-    initTime.getTime() - 10 * 60 * 1000
-  );
-
-  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 = [];
-
-    // 规则数据
-    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 };
+export async function getKPITitleList(query: Record<string, any>) {
+  return request({
+    url: '/neData/kpi/title/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+/**
+ * 修改指标标题
+ * @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,
+  });
+}
+
+//CCT指标
+export async function getCctHour(query: Record<string, any>) {
+  return request({
+    url: '/neData/ims/cdr/cct-hour',
+    method: 'get',
+    params: query,
  });
 }
--- a/src/api/perfManage/perfThreshold.ts
+++ b/src/api/perfManage/perfThreshold.ts
@@ -1,7 +1,6 @@
 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/system/login-source.ts
+++ b/src/api/system/login-source.ts
@@ -0,0 +1,64 @@
+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
@@ -0,0 +1,99 @@
+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/upload',
-    method: 'post',
+    url: '/file/upload2',
+    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,13 +203,57 @@ 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
@@ -217,7 +261,7 @@ export function chunkUpload(data: FormData) {
 export function transferStaticFile(data: Record<string, any>) {
  return request({
    url: `/file/transferStaticFile`,
-    method: 'post',
+    method: 'POST',
    data,
    timeout: 60_000,
  });
@@ -241,11 +285,12 @@ 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/src/api/tool/neFile.ts
+++ b/src/api/tool/neFile.ts
@@ -24,7 +24,7 @@ export function getNeFile(query: Record<string, any>) {
    method: 'get',
    params: query,
    responseType: 'blob',
-    timeout: 180_000,
+    timeout: 600_000,
  });
 }

@@ -35,7 +35,7 @@ export function getNeDirZip(data: Record<string, any>) {
    method: 'get',
    params: data,
    responseType: 'blob',
-    timeout: 60_000,
+    timeout: 600_000,
  });
 }

@@ -45,6 +45,6 @@ export function getNeViewFile(data: Record<string, any>) {
    url: '/ne/action/viewFile',
    method: 'get',
    params: data,
-    timeout: 60_000,
+    timeout: 600_000,
  });
 }
--- a/src/api/tool/ping.ts
+++ b/src/api/tool/ping.ts
@@ -8,3 +8,12 @@ export function pingV(data: Record<string, string>) {
    params: data,
  });
 }
+
+// ping RTT 时延抖动
+export function pingRTT(data: Record<string, string>) {
+  return request({
+    url: '/tool/ping/rtt',
+    method: 'POST',
+    data: data,
+  });
+}
--- a/src/api/trace/analysis.ts
+++ b/src/api/trace/analysis.ts
@@ -1,71 +0,0 @@
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { request } from '@/plugins/http-fetch';
-import { parseObjLineToHump } from '@/utils/parse-utils';
-
-/**
- * 查询信令列表
- * @param query 查询参数
- * @returns object
- */
-export async function listTraceData(query: Record<string, any>) {
-  let totalSQL = 'select count(*) as total from trace_data where 1=1 ';
-  let rowsSQL = 'select * from trace_data where 1=1 ';
-
-  // 查询
-  let querySQL = '';
-  if (query.imsi) {
-    querySQL += ` and imsi like '%${query.imsi}%' `;
-  }
-  if (query.msisdn) {
-    querySQL += ` and msisdn like '%${query.msisdn}%' `;
-  }
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/omc_db/trace_data`,
-    method: 'get',
-    params: {
-      totalSQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + limtSql,
-    },
-  });
-
-  // 解析数据
-  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['trace_data'];
-      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;
-}
-
-/**
- * 信令数据解析HTML
- * @param id 任务ID
- * @returns
- */
-export function getTraceRawInfo(id: Record<string, string>) {
-  return request({
-    url: `/api/rest/traceManagement/v1/decMessage/${id}`,
-    method: 'get',
-    responseType: 'text',
-  });
-}
--- a/src/api/trace/packet.ts
+++ b/src/api/trace/packet.ts
@@ -62,3 +62,18 @@ export function packetKeep(taskNo: string, duration: number = 120) {
    data: { taskNo, duration },
  });
 }
+
+/**
+ * 信令跟踪文件
+ * @param taskNo 对象
+ * @returns object
+ */
+export function packetPCAPFile(taskNo: string) {
+  return request({
+    url: '/trace/packet/filePull',
+    method: 'get',
+    params: { taskNo },
+    responseType: 'blob',
+    timeout: 680_000,
+  });
+}
--- a/src/api/trace/task.ts
+++ b/src/api/trace/task.ts
@@ -1,6 +1,4 @@
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
-import { parseObjLineToHump } from '@/utils/parse-utils';

 /**
 * 查询跟踪任务列表
@@ -76,29 +74,31 @@ export function filePullTask(traceId: string) {
    method: 'get',
    params: { traceId },
    responseType: 'blob',
-    timeout: 60_000,
+    timeout: 600_000,
  });
 }

 /**
- * 获取网元跟踪接口列表
+ * 跟踪任务数据列表
+ * @param query 查询参数
 * @returns object
 */
-export async function getNeTraceInterfaceAll() {
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/ne_info`,
+export async function listTraceData(query: Record<string, any>) {
+  return request({
+    url: '/trace/data/list',
+    method: 'get',
+    params: query,
+  });
+}
+
+/**
+ * 查询跟踪任务数据信息
+ * @param id ID
+ * @returns object
+ */
+export async function getTraceData(id: string | number) {
+  return request({
+    url: `/trace/data/${id}`,
    method: 'get',
-    params: {
-      SQL: `SELECT ne_type,interface FROM trace_info GROUP BY ne_type,interface`,
-    },
  });
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
-    let data = result.data.data[0];
-    return Object.assign(result, {
-      data: parseObjLineToHump(data['trace_info']),
-    });
-  }
-  return result;
 }
--- a/src/api/trace/taskHLR.ts
+++ b/src/api/trace/taskHLR.ts
@@ -78,6 +78,6 @@ export function filePullTaskHLR(query: Record<string, any>) {
    method: 'get',
    params: query,
    responseType: 'blob',
-    timeout: 60_000,
+    timeout: 600_000,
  });
 }
--- a/src/assets/background.jpg
+++ b/src/assets/background.jpg
--- a/src/assets/svg/4gEvent.svg
+++ b/src/assets/svg/4gEvent.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721721606045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7339" width="200" height="200"><path d="M610.6 234.24L627 294.6c90.88-24.73 184.58 28.77 209.45 119.65l60.36-16.4C862.92 273.5 734.67 200.37 610.6 234.24z m-34.42-126.22l16.4 60.36c160.51-43.83 326.13 50.81 369.96 211.33l60.36-16.4C969.94 169.45 770.03 55.18 576.18 108.02zM179.47 922.27V827.5H0v-84.83l179.47-261.74h92.22v274.24h62.38v72.33h-62.38v94.77h-92.22z m0-167.09V598.02L72.33 755.18h107.14z m0 0" p-id="7340" fill="#ffffff"></path><path d="M695.69 752.62h-89.8v-77.29h186.99v231.9c-33.34 9.95-67.35 14.92-102.17 14.92-26.62 3.37-61.57 4.97-104.72 4.97-141.29-8.33-213.62-86.44-216.97-234.31 3.36-151.24 75.69-231.9 216.97-241.85 144.65 0 216.03 49.88 214.42 149.63H695.69c0-51.49-30.79-77.3-92.23-77.3-84.83 1.62-127.98 58.21-129.59 169.52 1.61 109.7 44.9 165.49 129.59 167.1 24.87 0 54.05-3.36 87.25-9.95-1.61 1.61 0 1.61 4.98 0v-97.34z m0 0" p-id="7341" fill="#ffffff"></path></svg>
--- a/src/assets/svg/5gEvent.svg
+++ b/src/assets/svg/5gEvent.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721721630123" class="icon" viewBox="0 0 1216 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="54141" width="200" height="200"><path d="M747.264 190.912l18.368 67.328a190.272 190.272 0 0 1 233.728 133.44l67.264-18.368a260.032 260.032 0 0 0-319.36-182.4z m-38.4-140.736l18.368 67.328a336.192 336.192 0 0 1 412.8 235.776l67.328-18.368A405.952 405.952 0 0 0 708.864 50.176z m133.376 719.232h-100.16v-86.272h208.64v258.752c-37.12 11.136-75.072 16.704-114.048 16.704a984.96 984.96 0 0 1-116.864 5.568c-157.632-9.28-238.336-96.448-242.048-261.504 3.712-168.768 84.416-258.752 242.048-269.888 161.344 0 241.088 55.68 239.296 166.912H842.24c0-57.472-34.368-86.208-102.912-86.208-94.592 1.856-142.848 64.896-144.64 189.184 1.792 122.368 50.048 184.576 144.64 186.368 27.776 0 60.16-3.712 97.344-11.136-1.92 1.92 0 1.92 5.568 0v-108.48zM234.24 969.216c-86.016 0-148.992-30.72-201.216-80.64l71.424-85.248c40.704 36.864 80.64 58.368 128.256 58.368 55.296 0 89.856-26.88 89.856-74.496v-1.536c0-46.08-39.168-72.96-95.232-72.96-33.792 0-64.512 9.216-89.856 19.968L69.12 687.36l15.36-264.96h330.24v103.68H185.856l-6.144 92.928a262.976 262.976 0 0 1 70.656-9.216c104.448 0 188.16 50.688 188.16 172.032v1.536c0 113.664-80.64 185.856-204.288 185.856z" p-id="54142" fill="#ffffff"></path></svg>
--- a/src/assets/svg/basefff.svg
+++ b/src/assets/svg/basefff.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1720074329868" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4280" width="64" height="64"><path d="M616.5 151.3l-28.3 28.3c19.7 19.6 31.8 46.6 31.8 76.5 0 29.8-12.2 56.9-31.8 76.5l28.3 28.3c26.8-27 43.5-64 43.5-104.9s-16.7-77.9-43.5-104.7zM435.8 179.5l-28.3-28.3C380.7 178.1 364 215.1 364 256s16.7 77.9 43.5 104.7l28.3-28.3C416.2 312.9 404 285.8 404 256c0-29.9 12.2-56.9 31.8-76.5zM346.6 134.3L318.3 106c-38.5 38.4-62.3 91.5-62.3 150s23.8 111.6 62.3 150l28.3-28.3C315.3 346.6 296 303.5 296 256s19.3-90.6 50.6-121.7zM705.7 106l-28.3 28.3C708.7 165.4 728 208.5 728 256s-19.3 90.6-50.6 121.7l28.3 28.3c38.5-38.4 62.3-91.5 62.3-150s-23.8-111.6-62.3-150zM815.2 60.8l-0.1-0.1L786.7 89c0.1 0 0.1 0.1 0.2 0.1C831.5 133.7 856 193 856 256s-24.5 122.3-69.1 166.9c0 0-0.1 0.1-0.2 0.1l28.3 28.3 0.1-0.1C867.3 399 896 329.7 896 256s-28.7-143-80.8-195.2zM237.3 89L209 60.7l-0.1 0.1C156.7 113 128 182.3 128 256s28.7 143 80.8 195.2l0.1 0.1 28.3-28.3c-0.1 0-0.1-0.1-0.2-0.1-44.5-44.6-69-103.9-69-166.9s24.5-122.3 69.1-166.9c0.1 0 0.1-0.1 0.2-0.1zM511.712 256.002l0.283-0.283 0.283 0.283-0.283 0.283z" p-id="4281" fill="#ffffff"></path><path d="M511.719 256.021l0.282-0.282 0.283 0.282-0.283 0.283z" p-id="4282" fill="#ffffff"></path><path d="M708.4 616l-14.2-26.1-7.6-13.9-11.6-21.2L512 256 337.5 576l-21.8 40L128 960h74l33.8-64 28.9-53h494.6l28.9 53 33.8 64h74L708.4 616zM512 389.6L613.7 576H410.3L512 389.6zM388.5 616H569L305.6 768.1 388.5 616z m-63.4 187l313.6-181.1L737.5 803H325.1z" p-id="4283" fill="#ffffff"></path></svg>
+
+
--- a/src/assets/svg/dark.svg
+++ b/src/assets/svg/dark.svg
@@ -0,0 +1 @@
+<svg width="1em" height="1em" class="icon-dark" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg" style="vertical-align: -0.125em;color: rgba(255, 255, 255, 0.65);"><g id="Dark-\u9875\u9762-1" stroke="none" stroke-width="1px" fill="none" fill-rule="evenodd"><g id="Dark-\u9ED8\u8BA4" transform="translate(-9.000000, -49.500000)" fill="currentColor" fill-rule="nonzero"><g id="Dark-\u7F16\u7EC4-17" transform="translate(0.000000, 42.500000)"><g id="Dark-moon" transform="translate(9.268811, 7.500000)"><rect id="Dark-\u77E9\u5F62" opacity="0" x="0" y="0" width="16" height="16"></rect><path d="M8,1.33333333 C8.14933333,1.33333333 8.29688889,1.33844444 8.44266667,1.34866666 C8.14755556,1.98422221 8,2.64577777 8,3.33333333 C8,3.96533333 8.12333333,4.56955555 8.37,5.146 C8.61666667,5.72244445 8.94822222,6.21888889 9.36466667,6.63533333 C9.78111112,7.05177777 10.2775556,7.38333332 10.854,7.63 C11.4304444,7.87666668 12.0346667,8.00000001 12.6666667,8 C13.3542222,8 14.0157778,7.85244444 14.6513333,7.55733333 C14.6615556,7.70311111 14.6666667,7.85066667 14.6666667,8 C14.6666667,8.604 14.5868889,9.19422222 14.4273333,9.77066667 C14.2677778,10.3471111 14.0446667,10.8793333 13.758,11.3673333 C13.4713333,11.8553333 13.1233333,12.3042222 12.714,12.714 C12.3046667,13.1237778 11.8557778,13.4717778 11.3673333,13.758 C10.8788889,14.0442222 10.3466667,14.2673333 9.77066667,14.4273333 C9.19466667,14.5873333 8.60444445,14.6671111 8,14.6666685 C7.39555555,14.6662222 6.80533333,14.5864444 6.22933333,14.4273333 C5.65333333,14.2682222 5.1211111,14.0451111 4.63266666,13.758 C4.14422221,13.4708889 3.69533332,13.1228889 3.28599998,12.714 C2.87666665,12.3051111 2.52866665,11.8562222 2.24199998,11.3673333 C1.95533332,10.8784444 1.73222221,10.3462222 1.57266666,9.77066667 C1.4131111,9.19511112 1.33333333,8.6048889 1.33333333,8 C1.33333333,7.3951111 1.4131111,6.80488888 1.57266666,6.22933333 C1.73222221,5.65377778 1.95533332,5.12155555 2.24199998,4.63266666 C2.52866665,4.14377776 2.87666665,3.69488887 3.28599998,3.28599998 C3.69533332,2.8771111 4.14422221,2.5291111 4.63266666,2.24199998 C5.1211111,1.95488887 5.65333333,1.73177776 6.22933333,1.57266666 C6.80533333,1.41355555 7.39555555,1.33377778 8,1.33333333 Z M6.68733333,2.828 C6.11444444,2.97377778 5.58066667,3.20977778 5.086,3.536 C4.59133333,3.86222222 4.166,4.24933333 3.81,4.69733333 C3.454,5.14533333 3.17444444,5.65488889 2.97133333,6.226 C2.76822221,6.79711111 2.66666666,7.38822222 2.66666666,7.99933333 C2.66666666,8.72155555 2.80733332,9.41155555 3.08866666,10.0693333 C3.36999999,10.7271111 3.74933332,11.2948889 4.22666666,11.7726667 C4.70399999,12.2504444 5.27177777,12.6297778 5.92999998,12.9106667 C6.5882222,13.1915556 7.2782222,13.3322222 7.99999998,13.3326667 C8.6111111,13.3326667 9.20222221,13.2311111 9.77333331,13.028 C10.3444444,12.8248889 10.854,12.5453333 11.302,12.1893333 C11.75,11.8333333 12.1371111,11.408 12.4633333,10.9133333 C12.7895555,10.4186666 13.0255555,9.88488887 13.1713333,9.31199998 C13.022,9.32577777 12.8535555,9.33266666 12.666,9.33266666 C11.8535555,9.33266666 11.0775555,9.17377777 10.338,8.85599998 C9.59844443,8.5382222 8.96044443,8.11111109 8.42399998,7.57466666 C7.88755554,7.03822222 7.46044443,6.40022222 7.14266666,5.66066666 C6.82488889,4.92111109 6.66599999,4.14511109 6.66599998,3.33266666 C6.66599998,3.1451111 6.67288888,2.97666666 6.68666666,2.82733333 L6.68733333,2.828 Z" id="Dark-\u5F62\u72B6"></path></g></g></g></g></svg>
--- a/src/assets/svg/light.svg
+++ b/src/assets/svg/light.svg
@@ -0,0 +1 @@
+<svg width="1em" height="1em" class="icon-light" viewBox="0 0 13 13" xmlns="http://www.w3.org/2000/svg" style="vertical-align: -0.125em;color: rgba(0, 0, 0, 0.88);"><g id="Light-\u9875\u9762-1" stroke="none" stroke-width="1px" fill="none" fill-rule="evenodd"><g id="Light-\u4E3B\u9898\u5305" transform="translate(-2943.000000, -292.000000)" fill="currentColor" fill-rule="nonzero"><g id="Light-\u7F16\u7EC4-12" transform="translate(2415.000000, 222.000000)"><g id="Light-\u89C6\u56FE\u5207\u6362-\u7F16\u8F91\u6001" transform="translate(518.000000, 60.000000)"><g id="Light-eye" transform="translate(8.000000, 8.000000)"><g id="Light-sun" transform="translate(2.000000, 2.000000)"><rect id="Light-\u77E9\u5F62" opacity="0" x="0" y="0" width="13" height="13"></rect><path d="M6.5,9.75 C4.7051875,9.75 3.25,8.2948125 3.25,6.5 C3.25,4.7051875 4.7051875,3.25 6.5,3.25 C8.2948125,3.25 9.75,4.7051875 9.75,6.5 C9.75,8.2948125 8.2948125,9.75 6.5,9.75 Z M6.5,8.66666667 C7.69661696,8.66666667 8.66666667,7.69661696 8.66666667,6.5 C8.66666667,5.30338304 7.69661696,4.33333333 6.5,4.33333333 C5.30338305,4.33333333 4.33333336,5.30338305 4.33333336,6.5 C4.33333336,7.69661695 5.30338305,8.66666667 6.5,8.66666667 Z M5.95833333,1.08333333 C5.95833333,0.784179087 6.20084576,0.541666658 6.5,0.541666658 C6.79915424,0.541666658 7.04166667,0.784179087 7.04166667,1.08333333 L7.04166667,2.16666667 C7.04166667,2.46582091 6.79915424,2.70833334 6.5,2.70833334 C6.20084576,2.70833334 5.95833333,2.46582091 5.95833333,2.16666667 L5.95833333,1.08333333 L5.95833333,1.08333333 Z M5.95833333,10.8333333 C5.95833333,10.5341791 6.20084576,10.2916667 6.5,10.2916667 C6.79915424,10.2916667 7.04166667,10.5341791 7.04166667,10.8333333 L7.04166667,11.9166667 C7.04166667,12.2158209 6.79915424,12.4583333 6.5,12.4583333 C6.20084576,12.4583333 5.95833333,12.2158209 5.95833333,11.9166667 L5.95833333,10.8333333 L5.95833333,10.8333333 Z M1.08333333,7.04166667 C0.784179087,7.04166667 0.541666658,6.79915424 0.541666658,6.5 C0.541666658,6.20084576 0.784179087,5.95833333 1.08333333,5.95833333 L2.16666667,5.95833333 C2.46582091,5.95833333 2.70833334,6.20084576 2.70833334,6.5 C2.70833334,6.79915424 2.46582091,7.04166667 2.16666667,7.04166667 L1.08333333,7.04166667 L1.08333333,7.04166667 Z M10.8333333,7.04166667 C10.5341791,7.04166667 10.2916667,6.79915424 10.2916667,6.5 C10.2916667,6.20084576 10.5341791,5.95833333 10.8333333,5.95833333 L11.9166667,5.95833333 C12.2158209,5.95833333 12.4583333,6.20084576 12.4583333,6.5 C12.4583333,6.79915424 12.2158209,7.04166667 11.9166667,7.04166667 L10.8333333,7.04166667 L10.8333333,7.04166667 Z M2.05454167,2.82045833 C1.84926545,2.60791971 1.85220137,2.27007933 2.06114035,2.06114035 C2.27007933,1.85220137 2.60791971,1.84926545 2.82045833,2.05454167 L3.63295833,2.86704167 C3.83823455,3.07958029 3.83529863,3.41742067 3.62635965,3.62635965 C3.41742067,3.83529863 3.07958029,3.83823455 2.86704167,3.63295833 L2.05454167,2.82045833 L2.05454167,2.82045833 Z M9.36704167,10.1329583 C9.16176545,9.92041971 9.16470137,9.58257933 9.37364035,9.37364035 C9.58257933,9.16470137 9.92041971,9.16176545 10.1329583,9.36704167 L10.9454583,10.1795417 C11.1507346,10.3920803 11.1477986,10.7299207 10.9388596,10.9388596 C10.7299207,11.1477986 10.3920803,11.1507346 10.1795417,10.9454583 L9.36704167,10.1329583 L9.36704167,10.1329583 Z M2.82045833,10.9454583 C2.60791971,11.1507346 2.27007933,11.1477986 2.06114035,10.9388596 C1.85220137,10.7299207 1.84926545,10.3920803 2.05454167,10.1795417 L2.86704167,9.36704167 C3.07958029,9.16176545 3.41742067,9.16470137 3.62635965,9.37364035 C3.83529863,9.58257933 3.83823455,9.92041971 3.63295833,10.1329583 L2.82045833,10.9454583 L2.82045833,10.9454583 Z M10.1329583,3.63295833 C9.92041971,3.83823455 9.58257933,3.83529863 9.37364035,3.62635965 C9.16470137,3.41742067 9.16176545,3.07958029 9.36704167,2.86704167 L10.1795417,2.05454167 C10.3920803,1.84926545 10.7299207,1.85220137 10.9388596,2.06114035 C11.1477986,2.27007933 11.1507346,2.60791971 10.9454583,2.82045833 L10.1329583,3.63295833 L10.1329583,3.63295833 Z" id="Light-\u5F62\u72B6"></path></g></g></g></g></g></g></svg>
--- a/src/assets/svg/smscCdr.svg
+++ b/src/assets/svg/smscCdr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729046804258" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1511" width="200" height="200"><path d="M958.359001 286.941198c0-64.308655-52.132334-116.440989-116.440989-116.440989L181.453678 170.500209c-64.308655 0-116.440989 52.132334-116.440989 116.440989l0 448.63995c0 64.308655 52.132334 116.440989 116.440989 116.440989l660.464333 0c64.308655 0 116.440989-52.132334 116.440989-116.440989L958.359001 286.941198zM843.814198 212.455763c12.059664 0 23.444968 3.465938 33.519418 8.598842L530.749016 549.347606c-1.227967 1.161453-1.156336 0.916882-1.752924 1.868557-1.426489 1.067308-6.055926 3.922333-15.449877 3.922333-9.397021 0-14.025435-2.75474-15.4509-3.818979-0.676405-1.077541-0.662079-0.716314-1.995447-1.940189l-353.122503-324.412624c11.609409-7.557116 25.445532-12.509918 40.300868-12.509918L843.814198 212.456786zM916.403446 736.484727c0 40.857547-31.730679 73.582879-72.589248 73.582879L183.27721 810.067606c-40.85857 0-75.28566-32.725332-75.28566-73.582879L107.99155 287.657512c0-10.630105 2.860141-20.735253 6.909363-29.882588l351.486236 322.096882c4.91187 5.302773 19.479657 17.676591 47.009663 17.676591 27.799136 0 42.303478-12.618389 47.076178-17.830087l346.800517-328.899822c6.251378 10.860349 9.129938 23.433712 9.129938 36.838L916.403446 736.484727z" fill="#ffffff" p-id="1512"></path></svg>
--- a/src/components/CronModal/index.vue
+++ b/src/components/CronModal/index.vue
@@ -3,7 +3,7 @@
    :drag="true"
    :destroyOnClose="true"
    :title="t('components.CronModal.title')"
-    :visible="props.visible"
+    :open="props.open"
    :body-style="{ padding: '0 24px' }"
    @cancel="fnCronModal(false)"
    @ok="fnCronModal(true)"
@@ -35,6 +35,7 @@
  </ProModal>
 </template>
 <script lang="ts" setup>
+import { ProModal } from 'antdv-pro-modal';
 import CronSecond from './components/Second.vue';
 import CronMinute from './components/Minute.vue';
 import CronHour from './components/Hour.vue';
@@ -44,9 +45,9 @@ import { reactive, computed, watch } from 'vue';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();

-const emit = defineEmits(['cancel', 'ok', 'update:visible']);
+const emit = defineEmits(['cancel', 'ok', 'update:open']);
 const props = defineProps({
-  visible: {
+  open: {
    type: Boolean,
    required: true,
  },
@@ -75,7 +76,7 @@ const cronStr = computed(() => {

 /**监听是否显示，初始cron属性 */
 watch(
-  () => props.visible,
+  () => props.open,
  val => {
    if (!val) return;
    const arr = props.cron.split(' ');
@@ -98,7 +99,7 @@ watch(
 * @param val modal触发事件
 */
 function fnCronModal(val: boolean) {
-  emit('update:visible', false);
+  emit('update:open', false);
  if (val) {
    emit('ok', cronStr.value);
  } else {
--- a/src/components/ExportCustomModal/index.vue
+++ b/src/components/ExportCustomModal/index.vue
@@ -0,0 +1,479 @@
+<template>
+  <a-modal
+    v-model:open="visible"
+    :title="t('common.exportCustom')"
+    width="750px"
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <div class="export-custom-container">
+      <!-- 列配置区域 -->
+      <div class="columns-config">
+        <div class="config-header">
+          <h4>{{ t('common.exportColumns') }}</h4>
+          <a-button type="link" @click="resetToDefault">
+            {{ t('common.resetToDefault') }}
+          </a-button>
+        </div>
+
+        <div class="columns-list">
+          <Container
+            @drop="onDrop"
+            :get-child-payload="getChildPayload"
+            drag-class="drag-ghost"
+            drop-class="drop-ghost"
+            drag-handle-selector=".drag-handle"
+            :non-drag-area-selector="'.column-name, .ant-checkbox-wrapper'"
+          >
+            <Draggable
+              v-for="(column, index) in customColumns"
+              :key="column.key"
+              class="column-item"
+            >
+              <div class="column-controls">
+                <a-checkbox
+                  v-model:checked="column.visible"
+                  @change="updateColumnVisibility(column)"
+                />
+                <div class="drag-handle">
+                  <HolderOutlined />
+                </div>
+              </div>
+
+              <div class="column-info">
+                <div class="column-name">
+                  <a-input
+                    v-model:value="column.title"
+                    :placeholder="t('common.columnName')"
+                    size="small"
+                  />
+                </div>
+                <!-- 隐藏col_数字标签，不影响用户使用 -->
+                <!-- <div class="column-key">
+                  <a-tag size="small" color="blue">{{ column.key }}</a-tag>
+                </div> -->
+              </div>
+            </Draggable>
+          </Container>
+        </div>
+      </div>
+
+      <!-- 预览区域 -->
+      <div class="preview-section">
+        <h4>{{ t('common.preview') }}</h4>
+        <div class="preview-table">
+          <a-table
+            :columns="previewColumns"
+            :data-source="previewData"
+            :pagination="false"
+            size="small"
+            :scroll="{ x: 400 }"
+          />
+        </div>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onMounted } from 'vue';
+import { Modal, message } from 'ant-design-vue/es';
+import { Container, Draggable } from 'vue3-smooth-dnd';
+import useI18n from '@/hooks/useI18n';
+import { ColumnsType } from 'ant-design-vue/es/table';
+
+interface CustomColumn {
+  key: string;
+  title: string;
+  visible: boolean;
+  originalTitle: string;
+  dataIndex?: string;
+  customRender?: any;
+  columnIndex?: number; // Excel列索引
+}
+
+interface Props {
+  open: boolean;
+  originalColumns: ColumnsType;
+  sampleData: any[];
+}
+
+interface Emits {
+  (e: 'update:open', value: boolean): void;
+  (e: 'confirm', config: CustomColumn[]): void;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits<Emits>();
+const { t } = useI18n();
+
+const visible = ref(false);
+const confirmLoading = ref(false);
+const customColumns = ref<CustomColumn[]>([]);
+
+// 监听props变化
+watch(() => props.open, (newVal) => {
+  visible.value = newVal;
+  if (newVal) {
+    initCustomColumns();
+  }
+});
+
+watch(visible, (newVal) => {
+  emit('update:open', newVal);
+});
+
+// 初始化自定义列配置
+function initCustomColumns() {
+  // 如果传入的是完整的列配置（包含columnIndex），直接使用
+  if (props.originalColumns.length > 0 && (props.originalColumns[0] as any).columnIndex !== undefined) {
+    const columns: CustomColumn[] = props.originalColumns.map(col => ({
+      key: (col as any).key,
+      title: (col as any).title,
+      visible: true,
+      originalTitle: (col as any).originalTitle || (col as any).title,
+      dataIndex: (col as any).dataIndex,
+      columnIndex: (col as any).columnIndex
+    }));
+
+    // 尝试从本地存储加载配置
+    const savedConfig = localStorage.getItem('sgwc-cdr-export-config');
+    if (savedConfig) {
+      try {
+        const saved = JSON.parse(savedConfig);
+        console.log('Loaded saved config:', saved);
+
+        // 基于originalTitle匹配保存的配置
+        const mergedColumns = columns.map(col => {
+          const savedCol = saved.find((s: any) => s.originalTitle === col.originalTitle);
+          if (savedCol) {
+            console.log(`Matched column: ${col.originalTitle}, visible: ${savedCol.visible}, title: ${savedCol.title}`);
+            return {
+              ...col,
+              visible: savedCol.visible !== undefined ? savedCol.visible : true,
+              title: savedCol.title || col.title
+            };
+          }
+          return col;
+        });
+
+        // 按照保存的顺序排列（如果存在）
+        const sortedColumns = sortColumnsByConfig(mergedColumns, saved);
+        console.log('Final columns after merge and sort:', sortedColumns);
+        customColumns.value = sortedColumns;
+      } catch (error) {
+        console.error('Failed to load saved export config:', error);
+        customColumns.value = columns;
+      }
+    } else {
+      console.log('No saved config found, using default columns');
+      customColumns.value = columns;
+    }
+    return;
+  }
+
+  // 兼容旧的表格列配置
+  const columns: CustomColumn[] = props.originalColumns
+    .filter(col => col.key !== 'id' && (col as any).dataIndex) // 过滤掉操作列
+    .map(col => ({
+      key: col.key as string,
+      title: col.title as string,
+      visible: true,
+      originalTitle: col.title as string,
+      dataIndex: (col as any).dataIndex as string,
+      customRender: (col as any).customRender
+    }));
+
+  // 尝试从本地存储加载配置
+  const savedConfig = localStorage.getItem('sgwc-cdr-export-config');
+  if (savedConfig) {
+    try {
+      const saved = JSON.parse(savedConfig);
+      // 合并保存的配置和当前列，只合并特定字段
+      const mergedColumns = columns.map(col => {
+        const savedCol = saved.find((s: CustomColumn) => s.key === col.key);
+        if (savedCol) {
+          return {
+            ...col,
+            visible: savedCol.visible, // 只合并可见性
+            title: savedCol.title !== savedCol.originalTitle ? savedCol.title : col.title // 只合并自定义的标题
+          };
+        }
+        return col;
+      });
+      customColumns.value = mergedColumns;
+    } catch (error) {
+      console.error('Failed to load saved export config:', error);
+      customColumns.value = columns;
+    }
+  } else {
+    customColumns.value = columns;
+  }
+}
+
+// 按照保存的配置排序列
+function sortColumnsByConfig(columns: CustomColumn[], savedConfig: CustomColumn[]): CustomColumn[] {
+  if (!savedConfig || savedConfig.length === 0) {
+    return columns;
+  }
+
+  // 创建一个映射：originalTitle -> savedOrder
+  const orderMap = new Map<string, number>();
+  savedConfig.forEach((col, index) => {
+    orderMap.set(col.originalTitle, index);
+  });
+
+  // 排序：已保存的列按保存顺序，新列放在最后
+  return [...columns].sort((a, b) => {
+    const orderA = orderMap.has(a.originalTitle) ? orderMap.get(a.originalTitle)! : 9999;
+    const orderB = orderMap.has(b.originalTitle) ? orderMap.get(b.originalTitle)! : 9999;
+    return orderA - orderB;
+  });
+}
+
+// 预览列配置
+const previewColumns = computed(() => {
+  return customColumns.value
+    .filter(col => col.visible)
+    .map(col => ({
+      title: col.title,
+      dataIndex: col.dataIndex || col.key,
+      key: col.key,
+      customRender: col.customRender
+    }));
+});
+
+// 预览数据（只显示前2条，降低预览高度）
+const previewData = computed(() => {
+  return props.sampleData.slice(0, 1);
+});
+
+// 更新列可见性
+function updateColumnVisibility(column: CustomColumn) {
+  // 确保至少有一列可见
+  const visibleCount = customColumns.value.filter(col => col.visible).length;
+  if (visibleCount === 0) {
+    column.visible = true;
+    message.warning(t('common.atLeastOneColumn'));
+  }
+}
+
+// 拖拽相关函数
+function getChildPayload(index: number) {
+  return customColumns.value[index];
+}
+
+function onDrop(dropResult: any) {
+  const { removedIndex, addedIndex } = dropResult;
+  if (removedIndex !== null && addedIndex !== null) {
+    const item = customColumns.value[removedIndex];
+    customColumns.value.splice(removedIndex, 1);
+    customColumns.value.splice(addedIndex, 0, item);
+  }
+}
+
+// 重置为默认配置
+function resetToDefault() {
+  Modal.confirm({
+    title: t('common.confirm'),
+    content: t('common.resetConfirm'),
+    onOk() {
+      // 清除本地存储的配置
+      localStorage.removeItem('sgwc-cdr-export-config');
+      // 重新初始化
+      initCustomColumns();
+      message.success(t('common.resetSuccess'));
+    }
+  });
+}
+
+// 确认导出
+function handleOk() {
+  const visibleColumns = customColumns.value.filter(col => col.visible);
+  if (visibleColumns.length === 0) {
+    message.error(t('common.selectAtLeastOneColumn'));
+    return;
+  }
+
+  confirmLoading.value = true;
+
+  // 保存配置到本地存储
+  try {
+    // 保存时只保存必要的字段，用于下次加载时恢复配置
+    const configToSave = customColumns.value.map((col, index) => ({
+      originalTitle: col.originalTitle || col.title, // 用于匹配列
+      title: col.title,                               // 自定义标题
+      visible: col.visible,                           // 可见性
+      order: index                                    // 顺序
+    }));
+    localStorage.setItem('sgwc-cdr-export-config', JSON.stringify(configToSave));
+    console.log('Export config saved:', configToSave);
+  } catch (error) {
+    console.error('Failed to save export config:', error);
+  }
+
+  // 延迟一下让用户看到loading状态
+  setTimeout(() => {
+    emit('confirm', customColumns.value);
+    confirmLoading.value = false;
+    visible.value = false;
+  }, 500);
+}
+
+// 取消
+function handleCancel() {
+  visible.value = false;
+}
+
+onMounted(() => {
+  if (props.open) {
+    initCustomColumns();
+  }
+});
+
+// 调试功能：清除有问题的缓存
+function clearProblematicCache() {
+  localStorage.removeItem('sgwc-cdr-export-config');
+  console.log('Cleared problematic cache');
+}
+</script>
+
+<style lang="less" scoped>
+.export-custom-container {
+  .columns-config {
+    margin-bottom: 12px;
+
+    .config-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 10px;
+
+      h4 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: 600;
+      }
+    }
+
+    .columns-list {
+      border: 1px solid #d9d9d9;
+      border-radius: 6px;
+      max-height: 200px;
+      overflow-y: auto;
+
+      .column-item {
+        display: flex;
+        align-items: center;
+        padding: 6px 10px;
+        border-bottom: 1px solid #f0f0f0;
+        transition: background-color 0.2s;
+
+        &:hover {
+          background-color: #fafafa;
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        .column-controls {
+          display: flex;
+          align-items: center;
+          margin-right: 12px;
+
+          .drag-handle {
+            margin-left: 8px;
+            cursor: grab;
+            color: #999;
+            padding: 4px;
+            border-radius: 4px;
+            transition: all 0.2s;
+            user-select: none;
+
+            &:hover {
+              color: #1890ff;
+              background-color: #f0f0f0;
+            }
+
+            &:active {
+              cursor: grabbing;
+              color: #0050b3;
+              background-color: #e6f7ff;
+            }
+          }
+        }
+
+        .column-info {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          pointer-events: auto;
+          cursor: default;
+
+          .column-name {
+            flex: 1;
+          }
+
+          .column-key {
+            display: none; // 隐藏标签
+          }
+        }
+
+        // 禁止复选框触发拖拽
+        :deep(.ant-checkbox-wrapper) {
+          pointer-events: auto;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .preview-section {
+    h4 {
+      margin: 0 0 10px 0;
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+    .preview-table {
+      border: 1px solid #d9d9d9;
+      border-radius: 6px;
+      overflow: hidden;
+      max-height: 180px;
+
+      :deep(.ant-table-wrapper) {
+        .ant-table {
+          font-size: 12px;
+        }
+
+        .ant-table-thead > tr > th {
+          padding: 8px 8px;
+          font-size: 12px;
+        }
+
+        .ant-table-tbody > tr > td {
+          padding: 6px 8px;
+          font-size: 12px;
+        }
+
+        .ant-table-body {
+          max-height: 120px;
+          overflow-y: auto;
+        }
+      }
+    }
+  }
+}
+
+// 拖拽样式
+.drag-ghost {
+  opacity: 0.5;
+  background: #f0f0f0;
+}
+
+.drop-ghost {
+  background: #e6f7ff;
+}
+</style>
--- a/src/components/GlobalMask/index.vue
+++ b/src/components/GlobalMask/index.vue
@@ -12,7 +12,7 @@ const router = useRouter();
 const { t } = useI18n();

 /**显示遮罩 */
-const isVisible = computed(() => !['none', 'lock'].includes(maskStore.type));
+const isOpen = computed(() => !['none', 'lock'].includes(maskStore.type));

 // 用户无操作一段时间后进行锁屏
 function idleTimeout(time: number, callback: Function) {
@@ -67,7 +67,7 @@ onUnmounted(() => {});
 </script>
 <template>
  <a-modal
-    v-model:visible="isVisible"
+    v-model:open="isOpen"
    get-container="#app"
    :footer="null"
    :zIndex="1008"
--- a/src/components/IntlTelInput/index.vue
+++ b/src/components/IntlTelInput/index.vue
@@ -1,9 +1,9 @@
 <!-- https://github.com/jackocnr/intl-tel-input/blob/master/react/src/intl-tel-input/react.tsx -->
 <script lang="ts" setup>
-import intlTelInput, { Iti, SomeOptions } from 'intl-tel-input';
+import { Iti } from 'intl-tel-input';
+import intlTelInput from 'intl-tel-input/intlTelInputWithUtils';
 import 'intl-tel-input/build/css/intlTelInput.min.css';
-import 'intl-tel-input/build/js/utils.js';
-import { ref, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
+import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import useI18n from '@/hooks/useI18n';
 const { currentLocale } = useI18n();
 const emit = defineEmits(['update:value', 'update:change']);
@@ -45,13 +45,13 @@ const itiRef = ref<Iti | null>(null);
 function fnChange() {
  if (!itiRef.value) return;

-  const num = itiRef.value?.getNumber() || '';
+  const number = itiRef.value?.getNumber() || '';
  const countryIso = itiRef.value?.getSelectedCountryData().iso2 || '';
  // note: this number will be in standard E164 format, but any container component can use
  // intlTelInputUtils.formatNumber() to convert this to another format
  // as well as intlTelInputUtils.getNumberType() etc. if need be
  let data = {
-    num,
+    number,
    countryIso,
    validity: false,
    errorCode: -1,
@@ -69,21 +69,11 @@ function fnChange() {
    data.errorCode = errorCode;
  }
  // console.log(data);
-  emit('update:value', num);
+
+  emit('update:value', number);
  emit('update:change', data);
 }

-watch(
-  () => props.value,
-  v => {
-    if (v) {
-      itiRef.value?.setNumber(v);
-    } else {
-      itiRef.value?.setNumber('');
-    }
-  }
-);
-
 onMounted(() => {
  nextTick(async () => {
    if (inputRef.value) {
@@ -106,7 +96,13 @@ onMounted(() => {
        formatOnDisplay: true,
        autoPlaceholder: 'polite',
        i18n: i18n,
-      } as SomeOptions);
+      });
+      if (props.value) {
+        itiRef.value.setNumber(props.value);
+      }
+      if (props.disabled) {
+        itiRef.value.setDisabled(props.disabled);
+      }
      inputRef.value.addEventListener('countrychange', fnChange);
    }
  });
@@ -124,8 +120,7 @@ onBeforeUnmount(() => {
  <input
    type="tel"
    class="ant-input"
-    ref="inputRef"
-    :value="value"
+    ref="inputRef" 
    :disabled="disabled"
    :placeholder="placeholder"
    :maxlength="maxlength"
@@ -142,4 +137,32 @@ onBeforeUnmount(() => {
 .iti .iti__country-container .iti__search-input {
  padding: 4px 8px;
 }
+
+.iti .ant-input {
+  box-sizing: border-box;
+  margin: 0;
+  font-variant: tabular-nums;
+  list-style: none;
+  font-feature-settings: 'tnum';
+  position: relative;
+  display: inline-block;
+  width: 100%;
+  min-width: 0;
+  padding: 4px 11px;
+  color: #000000d9;
+  font-size: 14px;
+  line-height: 1.5715;
+  background-color: transparent;
+  background-image: none;
+  border: 1px solid #424242;
+  border-radius: 6px;
+  transition: all 0.3s;
+}
+.iti .ant-input:focus,
+.iti .ant-input-focused {
+  border-color: var(--ant-primary-color-hover);
+  box-shadow: 0 0 0 2px var(--ant-primary-color-outline);
+  border-right-width: 1px !important;
+  outline: 0;
+}
 </style>
--- a/src/components/TableColumnsDnd/index.vue
+++ b/src/components/TableColumnsDnd/index.vue
@@ -2,7 +2,6 @@
 import { reactive, watch, onMounted, PropType, nextTick } from 'vue';
 import { Container, Draggable } from 'vue3-smooth-dnd';
 import useI18n from '@/hooks/useI18n';
-import { type ColumnsType } from 'ant-design-vue/lib/table';
 import { dbGetJSON, dbSetJSON } from '@/utils/cache-db-utils';
 import { CACHE_DB_TABLE_DND } from '@/constants/cache-keys-constants';
 const { t, currentLocale } = useI18n();
@@ -37,7 +36,7 @@ const props = defineProps({
 });

 /**表格字段列 */
-const tableColumns = reactive<ColumnsType>(props.columns);
+const tableColumns = reactive(props.columns);

 /**表格字段列勾选状态 */
 const state = reactive<{
@@ -56,7 +55,9 @@ const state = reactive<{
 function fnTableColumnsCheckAllChange(e: any) {
  const checked = e.target.checked;
  state.indeterminate = false;
-  state.columnsTitleList = checked ? tableColumns.map(s => `${s.title}`) : [];
+  state.columnsTitleList = checked
+    ? tableColumns.map(s => `${s.title as string}`)
+    : [];
 }

 /**表格字段列拖拽操作 */
--- a/src/components/TerminalRedis/index.vue
+++ b/src/components/TerminalRedis/index.vue
@@ -0,0 +1,289 @@
+<script lang="ts" setup>
+import { message } from 'ant-design-vue/es';
+import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue';
+import { FitAddon } from '@xterm/addon-fit';
+import { Terminal } from '@xterm/xterm';
+import '@xterm/xterm/css/xterm.css';
+import { RESULT_CODE_ERROR } from '@/constants/result-constants';
+import { OptionsType, WS } from '@/plugins/ws-websocket';
+const ws = new WS();
+const emit = defineEmits(['connect', 'close', 'message']);
+const props = defineProps({
+  /**终端ID，必传 */
+  id: {
+    type: String,
+    required: true,
+  },
+  /**连接主机ID，必传 */
+  hostId: {
+    type: String,
+    required: true,
+  },
+  /**初始发送命令 */
+  initCmd: {
+    type: [String, Boolean],
+    default: false,
+  },
+});
+
+/**终端输入DOM节点实例对象 */
+const terminalDom = ref<HTMLElement | undefined>(undefined);
+
+/**终端输入实例对象 */
+const terminal = ref<any>(null);
+
+/**终端输入文字状态 */
+const terminalState = reactive<{
+  /**输入值 */
+  text: string;
+  /**历史 */
+  history: {
+    label?: string;
+    value: string;
+  }[];
+}>({
+  text: '',
+  history: [
+    {
+      value: 'info server',
+    },
+    {
+      value: 'info replication',
+    },
+    {
+      value: 'keys ausf:*',
+    },
+    {
+      value: 'quit',
+    },
+  ],
+});
+
+/**自动完成根据输入项进行筛选 */
+function fnAutoCompleteFilter(input: string, option: any) {
+  return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+}
+
+/**自动完成按键触发 */
+function fnAutoCompleteKeydown(evt: KeyboardEvent) {
+  if (evt.key === 'Enter') {
+    // 阻止默认的换行行为
+    evt.preventDefault();
+    // 按下 Shift + Enter 键时换行
+    if (evt.shiftKey && evt.target) {
+      // 插入换行符
+      const textarea = evt.target as HTMLInputElement;
+      const start = textarea.selectionStart || 0;
+      const end = textarea.selectionEnd || 0;
+      const text = textarea.value;
+      textarea.value = text.substring(0, start) + '\n' + text.substring(end);
+      terminalState.text = textarea.value;
+      // 更新光标位置
+      textarea.selectionStart = textarea.selectionEnd = start + 1;
+    } else {
+      // ws未连接
+      if (ws.state() !== WebSocket.OPEN) {
+        message.error('disconnected');
+        return;
+      }
+
+      // 输入历史
+      const cmdStr = terminalState.text.trim().replace(/\n/g, '\r\n');
+      const hisIndex = terminalState.history.findIndex(
+        item => item.value === cmdStr
+      );
+      if (hisIndex === -1) {
+        terminalState.history.push({
+          value: cmdStr,
+        });
+      }
+
+      // 发送文本
+      terminal.value.scrollToBottom();
+      terminal.value.writeln('\r\n> ' + cmdStr);
+      ws.send({
+        requestId: `redis_${props.hostId}`,
+        type: 'redis',
+        data: `${cmdStr}\r\n`,
+      });
+      terminalState.text = '';
+
+      // 退出登录
+      if (['q', 'quit', 'exit'].includes(cmdStr)) {
+        setTimeout(() => {
+          ws.close();
+        }, 1000);
+      }
+    }
+  }
+}
+
+/**终端输入渲染 */
+function handleRanderXterm(container: HTMLElement | undefined) {
+  if (!container) return;
+  const xterm = new Terminal({
+    lineHeight: 1.2,
+    fontSize: 12,
+    fontFamily: "Monaco, Menlo, Consolas, 'Courier New', monospace",
+    theme: {
+      background: '#000000',
+    },
+    cursorBlink: true, // 光标闪烁
+    cursorStyle: 'block',
+    scrollback: 1000,
+    scrollSensitivity: 15,
+    tabStopWidth: 4,
+    disableStdin: true, // 禁止输入
+  });
+  // 挂载
+  xterm.open(container);
+  // 自适应尺寸
+  const fitAddon = new FitAddon();
+  xterm.loadAddon(fitAddon);
+  // 创建 ResizeObserver 实例
+  var observer = new ResizeObserver(entries => {
+    fitAddon.fit();
+  });
+  // 监听元素大小变化
+  observer.observe(container);
+
+  terminal.value = xterm;
+}
+
+/**连接打开后回调 */
+function wsOpen(ev: any) {
+  // console.info('wsOpen', ev);
+  nextTick(() => {
+    handleRanderXterm(terminalDom.value);
+
+    // 连接事件
+    emit('connect', {
+      timeStamp: ev.timeStamp,
+      cols: terminal.value.cols,
+      rows: terminal.value.rows,
+      hostId: props.hostId,
+      id: props.id,
+    });
+    // 初始发送命令
+    if (typeof props.initCmd === 'string') {
+      ws.send({
+        requestId: `redis_${props.hostId}`,
+        type: 'redis',
+        data: `${props.initCmd}\r\n`,
+      });
+    }
+  });
+}
+
+/**连接错误后回调 */
+function wsError(ev: any) {
+  console.error('wsError', ev);
+  if (terminal.value != null) {
+    let message = 'disconnected';
+    terminal.value.write(`\x1b[31m${message}\x1b[m\r\n`);
+  } else if (terminalDom.value) {
+    terminalDom.value.style.background = '#000';
+    terminalDom.value.style.color = '#ff4d4f';
+    terminalDom.value.style.height = '60%';
+    terminalDom.value.innerText = 'disconnected';
+  }
+}
+
+/**连接关闭后回调 */
+function wsClose(code: number) {
+  // console.warn('wsClose', code);
+  if (terminal.value != null) {
+    let message = 'disconnected';
+    terminal.value.write(`\x1b[31m${message}\x1b[m\r\n`);
+  }
+  // 关闭事件
+  emit('close', {
+    code: code,
+    hostId: props.hostId,
+    id: props.id,
+  });
+}
+
+/**接收消息后回调 */
+function wsMessage(res: Record<string, any>) {
+  emit('message', res);
+  // console.log('wsMessage', res);
+  const { code, requestId, data } = res;
+  if (code === RESULT_CODE_ERROR) {
+    console.warn(res.msg);
+    return;
+  }
+  if (!requestId) return;
+  if (data.indexOf('is empty') > 0) return;
+  if (terminal.value != null) {
+    // terminal.value.write(data.trim().replace(/\n/g, "\r\n"));
+    // 是否n结尾
+    if (/[\r\n]$/.test(data)) {
+      terminal.value.writeln(data.trim().replace(/\n/g, '\r\n'));
+    } else {
+      terminal.value.write(data.replace(/\n/g, '\r\n'));
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.hostId) {
+    // 建立链接
+    const options: OptionsType = {
+      url: '/ws/redis',
+      params: {
+        hostId: props.hostId,
+      },
+      onmessage: wsMessage,
+      onerror: wsError,
+      onopen: wsOpen,
+      onclose: wsClose,
+    };
+    ws.connect(options);
+  }
+});
+
+onBeforeUnmount(() => {
+  ws.close();
+});
+
+// 给组件设置属性 ref="xxxTerminal"
+// setup内使用 const xxxTerminal = ref();
+defineExpose({
+  /**发送方法 */
+  send: (data: string) => {
+    ws.send({
+      requestId: `redis_${props.hostId}`,
+      type: 'redis',
+      data: `${data}\r\n`,
+    });
+  },
+});
+</script>
+
+<template>
+  <div class="terminal">
+    <div ref="terminalDom" style="height: calc(100% - 36px)" :id="id"></div>
+    <a-auto-complete
+      v-model:value="terminalState.text"
+      :dropdown-match-select-width="500"
+      style="width: 100%"
+      :options="terminalState.history"
+      :filter-option="fnAutoCompleteFilter"
+      :defaultActiveFirstOption="false"
+    >
+      <a-textarea
+        :auto-size="{ minRows: 1, maxRows: 6 }"
+        placeholder="Execute command. Shift+Enter to line feed, Enter to send"
+        @keypress="fnAutoCompleteKeydown"
+      />
+    </a-auto-complete>
+  </div>
+</template>
+
+<style lang="css" scoped>
+.terminal {
+  width: 100%;
+  height: 100%;
+}
+</style>
--- a/src/components/TerminalSSH/index.vue
+++ b/src/components/TerminalSSH/index.vue
@@ -126,7 +126,7 @@ function handleRanderXterm(container: HTMLElement | undefined) {
    // console.log('尺寸', cols, rows);
    ws.send({
      requestId: `ssh_resize_${props.hostId}`,
-      type: 'ssh_resize',
+      type: 'resize',
      data: { cols, rows },
    });
  });
--- a/src/components/TerminalSSHView/index.vue
+++ b/src/components/TerminalSSHView/index.vue
@@ -43,6 +43,11 @@ const props = defineProps({
    type: String,
    default: 'ssh',
  },
+  /**消息处理函数 */
+  processMessages: {
+    type: Function,
+    default: undefined,
+  },
 });

 /**终端输入DOM节点实例对象 */
@@ -153,32 +158,49 @@ function wsMessage(res: Record<string, any>) {
  }
  if (!requestId) return;
  if (terminal.value != null) {
-    // 查找的开始输出标记
-    const parts: string[] = data.split('\u001b[?2004l\r');
-    if (parts.length > 0) {
-      let text = parts[parts.length - 1];
-      // 找到最后输出标记
-      let lestIndex = text.lastIndexOf('\u001b[?2004h\u001b]0;');
-      if (lestIndex !== -1) {
-        text = text.substring(0, lestIndex);
-      }
-      if (text === '' || text === '\r\n' || text.startsWith('^C\r\n')) {
-        return;
-      }
-      // 是否还有最后输出标记
-      lestIndex = text.lastIndexOf('\u001b[?2004h');
-      if (lestIndex !== -1) {
-        text = text.substring(0, lestIndex);
-      }
-      // console.log({ parts, text });
-      terminal.value.write(text);
+    let text = '';
+    // 处理消息
+    if (props.processMessages) {
+      text = props.processMessages(data); 
+    }else{
+      text = processMessage(data);
+    }
+    // 无消息是则不输出
+    if (text === '') {
      return;
    }
-    // 无标记
-    terminal.value.write(data);
+    terminal.value.write(text);
  }
 }

+/**终端消息处理*/
+function processMessage(data: string): string {
+  // 查找的开始输出标记
+  const parts: string[] = data.split('\u001b[?2004l\r');
+  if (parts.length > 0) {
+    if (parts[0].startsWith('^C') || parts[0].startsWith('\r')) {
+      return '';
+    }
+    let text = parts[parts.length - 1];
+    // 找到最后输出标记
+    let lestIndex = text.lastIndexOf('\u001b[?2004h\u001b]0;');
+    if (lestIndex !== -1) {
+      text = text.substring(0, lestIndex);
+    }
+    if (text === '' || text === '\r\n' || text.startsWith('^C\r\n')) {
+      return '';
+    }
+    // 是否还有最后输出标记
+    lestIndex = text.lastIndexOf('\u001b[?2004h');
+    if (lestIndex !== -1) {
+      text = text.substring(0, lestIndex);
+    }
+    // console.log({ parts, text });
+    return text;
+  }
+  return data;
+}
+
 onMounted(() => {
  if (props.neType && props.neId) {
    // 建立链接
--- a/src/components/TerminalTelnet/index.vue
+++ b/src/components/TerminalTelnet/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { message } from 'ant-design-vue/lib';
+import { message } from 'ant-design-vue/es';
 import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import { FitAddon } from '@xterm/addon-fit';
 import { Terminal } from '@xterm/xterm';
@@ -80,16 +80,16 @@ function fnAutoCompleteFilter(input: string, option: any) {
 }

 /**自动完成按键触发 */
-function fnAutoCompleteKeydown(evt: any) {
+function fnAutoCompleteKeydown(evt: KeyboardEvent) {
  if (evt.key === 'Enter') {
    // 阻止默认的换行行为
    evt.preventDefault();
    // 按下 Shift + Enter 键时换行
-    if (evt.shiftKey) {
+    if (evt.shiftKey && evt.target) {
      // 插入换行符
-      const textarea = evt.target;
-      const start = textarea.selectionStart;
-      const end = textarea.selectionEnd;
+      const textarea = evt.target as HTMLInputElement;
+      const start = textarea.selectionStart || 0;
+      const end = textarea.selectionEnd || 0;
      const text = textarea.value;
      textarea.value = text.substring(0, start) + '\n' + text.substring(end);
      terminalState.text = textarea.value;
@@ -121,7 +121,7 @@ function fnAutoCompleteKeydown(evt: any) {
        type: 'telnet',
        data: `${cmdStr}\r\n`,
      });
-      terminalState.text = ' ';
+      terminalState.text = '';

      // 退出登录
      if (['q', 'quit', 'exit'].includes(cmdStr)) {
@@ -160,7 +160,7 @@ function handleRanderXterm(container: HTMLElement | undefined) {
    // console.log('尺寸', cols, rows);
    ws.send({
      requestId: `telnet_resize_${props.hostId}`,
-      type: 'telnet_resize',
+      type: 'resize',
      data: { cols, rows },
    });
  });
@@ -296,11 +296,12 @@ defineExpose({
      style="width: 100%"
      :options="terminalState.history"
      :filter-option="fnAutoCompleteFilter"
-      @keydown="fnAutoCompleteKeydown"
+      :defaultActiveFirstOption="false"
    >
      <a-textarea
        :auto-size="{ minRows: 1, maxRows: 6 }"
        placeholder="Execute command. Shift+Enter to line feed, Enter to send"
+        @keypress="fnAutoCompleteKeydown"
      />
    </a-auto-complete>
  </div>
--- a/src/components/TerminalText/index.vue
+++ b/src/components/TerminalText/index.vue
@@ -1,97 +0,0 @@
-<script lang="ts" setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import { FitAddon } from '@xterm/addon-fit';
-import { Terminal } from '@xterm/xterm';
-import '@xterm/xterm/css/xterm.css';
-const emit = defineEmits(['update:value']);
-const props = defineProps({
-  /**终端ID，必传 */
-  id: {
-    type: String,
-    required: true,
-  },
-  /**窗口单行字符数 */
-  cols: {
-    type: Number,
-    default: 80,
-  },
-  /**窗口行数 */
-  rows: {
-    type: Number,
-    default: 40,
-  },
-  /**信息 */
-  value: {
-    type: String,
-    default: '',
-  },
-});
-
-/**终端输入DOM节点实例对象 */
-const terminalDom = ref<HTMLElement | undefined>(undefined);
-
-/**终端输入实例对象 */
-const terminal = ref<any>(null);
-
-/**终端输入渲染 */
-function handleRanderXterm(container: HTMLElement | undefined) {
-  if (!container) return;
-  const xterm = new Terminal({
-    cols: props.cols,
-    rows: props.rows,
-    lineHeight: 1.2,
-    fontSize: 12,
-    fontFamily: "Monaco, Menlo, Consolas, 'Courier New', monospace",
-    theme: {
-      background: '#000000',
-    },
-    cursorBlink: false, // 光标闪烁
-    cursorStyle: 'block',
-    scrollback: 1000,
-    scrollSensitivity: 15,
-    tabStopWidth: 4,
-    disableStdin: true, // 禁止输入
-  });
-  // 挂载
-  xterm.open(container);
-  // 自适应尺寸
-  const fitAddon = new FitAddon();
-  xterm.loadAddon(fitAddon);
-
-  // 创建 ResizeObserver 实例
-  var observer = new ResizeObserver(entries => {
-    fitAddon.fit();
-  });
-  // 监听元素大小变化
-  observer.observe(container);
-
-  terminal.value = xterm;
-}
-
-onMounted(() => {
-  nextTick(() => {
-    handleRanderXterm(terminalDom.value);
-    // 初始发送命令
-    if (typeof props.value === 'string') {
-      terminal.value.write(props.value);
-    }
-  });
-});
-
-onBeforeUnmount(() => {
-  if (terminal.value != null) {
-    terminal.value.dispose();
-  }
-});
-</script>
-
-<template>
-  <div ref="terminalDom" :id="id" class="terminal"></div>
-</template>
-
-<style lang="css" scoped>
-.terminal {
-  width: 100%;
-  height: 100%;
-}
-</style>
--- a/src/components/UploadModal/index.vue
+++ b/src/components/UploadModal/index.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { message } from 'ant-design-vue/lib';
-import { FileType } from 'ant-design-vue/lib/upload/interface';
-import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
+import { message } from 'ant-design-vue/es';
+import { FileType } from 'ant-design-vue/es/upload/interface';
+import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
+import { ProModal } from 'antdv-pro-modal';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
-const emit = defineEmits(['upload', 'close', 'update:visible']);
+const emit = defineEmits(['upload', 'close', 'update:open']);
 const props = defineProps({
  /**窗口标题 */
  title: {
@@ -17,7 +18,7 @@ const props = defineProps({
    default: false,
  },
  /**是否弹出显示，必传 */
-  visible: {
+  open: {
    type: Boolean,
    required: true,
  },
@@ -80,7 +81,7 @@ function fnUpload(up: UploadRequestOption) {
    :drag="true"
    :destroyOnClose="true"
    :title="props.title"
-    :visible="props.visible"
+    :open="props.open"
    :keyboard="false"
    :mask-closable="false"
    :confirm-loading="props.loading"
--- a/src/constants/admin-constants.ts
+++ b/src/constants/admin-constants.ts
@@ -3,3 +3,6 @@ export const ADMIN_ROLE_KEY = 'system';

 /**系统管理员-系统指定权限 */
 export const ADMIN_PERMISSION = '*:*:*';
+
+/**次级系统管理员 */
+export const TENANTADMIN_ROLE_KEY = 'admin';
--- a/src/constants/cache-keys-constants.ts
+++ b/src/constants/cache-keys-constants.ts
@@ -1,3 +1,6 @@
+/**会话缓存-接口加密 */
+export const CACHE_SESSION_CRYPTO_API = 'cache:session:cryptoApi';
+
 /**会话缓存-网络请求 */
 export const CACHE_SESSION_FATCH = 'cache:session:fatch';

--- a/src/constants/ne-constants.ts
+++ b/src/constants/ne-constants.ts
@@ -4,6 +4,7 @@ export const NE_TYPE_LIST = [
  'IMS',
  'AMF',
  'AUSF',
+  'UDR',
  'UDM',
  'SMF',
  'PCF',
@@ -16,7 +17,11 @@ export const NE_TYPE_LIST = [
  'N3IWF',
  'MOCNGW',
  'SMSC',
+  'SMSF',
  'CBC',
+  'CHF',
+  'HLR',
+  'SGWC',
 ];

 /**
--- a/src/hooks/useRangePicker.ts
+++ b/src/hooks/useRangePicker.ts
@@ -0,0 +1,47 @@
+import dayjs from 'dayjs';
+
+/**日期快捷选择 */
+export function dayjsRanges() {
+  return [
+    {
+      label: 'Today',
+      value: [dayjs().startOf('day'), dayjs()],
+    },
+    {
+      label: 'Last 1 hour',
+      value: [
+        dayjs().subtract(1, 'hour').startOf('hour'),
+        dayjs().subtract(1, 'hour').endOf('hour'),
+      ],
+    },
+    // {
+    //   label: 'Last 3 hour',
+    //   value: [dayjs().subtract(3, 'hours'), dayjs()],
+    // },
+    // {
+    //   label: 'Last 6 hour',
+    //   value: [dayjs().subtract(6, 'hours'), dayjs()],
+    // },
+    {
+      label: 'Last 1 day',
+      value: [
+        dayjs().subtract(1, 'day').startOf('day'),
+        dayjs().subtract(1, 'day').endOf('day'),
+      ],
+    },
+    {
+      label: 'Last 7 day',
+      value: [
+        dayjs().subtract(7, 'day').startOf('day'),
+        dayjs().subtract(1, 'day').endOf('day'),
+      ],
+    },
+    {
+      label: 'Last 15 day',
+      value: [
+        dayjs().subtract(15, 'day').startOf('day'),
+        dayjs().subtract(1, 'day').endOf('day'),
+      ],
+    },
+  ];
+}
--- a/src/hooks/useTheme.ts
+++ b/src/hooks/useTheme.ts
@@ -1,5 +1,5 @@
 import { onBeforeMount } from 'vue';
-import { ConfigProvider, message } from 'ant-design-vue/lib';
+import { ConfigProvider, message } from 'ant-design-vue/es';
 import { CACHE_LOCAL_PRIMARY_COLOR } from '@/constants/cache-keys-constants';
 import { localGet, localSet } from '@/utils/cache-local-utils';

--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -6,17 +6,18 @@ export default {

  // 通用
  common: {
-    title: 'Core Network Management Platform',
+    title: 'Login Platform',
    desc: 'Core Network Management Platform',
    loading: 'Please wait...',
    inputPlease: 'Please input',
+    searchPlease: 'Search menus...',
+    searchTip: 'Enter keywords to search menus',
    selectPlease: 'please select',
    tipTitle: 'Prompt',
    msgSuccess: 'Success {msg}',
    errorFields: 'Please fill in the required information in {num} correctly!',
    tablePaginationTotal: 'Total {total} items',
    noData: "No Data",
-    zebra:'Tabular zebra pattern',
    ok: 'Ok',
    cancel: 'Cancel',
    close: 'Close',
@@ -29,6 +30,7 @@ export default {
    editText: 'Edit',
    deleteText: 'Delete',
    downloadText: 'Download',
+    CloudServerText:'Sync',
    import:'Import',
    export:'Export',
    uploadText: 'Upload',
@@ -39,6 +41,11 @@ export default {
    columnSetText: 'Column Setting',
    columnSetTitle: 'Column Display / Sorting',
    sizeText: 'Density',
+    preview:'Preview',
+    exportCustom:'Custom Export',
+    exportColumns:'Column Definition',
+    resetToDefault:'Reset to default columns',
+    exportDefault:'Export',
    size: {
      default: 'Default',
      middle: 'Medium',
@@ -131,7 +138,7 @@ export default {
    },
    LockScreen: {
      inputPlacePwd:'Lock Screen Password',
-      validSucc:'Validation Passed',
+      enter:'Enter',
      validError:'Validation Failure',
      backLogin:'Logout to Relogin',
      backReload:'Restarting now, please wait...',
@@ -143,7 +150,7 @@ export default {

  // 静态路由
  router: {
-    index: "Home",
+    index: "Overview",
    login: "Sign In",
    register: 'Registrations',
    page403: 'No Access',
@@ -192,6 +199,7 @@ export default {
      lockPasswd: "Unlock Password",
      lockPasswdTip: "No password can be set",
      fullscreen: "Full Screen",
+      theme: "Theme light/dark mode",
      logout: "Logout",
      profile: "Profile",
      settings: "Settings",
@@ -221,12 +229,11 @@ export default {
      capability: 'Capability',
      serialNum: 'Serial Number',
      expiryDate: 'Expiry Date',
-      neStatus: 'NE status is abnormal',
-      runStatus:'Running Status',
-      mark:'Brief Information',
+      neStatus: 'Status Abnormal',
+      runStatus: 'Runing Status',
+      mark:'Information',
      object:'Object',
      versionNum:'Version',
-      systemStatus:'Status',
      realNeStatus:'Status',
      reloadTime:'Refresh Time',
      Critical:'Critical',
@@ -254,12 +261,16 @@ export default {
    login: {
      tabPane1: 'Account password login',
      tabPane2: 'Login with phone number',
-      registerBtn: 'Register an account',
+      registerBtn: 'Register Account',
      loginBtn: 'Sign In',
      loginSuccess: 'Login Successful',
-      loginMethod: 'Other login methods:',
-      loginMethodWX: 'WeChat Scan Login',
-      loginMethodQQ: 'QQ Scan Code Login',
+      otherMethod: 'Other Methods',
+      backBtn: 'Back',
+      backBtnLogin: 'Return Login',
+      authorizedNotfound: 'Authorized Not Found',
+      authorizedFailed: 'Authorized Failed',
+      authorizedSuccess: 'Authorized Successful',
+      redirectHome: 'Redirect to home page in {i} seconds',
    },
    register: {
      registerBtn: 'Register',
@@ -317,6 +328,8 @@ export default {
        color: "Style color scheme",
        colorActions: "Overall style color scheme setting",
        colorRandomly: "Randomization",
+        theme: "Theme dark and light modes",
+        themeActions: "Toggle light/dark mode",
        navTheme: "Dark Menu",
        navThemeActions: "Menus that can only change the navigation mode",
        fixedHeader: "Fixed top navigation bar",
@@ -348,178 +361,39 @@ export default {
        description: "No data yet, try refreshing",
      },
    },
-    configManage: {
-      neManage: {
-        addNe:'Add Network Element',
-        delSure:'Confirm deleting the data item with network element name {msg}',
-        editNe:'Edit Network Element',
-        exportSure:'Confirm exporting the configuration information with the network element name {msg}',
-        exportTip:'Export successful, please go to backup management for download',
-        getInfo:'Failed to get network element information',
-        neType:'NE Type',
-        neTypePlease: 'Select network element type',
-        neId:'NE ID',
-        neName:'NE Name',
-        neTypeTip:'Fill in the type of network element created, such as:SMF',
-        uid:'RM UID',
-        uidTip:'Please enter a unique resource identifier',
-        ip:'IP Address',
-        mac:'NE MAC address',
-        macTip:'Able to locate the physical address (MAC) of the network element',
-        port:'Port',
-        portTip:'Maximum range 0~65535',
-        pvflag:'PV Flag',
-        pnf:'Physical Network Element',
-        vnf:'Virtual Network Element',
-        province:'Region',
-        vendorName:'Vendor Name',
-        dn:'Network Identification',
-        reload: 'Reload',
-        restart: 'Restart',
-        totalSure:'Confirm the network element with {operator} network element name {msg}',
-        stop: 'Stop',
-        start: 'Start',
-        log: 'Logs',
-        export: 'Export',
-        import: 'Import',
-        fileForm:'File Source',
-        selectPlease:'Please select the source of the import file',
-        server:'Server File',
-        local:'Local File',
-        fileSelect:'Please select the current import file',
-        sync:'Synchronize to NE',
-        open:'Open',
-        close:'Close',
-        addFail:'Add failed',
-        operFail:'Operation Failed'
-      },
-      backupManage: {
-        setBackupTask: 'Set automatic backup time',
-        neTypePlease: 'Query network element type',
-        neType: 'NE Type',
-        neID: 'NE ID',
-        fileName: 'File Name',
-        createAt: 'Create at',
-        remark:'Remark',
-        edit:'Edit Backup File',
-        totalSure:'Confirm that {oper} records item number {id}?',
-      },
-      softwareManage: {
-        sendBtn: 'Distribute',
-        runBtn: 'Activate',
-        backBtn: 'Rollback',
-        historyBtn: 'Distribution Record',
-        neTypePlease: 'Select network element type',
-        neType: 'NE Type',
-        fileName: 'File Name',
-        version: 'Version',
-        versionPlease: 'Version number cannot be empty',
-        updateTime: 'Uploaded Time',
-        description: 'Description',
-        deleteTip: 'Are you sure to delete the data item with software [{fileName}]?',
-        downloadTip: 'Are you sure to download the data item with software [{fileName}]?',
-        updateComment: 'Comment',
-        updateCommentPlease: 'Please enter the software description',
-        updateFile: 'Software File',
-        updateFilePlease: 'Please upload the updated software file',
-        verifyFile: 'Verify File',
-        selectFile: 'SELECT FILE',
-        sendTitle: 'Distribute software version',
-        sendContent: 'Are you sure to send the file with the software package [{fileName}] to the corresponding network element?',
-        runTitle: 'Activate software version',
-        runContent: 'Are you sure to activate the software version of [{fileName}] that has been issued to the corresponding network element?',
-        backTitle: 'Fallback software version',
-        backContent: 'Confirm that the software version of [{fileName}] has been issued for the corresponding network element rollback?',
-        neId: 'Corresponding network element',
-        neIdPlease: 'Please select the corresponding network element',
-        versions:'Version',
-        upVersions:'Version before upgrade',
-        backVersions:'Version before rollback',
-        status:'Status',
-        letUpTime:'Activation time',
-        createTime:'Creation time',
-        onlyAble:'Only upload file format {fileText} is supported',
-        nullVersion:'There is no rollback version for the current network element.',
-      },
-      license: {
-        neTypePlease: 'Select network element type',
-        neType: 'NE Type',
-        serialNum: 'Serial Num',
-        createTime: 'Time',
-        comment: 'Description',
-        updateComment: 'License Description',
-        updateCommentPlease: 'Please enter a license description',
-        updateFile: 'License File',
-        updateFilePlease: 'Please upload and update the License file',
-        selectFile: 'SELECT FILE',
-        neId: 'NE ID',
-        neIdPlease: 'Please select the corresponding network element',
-      },
-      configParam:{
-        dataNull:'No configuration item data yet',
-        editSuss:'Modification successful',
-        editFail:'Edit failed',
-        Unable:'Illegal operation of attribute value',
-        delSure:'Confirm to delete the data item with Index [{value}]?',
-        addSuss:'Add successfully',
-        addFail:'Add failed',
-        delArraySure:'Confirm to delete the data item with {arrayChildTitle} Index as [{value}]?',
-        parUnable:'The parameter value is not within the reasonable range',
-        ipv4Tip:'Not a legal IPV4 address',
-        ipv6Tip:'Not a legal IPV6 address',
-        enumTip:'Not a reasonable enumeration value',
-        boolTip:'Not a reasonable Boolean value',
-        default:'The input value is of unknown type',
-        reloadSuss:'Network element reloading completed',
-        reloadFail:'Network element reloading failed',
-        neNUll:'No network element list data yet',
-        reload:'Reload',
-        post:'Submit',
-        editSure:'Are you sure you want to update this attribute value? ',
-        arraryEdit:'Are you sure to submit the record whose updated Index is [{value}]? ',
-        addSure:'Are you sure to submit the new record of Index: [{value}]? '
-      },
-      configParamForm: {
-        treeTitle: "Navigation Configuration",
-        treeSelectTip: "Select configuration item information in the left configuration navigation!",
-        neType: 'NE Type',
-        neTypePleace: "Please select the network element type",
-        noConfigData: "No data on configuration items",
-        updateValue: "[ {num} ] parameter value modified successfully.",
-        updateValueErr: "Attribute value modification failure",
-        updateItem: "Modify Index to {num}.",
-        updateItemErr: "Record modification failure",
-        delItemOk: "Deleting Index as {num} succeeded",
-        addItemOk: "Add Index as {num} Record Succeeded",
-        addItemErr: "Record addition failure",
-        requireUn: "[ {display} ] input value is of unknown type",
-        requireString: "[ {display} ] parameter value is invalid.",
-        requireInt: "[ {display} ] parameter value not in reasonable range {filter}",
-        requireIpv4: "[ {display} ] not a legitimate IPV4 address",
-        requireIpv6: "[ {display} ] not a legitimate IPV6 address.",
-        requireEnum: "[ {display} ] is not a reasonable enumeration value.",
-        requireBool: "[ {display} ] is not a reasonable boolean value.",
-        editOkTip: "Confirm updating the value of this [ {num} ] attribute?",
-        updateItemTip: "Confirm updating the data item with Index [{num}]?",
-        delItemTip: "Confirm deleting the data item with Index [{num}]?",
-        arrayMore: "Expand",
-      },
-    },
    dashboard: {
      overview:{
        title: "Core Network Dashboard",
-        fullscreen: "Click on the full-screen display",
+        fullscreen: "Full Screen Display",
        toRouter: "Click to jump to the detail page",
+        Users:"UDM Subscription Data",
+        VoNR:"IMS Online Users",
+        sessions:"PDU Sessions in SMF",
+        FivegNodeN:"Online gNB in AMF",
+        Fiveusers:"Active users in AMF",
+        FourgNodeN:"Online eNB in MME",
+        Fourusers:"Active users in MME",
+        UPFjump:"Key Performance Indicators",
+        Networkjump:"5GC System Architecture",
+        Alarmjump:"Active Alarms",
+        IMSUsers:"UDM IMS User Data",
+        VoIPUsers:"UDM VoIP User Data",
        skim: {
-          users: "Users",
-          userTitle:'User Information',
+          users: "Total Subscriber Base",
+          userTitle:'Subscriber Information',
          imsUeNum: "VoNR/VoLTE",
-          smfUeNum: "Data Sessions",
+          smfUeNum: "User Sessions",
          gnbBase: "Online gNodeB",
+          gnbSumBase: "Total gNodeB",
          enbBase: "Online eNodeB",
+          enbSumBase: "Total eNodeB",
          gnbUeNum:'5G Active Users',
          enbUeNum:'4G Active Users',
          baseTitle:'Online Information',
+          nodeBInfo: 'NodeB Information',
+          onlineinfo:'UE Online Information',
+          ims:'VoLTE',
+          voip:'VoIP'
        },
        upfFlow:{
          title: "UPF Throughput",
@@ -549,6 +423,7 @@ export default {
        },
        userActivity: {
          title: "User Activity",
+          imsTitle: "IMS Activity",
          type: "Type",
          duration: "Duration",
          caller: "Caller",
@@ -567,23 +442,32 @@ export default {
        rowInfo: "Info",
        type: "Type",
        duration: "Duration",
+        mosAverage: "MOS",
+        callConnectionTime: "Call Connection Time",
        seizureTime: "Call Start Time",
        releaseTime: "Hangup Time",
        caller: "Caller",
        called: "Called",
        result: "Result",
+        resultCode: "Result Code",
+        resultCause: "Result Cause",
        resultOk: "Success",
        resultFail: "Fail",
        delTip: "Confirm deletion of the data item numbered [{msg}]?",
-        exportTip: "Do you confirm to export the current query conditions of the CDR data? (Maximum 10,000 items can be exported.)",
-        smfChargingID: 'Charging ID',
+        tenantName: "Tenant Name",
+        exportTip: "Do you confirm to export the current query conditions of the CDR data?",
+        chargingID: 'Charging ID',
        smfSubscriptionIDData: 'Subscription ID Data',
        smfSubscriptionIDType: 'Subscription ID Type',
        smfDataVolumeUplink: 'Data Volume Uplink',
        smfDataVolumeDownlink: 'Data Volume Downlink',
        smfDataTotalVolume: 'Data Total Volume',
-        smfDuration: 'Duration',
-        smfInvocationTime: 'Invocation Time',
+        durationTime: 'Duration',
+        invocationTime: 'Invocation Time',
+        sgwcServedIMSI: 'IMSI',
+        sgwcServedMSISDN: 'MSISDN',
+        sgwcVolumeGPRSUplink: 'GPRS Uplink',
+        sgwcVolumeGPRSDownlink: 'GPRS Downlink',
      },
      ue: {
        eventType: "Event Type",
@@ -595,7 +479,7 @@ export default {
        result: "Result",
        resultOk: "Successes",
        delTip: "Confirm deletion of the data item numbered [{msg}]?",
-        exportTip: "Do you confirm to export the event data of the current query condition? (Maximum 10,000 items can be exported.)",
+        exportTip: "Do you confirm to export the event data of the current query condition?",
      },
    },
    ne: {
@@ -618,6 +502,8 @@ export default {
        portTip: "Network element port default:33030",
        serialNum: 'Serial Number',
        expiryDate: 'Expiry Date',
+        ueNumber: 'UE Number',
+        nbNumber: 'Radio Number',
        normalcy: 'Normal',
        exceptions: 'Abnormal',
        restart: 'Restart',
@@ -655,7 +541,7 @@ export default {
        delTip: 'Confirm deletion of network element information data items?',
        oam: {
          title: 'OAM Configuration',
-          sync: 'Sync to NE',
+          restart: 'Restart NE',
          oamEnable: 'Service',
          oamPort: 'Port',
          snmpEnable: 'Service',
@@ -758,14 +644,15 @@ export default {
        upgradeDone: 'Update complete, service being reloaded',
        upgradeFail: 'The update fails, please check whether the software file exists and whether the service terminal environment is available!',
        upgradeModal: 'Network Element Version Updates',
+        noPath: 'Package File Not Found',
      },
      neLicense: {
        status: "License Status",
        change: "Change License",
        reload: "Refresh Info",
        reloadTip: "Confirmed to refresh license information?",
-        reloadBatch: "Batch Refresh",
-        reloadBatchTip: "Do you do an information refresh on checked records?",
+        reloadBatch: "Refresh License Status",
+        reloadBatchTip: "Do you perform a license status information refresh for the current list of NE?",
        updateTtile: "Update License",
        downCodeTop: "Confirmed to save the license activation code to a file?",
        activationRequestCode: "License Activation Code",
@@ -781,7 +668,9 @@ export default {
        treeSelectTip: "Select configuration item information in the left configuration navigation!",
        neType: 'NE Type',
        neTypePleace: "Please select the network element type",
+        neIdSyncPleace: "Please select the synchronized network element",
        noConfigData: "No data on configuration items",
+        noConfigdDisabled: "The configuration item is not normal",
        updateValue: "[ {num} ] parameter value modified successfully.",
        updateValueErr: "Attribute value modification failure",
        updateItem: "Modify Index to {num}.",
@@ -805,6 +694,19 @@ export default {
        name: "Name",
        downTip: 'Confirmed to download the backup file [{txt}]?',
        title: "Modify Backup {txt}",
+        backupModal: {
+          pushFileOper: "Send Current File To Remote Backup",
+          title: "Setting Remote Backup Service",
+          enable: "Enable",
+          toIp: "Service IP",
+          toIpPleace: "Please input the remote backup server IP address",
+          toPort: "Service Port",
+          username: "UserName",
+          usernamePleace: 'Please enter the service login username',
+          password: "Password",
+          dir: "Save Dir",
+          dirPleace: 'Please enter the service address target file directory',
+        }
      },
      neQuickSetup: {
        reloadPara5G: 'Reload',
@@ -842,7 +744,7 @@ export default {
        installSourceUpload: 'New Upload',
        installSelect: 'Select Record',
        installUpload: 'Upload File',
-        installText: 'Installed',
+        installText: 'Install',
        licenseTitle: "Licenses",
        licenseDesc: "Network element service authorization certification",
        licenseResultTitle: "Whether to authorize activation immediately",
@@ -855,9 +757,61 @@ export default {
        licenseTip2: '2. Clicking [Finish] will end the installation process.',
      },
    },
+    neData: {
+      common: {
+        startIMSI: 'Starting IMSI',
+        imsi: 'IMSI',
+        imsiTip: 'IMSI=MCC+MNC+MSIN',
+        imsiTip1: 'MCC=Mobile Country Code, consisting of three digits.',
+        imsiTip2: 'MNC = Mobile Network Number, consisting of two digits',
+        imsiTip3: 'MSIN = Mobile Subscriber Identification Number, consisting of 10 equal digits.',
+        imsiPlease: "Please enter IMSI correctly",
+        msisdn: 'Mobile Customer Identification Number',
+        msisdnPlease: "Please enter the Mobile Customer Identification Number correctly",
+        loadDataConfirm: 'Confirmed to reload data?',
+        loadData: 'Load Data',
+        loadDataTip: 'Successfully fetched loaded data: {num} items, the system is internally updating the data, it will take about {timer} seconds, please wait!!!!!.',
+        batchOper: 'Batch Operation',
+        batchAddText: 'Batch Addition',
+        batchDelText: 'Batch Deletion',
+        batchUpdateText: 'Batch Update',
+        batchNum: 'Number of releases',
+        checkDel:'Check Delete',
+        importTemplate: 'Download Template',
+      },
+      baseStation: {
+        list: "List",
+        topology: "Topology",
+        nbName: "RAN Node Name",
+        nbId: "RAN Node ID",
+        ueNum: "UE Number",
+        topologyTitle: "Radio State Graph",
+        name: "Name",
+        namePlease: "text content length 0~64",
+        position: "Position",
+        positionPlease: "location description. Prohibition of spaces, length of text content 0-64",
+        address: "IP Address",
+        addressPlease: "text content length 0~64",
+        state: "State",
+        online: "Online",
+        offline: "Offline",
+        time: "Change Time",
+        addRadio: "Add Radio Info",
+        editRadio: "Edit Radio Info",
+        history: "Status History",
+        exportTip: "Confirm exporting xlsx table files based on search criteria?",
+        importDataEmpty: "Imported data is empty",
+      },
+      backupData: {
+        auth: "UDM Authentication",
+        sub: "UDM Subscribers",
+        voip: "VoIP Authentication",
+        volte: "IMS Subscribers",
+      }
+    },
    neUser: {
      auth: {
-        authInfo:' Authentication Info',
+        authInfo:' Authentication of Info',
        neTypePlease: 'Query network element Object',
        neType: 'UDM Object',
        export: 'Export',
@@ -865,13 +819,14 @@ export default {
        checkExport : 'Check Export',
        checkExportConfirm: 'Confirm exporting the checked authenticated user data?',
        import: 'Import',
+        importFail: 'Failure Record',
        loadDataConfirm: 'Are you sure you want to reload the data?',
        loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!',
+        loadDataTip: 'Successfully fetched loaded data: {num} items, the system is internally updating the data, it will take about {timer} seconds, please wait!!!!!.',
        startIMSI: 'Start IMSI',
        batchAddText: 'Batch Add',
        batchDelText: 'Batch Delete',
-        numAdd: 'Number of releases',
+        numAdd: 'Number of authentication profiles',
        numDel: 'Number of deleted',
        checkDel: 'Check Delete',
        imsiTip: 'IMSI=MCC+MNC+MSIN',
@@ -884,19 +839,22 @@ export default {
        opcTip: 'The authentication key, OPC, is calculated from Ki and OP, OP is the root key of the operator, ki is the authentication key, and the maximum length is 32.',
        delSure:'Are you sure you want to delete the user with IMSI number: {imsi} ?',
        imsiConfirm:'The length of the IMSI must be 15',
+        startUserName:'Start username',
      },
      sub: {
        subInfo:' Subscription Info',
        neType: 'UDM Object',
+        imsType:'IMS Object',
        export: 'Export',
        exportConfirm: 'Are you sure to export all signed user data?',
        checkExport : 'Check Export',
        checkExportConfirm: 'Are you sure to export the data of the checked subscribers?',
        import: 'Import',
+        importFail: 'Failure Record',
        loadDataConfirm: 'Are you sure you want to reload the data?',
        loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!',
-        numAdd: 'Number of releases',
+        loadDataTip: 'Successfully fetched loaded data: {num} items, the system is internally updating the data, it will take about {timer} seconds, please wait!!!!!.',
+        numAdd: 'Number of subscriber profiles',
        numDel: 'Number of deleted',
        checkDel: 'Check Delete',
        batchAddText: 'Batch Add',
@@ -916,6 +874,10 @@ export default {
        rfspTip:'RFSP index, in NG-RAN, the index of a specific RRM configuration, parameter between 0 and 127',
        ueTypeTip: 'Operator-defined subscriber UE Usage Type, integer, parameter between 0 and 127',
        cnFlag: 'Whether to enable 5G Core Network service',
+        cnFlag0: 'No Access Allowed',
+        cnFlag1: 'Access Only 5G',
+        cnFlag2: 'Access Only 4G',
+        cnFlag3: 'Access 4G/5G',
        epsFlagTip: 'Whether to enable 4G EPS service',
        contextIdTip: 'To sign up for an APN Context ID, you must select it from the APN Context list.',
        apnContextTip: 'The list of APNs available to the phone, up to six, is defined in the HSS.',
@@ -925,6 +887,12 @@ export default {
        ardTip:'Access-Restriction-Data (Access-Restriction-Data), can be used to distinguish between 2G/3G/LTE users, to facilitate the coexistence of 2G/3G/LTE network for different types of users to distinguish between the service',
        smDataTip:'The IP in sm_data=1-000001&internet-1.2.3.4&ims-1.2.3.5: 1.2.3.4 is the static IP assigned to the APN of 5G user internet, and 1.2.3.5 is the static IP assigned to the APN of 5G user ims. If it is dynamic allocation, just remove the IP and the previous connector. Need to support multiple dnn uses & connections',
        smDataArrTip:'SST,DNN/APN is required',
+        tenantName:'Tenant Name',
+        imsiMode:'IMSI Matching Mode',
+        fuzzyMatch:'Fuzzy Match',
+        prefixMatch:'Prefix Match',
+        fullMatch:'Full Match',
+        suffixMatch:'Suffix Match',
      },
      pcf: {
        neType: 'PCF Object',
@@ -958,7 +926,9 @@ export default {
        rfsfTip:'RAT Frequency Selection Priority',
      },
      base5G: {
-        neType: 'NE Object',
+        neType: 'Radio Type',
+        gnb:'5G Radios',
+        enb:'4G Radios',
      },
      n3iwf: {
        neType: 'N3IWF Object',
@@ -1054,6 +1024,14 @@ export default {
        realTimeData: "Real Time Data",
      },
      customTarget:{
+        TourTitle1:'Calculate element selection',
+        TourDes1:'Select the metric corresponding to the selected NE type for the calculation formula',
+        TourTitle2:'Calculate symbol selection',
+        TourDes2:'Select a calculation symbol',
+        TourTitle3:'Calculation formula',
+        TourDes3:'The calculation formula is automatically composed from the calculation elements and calculation symbols selected earlier',
+        TourTitle4:'Result unit',
+        TourDes4:'Units are optional. PS: Formula automatically × 100% when the % sign',
        kpiId:' Custom Indicator',
        kpiIdTip:'This Ne has no custom indicators',
        period:' Granularity',
@@ -1062,7 +1040,14 @@ export default {
        expression:'Expression',
        description:' Description',
        kpiSet:' Statistical Settings',
-        delCustomTip:'Confirm deletion of data item with record number {num}?',
+        ago1Hour:'Last 1 hour',
+        ago3Hour:'Last 3 hour',
+        ago6Hour:'Last 6 hour',
+        toDay:'Today',
+        ago1Day:'Last 1 day',
+        ago7Day:'Last 7 day',
+        ago15Day:'Last 15 day',
+        delCustomTip:'Confirm deletion of data item with record Custom Indicator {num}?',
        delCustom:' Successfully delete record number {num} custom indicator',
        addCustom:' Add custom indicator',
        editCustom:' Edit Custom indicator',
@@ -1074,8 +1059,20 @@ export default {
        element:'Element',
        granularity:'Granularity',
        unit:'Unit',
+        expressionModal:'Expression Modal',
+        expressionErrorTip:'Please check the expression, the wrong indicator is {kpiId}',
+        expressionNoIdTip:'Please check the expression, no valid indicator is found',
+        unitSelect:'To better display the image, the same unit needs to be selected. The current unit is:',
+        avg:'(average)',
+        total:'(total)',
+        ago1:'Past 24 hrs value',
+        ago7:'Past 7 days value',
+        ago30:'Past 30 days value',
      },
      kpiKeyTarget:{
+        "time":"Time",
+        "rawData":"Table Data",
+        "statistics":"NE metrics",
        "fullWidthLayout":"Full Width",
        "twoColumnLayout":"Two Column",
        "saveLayout": "Save Layout",
@@ -1088,33 +1085,39 @@ export default {
        "layout3": "Layout 3"
      },
      kpiOverView:{
+        "kpiName":"NE Metrics Name",
+        "maxValue":"Max",
+        "maxValueTip":"The max value of metric data within the user's filtered time range.",
+        "minValue":"Min",
+        "minValueTip":"The min value of metric data within the user's filtered time range.",
+        "avgValue":"Avg",
+        "avgValueTip":"The average value of metric data within the user's filtered time range.",
+        "totalValue":"Sum",
+        "totalValueTip":"The sum value of metric data within the user's filtered time range.",
        "kpiChartTitle":"Overview of NE metrics",
        "changeLine":"Change to Line Charts",
        "changeBar":"Change to Bar Charts",
        "chooseShowMetrics":"Select the metric you want to display",
        "chooseMetrics":"Select an indicator",
+        "tips":"The percentages and rates are averages,the counts are statistical values.",
+      },
+      voiceOverView:{
+        "voiceTitle":"Voice Calls Dashboard",
+        "tips":"Voice Call Statistics Per Minute",
+        "ne":"NE",
+        "now":"Now",
+        "last":"Past",
+        "calls":"Calls",
+        "activeCall":"Active Calls",
+        "callMOMT":"MO/MT Call Success Rate",
+        "failedcall":"Failed Calls",
+        "registration":"Registrations",
+        "activeregistration":"Active Registrations",
+        "registrationsuccess":"Registration Success Rate",
+        "failedregistration":"Failed Registrations",
      },
    },
    traceManage: {
-      analysis: {
-        imsi: 'IMSI',
-        imsiPlease: 'Please enter IMSI',
-        msisdn: 'MSISDN',
-        msisdnPlease: 'Please enter MSISDN',
-        trackTaskId: 'Task ID',
-        srcIp: 'Source IP Address',
-        dstIp: 'Destination IP Address',
-        signalType: 'Signaling Type',
-        msgDirect: 'Message Direction',
-        msgType: 'Message Type',
-        rowTime: 'Record Time',
-        signalData: 'Signaling Data',
-        signalDetail: 'Signaling Details',
-        noData: 'No information content',
-        taskTitle: 'Task {num}',
-        taskDownText: 'Download HTML',
-        taskDownTip: 'Confirm downloading the signaling details HTML file?',
-      },
      pcap: {
        capArgPlease: 'Please enter tcpdump -i any support parameter',
        cmd: 'Command',
@@ -1149,6 +1152,7 @@ export default {
      },
      task: {
        traceId: 'Tracing No',
+        title: 'Tracing Title',
        trackType: 'Tracing Type',
        trackTypePlease: 'Please select a tracing type',
        creater: 'Created by',
@@ -1165,30 +1169,35 @@ export default {
        imsiTip: 'Mobile communication IMSI number',
        srcIp: 'Source IP Address',
        srcIpPlease: 'Please enter the IP address',
-        srcIpTip: 'Current sender IPv4 address',
+        srcIpTip: 'sending IPv4 address',
        dstIp: 'Destination IP Address',
        dstIpPlease: 'Please enter the IP address',
-        dstIpTip: 'IPv4 address of the receiving end of the other party',
+        dstIpTip: 'receiving end IPv4 address',
        interfaces: 'Signaling Interface',
        interfacesPlease: 'Please enter the signaling interface',
-        signalPort: 'Signal Port',
-        signalPortPlease: 'Please enter the signaling port',
-        signalPortTip: 'Port of the side corresponding to the destination IP address or source IP address',
-        rangePicker: 'Start/End Time',
+        rangePicker: 'Task Time',
        rangePickerPlease: 'Please select the start and end time of the task',
        remark: 'Remark',
        remarkPlease: 'Task description can be entered',
        addTask: 'Add Task',
-        editTask: 'Modify Task',
        viewTask: 'View Task',
        errorTaskInfo: 'Failed to obtain task information',
        delTaskTip: 'Are you sure to delete the data item with record ID {id} ?',
        stopTask: 'Successful cessation of tasks {id}',
        stopTaskTip: 'Confirm stopping the task with record ID {id} ?',
-        pcapView: "Tracking Data Analysis",
-        traceFile: "Tracking File",
+        pcapView: "Track Data Analysis",
+        traceFile: "Track File",
        errMsg: "Error Message",
        imsiORmsisdn: "imsi or msisdn is null, cannot start task",
+        dataView: "Track Data",
+        protocolOrInterface: "Protocol/Interface",
+        msgNe: 'Network Element',
+        msgEvent: 'Event',
+        msgType: 'Type',
+        msgDirect: 'Direction',
+        msgLen: 'Length',
+        rowTime: 'Time',
+        taskInfo: 'Task information',
      },
    },
    faultManage: {
@@ -1208,7 +1217,7 @@ export default {
        clear: 'Clear',
        mySelf: 'Personalization',
        exportAll: 'Export All',
-        disPlayFilfter: 'Display Filters',
+        disPlayFilfter: 'Filter out Alerts',
        alarmId:'ID',
        alarmTitle:'Title',
        clearUser:'Clear User',
@@ -1298,22 +1307,30 @@ export default {
        size: "Size",
        modifiedTime: "Modified Time",
        fileName: "File Name",
+        downTipZip: "Confirm downloading the directory [{fileName}] as a ZIP file?",
        downTip: "Confirm the download file name is [{fileName}] File?",
        downTipErr: "Failed to get file",
        dirCd: "Enter Dir",
        viewAs: 'View Action',
        reload: "Reload",
-        follow: 'Monitoring Content',
+        follow: 'Enable Instant Update',
        tailChar: 'End Characters',
        tailLines: 'End Lines',
      },
      exportFile:{
-        fileName:'File Source',
+        fileSource:'File Source',
+        fileSourcePlease:'Please select the source of the document',
        downTip: "Confirm the download file name is [{fileName}] File?",
        downTipErr: "Failed to get file",
        deleteTip: "Confirm the delete file name is [{fileName}] File?",
        deleteTipErr: "Failed to delete file",
-        selectTip:"Please select File Name",
+        sysloginLog:'System Login Log',
+        sysOperateLog:'System Operation Log',
+        neLog:'NE Log',
+        cdrIMS:'CDR Voice',
+        cdrSMF:'CDR Data',
+        cdrSMSC:'CDR SMS',
+        cdrSGWC:'CDR Roaming Data',
      }
    },
    monitor: {
@@ -1687,6 +1704,8 @@ export default {
        userName: 'Nick Name',
        permission: 'Role',
        className: 'Department',
+        userType: 'User Type',
+        tenntName:'Tenant Name',
        loginIp: 'Login Address',
        loginTime: 'Login Time',
        status: 'Status',
@@ -1712,6 +1731,7 @@ export default {
        sex:'User Gender',
        email:'E-mail',
        fromClass:'Department',
+        fromTenant:'Tenant',
        userWork:'User position',
        userWorkPlease: 'Please select user post',
        userTip:'User Description',
@@ -1725,6 +1745,7 @@ export default {
        lock:'Lock',
        inactive:'Inactive',
        active:'Active',
+        permissionTip:'If want to select a tenant role, make sure there is at least one tenant in the tenant management.',
      },
      config: {
        configName: "Config Name",
@@ -1749,6 +1770,55 @@ export default {
        refreshCacheTip: "Are you sure you want to refresh the parameter configuration cache?",
        refreshCacheOk: "Refresh Cache Successful",
      },
+      loginSource: {
+        uid: "UID",
+        name: "Name",
+        namePlease: 'Please enter the authentication source name correctly',
+        icon: "Icon",
+        iconPlease: 'You can enter the image link or upload the image path address',
+        type: "Type",
+        activeFlag: "Status",
+        remark: "Remark",
+        createTime: "Create Time",
+        updateTime: "Update Time",
+        ldapUrl: "Server Address",
+        ldapUrlPlease: 'Please enter the LDAP server address correctly',
+        ldapBaseDN: "Base DN",
+        baseDnPlease: 'Please enter the LDAP base DN correctly',
+        ldapUserFilter: "User Filter",
+        userFilterPlease: 'Please enter the LDAP user filter correctly',
+        ldapBindDN: "Bind DN",
+        ldapBindPassword: "Bind Password",
+        smtpHost: 'Server Address',
+        smtpHostPlease: 'Please enter the SMTP server address correctly',
+        smtpPort: 'Port Number',
+        smtpPortPlease: 'Please enter the SMTP port number correctly',
+        oauth2ClientID: 'Client ID',
+        oauth2ClientIDPlease: 'Please enter the OAuth2 client ID correctly',
+        oauth2ClientSecret: 'Client Secret',
+        oauth2ClientSecretPlease: 'Please enter the OAuth2 client secret correctly',
+        oauth2AuthURL: 'Authorization URL',
+        oauth2AuthURLPlease: 'Please enter the OAuth2 authorization URL correctly',
+        oauth2TokenURL: 'Token URL',
+        oauth2TokenURLPlease: 'Please enter the OAuth2 token URL correctly',
+        oauth2UserURL: 'User Info URL',
+        oauth2UserURLPlease: 'Please enter the OAuth2 user info URL correctly',
+        oauth2AccountField: 'Account Field',
+        oauth2AccountFieldPlease: 'Please enter the OAuth2 account field correctly',
+        oauth2Scopes: 'Scopes',
+        oauth2ScopesPlease: 'Please enter the OAuth2 scopes correctly',
+        oauth2RedirectURL: 'Redirect URL',
+        oauth2RedirectURLPlease: 'Please enter the OAuth2 redirect URL correctly',
+        oauth2RedirectURLTip: 'Please jump to the specified path (omchost/#/login/oauth2), redirect with code and state address parameters',
+        uploadFileTip: 'Confirm to upload the authentication source icon?',
+        uploadFileOk: 'Authentication source icon upload successful',
+        uploadFileErr: 'Authentication source icon upload failed',
+        viewInfoErr: "Failed to get authentication source information",
+        addInfo: "Add Authentication Source",
+        editInfo: "Modify Authentication Source",
+        delTip: "Confirm deleting the authentication source number [{num}] data item?",
+        delOk: "Deleted Successfully",
+      },
      setting: {
        charMaxLen: 'characters length',
        saveSubmit: 'Submit&Save',
@@ -1808,6 +1878,10 @@ export default {
        home: 'Home Page',
        homeTip:'Do you want to submit the current interface as the system interface?',
        homeSet:'Home Page Settings',
+        backup: 'System Backup',
+        backupInstruction: 'System backup will back up the net element information records and configuration files running on the current system, and can restore the system to the previous state!',
+        backupExportTip: 'Confirm to export system backup?',
+        backupImportTip: 'Confirm to import system backup?',
      },
      role:{
        allScopeOptions:'All data permissions',
@@ -1852,6 +1926,7 @@ export default {
        cancelGive:'Cancel authorization',
        cancelSure:'Confirm to cancel the authorization of the data item with user number [{userId}]?',
        batchCancel:'Batch cancellation of authorization',
+        selectUser:'Assign Users',
      },
      dept:{
        classInfo:' Department Information',
@@ -1872,6 +1947,37 @@ export default {
        phone:'Contact Number',
        email:'Mail',
      },
+      tenant:{
+        classInfo:' Tenant Information',
+        className:'Name',
+        classId:'Number',
+        classSort:'Sorting',
+        status:'Status',
+        type:' Tenancy Asset',
+        createTime:'Creation Time',
+        highClass:'Root Level',
+        key:'Asset Key',
+        emailTip:'Please input the correct email address',
+        phoneTip:'Please enter the correct phone number',
+        node:'Root Node',
+        delSure:'Are you sure to delete the data item with  TenantName: {title}?',
+        delTypeSure:'Are you sure to delete the data item with  Tenancy Asset: {tenancyAsset}, Asset Key: {tenancyKey}?',
+        open:'Exhibition',
+        close:'Fold',
+        addClass:'Add Tenant',
+        admin:'Principal',
+        phone:'Contact Number',
+        email:'Mail',
+        SDSST:'Network Slice',
+        APN:'Access Point Name',
+        IMSI:'SIM Card',
+        treeSelectTip:'Please select a tenant from the tenant list on the left for configuration',
+        upfTip:'Please select from the drop-down list of UPF Resource UIDs',
+        imsiTip:'Please select the matching type and fill in the SIM card number fragment',
+        radioTip:'Please select from the drop-down list of radio type and radio ID',
+        defaultTip:'Please select from the drop-down list of Tenancy Asset, and then fill the Asset Key',
+        patternTip:'The Asset Key cannot contain special characters',
+      },
      post:{
        positionInfo:'Position Information',
        positionId:'Position Number',
@@ -1894,7 +2000,7 @@ export default {
          requestMe:'Request Method',
          host:'Request Host',
          operStatus:'Status',
-          operDate:'Time',
+          operDate:'Time Stamp',
          useTime:'Time Lap',
          logInfo:'Operation Log Information',
          delSure:'Are you sure to delete the data item with access number [{ids}]?',
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -6,17 +6,18 @@ export default {

  // 通用
  common: {
-    title: '核心网管理平台',
+    title: '登录平台',
    desc: '核心网管理平台',
    loading: '请稍等...',
    inputPlease: '请输入',
+    searchPlease: '搜索菜单...',
+    searchTip: '输入关键词搜索菜单',
    selectPlease: '请选择',
    tipTitle: '提示',
    msgSuccess: '{msg} 成功',
    errorFields: '请正确填写 {num} 处必填信息！',
    tablePaginationTotal: '总共 {total} 条',
    noData: "暂无数据",
-    zebra:'表格斑马纹',
    ok: '确定',
    cancel: '取消',
    close: '关闭',
@@ -29,6 +30,7 @@ export default {
    editText: '编辑',
    deleteText: '删除',
    downloadText: '下载',
+    CloudServerText:'同步',
    import:'导入',
    export:'导出',
    uploadText: '上传',
@@ -39,6 +41,10 @@ export default {
    columnSetText: '列设置',
    columnSetTitle: '列展示/排序',
    sizeText: '密度',
+    exportCustom:'自定义导出',
+    exportColumns:'列定义',
+    resetToDefault:'重置为默认列',
+    exportDefault:'全部导出',
    size: {
      default: '默认',
      middle: '中等',
@@ -131,7 +137,7 @@ export default {
    },
    LockScreen: {
      inputPlacePwd:'请输入锁屏密码',
-      validSucc:'校验通过',
+      enter:'进入',
      validError:'校验失败',
      backLogin:'退出并重新登录',
      backReload:'正在重启，请稍等...',
@@ -143,7 +149,7 @@ export default {

  // 静态路由
  router: {
-    index: "主页",
+    index: "概览",
    login: "登录",
    register: '注册',
    page403: '没有访问权限',
@@ -192,6 +198,7 @@ export default {
      lockPasswd: "解锁密码",
      lockPasswdTip: "可不设置密码",
      fullscreen: "全屏显示",
+      theme: "主题明/暗模式",
      logout: "退出登录",
      profile: "个人中心",
      settings: "个人设置",
@@ -221,13 +228,12 @@ export default {
      capability: '用户容量',
      serialNum: '序列号',
      expiryDate: '许可证到期日期',
-      neStatus:'网元状态异常',
+      neStatus:'状态异常',
      runStatus:'运行状态',
-      mark:'简略信息',
+      mark:'信息',
      object:'对象',
      versionNum:'版本号',
-      systemStatus:'系统状态',
-      realNeStatus:'网元状态',
+      realNeStatus:'状态',
      reloadTime:'刷新时间',
      Critical:'严重告警',
      Major:'主要告警',
@@ -257,9 +263,13 @@ export default {
      registerBtn: '注册账号',
      loginBtn: '登录',
      loginSuccess: '登录成功',
-      loginMethod: '其他登录方式：',
-      loginMethodWX: '微信扫一扫登录',
-      loginMethodQQ: 'QQ扫码登录',
+      otherMethod: '其他方式',
+      backBtn: '返回',
+      backBtnLogin: '返回登录',
+      authorizedNotfound: '授权无效',
+      authorizedFailed: '授权失败',
+      authorizedSuccess: '授权成功',
+      redirectHome: '{i} 秒后跳转主页',
    },
    register: {
      registerBtn: '注册',
@@ -317,6 +327,8 @@ export default {
        color: "风格配色",
        colorActions: "整体风格配色设置",
        colorRandomly: "随机",
+        theme: "主题明暗模式",
+        themeActions: "切换浅色/暗黑模式",
        navTheme: "深色菜单",
        navThemeActions: "只能改变导航模式的菜单",
        fixedHeader: "固定顶部导航栏",
@@ -348,178 +360,39 @@ export default {
        description: "暂无数据，尝试刷新看看",
      },
    },
-    configManage: {
-      neManage: {
-        addNe:'添加网元',
-        delSure:'确认删除网元名称为{msg}的数据项 ',
-        editNe:'修改网元',
-        exportSure:'确认导出网元名称为 {msg} 的配置信息',
-        exportTip:'导出成功,请到备份管理进行下载',
-        getInfo:'获取网元信息失败',
-        neType:'网元类型',
-        neTypePlease: '请输入网元类型',
-        neId:'网元内部标识',
-        neName:'网元名称',
-        neTypeTip:'填写创建的网元类型,如:SMF',
-        uid:'资源唯一标识',
-        uidTip:'请输入资源唯一标识',
-        ip:'IP地址',
-        mac:'网元物理地址',
-        macTip:'能够定位网元的物理地址(MAC)',
-        port:'端口',
-        portTip:'最大范围0~65535',
-        pvflag:'网元虚拟化标识',
-        pnf:'物理网元',
-        vnf:'虚拟网元',
-        province:'网元服务省份',
-        vendorName:'厂商名称',
-        dn:'网络标识',
-        reload: '重载',
-        restart: '重启',
-        totalSure:'确认{oper}网元名称为 {msg} 的网元',
-        stop: '停止',
-        start: '启动',
-        log: '日志',
-        export: '导出',
-        import: '导入',
-        fileForm:'文件来源',
-        selectPlease:'请选择导入文件来源',
-        server:'服务器文件',
-        local:'本地文件',
-        fileSelect:'请选择当前导入文件',
-        sync:'同步到网元',
-        open:'开',
-        close:'关',
-        addFail:'新增失败',
-        operFail:'操作失败'
-      },
-      backupManage: {
-        setBackupTask: '设置自动备份时间',
-        neTypePlease: '查询网元类型',
-        neType: '网元类型',
-        neID: '网元内部标识',
-        fileName: '文件名',
-        createAt: '创建时间',
-        remark:'备份说明',
-        edit:'编辑备份文件',
-        totalSure:'确认{oper}记录编号为 {id} 的数据项?',
-      },
-      softwareManage: {
-        sendBtn: '下发',
-        runBtn: '激活',
-        backBtn: '回退',
-        historyBtn: '下发记录',
-        neTypePlease: '选择网元类型',
-        neType: '网元类型',
-        fileName: '文件名',
-        version: '版本号',
-        versionPlease: '版本号不能为空',
-        updateTime: '上传时间',
-        description: '功能描述',
-        deleteTip: '确认删除 【{fileName}】 的软件数据项?',
-        downloadTip: '确认下载 【{fileName}】 的软件数据项?',
-        updateComment: '软件说明',
-        updateCommentPlease: '请输入软件说明',
-        updateFile: '软件文件',
-        updateFilePlease: '请上传更新软件文件',
-        verifyFile: '校验文件',
-        selectFile: '选择文件',
-        sendTitle: '下发软件版本',
-        sendContent: '确认下发软件包为【{fileName}】的文件到对应网元?',
-        runTitle: '激活软件版本',
-        runContent: '确认在对应网元激活已下发【{fileName}】的软件版本?',
-        backTitle: '回退软件版本',
-        backContent: '确认在对应网元回退已下发【{fileName}】的软件版本?',
-        neId: '对应网元',
-        neIdPlease: '请选择对应网元',
-        versions:'版本',
-        upVersions:'升级前版本',
-        backVersions:'回退前版本',
-        status:'状态',
-        letUpTime:'激活时间',
-        createTime:'创建时间',
-        onlyAble:'只支持上传文件格式 {fileText}',
-        nullVersion:'当前网元无可回退版本',
-      },
-      license: {
-        neTypePlease: '选择网元类型',
-        neType: '网元类型',
-        serialNum: '序列号',
-        createTime: '时间',
-        comment: '说明',
-        updateComment: 'License说明',
-        updateCommentPlease: '请输入License说明',
-        updateFile: 'License文件',
-        updateFilePlease: '请上传更新License文件',
-        selectFile: '选择文件',
-        neId: '网元内部标识',
-        neIdPlease: '请选择对应网元',
-      },
-      configParam:{
-        dataNull:'暂无配置项数据',
-        editSuss:'修改成功',
-        editFail:'修改失败',
-        unable:'非法操作属性值',
-        delSure:'确认删除Index为 【{value}】 的数据项?',
-        addSuss:'新增成功',
-        addFail:'新增失败',
-        delArraySure:'确认删除{arrayChildTitle} Index 为 【{value}】 的数据项?',
-        parUnable:'参数值不在合理范围',
-        ipv4Tip:'不是合法的IPV4地址',
-        ipv6Tip:'不是合法的IPV6地址',
-        enumTip:'不是合理的枚举值',
-        boolTip:'不是合理的布尔类型的值',
-        default:'输入值是未知类型',
-        reloadSuss:'网元重新加载完成',
-        reloadFail:'网元重新加载失败',
-        neNUll:'暂无网元列表数据',
-        reload:'重载',
-        post:'提交',
-        editSure:'确认更新该属性值吗？',
-        arraryEdit:'确认提交更新 Index 为 【{value}】 的记录吗？',
-        addSure:'确认提交新增 Index :【{value}】 的记录吗？',
-      },
-      configParamForm: {
-        treeTitle: "配置导航",
-        treeSelectTip: "左侧配置导航中选择配置项信息！",
-        neType: "网元类型",
-        neTypePleace: "请选择网元类型",
-        noConfigData: "暂无配置项数据",
-        updateValue: "【 {num} 】 属性值修改成功",
-        updateValueErr: "属性值修改失败",
-        updateItem: "修改 Index 为 {num} 记录成功",
-        updateItemErr: "记录修改失败",
-        delItemOk: "删除 Index 为 {num} 记录成功",
-        addItemOk: "新增 Index 为 {num} 记录成功",
-        addItemErr: "记录新增失败",
-        requireUn: "【 {display} 】输入值是未知类型",
-        requireString: "【 {display} 】参数值不合理",
-        requireInt: "【 {display} 】参数值不在合理范围 {filter}",
-        requireIpv4: "【 {display} 】不是合法的IPV4地址",
-        requireIpv6: "【 {display} 】不是合法的IPV6地址",
-        requireEnum: "【 {display} 】不是合理的枚举值",
-        requireBool: "【 {display} 】不是合理的布尔类型的值",
-        editOkTip: "确认更新该【 {num} 】属性值吗？",
-        updateItemTip: "确认更新Index为 【{num}】 的数据项？",
-        delItemTip: "确认删除Index为 【{num}】 的数据项？",
-        arrayMore: "展开",
-      },
-    },
    dashboard: {
      overview:{
        title: "核心网系统看板",
        fullscreen: "点击全屏显示",
        toRouter: "点击跳转详情页面",
+        Users:"UDM 订阅数据",
+        VoNR:"IMS在线用户",
+        sessions:"SMF的PDU会话",
+        FivegNodeN:"5G在线基站数",
+        Fiveusers:"AMF在线用户数",
+        FourgNodeN:"4G在线基站数",
+        Fourusers:"MME在线用户数",
+        UPFjump:"点击跳转到UPF黄金指标界面",
+        Networkjump:"点击跳转到网元系统拓扑图",
+        Alarmjump:"点击跳转到活动告警",
+        IMSUsers:"点击跳转到 IMS 用户",
+        VoIPUsers:"点击跳转到 VoIP 用户",
        skim: {
          users: "用户数",
          userTitle:'用户信息',
          imsUeNum: "IMS 会话数",
          smfUeNum: "Data 会话数",
          gnbBase: "5G 基站数",
+          gnbSumBase: "5G 基站总数",
          gnbUeNum:'5G 用户数',
          enbBase: "4G 基站数",
+          enbSumBase: "4G 基站总数",
          enbUeNum:'4G 用户数',
          baseTitle:'在线信息',
+          nodeBInfo: '基站信息',
+          onlineinfo:'User Online Infomation',
+          ims:'IMS',
+          voip:'VoIP'
        },
        upfFlow:{
          title: "用户面吞吐量",
@@ -549,6 +422,7 @@ export default {
        },
        userActivity: {
          title: "用户活动",
+          imsTitle: "IMS 活动",
          type: "类型",
          duration: "时长",
          caller: "主叫",
@@ -567,23 +441,32 @@ export default {
        rowInfo: "记录信息",
        type: "记录类型",
        duration: "通话时长",
+        mosAverage: "MOS",
+        callConnectionTime: "Call Connection Time",
        seizureTime: "呼叫开始时间",
        releaseTime: "挂断结束时间",
        caller: "主叫",
        called: "被叫",
        result: "结果",
+        resultCode: "结果码",
+        resultCause: "结果原因",
        resultOk: "成功",
        resultFail: "失败",
        delTip: "确认删除编号为【{msg}】的数据项?",
-        exportTip: "确认导出当前查询条件的话单数据吗？（导出最大支持一万条）",
-        smfChargingID: '计费ID',
+        tenantName: "租户名称",
+        exportTip: "确认导出当前查询条件的话单数据吗？",
+        chargingID: '计费ID',
        smfSubscriptionIDData: '订阅 ID 数据',
        smfSubscriptionIDType: '订阅 ID 类型',
        smfDataVolumeUplink: '数据量上行链路',
        smfDataVolumeDownlink: '数据量下行链路',
        smfDataTotalVolume: '数据总量',
-        smfDuration: '持续时间',
-        smfInvocationTime: '调用时间',
+        durationTime: '持续时间',
+        invocationTime: '调用时间',
+        sgwcServedIMSI: 'IMSI',
+        sgwcServedMSISDN: 'MSISDN',
+        sgwcVolumeGPRSUplink: 'GPRS 上行链路',
+        sgwcVolumeGPRSDownlink: 'GPRS 下行链路',
      },
      ue: {
        eventType: "事件类型",
@@ -595,7 +478,7 @@ export default {
        result: "结果",
        resultOk: "成功",
        delTip: "确认删除编号为【{msg}】的数据项?",
-        exportTip: "确认导出当前查询条件的事件数据吗？（导出最大支持一万条）",
+        exportTip: "确认导出当前查询条件的事件数据吗？",
      },
    },
    ne: {
@@ -618,6 +501,8 @@ export default {
        portTip: "网元服务端口,默认:33030",
        serialNum: '序列号',
        expiryDate: '许可证到期日期',
+        ueNumber: '用户数',
+        nbNumber: '基站数',
        normalcy: '正常',
        exceptions: '异常',
        restart: '重启',
@@ -655,7 +540,7 @@ export default {
        delTip: '确认删除网元信息数据项吗?',
        oam: {
          title: 'OAM配置',
-          sync: '同步到网元',
+          restart: '下发后重启网元',
          oamEnable: '服务',
          oamPort: '端口',
          snmpEnable: '服务',
@@ -758,14 +643,15 @@ export default {
        upgradeDone: '更新完成，服务正在重载',
        upgradeFail: '更新失败，请检查软件文件是否存在且服务终端环境是否可用！',
        upgradeModal: '网元版本更新',
+        noPath: '软件包文件未发现',
      },
      neLicense: {
        status: "许可证状态",
        change: "变更许可证",
        reload: "刷新信息",
        reloadTip: "确认要刷新许可证信息吗？",
-        reloadBatch: "批量刷新",
-        reloadBatchTip: "对勾选的记录进行信息刷新吗？",
+        reloadBatch: "刷新许可证状态",
+        reloadBatchTip: "对当前列表网元进行许可证状态信息刷新吗？",
        updateTtile: "更新许可证",
        downCodeTop: "确认要将许可激活码保存到文件吗？",
        activationRequestCode: "许可激活码",
@@ -781,7 +667,9 @@ export default {
        treeSelectTip: "左侧配置导航中选择配置项信息！",
        neType: "网元类型",
        neTypePleace: "请选择网元类型",
+        neIdSyncPleace: "请选择同步网元",
        noConfigData: "暂无配置项数据",
+        noConfigdDisabled: "配置项网元未正常服务",
        updateValue: "【 {num} 】 属性值修改成功",
        updateValueErr: "属性值修改失败",
        updateItem: "修改 Index 为 {num} 记录成功",
@@ -805,6 +693,19 @@ export default {
        name: "名称",
        downTip: '确认要下载备份文件【{txt}】吗？',
        title: "修改备份信息 {txt}",
+        backupModal: {
+          pushFileOper: "将当前文件发送到远程备份",
+          title: "设置远程备份服务",
+          enable: "启用",
+          toIp: "服务IP",
+          toIpPleace: "请输入远程备份服务器 IP 地址",
+          toPort: "服务端口",
+          username: "登录用户名",
+          usernamePleace: '请输入服务登录用户名',
+          password: "登录密码",
+          dir: "保存目录",
+          dirPleace: '请输入服务地址目标文件目录',
+        }
      },
      neQuickSetup: {
        reloadPara5G: '刷新',
@@ -855,6 +756,58 @@ export default {
        licenseTip2: '2. 点击【结束】将结束安装过程',
      },
    },
+    neData: {
+      common: {
+        startIMSI: '起始IMSI',
+        imsi: 'IMSI',
+        imsiTip: 'IMSI=MCC+MNC+MSIN',
+        imsiTip1: 'MCC=移动国家号码, 由三位数字组成',
+        imsiTip2: 'MNC=移动网络号，由两位数字组成',
+        imsiTip3: 'MSIN=移动客户识别码，采用等长10位数字构成',
+        imsiPlease: "请正确输入IMSI",
+        msisdn: '移动客户识别码',
+        msisdnPlease: "请正确输入移动客户识别码",
+        loadDataConfirm: '确认要重新加载数据吗？',
+        loadData: '加载数据',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，大约需要{timer}秒，请稍候!!!',
+        batchOper: '批量操作',
+        batchAddText: '批量新增',
+        batchDelText: '批量删除',
+        batchUpdateText: '批量更新',
+        batchNum: '批量个数',
+        checkDel:'勾选删除',
+        importTemplate: '导入模板',
+      },
+      baseStation: {
+        list: "列表",
+        topology: "拓扑图",
+        nbName: "设备名称",
+        nbId: "设备ID",
+        ueNum: "在线用户数",
+        topologyTitle: "基站状态关系图",
+        name: "基站名称",
+        namePlease: "文本内容长度0~64",
+        position: "基站位置",
+        positionPlease: "位置描述。禁止空格，文本内容长度0-64",
+        address: "IP地址",
+        addressPlease: "文本内容长度0~64",
+        state: "基站状态",
+        online: "在线",
+        offline: "离线",
+        time: "变更时间",
+        addRadio: "添加基站信息",
+        editRadio: "更新基站信息",
+        history: "历史记录",
+        exportTip: "确认根据搜索条件导出xlsx表格文件吗?",
+        importDataEmpty: "导入数据为空",
+      },
+      backupData: {
+        auth: "UDM鉴权用户",
+        sub: "UDM签约用户",
+        voip: "VOIP鉴权用户",
+        volte: "IMS签约用户",
+      }
+    },
    neUser: {
      auth: {
        authInfo:'鉴权信息',
@@ -865,9 +818,10 @@ export default {
        checkExport : '勾选导出',
        checkExportConfirm: '确认导出已勾选的鉴权用户数据吗？',
        import: '导入',
+        importFail: '失败记录',
        loadDataConfirm: '确认要重新加载数据吗？',
        loadData: '加载数据',
-        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，大约需要{timer}秒，请稍候!!!',
        startIMSI: '起始IMSI',
        batchAddText: '批量新增',
        batchDelText: '批量删除',
@@ -884,18 +838,21 @@ export default {
        opcTip: '鉴权秘钥，OPC是由Ki和OP经过计算得来的，OP为运营商的根秘钥，ki是鉴权秘钥,最大长度为32',
        delSure:'确认删除IMSI编号为: {imsi} 的用户吗?',
        imsiConfirm:'IMSI的长度必须为15',
+        startUserName:'起始用户名',
      },
      sub: {
        subInfo:'签约信息',
        neType: 'UDM网元类型',
+        imsType:'IMS网元类型',
        export: '导出',
        exportConfirm: '确认导出全部签约用户数据吗？',
        checkExport : '勾选导出',
        checkExportConfirm: '确认导出已勾选的签约用户数据吗？',
        import: '导入',
+        importFail: '失败记录',
        loadDataConfirm: '确认要重新加载数据吗？',
        loadData: '加载数据',
-        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，大约需要{timer}秒，请稍候!!!',
        numAdd: '放号个数',
        numDel: '删除个数',
        checkDel:'勾选删除',
@@ -916,6 +873,10 @@ export default {
        rfspTip:'RFSP 索引，在 NG-RAN 中，特定 RRM 配置的索引,参数介于0到127之间',
        ueTypeTip: '运营商定义的用户 UE Usage Type，整型，参数介于0到127之间',
        cnFlag: '是否开启 5G Core Network 服务',
+        cnFlag0: '不允许接入',
+        cnFlag1: '只能接入 5G',
+        cnFlag2: '只能接入 4G',
+        cnFlag3: '允许接入 4G/5G',
        epsFlagTip: '是否开启 4G EPS 服务',
        contextIdTip: '签约APN 上下文ID，必须从APN Context list 中选择。',
        apnContextTip: '手机可用的APN列表，最多六个，在HSS中定义。',
@@ -925,6 +886,12 @@ export default {
        ardTip:'接入控制标志(Access-Restriction-Data),可用于区分2G/3G/LTE用户,便于为2G/3G/LTE网络共存时,对不同类型用户进行区分服务',
        smDataTip:'sm_data=1-000001&internet-1.2.3.4&ims-1.2.3.5中的IP：1.2.3.4为5G用户internet这个APN分配的静态IP，1.2.3.5为5G用户ims这个APN分配的静态IP。如果是动态分配，把IP以及前面一个连接符去掉即可。需支持多个dnn用&连接',
        smDataArrTip:'SST,DNN/APN为必填项',
+        tenantName:'租户名称',
+        imsiMode:'IMSI匹配模式',
+        fuzzyMatch:'模糊匹配',
+        prefixMatch:'前缀匹配',
+        fullMatch:'全匹配',
+        suffixMatch:'后缀匹配',
      },
      pcf: {
        neType: 'PCF网元对象',
@@ -959,6 +926,8 @@ export default {
      },
      base5G: {
        neType: '网元对象',
+        gnb:'5G 基站',
+        enb:'4G 基站',
      },
      n3iwf: {
        neType: 'N3IWF网元对象',
@@ -971,7 +940,7 @@ export default {
      },
      nssf:{
        neType: 'NSSF网元对象',
-      },
+      }
    },
    perfManage: {
      taskManage:{
@@ -1054,6 +1023,14 @@ export default {
        realTimeData: "实时数据",
      },
      customTarget:{
+        TourTitle1:'计算元素选择',
+        TourDes1:'选择已经勾选网元类型对应的指标用于计算公式',
+        TourTitle2:'计算符号选择',
+        TourDes2:'选择计算符号',
+        TourTitle3:'计算公式',
+        TourDes3:'由前面选择的计算元素和计算符号自动组成计算公式',
+        TourTitle4:'结果单位',
+        TourDes4:'单位可选可填。PS：%符号时公式自动×100%',
        kpiId:'自定义指标项',
        kpiIdTip:'该网元没有自定义指标',
        period:'颗粒度',
@@ -1062,7 +1039,14 @@ export default {
        expression:'计算公式',
        description:'描述',
        kpiSet:'统计设置',
-        delCustomTip:'确认删除记录编号为 {num} 的数据项?',
+        ago1Hour:'过去1小时',
+        ago3Hour:'过去3小时',
+        ago6Hour:'过去6小时',
+        toDay:'今天',
+        ago1Day:'过去1天',
+        ago7Day:'过去7天',
+        ago15Day:'过去15天',
+        delCustomTip:'确认删除自定义指标项为 {num} 的数据项?',
        delCustom:'成功删除记录编号为 {num} 自定义指标',
        addCustom:'添加自定义指标',
        editCustom:'编辑自定义指标',
@@ -1074,8 +1058,20 @@ export default {
        element:'元素',
        granularity:'颗粒度',
        unit:'单位',
-        },
+        expressionModal:'表达式模块',
+        expressionErrorTip:'请检查表达式,错误的指标为{kpiId}',
+        expressionNoIdTip:'请检查表达式,没有找到任何有效的指标',
+        unitSelect:'为更好展示图需选择相同单位,当前单位为:',
+        avg:'(平均)',
+        total:'(累计)',
+        ago1:'近1天值',
+        ago7:'近7天值',
+        ago30:'近30天值',
+      },
      kpiKeyTarget:{
+        "time":"时间",
+        "rawData":"表格数据",
+        "statistics":"指标",
        "fullWidthLayout":"全宽布局",
        "twoColumnLayout":"两列布局",
        "saveLayout": "保存布局",
@@ -1088,34 +1084,39 @@ export default {
        "layout3": "布局3"
      },
      kpiOverView:{
+        "kpiName":"指标名",
+        "maxValue":"最大值",
+        "maxValueTip":"用户筛选时间范围内度量数据的最大值。",
+        "minValue":"最小值",
+        "minValueTip":"用户筛选时间范围内度量数据的最小值。",
+        "avgValue":"平均值",
+        "avgValueTip":"用户筛选时间范围内度量数据的平均值。",
+        "totalValue":"总值",
+        "totalValueTip":"用户筛选时间范围内度量数据的总值。",
        "kpiChartTitle":"网元指标概览",
        "changeLine":"切换为折线图",
        "changeBar":"切换为柱状图",
        "chooseShowMetrics":"选择需要显示的指标",
        "chooseMetrics":"选择指标",
-
+        "tips":"百分比和比率是平均值，计数是统计值。",
+      },
+      voiceOverView:{
+        "voiceTitle":"语音通话仪表盘",
+        "tips":"每分钟数据语音统计",
+        "ne":"网元",
+        "now":"现在",
+        "last":"过去",
+        "calls":"呼叫",
+        "activeCall":"正在通话",
+        "callMOMT":"呼叫 主叫接通率/被叫接通率",
+        "failedcall":"失败呼叫",
+        "registration":"注册",
+        "activeregistration":"主动注册",
+        "registrationsuccess":"注册成功率",
+        "failedregistration":"失败注册",
      },
    },
    traceManage: {
-      analysis: {
-        imsi: 'IMSI',
-        imsiPlease: '请输入IMSI',
-        msisdn: 'MSISDN',
-        msisdnPlease: '请输入MSISDN',
-        trackTaskId: '跟踪任务标记',
-        srcIp: '源IP地址',
-        dstIp: '目标IP地址',
-        signalType: '信令类型',
-        msgDirect: '消息元',
-        msgType: '消息类型',
-        rowTime: '记录时间',
-        signalData: '信令数据',
-        signalDetail: '信令详情',
-        noData: '无信息内容',
-        taskTitle: '任务 {num}',
-        taskDownText: '下载HTML',
-        taskDownTip: '确认下载信令详情HTML文件?',
-      },
      pcap: {
        capArgPlease: '请输入tcpdump -i any支持参数',
        cmd: '命令',
@@ -1150,6 +1151,7 @@ export default {
      },
      task: {
        traceId: '跟踪编号',
+        title: '跟踪标题',
        trackType: '跟踪类型',
        trackTypePlease: '请选择跟踪类型',
        creater: '创建人',
@@ -1166,21 +1168,17 @@ export default {
        imsiTip: '移动通信IMSI编号',
        srcIp: '源IP地址',
        srcIpPlease: '请输入源IP地址',
-        srcIpTip: '当前发送端IPv4地址',
+        srcIpTip: '发送端IPv4地址',
        dstIp: '目标IP地址',
        dstIpPlease: '请输入目标IP地址',
-        dstIpTip: '对方接收端IPv4地址',
+        dstIpTip: '接收端IPv4地址',
        interfaces: '信令接口',
        interfacesPlease: '请输入信令接口',
-        signalPort: '信令端口',
-        signalPortPlease: '请输入信令端口',
-        signalPortTip: '目标IP地址或源IP地址对应一方的端口',
-        rangePicker: '开始结束时间',
+        rangePicker: '任务时间',
        rangePickerPlease: '请选择任务时间开始结束时间',
        remark: '说明',
        remarkPlease: '可输入任务说明',
        addTask: '添加任务',
-        editTask: '修改任务',
        viewTask: '查看任务',
        errorTaskInfo: '获取任务信息失败',
        delTaskTip: '确认删除记录编号为 {id} 的数据项?',
@@ -1190,6 +1188,15 @@ export default {
        traceFile: "跟踪文件",
        errMsg: "错误信息",
        imsiORmsisdn: "imsi 或 msisdn 是空值，不能开始任务",
+        dataView: "跟踪数据",
+        protocolOrInterface: "协议/接口",
+        msgNe: '消息网元',
+        msgEvent: '消息事件',
+        msgType: '消息类型',
+        msgDirect: '消息方向',
+        msgLen: '消息长度',
+        rowTime: '消息时间',
+        taskInfo: '任务信息',
      },
    },
    faultManage: {
@@ -1299,6 +1306,7 @@ export default {
        size: "文件大小",
        modifiedTime: "修改时间",
        fileName: "文件名称",
+        downTipZip: "确认将目录 【{fileName}】 下载为ZIP文件?",
        downTip: "确认下载文件名为 【{fileName}】 文件?",
        downTipErr: "文件获取失败",
        dirCd: "进入目录",
@@ -1309,12 +1317,19 @@ export default {
        tailLines: '末尾行数',
      },
      exportFile:{
-        fileName:'文件来源',
+        fileSource:'文件来源',
+        fileSourcePlease:'请选择文件来源',
        downTip: "确认下载文件名为 【{fileName}】 文件?",
        downTipErr: "文件获取失败",
        deleteTip: "确认删除文件名为 【{fileName}】 文件?",
        deleteTipErr: "文件删除失败",
-        selectTip:"请选择文件名",
+        sysloginLog:'系统登录日志',
+        sysOperateLog:'系统操作日志',
+        neLog:'网元日志',
+        cdrIMS:'语音话单',
+        cdrSMF:'数据话单',
+        cdrSMSC:'短信话单',
+        cdrSGWC:'漫游数据话单',
      }
     },
    monitor: {
@@ -1335,8 +1350,8 @@ export default {
        filter: "全局过滤",
        startTime: '开始时间',
        endTime: '结束时间',
-        today: '昨天',
-        yesterday: '今天',
+        today: '今天',
+        yesterday: '昨天',
        week: '本周',
        month: '本月',
        avgLoad: '平均负载',
@@ -1686,8 +1701,10 @@ export default {
        userNum: '用户编号',
        account: '登录账号',
        userName: '用户昵称',
-        permission: '用户权限',
+        permission: '用户角色',
        className: '部门名称',
+        userType: '用户类型',
+        tenntName:'租户名称',
        loginIp: '登录地址',
        loginTime: '登录时间',
        status: '用户状态',
@@ -1713,6 +1730,7 @@ export default {
        sex:'用户性别',
        email:'电子邮箱',
        fromClass:'所属部门',
+        fromTenant:'所属租户',
        userWork:'用户岗位',
        userWorkPlease: '请选择用户岗位',
        userTip:'用户说明',
@@ -1726,6 +1744,7 @@ export default {
        lock:'锁定',
        inactive:'未激活',
        active:'激活',
+        permissionTip:'若要选择租户角色,需保证起码租户管理中有一个租户',
      },
      config: {
        configName: "参数名称",
@@ -1750,6 +1769,55 @@ export default {
        refreshCacheTip: "确定要刷新参数配置缓存吗?",
        refreshCacheOk: "刷新缓存成功",
      },
+      loginSource: {
+        uid: "唯一标识",
+        name: "名称",
+        namePlease: '请正确输入认证源名称',
+        icon: "图标",
+        iconPlease: '可填入图片链接或上传图片路径地址',
+        type: "类型",
+        activeFlag: "状态",
+        remark: "备注说明",
+        createTime: "创建时间",
+        updateTime: "更新时间",
+        ldapUrl: "服务器地址",
+        ldapUrlPlease: '请正确输入LDAP 服务器地址',
+        ldapBaseDN: "基础DN",
+        baseDnPlease: '请正确输入LDAP 基础DN',
+        ldapUserFilter: "用户过滤",
+        userFilterPlease: '请正确输入LDAP 用户过滤',
+        ldapBindDN: "绑定DN",
+        ldapBindPassword: "绑定密码",
+        smtpHost: '服务器地址',
+        smtpHostPlease: '请正确输入SMTP 服务器地址',
+        smtpPort: '端口号',
+        smtpPortPlease: '请正确输入SMTP 端口号',
+        oauth2ClientID: '客户端ID',
+        oauth2ClientIDPlease: '请正确输入OAuth2 客户端ID',
+        oauth2ClientSecret: '客户端密钥',
+        oauth2ClientSecretPlease: '请正确输入OAuth2 客户端密钥',
+        oauth2AuthURL: '授权URL',
+        oauth2AuthURLPlease: '请正确输入OAuth2 授权URL',
+        oauth2TokenURL: '令牌URL',
+        oauth2TokenURLPlease: '请正确输入OAuth2 令牌URL',
+        oauth2UserURL: '用户信息URL',
+        oauth2UserURLPlease: '请正确输入OAuth2 用户信息URL',
+        oauth2AccountField: '账号字段',
+        oauth2AccountFieldPlease: '请正确输入OAuth2 账号字段',
+        oauth2Scopes: '作用域',
+        oauth2ScopesPlease: '请正确输入OAuth2 作用域',
+        oauth2RedirectURL: '重定向URL',
+        oauth2RedirectURLPlease: '请正确输入OAuth2 重定向URL',
+        oauth2RedirectURLTip: '请跳转指定路径(omchost/#/login/oauth2), 重定向携带code和state地址参数',
+        uploadFileTip: '确认要上传认证源图标吗?',
+        uploadFileOk: '认证源图标上传成功',
+        uploadFileErr: '认证源图标上传失败',
+        viewInfoErr: "获取认证源信息失败",
+        addInfo: "添加认证源",
+        editInfo: "修改认证源",
+        delTip: "确认删除认证源编号为 【{num}】 的数据项?",
+        delOk: "删除成功",
+      },
      setting: {
        charMaxLen: '位字符长度',
        saveSubmit: '提交保存',
@@ -1809,6 +1877,10 @@ export default {
        home: '系统首页',
        homeTip:'确认要提交当前界面为系统界面吗?',
        homeSet:'系统首页设置',
+        backup: '系统备份',
+        backupInstruction: '系统备份将会对当前系统上运行的网元信息记录及配置文件进行备份，可进行系统的恢复操作！',
+        backupExportTip: '确认要导出系统备份吗?',
+        backupImportTip: '确认要导入系统备份吗?',
      },
      role:{
        allScopeOptions:'全部数据权限',
@@ -1853,6 +1925,7 @@ export default {
        cancelGive:'取消授权',
        cancelSure:'确认取消用户编号为 【{userId}】 的数据项授权?',
        batchCancel:'批量取消授权',
+        selectUser:'分配用户',
      },
      dept:{
        classInfo:'部门信息',
@@ -1873,6 +1946,37 @@ export default {
        phone:'联系电话',
        email:'邮箱',
      },
+      tenant:{
+        classInfo:'租户信息',
+        className:'名称',
+        classId:'编号',
+        classSort:'排序',
+        status:'状态',
+        type:'租赁类型',
+        createTime:'创建时间',
+        highClass:'根级',
+        key:'租赁标识',
+        emailTip:'请输入正确的邮箱地址',
+        phoneTip:'请输入正确的手机号码',
+        node:'根节点',
+        delSure:'确认删除租户名为 【{title}】 的数据项?',
+        delTypeSure:'确认删除租赁类型为 【{tenancyAsset}】,租赁标识为【{tenancyKey}】 的数据项?',
+        open:'展',
+        close:'折',
+        addClass:'新增租户',
+        admin:'负责人',
+        phone:'联系电话',
+        email:'邮箱',
+        SDSST:'网络切片',
+        APN:'接入点',
+        IMSI:'SIM卡',
+        treeSelectTip:'请从左侧租户列表中选择租户进行配置',
+        upfTip:'请选择下拉列表UPF的资源唯一标识',
+        imsiTip:'请选择匹配类型和填入SIM卡号段',
+        radioTip:'请从下拉列表选择基站类型和基站ID',
+        defaultTip:'请选择租赁资产类别, 然后填写资产标识',
+        patternTip:'租赁标识不能包含特殊字符',
+      },
      post:{
        positionInfo:'岗位信息',
        positionId:'岗位编号',
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import {
  ProLayout,
-  WaterMark,
  getMenuData,
  clearMenuItem,
-  type MenuDataItem,
+  MenuDataItem,
 } from 'antdv-pro-layout';
 import RightContent from './components/RightContent.vue';
 import Tabs from './components/Tabs.vue';
@@ -12,26 +11,26 @@ import GlobalMask from '@/components/GlobalMask/index.vue';
 import { scriptUrl } from '@/assets/js/icon_font_8d5l8fzk5b87iudi';
 import {
  computed,
-  reactive,
-  watch,
+  nextTick,
  onMounted,
  onUnmounted,
-  nextTick,
+  reactive,
+  watch,
 } from 'vue';
+import { useRouter } from 'vue-router';
 import useLayoutStore from '@/store/modules/layout';
+import useAppStore from '@/store/modules/app';
+import useUserStore from '@/store/modules/user';
 import useRouterStore from '@/store/modules/router';
 import useTabsStore from '@/store/modules/tabs';
-import useAlarmStore from '@/store/modules/alarm';
-import useAppStore from '@/store/modules/app';
-import { useRouter } from 'vue-router';
-import { MENU_PATH_INLINE } from '@/constants/menu-constants';
-const { proConfig, waterMarkContent } = useLayoutStore();
 import useI18n from '@/hooks/useI18n';
+import useAlarmStore from '@/store/modules/alarm';
 import { getServerTime } from '@/api';
+import { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-
-import { parseDateToStr } from '@/utils/date-utils';
+import { parseDateToStr, YYYY_MM_DD_HH_MM_SSZ } from '@/utils/date-utils';
 import { parseUrlPath } from '@/plugins/file-static-url';
+const { proConfig, waterMarkContent } = useLayoutStore();
 const { t, currentLocale } = useI18n();
 const routerStore = useRouterStore();
 const tabsStore = useTabsStore();
@@ -39,7 +38,7 @@ const appStore = useAppStore();
 const router = useRouter();

 /**菜单面板 */
-let layoutState = reactive({
+const layoutState = reactive({
  collapsed: false, // 是否展开菜单面板
  openKeys: ['/'], // 打开菜单key
  selectedKeys: ['/index'], // 选中高亮菜单key
@@ -66,19 +65,28 @@ watch(
  { immediate: true }
 );

-// 动态路由添加到菜单面板
-const rootRoute = router.getRoutes().find(r => r.name === 'Root');
-if (rootRoute) {
-  const children = routerStore.setRootRouterData(rootRoute.children);
-  const buildRouterData = routerStore.buildRouterData;
-  if (buildRouterData.length > 0) {
-    rootRoute.children = children.concat(buildRouterData);
-  } else {
-    rootRoute.children = children;
+const menuData = computed(() => {
+  // 动态路由添加到菜单面板
+  const rootRoute = router.getRoutes().find(r => r.name === 'Root');
+  if (rootRoute) {
+    const children = routerStore.setRootRouterData(rootRoute.children);
+    const buildRouterData = routerStore.buildRouterData;
+    if (buildRouterData.length > 0) {
+      rootRoute.children = children.concat(buildRouterData);
+    } else {
+      rootRoute.children = children;
+    }
+    // console.log(JSON.parse(JSON.stringify(rootRoute.children)));
+    if (!useUserStore().roles.includes('tenant')) {
+      rootRoute.children = rootRoute.children.filter(
+        item => item.name !== 'Index'
+      );
+    }
  }
-}

-const { menuData } = getMenuData(clearMenuItem(router.getRoutes()));
+  const { menuData } = getMenuData(clearMenuItem(router.getRoutes()));
+  return menuData;
+});

 /**面包屑数据对象，排除根节点和首页不显示 */
 const breadcrumb = computed(() => {
@@ -200,6 +208,7 @@ let serverTime = reactive({
  zone: 'UTC', // 时区 UTC
  interval: null as any, // 定时器
 });
+let activeAlarmRefresh = 0;

 // 获取服务器时间
 function fnGetServerTime() {
@@ -213,10 +222,18 @@ function fnGetServerTime() {
      serverTime.timestamp = parseInt(res.data.timestamp);
      serverTime.interval = setInterval(() => {
        serverTime.timestamp += 1000;
+        activeAlarmRefresh += 1;
        // serverTimeStr.value = parseDateToStr(serverTime.timestamp);
        // 用DOM直接修改
        if (serverTimeDom) {
-          serverTimeDom.innerText = parseDateToStr(serverTime.timestamp);
+          serverTimeDom.innerText = parseDateToStr(
+            serverTime.timestamp,
+            YYYY_MM_DD_HH_MM_SSZ
+          );
+        }
+        if (activeAlarmRefresh === 5) {
+          useAlarmStore().fnGetActiveAlarmInfo();
+          activeAlarmRefresh = 0;
        }
      }, 1000);
    }
@@ -247,7 +264,7 @@ onUnmounted(() => {
 </script>

 <template>
-  <WaterMark :content="waterMarkContent" :z-index="100">
+  <a-watermark :content="waterMarkContent" :z-index="100">
    <ProLayout
      v-model:collapsed="layoutState.collapsed"
      v-model:selectedKeys="layoutState.selectedKeys"
@@ -257,6 +274,7 @@ onUnmounted(() => {
      v-bind="proConfig"
      :iconfont-url="scriptUrl"
      :locale="fnLocale"
+      :sider-width="256"
    >
      <!--插槽-菜单头-->
      <template #menuHeaderRender>
@@ -290,10 +308,10 @@ onUnmounted(() => {
        </RouterLink>
      </template>

-      <!--插槽-顶部左侧，只对side布局有效-->
+      <!--插槽-渲染顶部内容区域，仅布局side有效-->
      <template #headerContentRender></template>

-      <!--插槽-顶部右侧-->
+      <!--插槽-渲染顶部内容右端区域-->
      <template #headerContentRightRender>
        <RightContent />
      </template>
@@ -364,7 +382,7 @@ onUnmounted(() => {

    <!-- 全局遮罩 -->
    <GlobalMask />
-  </WaterMark>
+  </a-watermark>
 </template>

 <style lang="less" scoped>
@@ -413,6 +431,19 @@ onUnmounted(() => {
  }
 }

+.theme-light.theme-menu-light .app-name {
+  color: #141414 !important;
+}
+.theme-light.theme-menu-dark .app-name {
+  color: #fff !important;
+}
+.theme-dark.theme-menu-light .app-name {
+  color: #fff !important;
+}
+.theme-dark.theme-menu-dark .app-name {
+  color: #fff !important;
+}
+
 .footer {
  z-index: 16;
  margin: 0px;
@@ -427,6 +458,7 @@ onUnmounted(() => {
    flex-direction: row;
    flex-wrap: nowrap;
    justify-content: space-between;
+    align-items: center;
    padding: 4px 16px;
    background: #fff;
    box-shadow: 0 1px 4px #0015291f;
@@ -434,6 +466,10 @@ onUnmounted(() => {
    height: 32px;
  }

+  [data-theme='dark'] &-fixed {
+    background: #141414;
+  }
+
  & #serverTimeDom {
    color: inherit;
    opacity: 0.85;
--- a/src/layouts/components/RightContent.vue
+++ b/src/layouts/components/RightContent.vue
@@ -1,16 +1,26 @@
 <script setup lang="ts">
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
+import svgLight from '@/assets/svg/light.svg';
+import svgDark from '@/assets/svg/dark.svg';
+import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
+import { viewTransitionTheme } from 'antdv-pro-layout';
+import { ProModal } from 'antdv-pro-modal';
+import SearchMenu from './SearchMenu.vue';
+import { ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useFullscreen } from '@vueuse/core';
+import { hasPermissions } from '@/plugins/auth-user';
 import useI18n from '@/hooks/useI18n';
+import useLayoutStore from '@/store/modules/layout';
 import useAppStore from '@/store/modules/app';
 import useUserStore from '@/store/modules/user';
 import useAlarmStore from '@/store/modules/alarm';
 import useMaskStore from '@/store/modules/mask';
-import { hasPermissions } from '@/plugins/auth-user';
-import { ref } from 'vue';
+import { dbClear } from '@/utils/cache-db-utils';
+import { CACHE_DB_TABLE_DND } from '@/constants/cache-keys-constants';
+import { TENANTADMIN_ROLE_KEY } from '@/constants/admin-constants';
 const { isFullscreen, toggle } = useFullscreen();
 const { t, changeLocale, optionsLocale } = useI18n();
+const layoutStore = useLayoutStore();
 const maskStore = useMaskStore();
 const userStore = useUserStore();
 const appStore = useAppStore();
@@ -27,7 +37,10 @@ function fnClick({ key }: MenuInfo) {
      router.push({ name: 'Profile' });
      break;
    case 'logout':
-      userStore.fnLogOut().finally(() => router.push({ name: 'Login' }));
+      userStore.fnLogOut().finally(() => {
+        dbClear(CACHE_DB_TABLE_DND);
+        router.push({ name: 'Login' });
+      });
      break;
  }
 }
@@ -57,6 +70,13 @@ function fnClickAlarm() {
  router.push({ name: 'ActiveAlarm_2088' });
 }

+/**改变主题色 */
+function fnClickTheme(e: any) {
+  viewTransitionTheme(isDarkMode => {
+    layoutStore.changeConf('theme', isDarkMode ? 'light' : 'dark');
+  }, e);
+}
+
 /**改变多语言 */
 function fnChangeLocale(e: any) {
  changeLocale(e.key);
@@ -65,25 +85,37 @@ function fnChangeLocale(e: any) {

 <template>
  <a-space :size="12" align="center">
-    <a-tooltip placement="bottom">
-      <template #title>{{ t('loayouts.rightContent.alarm') }}</template>
-      <a-button type="text" style="color: inherit" @click="fnClickAlarm">
-        <template #icon>
-          <a-badge
-            :count="useAlarmStore().activeAlarmTotal"
-            :overflow-count="99"
-            status="warning"
-            style="color: inherit"
-          >
-            <BellOutlined />
-          </a-badge>
-        </template>
-      </a-button>
-    </a-tooltip>
+    <!-- 搜索功能 -->
+    <span >
+      <SearchMenu />
+    </span>
+
+    <span v-roles:has="[TENANTADMIN_ROLE_KEY]">
+      <a-tooltip placement="bottom">
+        <template #title>{{ t('loayouts.rightContent.alarm') }}</template>
+        <a-button
+          type="text"
+          style="color: inherit"
+          @click="fnClickAlarm"
+          v-perms:has="['faultManage:active-alarm:index']"
+        >
+          <template #icon>
+            <a-badge
+              :count="useAlarmStore().activeAlarmTotal"
+              :overflow-count="99"
+              status="warning"
+              style="color: inherit"
+            >
+              <BellOutlined />
+            </a-badge>
+          </template>
+        </a-button>
+      </a-tooltip>
+    </span>

    <!-- 锁屏操作 -->
    <span v-perms:has="['system:setting:lock']">
-      <a-tooltip placement="bottom">
+      <a-tooltip placement="bottomRight">
        <template #title>{{ t('loayouts.rightContent.lock') }}</template>
        <a-button type="text" style="color: inherit" @click="fnClickLock()">
          <template #icon>
@@ -92,10 +124,11 @@ function fnChangeLocale(e: any) {
        </a-button>
        <ProModal
          :drag="true"
+          :center-y="true"
          :width="400"
          :minHeight="200"
          :mask-closable="false"
-          v-model:visible="lockConfirm"
+          v-model:open="lockConfirm"
          :title="t('loayouts.rightContent.lockTip')"
          @ok="fnClickLockToPage()"
        >
@@ -119,7 +152,7 @@ function fnChangeLocale(e: any) {
      </a-tooltip>
    </span>

-    <a-tooltip placement="bottom">
+    <a-tooltip placement="bottomRight">
      <template #title>{{ t('loayouts.rightContent.fullscreen') }}</template>
      <a-button type="text" style="color: inherit" @click="toggle">
        <template #icon>
@@ -129,14 +162,27 @@ function fnChangeLocale(e: any) {
      </a-button>
    </a-tooltip>

+    <a-tooltip placement="bottomRight">
+      <template #title>{{ t('loayouts.rightContent.theme') }}</template>
+      <a-button type="text" @click="fnClickTheme">
+        <template #icon>
+          <img
+            v-if="layoutStore.proConfig.theme === 'dark'"
+            :src="svgDark"
+            class="theme-icon"
+          />
+          <img v-else :src="svgLight" class="theme-icon" />
+        </template>
+      </a-button>
+    </a-tooltip>
+
    <a-dropdown
-      placement="bottom"
+      placement="bottomRight"
      trigger="click"
      v-if="appStore.i18nOpen && hasPermissions(['system:setting:i18n'])"
    >
-      <a-button size="small" type="default">
-        {{ t('i18n') }}
-        <DownOutlined />
+      <a-button type="text" style="color: inherit">
+        <template #icon> <TranslationOutlined /> </template>
      </a-button>
      <template #overlay>
        <a-menu @click="fnChangeLocale">
@@ -204,4 +250,11 @@ function fnChangeLocale(e: any) {
    overflow: hidden;
  }
 }
+
+.theme-icon {
+  width: 18px;
+  height: 18px;
+  margin-bottom: 4px;
+  color: inherit;
+}
 </style>
--- a/src/layouts/components/SearchMenu.vue
+++ b/src/layouts/components/SearchMenu.vue
@@ -0,0 +1,380 @@
+<template>
+  <!-- 搜索按钮 -->
+  <a-tooltip placement="bottom">
+    <template #title>{{ t('common.search') }}</template>
+    <a-button type="text" style="color: inherit" @click="fnClickSearch">
+      <template #icon>
+        <SearchOutlined />
+      </template>
+    </a-button>
+  </a-tooltip>
+
+  <!-- 搜索弹窗 -->
+  <ProModal
+    :drag="false"
+    :center-y="true"
+    :width="600"
+    :minHeight="400"
+    :mask-closable="true"
+    v-model:open="searchModalOpen"
+    :title="t('common.search')"
+    :footer="null"
+    @cancel="fnCloseSearch"
+  >
+    <div class="search-modal-content">
+      <a-input
+        ref="searchInputRef"
+        v-model:value="searchKeyword"
+        :placeholder="t('common.searchPlease')"
+        size="large"
+        style="margin-bottom: 16px"
+        @keydown="fnHandleKeydown"
+      >
+        <template #prefix>
+          <SearchOutlined style="color: #bfbfbf" />
+        </template>
+      </a-input>
+
+      <div class="search-results">
+        <div v-if="filteredMenus.length === 0" class="no-results">
+          <a-empty
+            :description="
+              searchKeyword ? t('common.noData') : t('common.searchTip')
+            "
+            :image="false"
+          />
+        </div>
+        <div v-else class="menu-list">
+          <div
+            v-for="menu in filteredMenus"
+            :key="menu.key"
+            class="menu-item"
+            @click="fnSelectMenu(menu)"
+          >
+            <div class="menu-icon">
+              <!-- 处理自定义图标字体 -->
+              <IconFont
+                v-if="menu.icon && menu.icon.startsWith('icon-')"
+                :type="menu.icon"
+                class="icon"
+              />
+              <!-- 处理Ant Design图标组件 -->
+              <component
+                :is="menu.icon"
+                v-else-if="menu.icon && !menu.icon.startsWith('icon-')"
+                class="icon"
+              />
+              <!-- 默认图标 -->
+              <FolderOutlined v-else class="icon" />
+            </div>
+            <div class="menu-info">
+              <div class="menu-title">{{ menu.title }}</div>
+            </div>
+            <div class="menu-action">
+              <RightOutlined />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ProModal>
+</template>
+
+<script setup lang="ts">
+import { getMenuData, clearMenuItem } from 'antdv-pro-layout';
+import { ProModal } from 'antdv-pro-modal';
+import IconFont from '@/components/IconFont/index.vue';
+import { ref, computed, nextTick } from 'vue';
+import { useRouter } from 'vue-router';
+import useI18n from '@/hooks/useI18n';
+import useUserStore from '@/store/modules/user';
+import useRouterStore from '@/store/modules/router';
+
+const { t } = useI18n();
+const userStore = useUserStore();
+const routerStore = useRouterStore();
+const router = useRouter();
+
+// 搜索相关状态
+const searchModalOpen = ref<boolean>(false);
+const searchKeyword = ref<string>('');
+const searchInputRef = ref();
+
+// 获取所有可搜索的菜单项
+const searchableMenus = computed(() => {
+  const menus: Array<{
+    title: string;
+    path: string;
+    icon?: string;
+    key: string;
+    routeName?: string;
+  }> = [];
+
+  // 使用和BasicLayout完全相同的菜单数据获取逻辑
+  const getMenuDataForSearch = () => {
+    // 动态路由添加到菜单面板
+    const rootRoute = router.getRoutes().find(r => r.name === 'Root');
+    if (rootRoute) {
+      const children = routerStore.setRootRouterData(rootRoute.children);
+      const buildRouterData = routerStore.buildRouterData;
+      if (buildRouterData.length > 0) {
+        rootRoute.children = children.concat(buildRouterData);
+      } else {
+        rootRoute.children = children;
+      }
+
+      // 根据用户角色过滤
+      if (!userStore.roles.includes('tenant')) {
+        rootRoute.children = rootRoute.children.filter(
+          item => item.name !== 'Index'
+        );
+      }
+    }
+
+    // 使用和BasicLayout相同的处理方法
+    const { menuData } = getMenuData(clearMenuItem(router.getRoutes()));
+    return menuData;
+  };
+
+  // 递归获取所有路由项
+  const getRouteItems = (routes: any[], parentPath = '') => {
+    routes.forEach((route: any) => {
+      // 跳过根路径和不显示的菜单
+      if (route.path === '/' || route.path === '' || route.meta?.hideInMenu) {
+        // 继续处理子路由
+        if (route.children && route.children.length > 0) {
+          getRouteItems(route.children, route.path === '/' ? '' : route.path);
+        }
+        return;
+      }
+
+      // 构建完整路径
+      let fullPath = route.path;
+      if (!route.path.startsWith('/') && parentPath) {
+        fullPath = `${parentPath}/${route.path}`;
+      }
+
+      // 只添加有meta.title的路由项
+      if (route.meta && route.meta.title) {
+        try {
+          const title = t(route.meta.title);
+          // 避免重复添加已存在的路由
+          const exists = menus.find(
+            m => m.routeName === route.name || m.path === fullPath
+          );
+          if (!exists) {
+            menus.push({
+              title: title,
+              path: fullPath,
+              icon: route.meta.icon,
+              key: route.name || fullPath,
+              routeName: route.name,
+            });
+          }
+        } catch (error) {
+          // 如果翻译失败，使用原始标题
+          const exists = menus.find(
+            m => m.routeName === route.name || m.path === fullPath
+          );
+          if (!exists) {
+            menus.push({
+              title: route.meta.title,
+              path: fullPath,
+              icon: route.meta.icon,
+              key: route.name || fullPath,
+              routeName: route.name,
+            });
+          }
+        }
+      }
+
+      // 处理子路由
+      if (route.children && route.children.length > 0) {
+        getRouteItems(route.children, fullPath);
+      }
+    });
+  };
+
+  // 使用和菜单面板相同的数据源
+  const menuRoutes = getMenuDataForSearch();
+
+  if (menuRoutes && menuRoutes.length > 0) {
+    getRouteItems(menuRoutes);
+  }
+
+  return menus;
+});
+
+// 过滤的菜单项
+const filteredMenus = computed(() => {
+  if (!searchKeyword.value.trim()) {
+    return searchableMenus.value.slice(0, 10); // 默认显示前10个
+  }
+
+  // return searchableMenus.value.filter(menu =>
+  //   menu.title.toLowerCase().includes(searchKeyword.value.toLowerCase()) ||
+  //   menu.path.toLowerCase().includes(searchKeyword.value.toLowerCase())
+  // ).slice(0, 10);
+  const value = searchKeyword.value.toLowerCase();
+  return searchableMenus.value
+    .filter(menu => menu.title.toLowerCase().includes(value))
+    .slice(0, 10);
+});
+
+/**打开搜索弹窗 */
+function fnClickSearch() {
+  searchModalOpen.value = true;
+  searchKeyword.value = '';
+
+  nextTick(() => {
+    searchInputRef.value?.focus();
+  });
+}
+
+/**关闭搜索弹窗 */
+function fnCloseSearch() {
+  searchModalOpen.value = false;
+  searchKeyword.value = '';
+}
+
+/**选择菜单项并跳转 */
+function fnSelectMenu(menu: any) {
+  try {
+    // 优先使用路由名称跳转
+    if (menu.routeName) {
+      router.push({ name: menu.routeName });
+    } else {
+      router.push(menu.path);
+    }
+    fnCloseSearch();
+  } catch (error) {
+    // 如果跳转失败，尝试直接使用路径
+    try {
+      router.push(menu.path);
+      fnCloseSearch();
+    } catch (secondError) {
+      // 可以在这里添加错误提示
+    }
+  }
+}
+
+/**键盘事件处理 */
+function fnHandleKeydown(e: KeyboardEvent) {
+  if (e.key === 'Escape') {
+    fnCloseSearch();
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.search-modal-content {
+  .search-results {
+    max-height: 400px;
+    overflow-y: auto;
+
+    .no-results {
+      text-align: center;
+      padding: 40px 0;
+    }
+
+    .menu-list {
+      .menu-item {
+        display: flex;
+        align-items: center;
+        padding: 12px 16px;
+        border-radius: 8px;
+        cursor: pointer;
+        transition: all 0.2s ease;
+        margin-bottom: 4px;
+
+        &:hover {
+          background-color: #f5f5f5;
+
+          .menu-action {
+            opacity: 1;
+          }
+        }
+
+        .menu-icon {
+          margin-right: 12px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 32px;
+          height: 32px;
+          background-color: #f0f2f5;
+          border-radius: 6px;
+
+          .icon {
+            font-size: 16px;
+            color: #666;
+          }
+        }
+
+        .menu-info {
+          flex: 1;
+          min-width: 0;
+
+          .menu-title {
+            font-size: 14px;
+            font-weight: 500;
+            color: #262626;
+            margin-bottom: 2px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+
+          .menu-path {
+            font-size: 12px;
+            color: #8c8c8c;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+
+        .menu-action {
+          opacity: 0;
+          transition: opacity 0.2s ease;
+          color: #bfbfbf;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+
+// 暗黑主题支持
+[data-theme='dark'] {
+  .search-modal-content {
+    .search-results {
+      .menu-list {
+        .menu-item {
+          &:hover {
+            background-color: #303030;
+          }
+
+          .menu-icon {
+            background-color: #262626;
+
+            .icon {
+              color: #bfbfbf;
+            }
+          }
+
+          .menu-info {
+            .menu-title {
+              color: #f0f0f0;
+            }
+
+            .menu-path {
+              color: #8c8c8c;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
--- a/src/layouts/components/Tabs.vue
+++ b/src/layouts/components/Tabs.vue
@@ -4,9 +4,9 @@ import { computed, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import useTabsStore from '@/store/modules/tabs';
 import useI18n from '@/hooks/useI18n';
-const { t } = useI18n();
 const tabsStore = useTabsStore();
 const router = useRouter();
+const { t } = useI18n();

 defineProps({
  /**标签栏宽度 */
@@ -112,7 +112,7 @@ watch(router.currentRoute, v => tabsStore.tabOpen(v), { immediate: true });
    <a-tabs
      class="tabs"
      :class="{ 'tabs-fixed': fixedHeader }"
-      :style="{ width: width, top: headerRender === false ? 0 : undefined }"
+      :style="{ width: fixedHeader ? width : '100%', top: headerRender === false ? 0 : undefined }"
      hide-add
      tab-position="top"
      type="editable-card"
@@ -150,7 +150,7 @@ watch(router.currentRoute, v => tabsStore.tabOpen(v), { immediate: true });
          </a-tooltip>
          <a-tooltip placement="topRight">
            <template #title>{{ t('loayouts.tabs.more') }}</template>
-            <a-dropdown trigger="click" placement="bottomRight">
+            <a-dropdown placement="bottomRight" trigger="click">
              <a-button type="ghost" shape="circle" size="small">
                <template #icon><DownOutlined /></template>
              </a-button>
@@ -199,7 +199,18 @@ watch(router.currentRoute, v => tabsStore.tabOpen(v), { immediate: true });
  }
 }

+[data-theme='dark'] .tabs {
+  background: #141414;
+}
+
 .tabs :deep(.ant-tabs-nav:before) {
  border-bottom: none;
 }
+.tabs :deep(.ant-tabs-nav-list .ant-tabs-tab) {
+  border-radius: 8px;
+}
+.tabs :deep(.ant-tabs-nav-list .ant-tabs-tab.ant-tabs-tab-active) {
+  border-bottom-right-radius: unset;
+  border-bottom-left-radius: unset;
+}
 </style>
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,16 +4,15 @@ import App from './App.vue';
 import router from './router';
 import directive from './directive';
 import i18n from './i18n';
-import ProModal from "antdv-pro-modal";
-import 'antdv-pro-layout/dist/style.css';
+
 import 'antdv-pro-modal/dist/style.css';
-import 'ant-design-vue/dist/antd.variable.min.css';
+import 'antdv-pro-layout/dist/style.css';
+import 'ant-design-vue/dist/reset.css';

 const app = createApp(App);
 app.use(store);
 app.use(router);
 app.use(directive);
 app.use(i18n);
-app.use(ProModal);

 app.mount('#app');
--- a/src/plugins/file-static-url.ts
+++ b/src/plugins/file-static-url.ts
@@ -19,3 +19,26 @@ export function parseUrlPath(path: string) {
    : import.meta.env.VITE_API_BASE_URL;
  return `${baseUrl}${path}?r=${Math.random().toFixed(2)}`;
 }
+
+/**
+ * 解析静态文件相对路径
+ * @param path 静态资源文件
+ * @returns
+ */
+export function parseBasePath(path: string) {
+  if (!path || path === '#') {
+    return '#';
+  }
+  if (validHttp(path)) {
+    return path;
+  }
+  // 兼容旧前端可改配置文件
+  const baseUrl = import.meta.env.VITE_HISTORY_BASE_URL;
+  let scriptUrl =
+    baseUrl.length === 1 && baseUrl.indexOf('/') === 0
+      ? ''
+      : baseUrl.indexOf('/') === -1
+      ? '/' + baseUrl
+      : baseUrl;
+  return `${scriptUrl}${path}?r=${Math.random().toFixed(2)}`;
+}
--- a/src/plugins/http-fetch.ts
+++ b/src/plugins/http-fetch.ts
@@ -61,7 +61,7 @@ type OptionsType = {
  /**请求地址 */
  url: string;
  /**请求方法 */
-  method: 'get' | 'post' | 'put' | 'delete' | 'PATCH';
+  method: 'get' | 'post' | 'put' | 'delete' | 'PATCH' | 'GET' | 'POST' | 'PUT' | 'DELETE';
  /**请求头 */
  headers?: HeadersInit;
  /**地址栏参数 */
@@ -198,7 +198,7 @@ function beforeRequest(options: OptionsType): OptionsType | Promise<any> {
  if (options.method === 'get') return options;

  // 非get参数提交
-  let body = options.data
+  let body = options.data;
  if (body instanceof FormData) {
    options.body = body;
  } else if (body) {
--- a/src/plugins/ws-websocket.ts
+++ b/src/plugins/ws-websocket.ts
@@ -119,17 +119,15 @@ export class WS {
      };
      // 用于指定当从服务器接受到信息时的回调函数。
      ws.onmessage = ev => {
+        if (ev.type !== 'message') return;
        // 解析文本消息
-        if (ev.type === 'message') {
-          const data = ev.data;
-          try {
-            const jsonData = JSON.parse(data);
-            if (typeof options.onmessage === 'function') {
-              options.onmessage(jsonData);
-            }
-          } catch (error) {
-            console.error('websocket message formatting error', error);
+        try {
+          const jsonData = JSON.parse(ev.data);
+          if (typeof options.onmessage === 'function') {
+            options.onmessage(jsonData);
          }
+        } catch (error) {
+          console.error('websocket message formatting error', error);
        }
      };
      // 用于指定连接关闭后的回调函数。
@@ -221,7 +219,7 @@ export class WS {
    this.heartInterval = window.setInterval(() => {
      this.send({
        requestId: `${Date.now()}`,
-        type: 'ping',
+        type: 'PING',
      });
    }, heartTimer);
  }
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -13,6 +13,8 @@ import { validHttp } from '@/utils/regular-utils';
 import useUserStore from '@/store/modules/user';
 import useAppStore from '@/store/modules/app';
 import useRouterStore from '@/store/modules/router';
+import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';

 // NProgress Configuration
 NProgress.configure({ showSpinner: false });
@@ -30,12 +32,15 @@ const constantRoutes: RouteRecordRaw[] = [
    name: 'Root',
    component: BasicLayout,
    redirect: '/index',
+    // redirect: '/monitor/dashboard',
    children: [
      {
        path: '/index',
        name: 'Index',
        meta: { title: 'router.index', icon: 'icon-pcduan' },
        component: () => import('@/views/index.vue'),
+        // meta: { title: 'router.index', icon: 'icon-pcduan', hideInMenu: true },
+        // redirect: '/monitor/dashboard',
      },
      {
        path: '/account',
@@ -63,11 +68,16 @@ const constantRoutes: RouteRecordRaw[] = [
      },
    ],
  },
+  {
+    path: '/login/oauth2',
+    name: 'LoginOAuth2', // 第三方认证重定向
+    component: () => import('@/views/login/oauth2.vue'),
+  },
  {
    path: '/login',
    name: 'Login',
    meta: { title: 'router.login' },
-    component: () => import('@/views/login.vue'),
+    component: () => import('@/views/login/index.vue'),
  },
  {
    path: '/register',
@@ -156,7 +166,7 @@ router.afterEach((to, from, failure) => {
 /**无Token可访问页面地址白名单 */
 const WHITE_LIST: string[] = [
  '/login',
-  '/auth-redirect',
+  '/login/oauth2',
  '/help',
  '/register',
  '/quick-start',
@@ -182,7 +192,12 @@ router.beforeEach(async (to, from, next) => {
    next({ name: 'Index' });
  }

-  const token = getToken();
+  let token = getToken();
+
+  // 免用户登录认证
+  if (!appStore.loginAuth) {
+    token = '== Not Login Auth ==';
+  }

  // 没有token
  if (!token) {
@@ -205,6 +220,9 @@ router.beforeEach(async (to, from, next) => {
      const user = useUserStore();
      if (user.roles && user.roles.length === 0) {
        try {
+          useNeInfoStore().fnRefreshNelist();
+          useNeListStore().fnNelistRefresh();
+
          // 获取用户信息
          await user.fnGetInfo();
          // 获取路由信息
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -1,9 +1,10 @@
 import { getSysConf } from '@/api';
-import { CACHE_LOCAL_I18N } from '@/constants/cache-keys-constants';
+import { CACHE_LOCAL_I18N, CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { removeToken } from '@/plugins/auth-token';
 import { parseUrlPath } from '@/plugins/file-static-url';
 import { localGet, localSet } from '@/utils/cache-local-utils';
+import { sessionSet } from '@/utils/cache-session-utils';
 import { defineStore } from 'pinia';

 /**应用参数类型 */
@@ -20,6 +21,10 @@ type AppStore = {
  buildTime: string;
  /**系统引导使用 */
  bootloader: boolean;
+  // 用户登录认证
+  loginAuth: boolean;
+  // 用户接口加密
+  cryptoApi: boolean;
  // 序列号
  serialNum: string;
  /**应用版权声明 */
@@ -52,6 +57,8 @@ const useAppStore = defineStore('app', {
    version: `-`,
    buildTime: `-`,
    bootloader: false,
+    loginAuth: true,
+    cryptoApi: true,
    serialNum: `-`,
    copyright: `Copyright ©2023 For ${import.meta.env.VITE_APP_NAME}`,
    logoType: 'icon',
@@ -85,6 +92,9 @@ const useAppStore = defineStore('app', {
        if (this.bootloader) {
          removeToken();
        }
+        this.loginAuth = res.data.loginAuth !== 'false';
+        this.cryptoApi = res.data.cryptoApi !== 'false';
+        sessionSet(CACHE_SESSION_CRYPTO_API,  res.data.cryptoApi);
        this.serialNum = res.data.serialNum;
        this.appName = res.data.title;
        this.copyright = res.data.copyright;
--- a/src/store/modules/layout.ts
+++ b/src/store/modules/layout.ts
@@ -1,16 +1,23 @@
-import { CACHE_LOCAL_PROCONFIG } from '@/constants/cache-keys-constants';
-import { localGetJSON, localSetJSON } from '@/utils/cache-local-utils';
+import { theme } from 'ant-design-vue/es';
+import type { ThemeConfig } from 'ant-design-vue/es/config-provider/context';
 import { defineStore } from 'pinia';
+import {
+  CACHE_LOCAL_PRIMARY_COLOR,
+  CACHE_LOCAL_PROCONFIG,
+} from '@/constants/cache-keys-constants';
+import {
+  localGet,
+  localGetJSON,
+  localSetJSON,
+} from '@/utils/cache-local-utils';

 /**布局参数类型 */
 type LayoutStore = {
-  /**布局设置抽屉显示 */
-  visible: boolean;
  /**布局配置 */
  proConfig: {
    /**导航布局 */
    layout: 'side' | 'top' | 'mix';
-    /**全局主题色，需要导入样式文件 */
+    /**全局主题色*/
    theme: 'dark' | 'light';
    /**菜单导航主题色 */
    menuTheme: 'dark' | 'light';
@@ -29,10 +36,33 @@ type LayoutStore = {
    /**内容区域-导航标签项 */
    tabRender: any | boolean | undefined;
  };
+  /**主题配置 */
+  themeConfig: ThemeConfig;
  /**水印内容 */
  waterMarkContent: string;
 };

+/**
+ * 获取随机颜色范围
+ * @returns 颜色
+ */
+function getRandomColor(): string {
+  const colors: string[] = [
+    '#f5222d',
+    '#fa541c',
+    '#fa8c16',
+    '#a0d911',
+    '#13c2c2',
+    '#1890ff',
+    '#722ed1',
+    '#eb2f96',
+    '#faad14',
+    '#52c41a',
+  ];
+  const i = Math.floor(Math.random() * 10);
+  return colors[i];
+}
+
 /**判断是否关闭内容区域 */
 const proRender = (render: any) => (render === false ? false : undefined);

@@ -50,7 +80,6 @@ const proConfigLocal: LayoutStore['proConfig'] = localGetJSON(

 const useLayoutStore = defineStore('layout', {
  state: (): LayoutStore => ({
-    visible: false,
    proConfig: {
      layout: proConfigLocal.layout,
      theme: proConfigLocal.theme,
@@ -63,13 +92,27 @@ const useLayoutStore = defineStore('layout', {
      menuHeaderRender: proRender(proConfigLocal.menuHeaderRender),
      tabRender: proRender(proConfigLocal.tabRender),
    },
+    themeConfig: {
+      algorithm: [theme.darkAlgorithm],
+      // algorithm: themeColor["dark"],
+      token: {
+        // colorBgContainer: "#fff",
+        colorPrimary: localGet(CACHE_LOCAL_PRIMARY_COLOR) || '#1890ff',
+        // borderRadius: 6,
+      },
+    },
    waterMarkContent: import.meta.env.VITE_APP_NAME,
  }),
-  actions: {
-    /**改变显示状态 */
-    changeVisibleLayoutSetting() {
-      this.visible = !this.visible;
+  getters: {
+    getColorPrimary(): string {
+      let color = '#1890ff';
+      if (this.themeConfig.token) {
+        color = this.themeConfig.token.colorPrimary || color;
+      }
+      return color;
    },
+  },
+  actions: {
    /**修改水印文字 */
    changeWaterMark(text: string) {
      this.waterMarkContent = text;
@@ -77,10 +120,48 @@ const useLayoutStore = defineStore('layout', {
    /**修改布局设置 */
    changeConf(key: string, value: boolean | string | number | undefined) {
      if (Reflect.has(this.proConfig, key)) {
+        // console.log(key, value);
+        if (key === 'theme') {
+          // const themeColor = {
+          //   light: theme.defaultAlgorithm,
+          //   compact: theme.compactAlgorithm,
+          //   dark: theme.darkAlgorithm,
+          // };
+          if (value === 'dark') {
+            document.documentElement.setAttribute('data-theme', 'dark');
+            this.themeConfig.algorithm = [theme.darkAlgorithm];
+          } else {
+            document.documentElement.setAttribute('data-theme', 'light');
+            this.themeConfig.algorithm = [theme.defaultAlgorithm];
+          }
+        }
        Reflect.set(this.proConfig, key, value);
        localSetJSON(CACHE_LOCAL_PROCONFIG, this.proConfig);
      }
    },
+    /**主题色初始化 */
+    initPrimaryColor() {
+      // 主题色初始化
+      this.changePrimaryColor(this.getColorPrimary);
+      // 明暗模式初始化
+      const themeMode = this.proConfig.theme;
+      document.documentElement.setAttribute('data-theme', themeMode);
+      this.changeConf('theme', themeMode);
+    },
+    /**
+     * 主题色变更
+     * @param color 颜色
+     */
+    changePrimaryColor(color?: string) {
+      if (!color) {
+        color = getRandomColor();
+      }
+
+      if (this.themeConfig && this.themeConfig.token) {
+        this.themeConfig.token.colorPrimary = color;
+        localStorage.setItem(CACHE_LOCAL_PRIMARY_COLOR, color);
+      }
+    },
  },
 });

--- a/src/store/modules/mask.ts
+++ b/src/store/modules/mask.ts
@@ -20,7 +20,7 @@ type MaskStateType = {
 const useMaskStore = defineStore('mask', {
  state: (): MaskStateType => ({
    type: (localGet(CACHE_LOCAL_MASK) || 'none') as MaskStateType['type'],
-    lockPasswd: localGet(CACHE_LOCAL_LOCK_PASSWD) || '',
+    lockPasswd: atob(localGet(CACHE_LOCAL_LOCK_PASSWD) || ''),
    lockTimeout: 0,
  }),
  getters: {},
@@ -59,7 +59,7 @@ const useMaskStore = defineStore('mask', {
        }, 5_000);
      }
      if (type === 'lock') {
-        localSet(CACHE_LOCAL_LOCK_PASSWD, this.lockPasswd);
+        localSet(CACHE_LOCAL_LOCK_PASSWD, btoa(this.lockPasswd));
      } else {
        localRemove(CACHE_LOCAL_LOCK_PASSWD);
      }
--- a/src/store/modules/ne_list.ts
+++ b/src/store/modules/ne_list.ts
@@ -0,0 +1,123 @@
+import { defineStore } from 'pinia';
+import {
+  RESULT_CODE_SUCCESS,
+  RESULT_MSG_SUCCESS,
+} from '@/constants/result-constants';
+import { listAllNeInfo } from '@/api/ne/neInfo';
+import { parseDataToOptions } from '@/utils/parse-tree-utils';
+
+/**网元列表信息类型 */
+type NeList = {
+  /**网元列表 */
+  neList: Record<string, any>[];
+  /**级联options树结构 */
+  neCascaderOptions: Record<string, any>[];
+  /**选择器单级父类型 */
+  neSelectOtions: Record<string, any>[];
+};
+
+const useNeListStore = defineStore('ne_list', {
+  state: (): NeList => ({
+    neList: [],
+    neCascaderOptions: [],
+    neSelectOtions: [],
+  }),
+  getters: {
+    /**
+     * 网元列表
+     * @param state 内部属性不用传入
+     * @returns 级联options
+     */
+    getNeList(state) {
+      return state.neList;
+    },
+    /**
+     * 获取级联options树结构
+     * @param state 内部属性不用传入
+     * @returns 级联options
+     */
+    getNeCascaderOptions(state) {
+      return state.neCascaderOptions;
+    },
+    /**
+     * 选择器单级父类型
+     * @param state 内部属性不用传入
+     * @returns 选择options
+     */
+    getNeSelectOtions(state) {
+      return state.neSelectOtions;
+    },
+  },
+  actions: {
+    // 刷新网元列表
+    async fnNelistRefresh() {
+      this.neList = [];
+      return await this.fnNelist();
+    },
+    // 获取网元列表
+    async fnNelist() {
+      // 有数据不请求
+      if (this.neList.length > 0) {
+        return {
+          code: RESULT_CODE_SUCCESS,
+          msg: RESULT_MSG_SUCCESS['en_US'],
+          data: this.neList,
+        };
+      }
+      const res = await listAllNeInfo({
+        bandStatus: false,
+        bandHost: false,
+      });
+      if (res.code === RESULT_CODE_SUCCESS) {
+        // 原始列表
+        this.neList = JSON.parse(JSON.stringify(res.data));
+
+        // 转级联数据
+        const options = parseDataToOptions(
+          res.data,
+          'neType',
+          'neName',
+          'neId'
+        );
+        this.neCascaderOptions = options;
+
+        // 转选择器单级父类型
+        this.neSelectOtions = options.map(item => {
+          return {
+            label: item.label,
+            value: item.value,
+          };
+        });
+      }
+      return res;
+    },
+    /**
+     * 含有网元
+     * @param metaNeType ['udm', 'ims', 'udm+ims', 'SGWC'] 支持大小写
+     * @returns boolean
+     */
+    fnHasNe(metaNeType: string[]) {
+      if (this.neList.length > 0) {
+        const neTypes = this.neSelectOtions.map(item => item.value);
+        let match = false; // 匹配
+        for (const netype of metaNeType) {
+          if (netype.indexOf('+') > -1) {
+            metaNeType = netype.split('+');
+            match = true;
+            break;
+          }
+        }
+
+        if (match) {
+          // 同时匹配
+          return metaNeType.every(item => neTypes.includes(item.toUpperCase()));
+        }
+        // 有一种
+        return metaNeType.some(item => neTypes.includes(item.toUpperCase()));
+      }
+      return false;
+    },
+  },
+});
+
+export default useNeListStore;
--- a/src/store/modules/neinfo.ts
+++ b/src/store/modules/neinfo.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { listAllNeInfo } from '@/api/ne/neInfo';
 import { parseDataToOptions } from '@/utils/parse-tree-utils';
-import { getNeTraceInterfaceAll } from '@/api/trace/task';
 import { getNePerformanceList } from '@/api/perfManage/taskManage';

 /**网元信息类型 */
@@ -13,8 +12,6 @@ type NeInfo = {
  neCascaderOptions: Record<string, any>[];
  /**选择器单级父类型 */
  neSelectOtions: Record<string, any>[];
-  /**跟踪接口列表 */
-  traceInterfaceList: Record<string, any>[];
  /**性能测量数据集 */
  perMeasurementList: Record<string, any>[];
 };
@@ -24,7 +21,6 @@ const useNeInfoStore = defineStore('neinfo', {
    neList: [],
    neCascaderOptions: [],
    neSelectOtions: [],
-    traceInterfaceList: [],
    perMeasurementList: [],
  }),
  getters: {
@@ -61,7 +57,7 @@ const useNeInfoStore = defineStore('neinfo', {
      const res = await listAllNeInfo({
        bandStatus: false,
      });
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      if (res.code === RESULT_CODE_SUCCESS) {
        // 原始列表
        this.neList = JSON.parse(JSON.stringify(res.data));

@@ -79,24 +75,6 @@ const useNeInfoStore = defineStore('neinfo', {
      }
      return res;
    },
-    // 刷新跟踪接口列表
-    async fnRefreshNeTraceInterface() {
-      this.traceInterfaceList = [];
-      const res = await this.fnNeTraceInterface();
-      return res;
-    },
-    // 获取跟踪接口列表
-    async fnNeTraceInterface() {
-      // 有数据不请求
-      if (this.traceInterfaceList.length > 0) {
-        return { code: 1, data: this.traceInterfaceList, msg: 'success' };
-      }
-      const res = await getNeTraceInterfaceAll();
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-        this.traceInterfaceList = res.data;
-      }
-      return res;
-    },
    // 获取性能测量数据集列表
    async fnNeTaskPerformance() {
      // 有数据不请求
@@ -104,7 +82,7 @@ const useNeInfoStore = defineStore('neinfo', {
        return { code: 1, data: this.perMeasurementList, msg: 'success' };
      }
      const res = await getNePerformanceList();
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      if (res.code === RESULT_CODE_SUCCESS) {
        this.perMeasurementList = res.data;
      }
      return res;
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,7 +1,7 @@
 import defaultAvatar from '@/assets/images/default_avatar.png';
 import useLayoutStore from './layout';
 import { login, logout, getInfo } from '@/api/login';
-import { getToken, setToken, removeToken } from '@/plugins/auth-token';
+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';
@@ -27,8 +27,8 @@ type UserInfo = {
  email: string;
  /**用户性别 */
  sex: string | undefined;
-  /**其他信息 */
-  profile: Record<string, any>;
+  /**用户类型 */
+  userType: string;
 };

 const useUserStore = defineStore('user', {
@@ -42,7 +42,7 @@ const useUserStore = defineStore('user', {
    phonenumber: '',
    email: '',
    sex: undefined,
-    profile: {},
+    userType: 'System',
  }),
  getters: {
    /**
@@ -122,6 +122,7 @@ const useUserStore = defineStore('user', {
        this.phonenumber = user.phonenumber;
        this.email = user.email;
        this.sex = user.sex;
+        this.userType = user.userType;

        // 验证返回的roles是否是一个非空数组
        if (Array.isArray(roles) && roles.length > 0) {
@@ -133,10 +134,10 @@ const useUserStore = defineStore('user', {
        }

        // 水印文字信息=用户昵称 手机号
-        let waterMarkContent = this.userName;
-        if (this.phonenumber) {
-          waterMarkContent = `${this.userName} ${this.phonenumber}`;
-        }
+        // let waterMarkContent = this.userName;
+        // if (this.phonenumber) {
+        //   waterMarkContent = `${this.userName} ${this.phonenumber}`;
+        // }
        // useLayoutStore().changeWaterMark(waterMarkContent);
        useLayoutStore().changeWaterMark('');
      }
--- a/src/typings/vite-env.d.ts
+++ b/src/typings/vite-env.d.ts
@@ -7,4 +7,11 @@ declare module '*.vue' {
  export default component;
 }

+// "vue3-smooth-dnd": "^0.0.6"
 declare module 'vue3-smooth-dnd';
+
+// "intl-tel-input": "^25.2.0"
+declare module 'intl-tel-input/intlTelInputWithUtils' {
+  import intlTelInput from 'intl-tel-input';
+  export default intlTelInput;
+}
--- a/src/utils/cache-db-utils.ts
+++ b/src/utils/cache-db-utils.ts
@@ -37,6 +37,24 @@ export async function dbGet(storeName: string, key: string) {
  return value;
 }

+/**数据级缓存全部移除 */
+export async function dbClear(storeName: string) {
+  if (!storeName ) {
+    return false;
+  }
+  localforage.config({
+    name: import.meta.env.VITE_APP_CODE,
+    storeName: storeName,
+  });
+  try {
+    await localforage.clear();
+    return true;
+  } catch (error) {
+    console.error(error);
+  }
+  return false;
+}
+
 /**数据级缓存移除 */
 export async function dbRemove(storeName: string, key: string) {
  if (!storeName || !key) {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`001012082101039,1234,internet\|ims_sig,internet\|ims_sig,321321,255,321312,32131,32131`
				`@@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721721606045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7339" width="200" height="200"><path d="M610.6 234.24L627 294.6c90.88-24.73 184.58 28.77 209.45 119.65l60.36-16.4C862.92 273.5 734.67 200.37 610.6 234.24z m-34.42-126.22l16.4 60.36c160.51-43.83 326.13 50.81 369.96 211.33l60.36-16.4C969.94 169.45 770.03 55.18 576.18 108.02zM179.47 922.27V827.5H0v-84.83l179.47-261.74h92.22v274.24h62.38v72.33h-62.38v94.77h-92.22z m0-167.09V598.02L72.33 755.18h107.14z m0 0" p-id="7340" fill="#ffffff"></path><path d="M695.69 752.62h-89.8v-77.29h186.99v231.9c-33.34 9.95-67.35 14.92-102.17 14.92-26.62 3.37-61.57 4.97-104.72 4.97-141.29-8.33-213.62-86.44-216.97-234.31 3.36-151.24 75.69-231.9 216.97-241.85 144.65 0 216.03 49.88 214.42 149.63H695.69c0-51.49-30.79-77.3-92.23-77.3-84.83 1.62-127.98 58.21-129.59 169.52 1.61 109.7 44.9 165.49 129.59 167.1 24.87 0 54.05-3.36 87.25-9.95-1.61 1.61 0 1.61 4.98 0v-97.34z m0 0" p-id="7341" fill="#ffffff"></path></svg>
				`@@ -0,0 +1,3 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1720074329868" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4280" width="64" height="64"><path d="M616.5 151.3l-28.3 28.3c19.7 19.6 31.8 46.6 31.8 76.5 0 29.8-12.2 56.9-31.8 76.5l28.3 28.3c26.8-27 43.5-64 43.5-104.9s-16.7-77.9-43.5-104.7zM435.8 179.5l-28.3-28.3C380.7 178.1 364 215.1 364 256s16.7 77.9 43.5 104.7l28.3-28.3C416.2 312.9 404 285.8 404 256c0-29.9 12.2-56.9 31.8-76.5zM346.6 134.3L318.3 106c-38.5 38.4-62.3 91.5-62.3 150s23.8 111.6 62.3 150l28.3-28.3C315.3 346.6 296 303.5 296 256s19.3-90.6 50.6-121.7zM705.7 106l-28.3 28.3C708.7 165.4 728 208.5 728 256s-19.3 90.6-50.6 121.7l28.3 28.3c38.5-38.4 62.3-91.5 62.3-150s-23.8-111.6-62.3-150zM815.2 60.8l-0.1-0.1L786.7 89c0.1 0 0.1 0.1 0.2 0.1C831.5 133.7 856 193 856 256s-24.5 122.3-69.1 166.9c0 0-0.1 0.1-0.2 0.1l28.3 28.3 0.1-0.1C867.3 399 896 329.7 896 256s-28.7-143-80.8-195.2zM237.3 89L209 60.7l-0.1 0.1C156.7 113 128 182.3 128 256s28.7 143 80.8 195.2l0.1 0.1 28.3-28.3c-0.1 0-0.1-0.1-0.2-0.1-44.5-44.6-69-103.9-69-166.9s24.5-122.3 69.1-166.9c0.1 0 0.1-0.1 0.2-0.1zM511.712 256.002l0.283-0.283 0.283 0.283-0.283 0.283z" p-id="4281" fill="#ffffff"></path><path d="M511.719 256.021l0.282-0.282 0.283 0.282-0.283 0.283z" p-id="4282" fill="#ffffff"></path><path d="M708.4 616l-14.2-26.1-7.6-13.9-11.6-21.2L512 256 337.5 576l-21.8 40L128 960h74l33.8-64 28.9-53h494.6l28.9 53 33.8 64h74L708.4 616zM512 389.6L613.7 576H410.3L512 389.6zM388.5 616H569L305.6 768.1 388.5 616z m-63.4 187l313.6-181.1L737.5 803H325.1z" p-id="4283" fill="#ffffff"></path></svg>
				`@@ -0,0 +1 @@`
				<svg width="1em" height="1em" class="icon-dark" viewBox="0 0 17 17" xmlns="http://www.w3.org/2000/svg" style="vertical-align: -0.125em;color: rgba(255, 255, 255, 0.65);"><g id="Dark-\u9875\u9762-1" stroke="none" stroke-width="1px" fill="none" fill-rule="evenodd"><g id="Dark-\u9ED8\u8BA4" transform="translate(-9.000000, -49.500000)" fill="currentColor" fill-rule="nonzero"><g id="Dark-\u7F16\u7EC4-17" transform="translate(0.000000, 42.500000)"><g id="Dark-moon" transform="translate(9.268811, 7.500000)"><rect id="Dark-\u77E9\u5F62" opacity="0" x="0" y="0" width="16" height="16"></rect><path d="M8,1.33333333 C8.14933333,1.33333333 8.29688889,1.33844444 8.44266667,1.34866666 C8.14755556,1.98422221 8,2.64577777 8,3.33333333 C8,3.96533333 8.12333333,4.56955555 8.37,5.146 C8.61666667,5.72244445 8.94822222,6.21888889 9.36466667,6.63533333 C9.78111112,7.05177777 10.2775556,7.38333332 10.854,7.63 C11.4304444,7.87666668 12.0346667,8.00000001 12.6666667,8 C13.3542222,8 14.0157778,7.85244444 14.6513333,7.55733333 C14.6615556,7.70311111 14.6666667,7.85066667 14.6666667,8 C14.6666667,8.604 14.5868889,9.19422222 14.4273333,9.77066667 C14.2677778,10.3471111 14.0446667,10.8793333 13.758,11.3673333 C13.4713333,11.8553333 13.1233333,12.3042222 12.714,12.714 C12.3046667,13.1237778 11.8557778,13.4717778 11.3673333,13.758 C10.8788889,14.0442222 10.3466667,14.2673333 9.77066667,14.4273333 C9.19466667,14.5873333 8.60444445,14.6671111 8,14.6666685 C7.39555555,14.6662222 6.80533333,14.5864444 6.22933333,14.4273333 C5.65333333,14.2682222 5.1211111,14.0451111 4.63266666,13.758 C4.14422221,13.4708889 3.69533332,13.1228889 3.28599998,12.714 C2.87666665,12.3051111 2.52866665,11.8562222 2.24199998,11.3673333 C1.95533332,10.8784444 1.73222221,10.3462222 1.57266666,9.77066667 C1.4131111,9.19511112 1.33333333,8.6048889 1.33333333,8 C1.33333333,7.3951111 1.4131111,6.80488888 1.57266666,6.22933333 C1.73222221,5.65377778 1.95533332,5.12155555 2.24199998,4.63266666 C2.52866665,4.14377776 2.87666665,3.69488887 3.28599998,3.28599998 C3.69533332,2.8771111 4.14422221,2.5291111 4.63266666,2.24199998 C5.1211111,1.95488887 5.65333333,1.73177776 6.22933333,1.57266666 C6.80533333,1.41355555 7.39555555,1.33377778 8,1.33333333 Z M6.68733333,2.828 C6.11444444,2.97377778 5.58066667,3.20977778 5.086,3.536 C4.59133333,3.86222222 4.166,4.24933333 3.81,4.69733333 C3.454,5.14533333 3.17444444,5.65488889 2.97133333,6.226 C2.76822221,6.79711111 2.66666666,7.38822222 2.66666666,7.99933333 C2.66666666,8.72155555 2.80733332,9.41155555 3.08866666,10.0693333 C3.36999999,10.7271111 3.74933332,11.2948889 4.22666666,11.7726667 C4.70399999,12.2504444 5.27177777,12.6297778 5.92999998,12.9106667 C6.5882222,13.1915556 7.2782222,13.3322222 7.99999998,13.3326667 C8.6111111,13.3326667 9.20222221,13.2311111 9.77333331,13.028 C10.3444444,12.8248889 10.854,12.5453333 11.302,12.1893333 C11.75,11.8333333 12.1371111,11.408 12.4633333,10.9133333 C12.7895555,10.4186666 13.0255555,9.88488887 13.1713333,9.31199998 C13.022,9.32577777 12.8535555,9.33266666 12.666,9.33266666 C11.8535555,9.33266666 11.0775555,9.17377777 10.338,8.85599998 C9.59844443,8.5382222 8.96044443,8.11111109 8.42399998,7.57466666 C7.88755554,7.03822222 7.46044443,6.40022222 7.14266666,5.66066666 C6.82488889,4.92111109 6.66599999,4.14511109 6.66599998,3.33266666 C6.66599998,3.1451111 6.67288888,2.97666666 6.68666666,2.82733333 L6.68733333,2.828 Z" id="Dark-\u5F62\u72B6"></path></g></g></g></g></svg>