Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_frontend_vue3

.env.development

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.231128.8"
+VITE_APP_VERSION = "2.231204.9"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

.env.production

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.2311.8"
+VITE_APP_VERSION = "2.2312.9"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

public/default/config.js

@@ -18,24 +18,10 @@
  */
 (function () {
   // host = ip:prot
-  const host = '192.168.2.166:3030';
+  const host = '192.168.8.100:3030';
-
-  const configs = {
-    // internationalization 国际化禁用，默认语言选择
-    i18nDisable: false,
-    i18nDisableDefault: 'en_US',
-    // Service Address 服务地址
-    baseUrl: `http://${host}`,
-    // websocket Address
-    wsUrl: `ws://${host}`,
-  };
-
-  if(!configs.i18nDisable){
-    localStorage.setItem('cache:local:i18n', configs.i18nDisableDefault);
-  }
-  for (const key in configs) {
-    console.log(key, `${configs[key]}`);
-    sessionStorage.setItem(key, `${configs[key]}`);
-  }
 
+  // Service Address 服务地址
+  sessionStorage.setItem(baseUrl, `http://${host}`);
+  // websocket Address
+  sessionStorage.setItem(wsUrl, `ws://${host}`);
 })();

public/loading.js

@@ -155,15 +155,15 @@
       }
     </style>`;
 
-    // 根据浏览器选择语言
     const lang = localStorage.getItem('cache:local:i18n');
-    if (!lang) {
+    // 根据浏览器选择语言
-      let preferredLanguage = navigator.language;
+    // if (!lang) {
-      if (preferredLanguage.indexOf('-')) {
+    //   let preferredLanguage = navigator.language;
-        preferredLanguage = preferredLanguage.replace('-', '_');
+    //   if (preferredLanguage.indexOf('-')) {
-      }
+    //     preferredLanguage = preferredLanguage.replace('-', '_');
-      localStorage.setItem('cache:local:i18n', preferredLanguage);
+    //   }
-    }
+    //   localStorage.setItem('cache:local:i18n', preferredLanguage);
+    // }
 
     let loadInfo = {
       title: '正在加载资源',

src/api/index.ts

@@ -79,12 +79,12 @@ export function getSysConf() {
 }
 
 /**
- * 转存帮助文档
+ * 转存上传文件到静态资源
  * @returns object
  */
-export function transferHelpDoc(data: Record<string, any>) {
+export function transferStaticFile(data: Record<string, any>) {
   return request({
-    url: `/helpDoc`,
+    url: `/transferStaticFile`,
     method: 'post',
     data,
   });

src/api/neUser/pcf.ts

@@ -6,15 +6,15 @@ import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
 
 /**
- * 签约规则导出
+ * 规则导出
  * @param data 表单数据对象
  * @returns bolb
  */
 export function exportRule(data: Record<string, any>) {
   return request({
-    url: '/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export',
+    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export`,
-    method: 'post',
+    method: 'get',
-    data: data,
+    params: data,
     responseType: 'blob',
     timeout: 180_000,
   });
@@ -22,14 +22,13 @@ export function exportRule(data: Record<string, any>) {
 
 /**
  * 导入规则数据
- * @param neId 网元ID
  * @param data 表单数据对象
  * @returns object
  */
 export function importRuleData(data: Record<string, any>) {
   return request({
-    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import`,
+    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import?neId=${data.neId}&filePath=${data.filePath}&fileType=${data.fileType}`,
-    method: 'post',
+    method: 'put',
     data,
     timeout: 60_000,
   });
@@ -52,28 +51,38 @@ export async function listRules(query: Record<string, any>) {
     code: result.code,
     msg: result.msg,
   };
+
   // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
+  if (result.code === RESULT_CODE_SUCCESS) {
-    const rows = parseObjLineToHump(result.data.data);
+    if (result.data?.status) {
-    data.total = rows.length;
+      return {
-    data.rows = rows;
+        code: RESULT_CODE_ERROR,
+        msg: result.data?.cause,
+        rows: result.data,
+      };
+    }
+    if (Array.isArray(result.data.data)) {
+      const rows = parseObjLineToHump(result.data.data);
+      data.total = rows.length;
+      data.rows = rows;
+    }
   }
 
   // 模拟数据
   // data.rows = [
-  //   {
+  //       {
-  //     msisdn: '12307550237',
+  //         "hdrEnrich": "dnn",
-  //     pccRules: 'internet',
+  //         "imsi": "160990100000003",
-  //     rfsp: 0,
+  //         "msisdn": "86755900011",
-  //     sessRules: 'internet',
+  //         "pccRules": "internet|ims_sig",
-  //   },
+  //         "qosAudio": "qos_audio",
-  //   {
+  //         "qosVideo": "qos_video",
-  //     msisdn: '12307550238',
+  //         "rfsp": 0,
-  //     pccRules: 'internet|ims_sig',
+  //         "sar": "def_sar",
-  //     rfsp: 0,
+  //         "sessRules": "internet|ims_sig",
-  //     sessRules: 'internet|ims_sig',
+  //         "uePolicy": "uep_001"
-  //   },
+  //     }
-  // ];
+  // ]
 
   return data;
 }
@@ -124,7 +133,7 @@ export async function updateRule(data: Record<string, any>) {
  */
 export async function batchUpdateRule(data: Record<string, any>) {
   const result = await request({
-    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/${data.num}?neId=${data.neId}`,
+    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/${data.num}?neId=${data.neId}`,
     method: 'put',
     data: data,
   });
@@ -168,7 +177,7 @@ export async function addRule(data: Record<string, any>) {
  */
 export async function batchAddRule(data: Record<string, any>) {
   const result = await request({
-    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/${data.num}?neId=${data.neId}`,
+    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/${data.num}?neId=${data.neId}`,
     method: 'post',
     data: data,
   });
@@ -202,7 +211,7 @@ export function delRule(neId: string, data: Record<string, any>) {
  */
 export async function batchDelRule(data: Record<string, any>) {
   return request({
-    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/${data.num}?neId=${data.neId}&imsi=${data.imsi}`,
+    url: `/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/${data.num}?neId=${data.neId}&imsi=${data.imsi}`,
     method: 'delete',
   });
 }

src/api/perfManage/goldTarget.ts

@@ -8,7 +8,6 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listgoldData(query: Record<string, any>) {
-  console.log(query);
   let totalSQL = 'select count(*) as total from gold_kpi where 1=1 ';
   let rowsSQL =
     '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 ';
@@ -29,10 +28,10 @@ export async function listgoldData(query: Record<string, any>) {
   let sortSql = ' order by  ';
   if (query.sortField) {
     sortSql += ` ${query.sortField} `;
-  }else{
+  } else {
     sortSql += ` start_time `;
   }
-  
+
   if (query.sortOrder === 'asc') {
     sortSql += ' asc ';
   } else {
@@ -76,3 +75,41 @@ export async function listgoldData(query: Record<string, any>) {
   }
   return result;
 }
+
+/**
+ * 查询黄金指标数据
+ * @param query 查询参数
+ * @returns object
+ */
+export async function goldData(query: Record<string, any>) {
+  const result = await request({
+    url: `/ne/kpi/data`,
+    method: 'get',
+    params: {
+      neType: query.neType[0],
+      neId: query.neType[1],
+      startTime: query.beginTime,
+      endTime: query.endTime,
+      interval: query.particle,
+    },
+    timeout: 60_000,
+  });
+
+  return result;
+}
+
+/**
+ * 查询网元可用黄金指标
+ * @param neType 网元类型
+ * @returns object
+ */
+export async function getGoldTitleByNE(neType: string) {
+  // 发起请求
+  const result = await request({
+    url: `/ne/kpi/title`,
+    method: 'get',
+    params: { neType },
+  });
+  // 解析数据
+  return result;
+}

src/assets/background.svg

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="1361px" height="609px" viewBox="0 0 1361 609" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
-    <title>Ant-Design-Pro</title>
-    <desc>mask-and-vue3 By TsMask</desc>
-    <defs></defs>
-    <g id="Ant-Design-Pro" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="mask-and-vue3" transform="translate(-79.000000, -82.000000)">
-            <g id="Group-21" transform="translate(77.000000, 73.000000)">
-                <g id="Group-18" opacity="0.8" transform="translate(74.901416, 569.699158) rotate(-7.000000) translate(-74.901416, -569.699158) translate(4.901416, 525.199158)">
-                    <ellipse id="Oval-11" fill="#CFDAE6" opacity="0.25" cx="63.5748792" cy="32.468367" rx="21.7830479" ry="21.766008"></ellipse>
-                    <ellipse id="Oval-3" fill="#CFDAE6" opacity="0.599999964" cx="5.98746479" cy="13.8668601" rx="5.2173913" ry="5.21330997"></ellipse>
-                    <path d="M38.1354514,88.3520215 C43.8984227,88.3520215 48.570234,83.6838647 48.570234,77.9254015 C48.570234,72.1669383 43.8984227,67.4987816 38.1354514,67.4987816 C32.3724801,67.4987816 27.7006688,72.1669383 27.7006688,77.9254015 C27.7006688,83.6838647 32.3724801,88.3520215 38.1354514,88.3520215 Z" id="Oval-3-Copy" fill="#CFDAE6" opacity="0.45"></path>
-                    <path d="M64.2775582,33.1704963 L119.185836,16.5654915" id="Path-12" stroke="#CFDAE6" stroke-width="1.73913043" stroke-linecap="round" stroke-linejoin="round"></path>
-                    <path d="M42.1431708,26.5002681 L7.71190162,14.5640702" id="Path-16" stroke="#E0B4B7" stroke-width="0.702678964" opacity="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1.405357899873153,2.108036953469981"></path>
-                    <path d="M63.9262187,33.521561 L43.6721326,69.3250951" id="Path-15" stroke="#BACAD9" stroke-width="0.702678964" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1.405357899873153,2.108036953469981"></path>
-                    <g id="Group-17" transform="translate(126.850922, 13.543654) rotate(30.000000) translate(-126.850922, -13.543654) translate(117.285705, 4.381889)" fill="#CFDAE6">
-                        <ellipse id="Oval-4" opacity="0.45" cx="9.13482653" cy="9.12768076" rx="9.13482653" ry="9.12768076"></ellipse>
-                        <path d="M18.2696531,18.2553615 C18.2696531,13.2142826 14.1798519,9.12768076 9.13482653,9.12768076 C4.08980114,9.12768076 0,13.2142826 0,18.2553615 L18.2696531,18.2553615 Z" id="Oval-4" transform="translate(9.134827, 13.691521) scale(-1, -1) translate(-9.134827, -13.691521) "></path>
-                    </g>
-                </g>
-                <g id="Group-14" transform="translate(216.294700, 123.725600) rotate(-5.000000) translate(-216.294700, -123.725600) translate(106.294700, 35.225600)">
-                    <ellipse id="Oval-2" fill="#CFDAE6" opacity="0.25" cx="29.1176471" cy="29.1402439" rx="29.1176471" ry="29.1402439"></ellipse>
-                    <ellipse id="Oval-2" fill="#CFDAE6" opacity="0.3" cx="29.1176471" cy="29.1402439" rx="21.5686275" ry="21.5853659"></ellipse>
-                    <ellipse id="Oval-2-Copy" stroke="#CFDAE6" opacity="0.4" cx="179.019608" cy="138.146341" rx="23.7254902" ry="23.7439024"></ellipse>
-                    <ellipse id="Oval-2" fill="#BACAD9" opacity="0.5" cx="29.1176471" cy="29.1402439" rx="10.7843137" ry="10.7926829"></ellipse>
-                    <path d="M29.1176471,39.9329268 L29.1176471,18.347561 C23.1616351,18.347561 18.3333333,23.1796097 18.3333333,29.1402439 C18.3333333,35.1008781 23.1616351,39.9329268 29.1176471,39.9329268 Z" id="Oval-2" fill="#BACAD9"></path>
-                    <g id="Group-9" opacity="0.45" transform="translate(172.000000, 131.000000)" fill="#E6A1A6">
-                        <ellipse id="Oval-2-Copy-2" cx="7.01960784" cy="7.14634146" rx="6.47058824" ry="6.47560976"></ellipse>
-                        <path d="M0.549019608,13.6219512 C4.12262681,13.6219512 7.01960784,10.722722 7.01960784,7.14634146 C7.01960784,3.56996095 4.12262681,0.670731707 0.549019608,0.670731707 L0.549019608,13.6219512 Z" id="Oval-2-Copy-2" transform="translate(3.784314, 7.146341) scale(-1, 1) translate(-3.784314, -7.146341) "></path>
-                    </g>
-                    <ellipse id="Oval-10" fill="#CFDAE6" cx="218.382353" cy="138.685976" rx="1.61764706" ry="1.61890244"></ellipse>
-                    <ellipse id="Oval-10-Copy-2" fill="#E0B4B7" opacity="0.35" cx="179.558824" cy="175.381098" rx="1.61764706" ry="1.61890244"></ellipse>
-                    <ellipse id="Oval-10-Copy" fill="#E0B4B7" opacity="0.35" cx="180.098039" cy="102.530488" rx="2.15686275" ry="2.15853659"></ellipse>
-                    <path d="M28.9985381,29.9671598 L171.151018,132.876024" id="Path-11" stroke="#CFDAE6" opacity="0.8"></path>
-                </g>
-                <g id="Group-10" opacity="0.799999952" transform="translate(1054.100635, 36.659317) rotate(-11.000000) translate(-1054.100635, -36.659317) translate(1026.600635, 4.659317)">
-                    <ellipse id="Oval-7" stroke="#CFDAE6" stroke-width="0.941176471" cx="43.8135593" cy="32" rx="11.1864407" ry="11.2941176"></ellipse>
-                    <g id="Group-12" transform="translate(34.596774, 23.111111)" fill="#BACAD9">
-                        <ellipse id="Oval-7" opacity="0.45" cx="9.18534718" cy="8.88888889" rx="8.47457627" ry="8.55614973"></ellipse>
-                        <path d="M9.18534718,17.4450386 C13.8657264,17.4450386 17.6599235,13.6143199 17.6599235,8.88888889 C17.6599235,4.16345787 13.8657264,0.332739156 9.18534718,0.332739156 L9.18534718,17.4450386 Z" id="Oval-7"></path>
-                    </g>
-                    <path d="M34.6597385,24.809694 L5.71666084,4.76878945" id="Path-2" stroke="#CFDAE6" stroke-width="0.941176471"></path>
-                    <ellipse id="Oval" stroke="#CFDAE6" stroke-width="0.941176471" cx="3.26271186" cy="3.29411765" rx="3.26271186" ry="3.29411765"></ellipse>
-                    <ellipse id="Oval-Copy" fill="#F7E1AD" cx="2.79661017" cy="61.1764706" rx="2.79661017" ry="2.82352941"></ellipse>
-                    <path d="M34.6312443,39.2922712 L5.06366663,59.785082" id="Path-10" stroke="#CFDAE6" stroke-width="0.941176471"></path>
-                </g>
-                <g id="Group-19" opacity="0.33" transform="translate(1282.537219, 446.502867) rotate(-10.000000) translate(-1282.537219, -446.502867) translate(1142.537219, 327.502867)">
-                    <g id="Group-17" transform="translate(141.333539, 104.502742) rotate(275.000000) translate(-141.333539, -104.502742) translate(129.333539, 92.502742)" fill="#BACAD9">
-                        <circle id="Oval-4" opacity="0.45" cx="11.6666667" cy="11.6666667" r="11.6666667"></circle>
-                        <path d="M23.3333333,23.3333333 C23.3333333,16.8900113 18.1099887,11.6666667 11.6666667,11.6666667 C5.22334459,11.6666667 0,16.8900113 0,23.3333333 L23.3333333,23.3333333 Z" id="Oval-4" transform="translate(11.666667, 17.500000) scale(-1, -1) translate(-11.666667, -17.500000) "></path>
-                    </g>
-                    <circle id="Oval-5-Copy-6" fill="#CFDAE6" cx="201.833333" cy="87.5" r="5.83333333"></circle>
-                    <path d="M143.5,88.8126685 L155.070501,17.6038544" id="Path-17" stroke="#BACAD9" stroke-width="1.16666667"></path>
-                    <path d="M17.5,37.3333333 L127.466252,97.6449735" id="Path-18" stroke="#BACAD9" stroke-width="1.16666667"></path>
-                    <polyline id="Path-19" stroke="#CFDAE6" stroke-width="1.16666667" points="143.902597 120.302281 174.935455 231.571342 38.5 147.510847 126.366941 110.833333"></polyline>
-                    <path d="M159.833333,99.7453842 L195.416667,89.25" id="Path-20" stroke="#E0B4B7" stroke-width="1.16666667" opacity="0.6"></path>
-                    <path d="M205.333333,82.1372105 L238.719406,36.1666667" id="Path-24" stroke="#BACAD9" stroke-width="1.16666667"></path>
-                    <path d="M266.723424,132.231988 L207.083333,90.4166667" id="Path-25" stroke="#CFDAE6" stroke-width="1.16666667"></path>
-                    <circle id="Oval-5" fill="#C1D1E0" cx="156.916667" cy="8.75" r="8.75"></circle>
-                    <circle id="Oval-5-Copy-3" fill="#C1D1E0" cx="39.0833333" cy="148.75" r="5.25"></circle>
-                    <circle id="Oval-5-Copy-2" fill-opacity="0.6" fill="#D1DEED" cx="8.75" cy="33.25" r="8.75"></circle>
-                    <circle id="Oval-5-Copy-4" fill-opacity="0.6" fill="#D1DEED" cx="243.833333" cy="30.3333333" r="5.83333333"></circle>
-                    <circle id="Oval-5-Copy-5" fill="#E0B4B7" cx="175.583333" cy="232.75" r="5.25"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/components/ChartLine/index.vue

@@ -69,7 +69,7 @@ const props = defineProps({
 const seriesStyle = [
   {
     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-    {
+      {
         offset: 0,
         color: 'rgba(22, 119, 255, .5)',
       },
@@ -203,7 +203,7 @@ function initChart() {
       },
     },
     grid: props.option.grid || { left: '8%', right: '8%', bottom: '20%' },
-    legend: {
+    legend: props.option.legend || {
       right: 10,
       itemWidth: 8,
       textStyle: {

src/hooks/useI18n.ts

@@ -1,6 +1,6 @@
-import { computed } from 'vue';
+import { computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { localSet } from '@/utils/cache-local-utils';
+import { localGet, localSet } from '@/utils/cache-local-utils';
 import { CACHE_LOCAL_I18N } from '@/constants/cache-keys-constants';
 
 export default function useLocale() {
@@ -20,7 +20,7 @@ export default function useLocale() {
   };
 
   // 可选的语言
-  const optionsLocale= [
+  const optionsLocale = [
     {
       value: 'zh_CN',
       label: '中文',
@@ -31,6 +31,14 @@ export default function useLocale() {
     },
   ];
 
+  // 挂载前根据默认语言在设置一次
+  onBeforeMount(() => {
+    const localI18n = localGet(CACHE_LOCAL_I18N);
+    if (localI18n) {
+      i18n.locale.value = localI18n;
+    }
+  });
+
   return {
     optionsLocale,
     currentLocale,

src/i18n/locales/en-US.ts

@@ -376,7 +376,7 @@ export default {
         fileName: 'File Name',
         version: 'Version',
         versionPlease: 'Version number cannot be empty',
-        updateTime: 'Uploaded',
+        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}]?',
@@ -407,7 +407,7 @@ export default {
         neTypePlease: 'Select network element type',
         neType: 'NE Type',
         fileName: 'File Name',
-        createTime: 'Uploaded',
+        createTime: 'Uploaded Time',
         comment: 'File Description',
         updateComment: 'License Description',
         updateCommentPlease: 'Please enter a license description',
@@ -477,7 +477,7 @@ export default {
         import: 'Import',
         loadDataConfirm: 'Are you sure you want to reload the data?',
         loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched updated data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
+        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
         startIMSI: 'Start IMSI',
         batchAddText: 'Batch Add',
         batchDelText: 'Batch Delete',
@@ -500,8 +500,8 @@ export default {
         exportConfirm: 'Are you sure to export all signed user data?',
         import: 'Import',
         loadDataConfirm: 'Are you sure you want to reload the data?',
-        loadData: 'Updated Data',
+        loadData: 'Load Data',
-        loadDataTip: 'Successfully fetched updated data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
+        loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!',
         numAdd: 'Number of releases',
         numDel: 'Number of deleted',
         batchAddText: 'Batch Add',
@@ -536,9 +536,9 @@ export default {
         addTitle: 'Adding Policy Control Information',
         updateTitle: '{imsi} Policy control information',
         startIMSI: 'Start IMSI',
-        batchAddText: 'Batch Addition',
+        batchAddText: 'Batch Add',
-        batchDelText: 'Batch Deletion',
+        batchDelText: 'Batch Delete',
-        batchUpdateText: 'Batch Update',
+        batchUpdateText: 'Batch Modify',
         batchNum: 'Number of batches', 
         imsiTip: 'IMSI=MCC+MNC+MSIN',
         imsiTip1: 'MCC=Mobile Country Code, consisting of three digits.',
@@ -628,6 +628,13 @@ export default {
         value:'Value',
         startTime:'Start Time',
         endTime:'End Time',
+        particle: 'Particle Ssize',
+        timeFrame: 'Time Range',
+        nullTip:'There are no statistical data within this time range',
+        kpiTitle:'KPI Statistics Chart',
+        allData:'Complete Data',
+        makeLine:'Statistical Chart',
+        time:'Time',
       }
     },
     traceManage: {
@@ -670,7 +677,7 @@ export default {
         execTimeout: 'Execution timeout',
         execSuccess: 'Execution completed',
         execFailed: 'Execution failed',
-        execBreak: 'break execution',
+        execBreak: 'Break Execution',
         noFileName: 'Invalid file name',
         execUPFStartA: 'Executed, please stop capturing packets according to the situation',
         execUPFStart: 'Execution successful, please stop capturing packets according to the situation',
@@ -1107,6 +1114,10 @@ export default {
         sysOfficialUrlOpen: 'Open the official website.',
         sysOfficialUrlInstruction: 'Official website link address',
         sysOfficialUrlInstruction1: 'start, if you need to hide do not jump to fill in the',
+        i18n: "Internationalization Switch",
+        i18nOpen: "Display Switch",
+        i18nDefault: "Default Languages",
+        i18nInstruction: 'Whether to display the internationalization switch and set the system default language',
       },
       role:{
         allScopeOptions:'All data permissions',

src/i18n/locales/zh-CN.ts

@@ -476,8 +476,8 @@ export default {
         exportConfirm: '确认导出全部鉴权用户数据吗?',
         import: '导入',
         loadDataConfirm: '确认要重新加载数据吗?',
-        loadData: '更新数据',
+        loadData: '加载数据',
-        loadDataTip: '成功获取更新数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
         startIMSI: '起始IMSI',
         batchAddText: '批量新增',
         batchDelText: '批量删除',
@@ -500,8 +500,8 @@ export default {
         exportConfirm: '确认导出全部签约用户数据吗?',
         import: '导入',
         loadDataConfirm: '确认要重新加载数据吗?',
-        loadData: '更新数据',
+        loadData: '加载数据',
-        loadDataTip: '成功获取更新数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
+        loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!',
         numAdd: '放号个数',
         numDel: '删除个数',
         batchAddText: '批量新增',
@@ -627,7 +627,14 @@ export default {
         enTitle:'黄金指标项',
         value:'值',
         startTime:'开始时间',
-        endTime:'结束时间'
+        endTime:'结束时间',
+        particle:'颗粒度',
+        timeFrame:'时间范围',
+        nullTip:'此时间范围内没有统计数据',
+        kpiTitle:'KPI统计图表',
+        allData:'完整统计数据',
+        makeLine:'统计图',
+        time:'时间',
       }
     },
     traceManage: {
@@ -1107,6 +1114,10 @@ export default {
         sysOfficialUrlOpen: '打开官网',
         sysOfficialUrlInstruction: '官网链接地址',
         sysOfficialUrlInstruction1: '开头，如需隐藏不跳转填写',
+        i18n: "国际化切换",
+        i18nOpen: "显示切换",
+        i18nDefault: "默认语言",
+        i18nInstruction: '是否显示国际化切换，设置系统默认语言',
       },
       role:{
         allScopeOptions:'全部数据权限',

src/layouts/BasicLayout.vue

@@ -23,7 +23,8 @@ import { getServerTime } from '@/api';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { onMounted } from 'vue';
 import { parseDateToStr } from '@/utils/date-utils';
-const { t } = useI18n();
+import { parseUrlPath } from '@/plugins/file-static-url';
+const { t, currentLocale } = useI18n();
 const routerStore = useRouterStore();
 const tabsStore = useTabsStore();
 const appStore = useAppStore();
@@ -121,6 +122,35 @@ function fnComponentSetName(component: any, to: any) {
 // 清空导航栏标签
 tabsStore.clear();
 
+// LOGO地址
+const logoUrl = computed(() => {
+  let url =
+    appStore.logoType === 'brand'
+      ? parseUrlPath(appStore.filePathBrand)
+      : parseUrlPath(appStore.filePathIcon);
+
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = currentLocale.value;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang);
+});
+
+// 系统使用手册地址
+const helpDocUrl = computed(() => {
+  let url = parseUrlPath(appStore.helpDoc);
+
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = currentLocale.value;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang);
+});
+
 /**系统使用手册跳转 */
 function fnClickHelpDoc(language?: string) {
   const routeData = router.resolve({ name: 'HelpDoc' });
@@ -220,7 +250,7 @@ document.addEventListener('visibilitychange', function () {
           >
             <img
               class="logo-icon"
-              :src="appStore.getLOGOIcon"
+              :src="logoUrl"
               :alt="appStore.appName"
               :title="appStore.appName"
             />
@@ -231,7 +261,7 @@ document.addEventListener('visibilitychange', function () {
           <template v-if="appStore.logoType === 'brand'">
             <img
               class="logo-brand"
-              :src="appStore.getLOGOBrand"
+              :src="logoUrl"
               :alt="appStore.appName"
               :title="appStore.appName"
             />
@@ -296,12 +326,7 @@ document.addEventListener('visibilitychange', function () {
               >
                 {{ t('loayouts.basic.officialUrl') }}
               </a-button>
-              <a-button
+              <a-button type="link" size="small" @click="fnClickHelpDoc()">
-                type="link"
-                size="small"
-                @click="fnClickHelpDoc()"
-                v-if="appStore.getHelpDoc !== '#'"
-              >
                 {{ t('loayouts.basic.helpDoc') }}
               </a-button>
             </a-space>

src/layouts/components/RightContent.vue

@@ -43,9 +43,6 @@ function fnClickHelpDoc(language?: string) {
   window.open(href, '_blank');
 }
 
-// 兼容旧前端可改配置文件
-const i18nDisable = sessionGet('i18nDisable') === 'false';
-
 /**改变多语言 */
 function fnChangeLocale(e: any) {
   changeLocale(e.key);
@@ -66,7 +63,7 @@ function fnChangeLocale(e: any) {
       </template>
     </a-button>
 
-    <a-tooltip placement="bottom" v-if="appStore.getHelpDoc !== '#'">
+    <a-tooltip placement="bottom">
       <template #title>{{ t('loayouts.rightContent.helpDoc') }}</template>
       <a-button type="text" @click="fnClickHelpDoc()">
         <template #icon>
@@ -88,7 +85,7 @@ function fnChangeLocale(e: any) {
     <a-dropdown
       placement="bottom"
       :trigger="['click', 'hover']"
-      v-if="!i18nDisable"
+      v-if="appStore.i18nOpen"
     >
       <a-button size="small" type="default">
         {{ t('i18n') }}

src/plugins/file-static-url.ts

@@ -0,0 +1,21 @@
+import { sessionGet } from '@/utils/cache-session-utils';
+import { validHttp } from '@/utils/regular-utils';
+
+/**
+ * 解析资源文件绝对路径 http
+ * @param path 服务端资源文件
+ * @returns
+ */
+export function parseUrlPath(path: string) {
+  if (!path || path === '#') {
+    return '#';
+  }
+  if (validHttp(path)) {
+    return path;
+  }
+  // 兼容旧前端可改配置文件
+  const baseUrl = import.meta.env.PROD
+    ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
+    : import.meta.env.VITE_API_BASE_URL;
+  return `${baseUrl}${path}`;
+}

src/store/modules/app.ts

@@ -1,10 +1,9 @@
 import { getSysConf } from '@/api';
-import defaultLOGOIcon from '@/assets/logo_icon.png';
+import { CACHE_LOCAL_I18N } from '@/constants/cache-keys-constants';
-import defaultLOGOBrand from '@/assets/logo_brand.png';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { validHttp } from '@/utils/regular-utils';
+import { parseUrlPath } from '@/plugins/file-static-url';
+import { localGet, localSet } from '@/utils/cache-local-utils';
 import { defineStore } from 'pinia';
-import { sessionGet } from '@/utils/cache-session-utils';
 
 /**应用参数类型 */
 type AppStore = {
@@ -14,6 +13,7 @@ type AppStore = {
   appCode: string;
   /**应用版本 */
   appVersion: string;
+
   /**应用版权声明 */
   copyright: string;
   /**LOGO显示类型 */
@@ -29,6 +29,10 @@ type AppStore = {
   helpDoc: string;
   /**官方网址 */
   officialUrl: string;
+  /**国际化切换 */
+  i18nOpen: boolean;
+  /**国际化默认语言 */
+  i18nDefault: string;
 };
 
 const useAppStore = defineStore('app', {
@@ -36,6 +40,7 @@ const useAppStore = defineStore('app', {
     appName: import.meta.env.VITE_APP_NAME,
     appCode: import.meta.env.VITE_APP_CODE,
     appVersion: import.meta.env.VITE_APP_VERSION,
+
     copyright: `Copyright ©2023 For ${import.meta.env.VITE_APP_NAME}`,
     logoType: 'icon',
     filePathIcon: '',
@@ -44,85 +49,10 @@ const useAppStore = defineStore('app', {
     loginBackground: '',
     helpDoc: '',
     officialUrl: '',
+    i18nOpen: true,
+    i18nDefault: 'en_US',
   }),
-  getters: {
+  getters: {},
-    /**
-     * 获取正确LOGO地址-icon
-     * @param state 内部属性不用传入
-     * @returns LOGO地址url
-     */
-    getLOGOIcon(state) {
-      const path = state.filePathIcon;
-      if (!path || path === '#') {
-        return defaultLOGOIcon;
-      }
-      if (validHttp(path)) {
-        return path;
-      }
-      // 兼容旧前端可改配置文件
-      const baseUrl = import.meta.env.PROD
-        ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
-        : import.meta.env.VITE_API_BASE_URL;
-      return `${baseUrl}${path}`;
-    },
-    /**
-     * 获取正确LOGO地址-brand
-     * @param state 内部属性不用传入
-     * @returns LOGO地址url
-     */
-    getLOGOBrand(state) {
-      const path = state.filePathBrand;
-      if (!path || path === '#') {
-        return defaultLOGOBrand;
-      }
-      if (validHttp(path)) {
-        return path;
-      }
-      // 兼容旧前端可改配置文件
-      const baseUrl = import.meta.env.PROD
-        ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
-        : import.meta.env.VITE_API_BASE_URL;
-      return `${baseUrl}${path}`;
-    },
-    /**
-     * 获取正确登录背景地址
-     * @param state 内部属性不用传入
-     * @returns 背景地址url
-     */
-    getLoginBackground(state) {
-      const path = state.loginBackground;
-      if (!path || path === '#') {
-        return '#';
-      }
-      if (validHttp(path)) {
-        return path;
-      }
-      // 兼容旧前端可改配置文件
-      const baseUrl = import.meta.env.PROD
-        ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
-        : import.meta.env.VITE_API_BASE_URL;
-      return `${baseUrl}${path}`;
-    },
-    /**
-     * 获取正确使用手册地址
-     * @param state 内部属性不用传入
-     * @returns 手册地址url
-     */
-    getHelpDoc(state) {
-      const path = state.helpDoc;
-      if (!path || path === '#') {
-        return '#';
-      }
-      if (validHttp(path)) {
-        return path;
-      }
-      // 兼容旧前端可改配置文件
-      const baseUrl = import.meta.env.PROD
-        ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL
-        : import.meta.env.VITE_API_BASE_URL;
-      return `${baseUrl}${path}`;
-    },
-  },
   actions: {
     /**设置网页标题 */
     setTitle(title?: string) {
@@ -136,16 +66,6 @@ const useAppStore = defineStore('app', {
     setCopyright(text: string) {
       this.copyright = text;
     },
-    /**设置LOGO */
-    setLOGO(type: 'brand' | 'icon', filePath: string) {
-      this.logoType = type;
-      if (type === 'brand') {
-        this.filePathBrand = filePath;
-      }
-      if (type === 'icon') {
-        this.filePathIcon = filePath;
-      }
-    },
     // 获取系统配置信息
     async fnSysConf() {
       const res = await getSysConf();
@@ -156,16 +76,30 @@ const useAppStore = defineStore('app', {
         this.filePathIcon = res.data.filePathIcon;
         this.filePathBrand = res.data.filePathBrand;
         // 修改html内容-小图当作favicon.ico
-        if (this.logoType) { 
+        if (this.logoType) {
           const iconDom = document.querySelector("link[rel~='icon']");
           if (iconDom) {
-            iconDom.setAttribute('href', this.getLOGOIcon);
+            let url = parseUrlPath(this.filePathIcon);
+            // 语言参数替换
+            if (url.indexOf('{language}') !== -1) {
+              const local = localGet(CACHE_LOCAL_I18N) || 'en_US';
+              const lang = local.split('_')[0];
+              url = url.replace('{language}', lang);
+            }
+            iconDom.setAttribute('href', url);
           }
         }
         this.registerUser = res.data.registerUser === 'true';
         this.loginBackground = res.data.loginBackground;
         this.helpDoc = res.data.helpDoc;
         this.officialUrl = res.data.officialUrl;
+        this.i18nOpen = res.data.i18nOpen === 'true';
+        this.i18nDefault = res.data.i18nDefault;
+        // 切换禁用时，设置默认语言
+        const localI18n = localGet(CACHE_LOCAL_I18N);
+        if (localI18n == null || (!this.i18nOpen && this.i18nDefault)) {
+          localSet(CACHE_LOCAL_I18N, this.i18nDefault);
+        }
       }
       return res;
     },

src/views/configManage/configParamTreeTable/index.vue

@@ -815,85 +815,40 @@ function arrayChildAddOk(from: Record<string, any>) {
 
 /**多列表新增行数据初始化 */
 function arrayAddInit(data: any[], dataRule: any) {
-  const len = data.length;
-  let lastItme: Record<string, any> = {};
   let newIndex = 0;
-  // 无数据时生成临时记录
+
-  if (len === 0) {
+  // 有数据时取得最后的index
-    lastItme = dataRule;
+  if (data.length !== 0) {
-  } else {
+    const lastFrom = Object.assign({}, JSON.parse(JSON.stringify(data.at(-1))));
-    lastItme = data[len - 1];
+    if (lastFrom.record.length > 0) {
+      newIndex = parseInt(lastFrom.key);
+    }
   }
-  const from = Object.assign({}, JSON.parse(JSON.stringify(lastItme)));
+
-  for (const row of from.record) {
+  const ruleFrom = Object.assign({}, JSON.parse(JSON.stringify(dataRule)));
+  for (const row of ruleFrom.record) {
     const value = row.value;
     if (row.name === 'index') {
-      if (value !== '') {
+      if (newIndex !== 0) {
-        newIndex = parseInt(value) + 1;
+        newIndex += 1;
+      } else {
+        newIndex = parseInt(value);
       }
       if (isNaN(newIndex)) {
         newIndex = 0;
       }
       row.value = newIndex;
-      from.key = newIndex;
+      ruleFrom.key = newIndex;
-      from.title = `Index-${newIndex}`;
+      ruleFrom.title = `Index-${newIndex}`;
       continue;
     }
     // 子嵌套的不初始
     if (row.array) {
-      row.value = null;
+      row.value = [];
       continue;
     }
-    const type = row.type;
-    const filter = row.filter;
-    switch (type) {
-      case 'int':
-        if (filter && filter.indexOf('~') !== -1) {
-          const filterArr = filter.split('~');
-          const minInt = parseInt(filterArr[0]);
-          row.value = minInt;
-        } else {
-          row.value = 0;
-        }
-        break;
-      case 'enum':
-        if (filter && filter.indexOf('{') === 0) {
-          let filterJson: Record<string, any> = {};
-          try {
-            filterJson = JSON.parse(filter); //string---json
-          } catch (error) {
-            console.error(error);
-          }
-
-          row.value = Object.keys(filterJson)[0];
-        } else {
-          row.value = '0';
-        }
-        break;
-      case 'bool':
-        if (filter && filter.indexOf('{') === 0) {
-          let filterJson: Record<string, any> = {};
-          try {
-            filterJson = JSON.parse(filter); //string---json
-          } catch (error) {
-            console.error(error);
-          }
-
-          row.value = Object.keys(filterJson)[0];
-        } else {
-          row.value = false;
-        }
-        break;
-      case 'ipv4':
-      case 'ipv6':
-      case 'regex':
-      default:
-        row.value = '';
-        break;
-    }
   }
-
+  return ruleFrom;
-  return from;
 }
 
 /**规则校验 */
@@ -1366,7 +1321,7 @@ onMounted(() => {
                         </a-button>
                         <!--特殊字段拓展显示-->
                         <span v-if="text.name === 'dnnList'">
-                          ({{ text.value.map((s: any) => s.dnn).join() }})
+                          ({{ text.value?.map((s: any) => s.dnn).join() }})
                         </span>
                       </template>
 

src/views/configManage/softwareManage/index.vue

@@ -448,7 +448,7 @@ const modalStateFrom = Form.useForm(
     ],
     comment: [
       {
-        required: true,
+        required: false,
         message: t('views.configManage.softwareManage.updateCommentPlease'),
       },
     ],
@@ -529,10 +529,19 @@ function fnBeforeUploadFile(file: FileType) {
   const fileName = file.name;
   const suff = fileName.substring(fileName.lastIndexOf('.'));
   if (!['.deb', '.rpm'].includes(suff)) {
-    message.error(t('views.configManage.softwareManage.onlyAble',{fileText:'(.deb、.rpm)'}), 3);
+    message.error(
-
+      t('views.configManage.softwareManage.onlyAble', {
+        fileText: '(.deb、.rpm)',
+      }),
+      3
+    );
     return false;
   }
+  // 根据给定的软件名取版本号 ims-r2.2312.8_u18.deb
+  const nameArr = fileName.split('.')
+  if(nameArr.length > 3) {
+    modalState.from.version = nameArr[1]
+  }
   return true;
 }
 
@@ -552,7 +561,10 @@ function fnBeforeUploadCms(file: FileType) {
   const fileName = file.name;
   const suff = fileName.substring(fileName.lastIndexOf('.'));
   if (!['.cms'].includes(suff)) {
-    message.error(t('views.configManage.softwareManage.onlyAble',{fileText:'(.cms)'}), 3);
+    message.error(
+      t('views.configManage.softwareManage.onlyAble', { fileText: '(.cms)' }),
+      3
+    );
     return false;
   }
   return true;

src/views/index.vue

@@ -92,7 +92,7 @@ let tableState: TabeStateType = reactive({
 /**表格状态 */
 let nfInfo: any = reactive({
   obj: 'OMC',
-  version: '2.2311.8',
+  version: '2.2312.8',
   status: t('views.index.normal'),
   number: '',
   outTimeDate: '',
@@ -141,9 +141,9 @@ let pronInfo: nfStateType = reactive({
 });
 
 /**查询网元状态列表 */
-function fnGetList() {
+function fnGetList(one: boolean) {
   if (tableState.loading) return;
-  tableState.loading = true;
+  one && (tableState.loading = true);
   listMain().then(res => {
     tableState.data = res;
     tableState.loading = false;
@@ -174,6 +174,7 @@ function fnGetList() {
         orient: 'vertical',
         left: 'left',
       },
+      color: ['#91cc75', '#ee6666'],
       series: [
         {
           name: t('views.index.realNeStatus'),
@@ -393,8 +394,8 @@ function fnLocale() {
 
 onMounted(() => {
   fnLocale();
-  fnGetList();
+  fnGetList(true);
-  timer = setInterval(fnGetList, 10000); // 每隔10秒执行一次
+  timer = setInterval(() => fnGetList(false), 10000); // 每隔10秒执行一次
 });
 
 // 在组件卸载之前清除定时器

src/views/login.vue

@@ -8,8 +8,8 @@ import { useRouter, useRoute } from 'vue-router';
 import useI18n from '@/hooks/useI18n';
 import { toRaw } from 'vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { sessionGet } from '@/utils/cache-session-utils';
+import { parseUrlPath } from '@/plugins/file-static-url';
-const { t, changeLocale, optionsLocale } = useI18n();
+const { t, changeLocale, optionsLocale, currentLocale } = useI18n();
 const appStore = useAppStore();
 const router = useRouter();
 const route = useRoute();
@@ -87,9 +87,25 @@ function fnGetCaptcha() {
   });
 }
 
+// LOGO地址
+const logoUrl = computed(() => {
+  let url =
+    appStore.logoType === 'brand'
+      ? parseUrlPath(appStore.filePathBrand)
+      : parseUrlPath(appStore.filePathIcon);
+
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = currentLocale.value;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang);
+});
+
 // 判断是否有背景地址
 const calcBG = computed(() => {
-  const bgURL = appStore.getLoginBackground;
+  const bgURL = parseUrlPath(appStore.loginBackground);
   if (bgURL && bgURL !== '#') {
     return {
       backgroundImage: `url(${bgURL})`,
@@ -116,9 +132,6 @@ onMounted(() => {
   fnGetCaptcha();
 });
 
-// 兼容旧前端可改配置文件
-const i18nDisable = sessionGet('i18nDisable') === 'false';
-
 /**改变多语言 */
 function fnChangeLocale(e: any) {
   changeLocale(e.key);
@@ -137,19 +150,11 @@ function fnChangeLocale(e: any) {
 
     <header class="header">
       <template v-if="appStore.logoType === 'icon'">
-        <img
+        <img :src="logoUrl" class="logo-icon" :alt="appStore.appName" />
-          :src="appStore.getLOGOIcon"
-          class="logo-icon"
-          :alt="appStore.appName"
-        />
         <span class="title">{{ appStore.appName }}</span>
       </template>
       <template v-if="appStore.logoType === 'brand'">
-        <img
+        <img :src="logoUrl" class="logo-brand" :alt="appStore.appName" />
-          :src="appStore.getLOGOBrand"
-          class="logo-brand"
-          :alt="appStore.appName"
-        />
       </template>
     </header>
 
@@ -274,7 +279,7 @@ function fnChangeLocale(e: any) {
           justify="space-between"
           align="middle"
           style="margin-top: 18px"
-          v-if="!i18nDisable"
+          v-if="appStore.i18nOpen"
         >
           <a-col :offset="18" :span="6">
             <a-dropdown :trigger="['click', 'hover']">
@@ -374,6 +379,7 @@ function fnChangeLocale(e: any) {
   }
   .logo-brand {
     height: 48px;
+    width: 174px;
     vertical-align: top;
     border-style: none;
     border-radius: 2px;

src/views/mmlManage/neOperate/index.vue

@@ -151,16 +151,17 @@ function fnSendMML() {
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
   const [neType, neId] = state.neType;
   sendMMlByNE(neType, neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultArr = res.data;
-      for (const str of resultArr) {
+      for (let i = 0; i < resultArr.length; i++) {
+        const str = resultArr[i];
         const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        state.mmlCmdLog += `${logStr}\n`;
+        const cmdStr = cmdArr[i];
+        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
       }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;

src/views/mmlManage/omcOperate/index.vue

@@ -148,15 +148,16 @@ function fnSendMML() {
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
   sendMMlByOMC(state.neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultArr = res.data;
-      for (const str of resultArr) {
+      for (let i = 0; i < resultArr.length; i++) {
+        const str = resultArr[i];
         const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        state.mmlCmdLog += `${logStr}\n`;
+        const cmdStr = cmdArr[i]
+        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`; 
       }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;

src/views/mmlManage/udmOperate/index.vue

@@ -148,15 +148,16 @@ function fnSendMML() {
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
   sendMMlByUDM(state.neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
       let resultArr = res.data;
-      for (const str of resultArr) {
+      for (let i = 0; i < resultArr.length; i++) {
+        const str = resultArr[i];
         const logStr = str.replace(/(\r\n|\n)/g, '\n');
-        state.mmlCmdLog += `${logStr}\n`;
+        const cmdStr = cmdArr[i];
+        state.mmlCmdLog += `${cmdStr}\n${logStr}\n`;
       }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;

src/views/monitor/online/index.vue

@@ -118,7 +118,7 @@ let tablePagination = {
   showSizeChanger: true,
   /**数据总数 */
   total: 0,
-  showTotal: (total: number) => `总共 ${total} 条`,
+  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
   onChange: (page: number, pageSize: number) => {
     tablePagination.current = page;
     tablePagination.pageSize = pageSize;

src/views/neUser/ims/index.vue

@@ -72,12 +72,14 @@ let tableColumns: ColumnsType = [
   {
     title: 'IMSI',
     dataIndex: 'imsi',
+    sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
     align: 'center',
     width: 150,
   },
   {
     title: 'MSISDN',
     dataIndex: 'msisdn',
+    sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
     align: 'center',
     width: 150,
   },

src/views/neUser/n3iwf/index.vue

@@ -61,20 +61,21 @@ let tableColumns: ColumnsType = [
   {
     title: 'IMSI',
     dataIndex: 'imsi',
+    sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
     align: 'center',
     width: 150,
   },
   {
-    title: 'ActiveTime',
+    title: 'Active Time',
     dataIndex: 'activeTime',
     align: 'center',
     width: 150,
   },
   {
-    title: 'RegState',
+    title: 'Registration State	',
     dataIndex: 'regState',
     align: 'center',
-    width: 100,
+    width: 150,
   },
   {
     title: 'Network Access Identity',

src/views/neUser/pcf/index.vue

@@ -82,6 +82,7 @@ let tableColumns: ColumnsType = [
   {
     title: 'MSISDN',
     dataIndex: 'msisdn',
+    sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
     align: 'center',
     width: 150,
   },
@@ -382,7 +383,7 @@ function fnExportList(type: string) {
   message.loading({ content: t('common.loading'), key });
   exportRule({
     neId: neID,
-    type: type,
+    fileType: type,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       message.success({
@@ -408,6 +409,11 @@ function fnGetList() {
   listRules(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tableState.data = res.rows;
+    } else {
+      message.warning({
+        content: `${res.msg}`,
+        duration: 3,
+      });
     }
     tableState.loading = false;
   });
@@ -458,15 +464,19 @@ function fnModalUploadImportUpload(file: File) {
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         return importRuleData({
-          type: 'txt',
           neId: neID,
           filePath: res.data,
+          fileType: 'txt',
         });
       }
       return res;
     })
     .then(res => {
-      uploadImportState.msg = res.msg;
+      if (res.code === RESULT_CODE_SUCCESS && res.data?.detail) {
+        uploadImportState.msg = res.data?.detail;
+      } else {
+        uploadImportState.msg = res.msg;
+      }
     })
     .finally(() => {
       hide();
@@ -584,7 +594,7 @@ onMounted(() => {
             @click.prevent="fnModalVisibleByBatch('update')"
           >
             <template #icon>
-              <DeleteOutlined />
+              <FormOutlined />
             </template>
             {{ t('views.neUser.pcf.batchUpdateText') }}
           </a-button>

src/views/neUser/ue/index.vue

@@ -73,6 +73,7 @@ let tableColumns: ColumnsType = [
     title: 'IMSI',
     dataIndex: 'imsi',
     align: 'center',
+    sorter: (a: any, b: any) => Number(a.imsi) - Number(b.imsi),
     customRender(opt) {
       const idx = opt.value.lastIndexOf('-');
       if (idx != -1) {
@@ -81,11 +82,13 @@ let tableColumns: ColumnsType = [
       return opt.value;
     },
     width: 150,
+   
   },
   {
     title: 'MSISDN',
     dataIndex: 'msisdn',
     align: 'center',
+    sorter: (a: any, b: any) => Number(a.msisdn) - Number(b.msisdn),
     customRender(opt) {
       const idx = opt.value.lastIndexOf('-');
       if (idx != -1) {

src/views/perfManage/goldTarget/index.vue

@@ -1,63 +1,33 @@
 <script setup lang="ts">
-import { useRoute } from 'vue-router';
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { Modal } from 'ant-design-vue/lib';
+import { message, Form } from 'ant-design-vue/lib';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/lib/table';
-import { parseDateToStr } from '@/utils/date-utils';
+import { SizeType } from 'ant-design-vue/lib/config-provider';
+import ChartLine from '@/components/ChartLine/index.vue';
+import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
+import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listgoldData } from '@/api/perfManage/goldTarget';
 import useNeInfoStore from '@/store/modules/neinfo';
-import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
-const { getDict } = useDictStore();
+import { getGoldTitleByNE, goldData } from '@/api/perfManage/goldTarget';
-const { t } = useI18n();
+import { parseDateToStr } from '@/utils/date-utils';
-const route = useRoute();
 
-/**路由标题 */
+const { t, currentLocale } = useI18n();
-let title = ref<string>((route.meta.title as string) ?? '标题');
+
+/**网元参数 */
+let neCascaderOptions = ref<Record<string, any>[]>([]);
 
 /**记录开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);
 
-/**查询参数 */
+/**表格字段列排序 */
-let queryParams = reactive({
+let tableColumnsDnd = ref<ColumnsType>([]);
-  /**网元类型 */
-  neType: '',
-  /**记录时间 */
-  beginTime: '',
-  endTime: '',
-  /**排序字段 */
-  sortField: 'value',
-  /**排序方式 */
-  sortOrder: 'asc',
-  /**当前页数 */
-  pageNum: 1,
-  /**每页条数 */
-  pageSize: 20,
-});
-
-/**查询参数重置 */
-function fnQueryReset() {
-  queryParams = Object.assign(queryParams, {
-    neType: '',
-    beginTime: '',
-    endTime: '',
-    sortField: 'value',
-    sortOrder: 'asc',
-    pageNum: 1,
-    pageSize: 20,
-  });
-  queryRangePicker.value = ['', ''];
-  tablePagination.current = 1;
-  tablePagination.pageSize = 20;
-  fnGetList();
-}
 
 /**表格状态类型 */
 type TabeStateType = {
+  /**表格列 */
+  tableColumns: object[];
   /**加载等待 */
   loading: boolean;
   /**紧凑型 */
@@ -70,53 +40,13 @@ type TabeStateType = {
 
 /**表格状态 */
 let tableState: TabeStateType = reactive({
+  tableColumns: [],
   loading: false,
   size: 'middle',
   seached: true,
   data: [],
 });
 
-/**表格字段列 */
-let tableColumns: ColumnsType = [
-  {
-    title: t('views.perfManage.goldTarget.type'),
-    dataIndex: 'neType',
-    align: 'center',
-  },
-  {
-    title: t('views.perfManage.goldTarget.enTitle'),
-    dataIndex: 'enTitle',
-    align: 'center',
-  },
-  {
-    title: t('views.perfManage.goldTarget.value'),
-    dataIndex: 'value',
-    key: 'value',
-    align: 'center',
-    sorter: true,
-  },
-  {
-    title: t('views.perfManage.goldTarget.startTime'),
-    dataIndex: 'startTime',
-    key: 'start_time',
-    align: 'center',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
-    sorter: true,
-  },
-  {
-    title: t('views.perfManage.goldTarget.endTime'),
-    dataIndex: 'endTime',
-    align: 'center',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
-  },
-];
-
 /**表格分页器参数 */
 let tablePagination = reactive({
   /**当前页数 */
@@ -150,45 +80,249 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询黄金指标列表, pageNum初始页数 */
+/**查询参数 */
-function fnGetList(pageNum?: number) {
+let queryParams: any = reactive({
-  if (tableState.loading) return;
+  /**卡片切换Flag */
-  tableState.loading = true;
+  cardFlag: 0,   //0-显示统计图 1-显示统计表  
-  if (pageNum) {
+  /**告警设备类型 */
-    queryParams.pageNum = pageNum;
+  neType: '',
+  /**告警网元标识 */
+  neId: '',
+  /**颗粒度 */
+  particle: '15',
+  beginTime: '',
+  endTime: '',
+});
+
+/**图表显示数据 */
+const chartsOption = reactive({
+  /**性能指标 */
+  perfChart: {},
+});
+
+/**对象信息状态类型 */
+type StateType = {
+  /**网元类型 */
+  neType: string[];
+  /**制表网元类型 */
+  designNeType: string;
+  /**黄金指标集 tree */
+  designTreeData: any[];
+  /**表单数据 */
+  from: Record<string, any>;
+};
+
+/**对象信息状态 */
+let state: StateType = reactive({
+  neType: [],
+  designNeType: '',
+  designTreeData: [],
+  from: {
+    uploadLoading: false,
+    sendLoading: false,
+  },
+});
+
+/**网元类型选择对应修改 */
+function fnNeChange(keys: any, _: any) {
+  // 不是同类型时需要重新加载
+  if (state.designNeType !== keys[0]) {
+    state.designTreeData = [];
+    queryParams.cardFlag = 0;
+    fnGetList();
   }
+}
+
+/**查询可选命令列表 */
+function fnGetList() {
+  const neType = queryParams.neType[0];
+  state.designNeType = neType;
+  var language = currentLocale.value.split('_')[0];
+  if (language === 'zh') language = 'cn';
+  getGoldTitleByNE(neType).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      // 构建树结构
+      const treeArr: Record<string, any>[] = [];
+      for (const item of res.data) {
+        const id = item['id'];
+        const kpiDisplay = item[`${language}Title`];
+        const kpiValue = item[`kpiId`];
+        treeArr.push({
+          key: kpiValue,
+          title: kpiDisplay,
+        });
+      }
+      state.designTreeData = treeArr;
+    } else {
+      message.warning({
+        content: t('common.getInfoFail'),
+        duration: 2,
+      });
+    }
+  });
+  fnDesign();
+}
+
+/**根据 key 查找对应的 title */
+function findTitleByKey(key: string): string | undefined {
+  const item = state.designTreeData.find(item => item.key === key);
+  return item ? item.title : undefined;
+}
+
+/**筛选条件进行制图 */
+function fnMakeTable(flag: any) {
+  queryParams.cardFlag = flag;
+  fnDesign();
+}
+
+/**筛选条件进行制图 */
+function fnDesign() {
+  //当前界面是表格界面
+  const columnsArr = state.designTreeData.map(item => {
+    return {
+      title: item.title,
+      dataIndex: item.key,
+      align: 'center',
+    };
+  });
+  tableState.tableColumns = columnsArr;
+  tableState.tableColumns.unshift({
+    title: t('views.perfManage.perfData.neName'),
+    dataIndex: 'neName',
+    align: 'center',
+  });
+  tableState.tableColumns.push({
+    title: t('views.perfManage.goldTarget.time'),
+    dataIndex: 'timeGroup',
+    align: 'center',
+  });
   if (!queryRangePicker.value) {
     queryRangePicker.value = ['', ''];
   }
   queryParams.beginTime = queryRangePicker.value[0];
   queryParams.endTime = queryRangePicker.value[1];
-  listgoldData(toRaw(queryParams)).then(res => {
+  const neType = queryParams.neType[0];
-    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+  let goldXDate: any = [];
-      tablePagination.total = res.total;
+  let goldYData: any = [];
-      tableState.data = res.rows;
+  goldData(queryParams).then(res => {
-    }
+    if (res.code === RESULT_CODE_SUCCESS) {
-    tableState.loading = false;
+      if (res.data.length > 0) {
-  });
+        tableState.data = res.data;
-}
+        tablePagination.total = res.data.length;
+        goldXDate = res.data.map((item: any) => item.timeGroup);
+        goldYData = Object.keys(res.data[0])
+          .filter(key => !['timeGroup', 'neName', 'startIndex'].includes(key))
+          .map(key => {
+            const title: any = findTitleByKey(key);
+            return {
+              name: title,
+              data: res.data.map((item: any) => parseInt(item[key])),
+            };
+          });
+      } else {
+        tableState.data = [];
+        tablePagination.total = 0;
+        state.designTreeData.forEach((item: any) => {
+          goldYData.push({ name: item.title, data: [] });
+        });
+        message.warning({
+          content: t('views.perfManage.goldTarget.nullTip'),
+          duration: 2,
+        });
+      }
 
-/**表格分页、排序、筛选变化时触发操作, 排序方式，取值为 ascend descend */
+      // 图标参数
-function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
+      const option = {
-  console.log(sorter);
+        xDatas: goldXDate,
-  const { columnKey, order } = sorter;
+        yDatas: goldYData,
-  if (order) {
+        tooltip: {
-    queryParams.sortField = columnKey;
+          trigger: 'axis',
-    queryParams.sortOrder = order.replace('end', '');
+          formatter: function (datas: any) {
-  } else {
+            let res = datas[0].name + '<br/>';
-    queryParams.sortOrder = 'asc';
+            for (const item of datas) {
-  }
+              res += `${item.marker} ${item.seriesName}:${item.data}<br/>`;
-  fnGetList(1);
+            }
+            return res;
+          },
+        },
+        legend: {
+          right: 10,
+          itemWidth: 8,
+          textStyle: {
+            color: '#646A73',
+          },
+          icon: 'circle',
+        },
+        grid: {
+          left: '10%',
+          right: '5%',
+          bottom: '20%',
+        },
+        yAxis: [
+          { type: 'value', axisLabel: { fontSize: 10 } },
+          {
+            type: 'value',
+            position: 'right',
+            alignTicks: true,
+            axisLabel: {
+              fontSize: 10,
+            },
+          },
+        ],
+      };
+      chartsOption.perfChart = option;
+
+      //处理表格数据
+    } else {
+      message.warning({
+        content: t('common.getInfoFail'),
+        duration: 2,
+      });
+    }
+  });
 }
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore().fnNelist();
+  useNeInfoStore()
-  // 获取列表数据
+    .fnNelist()
-  fnGetList();
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.data.length > 0) {
+          // 过滤不可用的网元
+          neCascaderOptions.value = useNeInfoStore().getNeCascaderOtions.filter(
+            (item: any) => {
+              return !['OMC'].includes(item.value);
+            }
+          );
+          // 默认选择AMF
+          const item = neCascaderOptions.value.find(s => s.value === 'UPF');
+          if (item && item.children) {
+            const info = item.children[0];
+            queryParams.neType = [info.neType, info.neId];
+          } else {
+            const info = neCascaderOptions.value[0].children[0];
+            queryParams.neType = [info.neType, info.neId];
+          }
+          const initTime: Date = new Date();
+          const startTime: Date = new Date(initTime);
+          startTime.setHours(0, 0, 0, 0); // 设置为今天的0点
+          const endTime: Date = new Date(initTime);
+          endTime.setHours(23, 59, 59, 59); // 设置为今天的12点
+
+          queryRangePicker.value = [
+            parseDateToStr(startTime),
+            parseDateToStr(endTime),
+          ];
+          fnGetList();
+        }
+      } else {
+        message.warning({
+          content: t('common.noData'),
+          duration: 2,
+        });
+      }
+    });
 });
 </script>
 
@@ -200,48 +334,59 @@ onMounted(() => {
       :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
     >
       <!-- 表格搜索栏 -->
-      <a-form :model="queryParams" name="queryParams" layout="horizontal">
+      <a-form :model="queryParams" name="queryParamsFrom" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.perfManage.goldTarget.type')"
               name="neType"
+              :label="t('views.traceManage.task.neType')"
             >
-              <a-auto-complete
+              <a-cascader
                 v-model:value="queryParams.neType"
-                :options="useNeInfoStore().getNeSelectOtions"
+                :options="neCascaderOptions"
-                allow-clear
+                @change="fnNeChange"
+                :allow-clear="false"
+                :placeholder="t('common.selectPlease')"
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
+          <a-col :lg="10" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.perfManage.goldTarget.startTime')"
+              :label="t('views.perfManage.goldTarget.timeFrame')"
-              name="queryRangePicker"
+              name="eventTime"
             >
               <a-range-picker
                 v-model:value="queryRangePicker"
-                allow-clear
-                bordered
-                show-time
                 value-format="YYYY-MM-DD HH:mm:ss"
                 format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
+                :allow-clear="false"
-              ></a-range-picker>
+                show-time
+              />
             </a-form-item>
           </a-col>
-
+          <a-col :lg="4" :md="12" :xs="24">
-          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.goldTarget.particle')"
+              name="particle"
+            >
+              <a-select
+                v-model:value="queryParams.particle"
+                :placeholder="t('common.selectPlease')"
+                :options="[
+                  { label: '15M', value: '15' },
+                  { label: '30M', value: '30' },
+                  { label: '60M', value: '60' },
+                ]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="2" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
+                <a-button type="primary" @click.prevent="fnDesign()">
                   <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
               </a-space>
             </a-form-item>
           </a-col>
@@ -249,86 +394,110 @@ onMounted(() => {
       </a-form>
     </a-card>
 
-    <a-card :bordered="false" :body-style="{ padding: '0px' }">
+    <template v-if="queryParams.cardFlag">
-      <!-- 插槽-卡片左侧侧 -->
+      <a-card :bordered="false" :body-style="{ padding: '0px' }">
-      <template #title> </template>
+        <!-- 插槽-卡片左侧侧 -->
+        <template #title>
+          <a-button type="primary" @click.prevent="fnMakeTable(0)">
+            <template #icon> <area-chart-outlined /> </template>
+            {{ t('views.perfManage.goldTarget.kpiTitle') }}
+          </a-button>
+        </template>
 
+        <!-- 插槽-卡片右侧 -->
+        <template #extra>
+          <a-space :size="8" align="center">
+            <a-tooltip>
+              <template #title>{{ t('common.searchBarText') }}</template>
+              <a-switch
+                v-model:checked="tableState.seached"
+                :checked-children="t('common.switch.show')"
+                :un-checked-children="t('common.switch.hide')"
+                size="small"
+              />
+            </a-tooltip>
+            <a-tooltip>
+              <template #title>{{ t('common.reloadText') }}</template>
+              <a-button type="text" @click.prevent="fnGetList()">
+                <template #icon><ReloadOutlined /></template>
+              </a-button>
+            </a-tooltip>
+            <TableColumnsDnd
+              :columns="tableState.tableColumns"
+              v-model:columns-dnd="tableColumnsDnd"
+            ></TableColumnsDnd>
+            <a-tooltip>
+              <template #title>{{ t('common.sizeText') }}</template>
+              <a-dropdown trigger="click" placement="bottomRight">
+                <a-button type="text">
+                  <template #icon><ColumnHeightOutlined /></template>
+                </a-button>
+                <template #overlay>
+                  <a-menu
+                    :selected-keys="[tableState.size as string]"
+                    @click="fnTableSize"
+                  >
+                    <a-menu-item key="default">
+                      {{ t('common.size.default') }}
+                    </a-menu-item>
+                    <a-menu-item key="middle">
+                      {{ t('common.size.middle') }}
+                    </a-menu-item>
+                    <a-menu-item key="small">
+                      {{ t('common.size.small') }}
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+            </a-tooltip>
+          </a-space>
+        </template>
+
+        <!-- 表格列表 -->
+        <a-table
+          class="table"
+          row-key="id"
+          :columns="tableColumnsDnd"
+          :loading="tableState.loading"
+          :data-source="tableState.data"
+          :size="tableState.size"
+          :pagination="tablePagination"
+          :scroll="{ x: true }"
+        >
+        </a-table>
+      </a-card>
+    </template>
+
+    <a-card :bordered="false" :body-style="{ marginBottom: '24px' }" v-else>
+      <!-- 插槽-卡片左侧侧 -->
+      <template #title>{{
+        t('views.perfManage.goldTarget.kpiTitle')
+      }}</template>
       <!-- 插槽-卡片右侧 -->
       <template #extra>
         <a-space :size="8" align="center">
-          <a-tooltip>
+          <a-button type="default" size="small" @click.prevent="fnMakeTable(1)">
-            <template #title>{{ t('common.searchBarText') }}</template>
+            <template #icon>
-            <a-switch
+              <ClearOutlined />
-              v-model:checked="tableState.seached"
+            </template>
-              :checked-children="t('common.switch.show')"
+            {{ t('views.perfManage.goldTarget.allData') }}
-              :un-checked-children="t('common.switch.hide')"
+          </a-button>
-              size="small"
-            />
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList()">
-              <template #icon><ReloadOutlined /></template>
-            </a-button>
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.sizeText') }}</template>
-            <a-dropdown trigger="click" placement="bottomRight">
-              <a-button type="text">
-                <template #icon><ColumnHeightOutlined /></template>
-              </a-button>
-              <template #overlay>
-                <a-menu
-                  :selected-keys="[tableState.size as string]"
-                  @click="fnTableSize"
-                >
-                  <a-menu-item key="default">
-                    {{ t('common.size.default') }}
-                  </a-menu-item>
-                  <a-menu-item key="middle">
-                    {{ t('common.size.middle') }}
-                  </a-menu-item>
-                  <a-menu-item key="small">
-                    {{ t('common.size.small') }}
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </a-tooltip>
         </a-space>
       </template>
-
+      <div class="chart">
-      <!-- 表格列表 -->
+        <ChartLine
-      <a-table
+          :option="chartsOption.perfChart"
-        class="table"
+          :dataZoom="true"
-        row-key="id"
+          height="400px"
-        :columns="tableColumns"
+        ></ChartLine>
-        :loading="tableState.loading"
+      </div>
-        :data-source="tableState.data"
-        :size="tableState.size"
-        @change="fnTableChange"
-        :pagination="tablePagination"
-        :scroll="{ x: true }"
-      >
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'alarmTitle'">
-            <a-tooltip>
-              <template #title>{{ record.operResult }}</template>
-              <div class="alarmTitleText">{{ record.alarmTitle }}</div>
-            </a-tooltip>
-          </template>
-        </template>
-      </a-table>
     </a-card>
   </PageContainer>
 </template>
 
 <style lang="less" scoped>
-.table :deep(.ant-pagination) {
+.chart {
-  padding: 0 24px;
+  width: 100%;
-}
+  height: 400px;
-.alarmTitleText {
-  max-width: 300px;
-  cursor: pointer;
 }
 </style>

src/views/perfManage/perfData/index.vue

@@ -352,14 +352,6 @@ onMounted(() => {
         @change="fnTableChange"
         :scroll="{ x: true }"
       >
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'alarmTitle'">
-            <a-tooltip>
-              <template #title>{{ record.operResult }}</template>
-              <div class="alarmTitleText">{{ record.alarmTitle }}</div>
-            </a-tooltip>
-          </template>
-        </template>
       </a-table>
     </a-card>
   </PageContainer>
@@ -369,8 +361,4 @@ onMounted(() => {
 .table :deep(.ant-pagination) {
   padding: 0 24px;
 }
-.alarmTitleText {
-  max-width: 300px;
-  cursor: pointer;
-}
 </style>

src/views/perfManage/perfThreshold/index.vue

@@ -322,7 +322,7 @@ function fnModalVisibleByEdit(id?: string) {
  * 进行表达规则校验
  */
 function fnModalOk() {
-  console.log(modalState.from);
+  //console.log(modalState.from);
   modalStateFrom
     .validate()
     .then(e => {

src/views/register.vue

@@ -1,14 +1,15 @@
 <script lang="ts" setup>
 import { GlobalFooter } from 'antdv-pro-layout';
 import { Modal, message } from 'ant-design-vue/lib';
-import { onMounted, reactive, toRaw } from 'vue';
+import { computed, onMounted, reactive, toRaw } from 'vue';
 import { register } from '@/api/login';
 import { regExpPasswd, regExpUserName } from '@/utils/regular-utils';
 import { useRouter, useRoute } from 'vue-router';
 import useAppStore from '@/store/modules/app';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-const { t } = useI18n();
+import { parseUrlPath } from '@/plugins/file-static-url';
+const { t, currentLocale } = useI18n();
 const router = useRouter();
 const route = useRoute();
 const appStore = useAppStore();
@@ -70,6 +71,22 @@ function fnFinish() {
     });
 }
 
+// LOGO地址
+const logoUrl = computed(() => {
+  let url =
+    appStore.logoType === 'brand'
+      ? parseUrlPath(appStore.filePathBrand)
+      : parseUrlPath(appStore.filePathIcon);
+
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = currentLocale.value;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang);
+});
+
 /**
  * 国际化翻译转换
  */
@@ -92,11 +109,11 @@ onMounted(() => {
       <div class="header">
         <a href="/" target="_self">
           <template v-if="appStore.logoType === 'icon'">
-            <img :src="appStore.getLOGOIcon" class="logo" alt="logo" />
+            <img :src="logoUrl" class="logo" alt="logo" />
             <span class="title">{{ appStore.appName }}</span>
           </template>
           <template v-if="appStore.logoType === 'brand'">
-            <img :src="appStore.getLOGOBrand" class="logo" alt="logo" />
+            <img :src="logoUrl" class="logo" alt="logo" />
           </template>
         </a>
       </div>
@@ -205,7 +222,6 @@ onMounted(() => {
   width: 100%;
   min-height: 100%;
   padding: 110px 0 144px;
-  background-image: url(../assets/background.svg);
   background-repeat: no-repeat;
   background-position: center 110px;
   background-size: 100%;

src/views/system/dept/index.vue

@@ -192,7 +192,7 @@ const modalStateFrom = Form.useForm(
       {
         required: true,
         min: 1,
-        max: 30,
+        max: 50,
         message: t('views.system.dept.className') + t('common.unableNull'),
       },
     ],
@@ -621,26 +621,34 @@ onMounted(() => {
       :title="modalState.title"
       @cancel="fnModalCancel"
     >
-      <a-form layout="horizontal">
+      <a-form layout="horizontal" :label-col="{ span: 6 }" :labelWrap="true">
+        <a-form-item
+          :label="t('views.system.dept.highClass')"
+          name="parentId"
+          :label-col="{ span: 3 }"
+          :labelWrap="true"
+        >
+          <a-tree-select
+            :value="modalState.from.parentId"
+            disabled
+            :tree-data="modalState.treeData"
+            :field-names="{
+              children: 'children',
+              label: 'deptName',
+              value: 'deptId',
+            }"
+            tree-node-label-prop="deptName"
+          >
+            <template #suffixIcon></template>
+          </a-tree-select>
+        </a-form-item>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.system.dept.highClass')"
+              :label="t('views.system.dept.className')"
-              name="parentId"
+              name="deptName"
             >
-              <a-tree-select
+              {{ modalState.from.deptName }}
-                :value="modalState.from.parentId"
-                disabled
-                :tree-data="modalState.treeData"
-                :field-names="{
-                  children: 'children',
-                  label: 'deptName',
-                  value: 'deptId',
-                }"
-                tree-node-label-prop="deptName"
-              >
-                <template #suffixIcon></template>
-              </a-tree-select>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -652,6 +660,7 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
+
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.system.dept.status')" name="status">
@@ -668,21 +677,16 @@ onMounted(() => {
           </a-col>
         </a-row>
         <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="24" :md="24" :xs="24">
             <a-form-item
-              :label="t('views.system.dept.className')"
+              :label="t('views.system.dept.admin')"
-              name="deptName"
+              name="leader"
+              :label-col="{ span: 3 }"
+              :labelWrap="true"
             >
-              {{ modalState.from.deptName }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.dept.admin')" name="leader">
               {{ modalState.from.leader }}
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.system.dept.phone')" name="phone">
               {{ modalState.from.phone }}
@@ -713,7 +717,12 @@ onMounted(() => {
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFrom" layout="horizontal">
+      <a-form
+        name="modalStateFrom"
+        layout="horizontal"
+        :label-col="{ span: 6 }"
+        :labelWrap="true"
+      >
         <a-form-item
           :label="t('views.system.dept.highClass')"
           name="parentId"
@@ -751,18 +760,6 @@ onMounted(() => {
 
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.dept.admin')"
-              name="leader"
-              v-bind="modalStateFrom.validateInfos.leader"
-            >
-              <a-input
-                v-model:value="modalState.from.leader"
-                allow-clear
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="6" :xs="24">
             <a-form-item :label="t('views.system.dept.status')" name="status">
               <a-select
                 v-model:value="modalState.from.status"
@@ -772,8 +769,11 @@ onMounted(() => {
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="6" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.dept.showSort')" name="orderNum">
+            <a-form-item
+              :label="t('views.system.dept.showSort')"
+              name="orderNum"
+            >
               <a-input-number
                 v-model:value="modalState.from.orderNum"
                 :min="0"
@@ -785,6 +785,20 @@ onMounted(() => {
         </a-row>
 
         <a-row :gutter="16">
+          <a-col :span="24">
+            <a-form-item
+              :label="t('views.system.dept.admin')"
+              name="leader"
+              v-bind="modalStateFrom.validateInfos.leader"
+              :label-col="{ span: 3 }"
+              :labelWrap="true"
+            >
+              <a-input
+                v-model:value="modalState.from.leader"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.system.dept.phone')"
@@ -800,7 +814,7 @@ onMounted(() => {
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-            :label="t('views.system.dept.email')"
+              :label="t('views.system.dept.email')"
               name="email"
               v-bind="modalStateFrom.validateInfos.email"
             >

src/views/system/setting/components/change-help-doc.vue

@@ -1,13 +1,15 @@
 <script lang="ts" setup>
 import { Modal, message } from 'ant-design-vue/lib';
 import { onMounted, reactive } from 'vue';
+import useAppStore from '@/store/modules/app';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { transferHelpDoc } from '@/api/index';
+import { transferStaticFile } from '@/api/index';
 import { uploadFileChunk } from '@/api/tool/file';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { useRouter } from 'vue-router';
+const appStore = useAppStore();
 const router = useRouter();
 const { t, currentLocale, optionsLocale } = useI18n();
 
@@ -79,9 +81,10 @@ function fnSave() {
       // 发送请求
       const hide = message.loading(t('common.loading'), 0);
       state.loading = true;
-      transferHelpDoc({
+      transferStaticFile({
         language: state.language,
         uploadPath: state.filePath,
+        staticPath: appStore.helpDoc,
       }).then(res => {
         state.loading = false;
         hide();

src/views/system/setting/components/change-i18n.vue

@@ -0,0 +1,143 @@
+<script lang="ts" setup>
+import { Modal, message } from 'ant-design-vue/lib';
+import { onMounted, reactive } from 'vue';
+import useAppStore from '@/store/modules/app';
+import useI18n from '@/hooks/useI18n';
+import { changeValue } from '@/api/system/config';
+import { CACHE_LOCAL_I18N } from '@/constants/cache-keys-constants';
+import { localSet } from '@/utils/cache-local-utils';
+const appStore = useAppStore();
+const { t, optionsLocale } = useI18n();
+
+type StateType = {
+  edite: boolean;
+  loading: boolean;
+  open: boolean;
+  default: string;
+};
+
+let state: StateType = reactive({
+  edite: false,
+  loading: false,
+  open: false,
+  default: '',
+});
+
+/**进入可编辑 */
+function fnEdit(v: boolean) {
+  state.edite = v;
+  if (!v) {
+    state.open = appStore.i18nOpen;
+    state.default = appStore.i18nDefault;
+  }
+}
+
+/**提交保存 */
+function fnSave() {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.system.setting.sysOfficialUrlTipContent'),
+    onOk() {
+      // 发送请求
+      const hide = message.loading(t('common.loading'), 0);
+      state.loading = true;
+      Promise.all([
+        changeValue({ key: 'sys.i18n.open', value: `${state.open}` }),
+        changeValue({ key: 'sys.i18n.default', value: `${state.default}` }),
+      ])
+        .then(resArr => {
+          // 不判断
+          message.success(t('views.system.setting.saveSuccess'), 3);
+          appStore.i18nOpen = state.open;
+          appStore.i18nDefault = state.default;
+          localSet(CACHE_LOCAL_I18N, state.default);
+          fnEdit(false);
+        })
+        .finally(() => {
+          state.loading = false;
+          hide();
+        });
+    },
+  });
+}
+
+onMounted(() => {
+  state.open = appStore.i18nOpen;
+  state.default = appStore.i18nDefault;
+});
+</script>
+
+<template>
+  <a-row :gutter="16">
+    <a-col :lg="12" :md="12" :xs="24" style="margin-bottom: 30px">
+      <a-form v-if="state.edite">
+        <a-form-item :label="t('views.system.setting.i18nOpen')">
+          <a-switch
+            :checked-children="t('common.switch.open')"
+            :un-checked-children="t('common.switch.shut')"
+            v-model:checked="state.open"
+          ></a-switch>
+        </a-form-item>
+        <a-form-item :label="t('views.system.setting.i18nDefault')">
+          <a-select v-model:value="state.default" style="width: 100px">
+            <a-select-option
+              v-for="opt in optionsLocale"
+              :key="opt.value"
+              :value="opt.value"
+            >
+              {{ opt.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+
+        <a-form-item>
+          <a-button type="primary" @click="fnSave">
+            {{ t('views.system.setting.saveSubmit') }}
+          </a-button>
+          <a-button style="margin-left: 10px" @click="fnEdit(false)">
+            {{ t('common.cancel') }}
+          </a-button>
+        </a-form-item>
+      </a-form>
+
+      <template v-else>
+        <a-form-item :label="t('views.system.setting.i18nOpen')">
+          <a-switch
+            :disabled="true"
+            :checked-children="t('common.switch.open')"
+            :un-checked-children="t('common.switch.shut')"
+            v-model:checked="state.open"
+          ></a-switch>
+        </a-form-item>
+        <a-form-item :label="t('views.system.setting.i18nDefault')">
+          <a-select
+            v-model:value="state.default"
+            style="width: 100px"
+            :disabled="true"
+          >
+            <a-select-option
+              v-for="opt in optionsLocale"
+              :key="opt.value"
+              :value="opt.value"
+            >
+              {{ opt.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+
+        <a-button type="dashed" @click="fnEdit(true)">
+          {{ t('common.editText') }}
+        </a-button>
+      </template>
+    </a-col>
+    <a-col :lg="12" :md="12" :xs="24">
+      <a-typography>
+        <a-typography-paragraph>
+          {{ t('views.system.setting.i18nInstruction') }}
+        </a-typography-paragraph>
+      </a-typography>
+    </a-col>
+  </a-row>
+</template>
+
+<style lang="less" scoped></style>

src/views/system/setting/components/change-login-bg.vue

@@ -9,6 +9,7 @@ import { uploadFile } from '@/api/tool/file';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { sessionGet } from '@/utils/cache-session-utils';
+import { parseUrlPath } from '@/plugins/file-static-url';
 const appStore = useAppStore();
 const { t } = useI18n();
 
@@ -84,7 +85,7 @@ function fnEdit(v: boolean) {
   state.edite = v;
   if (!v) {
     state.filePath = '#';
-    state.flag = appStore.getLoginBackground;
+    state.flag = parseUrlPath(appStore.loginBackground);
   }
 }
 
@@ -142,8 +143,8 @@ function fnRevert() {
 }
 
 onMounted(() => {
-  state.filePath = appStore.getLoginBackground;
+  state.filePath = parseUrlPath(appStore.loginBackground);
-  state.flag = appStore.getLoginBackground;
+  state.flag = parseUrlPath(appStore.loginBackground);
 });
 </script>
 

src/views/system/setting/components/change-logo.vue

@@ -3,20 +3,22 @@ import { Modal, 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 IconFont from '@/components/IconFont/index.vue';
-import { onMounted, reactive } from 'vue';
+import { onMounted, reactive, watch, computed } from 'vue';
 import useAppStore from '@/store/modules/app';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { uploadFile } from '@/api/tool/file';
 import { changeValue } from '@/api/system/config';
-import { computed } from 'vue';
 import { sessionGet } from '@/utils/cache-session-utils';
+import { transferStaticFile } from '@/api';
+import { parseUrlPath } from '@/plugins/file-static-url';
 const appStore = useAppStore();
-const { t } = useI18n();
+const { t, currentLocale, optionsLocale } = useI18n();
 
 type StateType = {
   edite: boolean;
   loading: boolean;
+  language: string;
   filePath: string; // 是否上传文件
   flag: string; // 是否变更标记
   type: 'brand' | 'icon';
@@ -27,6 +29,7 @@ type StateType = {
 let state: StateType = reactive({
   edite: false,
   loading: false,
+  language: '',
   filePath: '',
   flag: '',
   type: 'icon',
@@ -39,11 +42,14 @@ function fnBeforeUpload(file: FileType) {
   if (state.loading) return false;
   const isJpgOrPng = ['image/jpeg', 'image/png'].includes(file.type);
   if (!isJpgOrPng) {
-    message.error('只支持上传图片格式（jpg、png）', 3);
+    message.error(
+      t('views.system.setting.uploadFormat', { format: 'jpg、png' }),
+      3
+    );
   }
   const isLt2M = file.size / 1024 / 1024 < 2;
   if (!isLt2M) {
-    message.error('图片文件大小必须小于 2MB', 3);
+    message.error(t('views.system.setting.uploadSize', { size: 2 }), 3);
   }
   return isJpgOrPng && isLt2M;
 }
@@ -92,8 +98,8 @@ function fnEdit(v: boolean) {
       filePath: '',
       flag: `${appStore.logoType}/`,
       type: appStore.logoType,
-      icon: appStore.getLOGOIcon,
+      icon: getLogoURL('icon'),
-      brand: appStore.getLOGOBrand,
+      brand: getLogoURL('brand'),
     });
   }
 }
@@ -107,12 +113,16 @@ function fnSave() {
       const reqArr = [];
       // 改变LOGO地址
       if (state.filePath) {
-        let changeFilePath = 'sys.logo.filePathIcon';
+        let changeFilePath = appStore.filePathIcon;
         if (state.type === 'brand') {
-          changeFilePath = 'sys.logo.filePathBrand';
+          changeFilePath = appStore.filePathBrand;
         }
         reqArr.push(
-          changeValue({ key: changeFilePath, value: state.filePath })
+          transferStaticFile({
+            language: state.language,
+            uploadPath: state.filePath,
+            staticPath: changeFilePath,
+          })
         );
       }
       // 判断类型是否改变
@@ -128,9 +138,6 @@ function fnSave() {
         hide();
         if (resArr[0].code === RESULT_CODE_SUCCESS) {
           message.success(t('views.system.setting.saveSuccess'), 3);
-          if (state.filePath) {
-            appStore.setLOGO(state.type, state.filePath);
-          }
           if (state.type !== appStore.logoType) {
             appStore.logoType = state.type;
           }
@@ -152,13 +159,38 @@ const changeStatus = computed(() => {
   return true;
 });
 
+// LOGO地址
+function getLogoURL(type: 'brand' | 'icon') {
+  let url =
+    type === 'brand'
+      ? parseUrlPath(appStore.filePathBrand)
+      : parseUrlPath(appStore.filePathIcon);
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = state.language;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang || 'en');
+}
+
+// 监听语言切换
+watch(
+  () => state.language,
+  () => {
+    state.icon = getLogoURL('icon');
+    state.brand = getLogoURL('brand');
+  }
+);
+
 onMounted(() => {
   Object.assign(state, {
+    language: currentLocale.value,
     filePath: '',
     flag: `${appStore.logoType}/`,
     type: appStore.logoType,
-    icon: appStore.getLOGOIcon,
+    icon: getLogoURL('icon'),
-    brand: appStore.getLOGOBrand,
+    brand: getLogoURL('brand'),
   });
 });
 </script>
@@ -166,21 +198,39 @@ onMounted(() => {
 <template>
   <a-row :gutter="16">
     <a-col :lg="12" :md="12" :xs="24" style="margin-bottom: 30px">
-      <div class="header">
+      <a-form layout="vertical">
-        <div class="header-brand" v-show="state.type === 'brand'">
+        <a-form-item style="margin-bottom: 12px">
-          <img :width="174" :height="48" :src="state.brand" />
+          <div class="header">
-        </div>
+            <div class="header-brand" v-show="state.type === 'brand'">
-        <div class="header-icon" v-show="state.type === 'icon'">
+              <img :width="174" :height="48" :src="state.brand" />
-          <img :src="state.icon" />
+            </div>
-          <h1 :title="appStore.appName">
+            <div class="header-icon" v-show="state.type === 'icon'">
-            {{ appStore.appName }}
+              <img :src="state.icon" />
-          </h1>
+              <h1 :title="appStore.appName">
-        </div>
+                {{ appStore.appName }}
-        <div class="header-menu">
+              </h1>
-          <IconFont type="icon-pcduan" style="margin-right: 10px"></IconFont>
+            </div>
-          {{ t('router.index') }}
+            <div class="header-menu">
-        </div>
+              <IconFont
-      </div>
+                type="icon-pcduan"
+                style="margin-right: 10px"
+              ></IconFont>
+              {{ t('router.index') }}
+            </div>
+          </div>
+        </a-form-item>
+        <a-form-item>
+          <a-select v-model:value="state.language" style="width: 100px">
+            <a-select-option
+              v-for="opt in optionsLocale"
+              :key="opt.value"
+              :value="opt.value"
+            >
+              {{ opt.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
 
       <a-form layout="vertical" v-if="state.edite">
         <a-form-item>
@@ -257,7 +307,6 @@ onMounted(() => {
   height: 48px;
   padding-left: 16px;
   background-color: #001529;
-  margin-bottom: 24px;
 
   &-brand {
     width: 174px;

src/views/system/setting/index.vue

@@ -6,6 +6,7 @@ import ChangeTitle from './components/change-title.vue';
 import ChangeCopyright from './components/change-copyright.vue';
 import ChangeHelpDoc from './components/change-help-doc.vue';
 import ChangeOfficialUrl from './components/change-official-url.vue';
+import ChangeI18n from './components/change-i18n.vue';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
 </script>
@@ -29,14 +30,18 @@ const { t } = useI18n();
         {{ t('views.system.setting.sysLoginBg') }}
       </a-divider>
       <ChangeLogoBG></ChangeLogoBG>
-      <a-divider orientation="left"> 
+      <a-divider orientation="left">
         {{ t('views.system.setting.sysHelpDoc') }}
-       </a-divider>
+      </a-divider>
       <ChangeHelpDoc></ChangeHelpDoc>
       <a-divider orientation="left">
         {{ t('views.system.setting.sysOfficialUrl') }}
       </a-divider>
       <ChangeOfficialUrl></ChangeOfficialUrl>
+      <a-divider orientation="left">
+        {{ t('views.system.setting.i18n') }}
+      </a-divider>
+      <ChangeI18n></ChangeI18n>
     </a-card>
   </PageContainer>
 </template>

src/views/system/user/index.vue

@@ -135,7 +135,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('views.system.user.permission'),
     key: 'roles',
-    align: 'center',
+    align: 'left',
   },
   {
     title: t('views.system.user.className'),
@@ -1258,7 +1258,12 @@ onMounted(() => {
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFromByEdit" layout="horizontal">
+      <a-form
+        name="modalStateFromByEdit"
+        layout="horizontal"
+        :label-col="{ span: 6 }"
+        :labelWrap="true"
+      >
         <a-row :gutter="16" v-if="!modalState.from.userId">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1309,22 +1314,20 @@ onMounted(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="6" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.system.user.sex')" name="sex">
+            <a-form-item
+              :label="t('views.system.user.userWork')"
+              name="postIds"
+            >
               <a-select
-                v-model:value="modalState.from.sex"
+                v-model:value="modalState.from.postIds"
-                default-value="1"
+                allow-clear
-                :options="dict.sysUserSex"
+                mode="multiple"
-              >
+                show-search
-              </a-select>
+                option-filter-prop="postName"
-            </a-form-item>
+                option-label-prop="postName"
-          </a-col>
+                :options="modalState.options.posts"
-          <a-col :lg="6" :md="6" :xs="24">
+                :field-names="{ label: 'postName', value: 'postId' }"
-            <a-form-item :label="t('views.system.user.status')" name="status">
-              <a-select
-                v-model:value="modalState.from.status"
-                default-value="0"
-                :options="dict.sysNormalDisable"
               >
               </a-select>
             </a-form-item>
@@ -1360,7 +1363,53 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-form-item :label="t('views.system.user.fromClass')" name="deptId">
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.system.user.sex')" name="sex">
+              <a-select
+                v-model:value="modalState.from.sex"
+                default-value="1"
+                :options="dict.sysUserSex"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.system.user.status')" name="status">
+              <a-select
+                v-model:value="modalState.from.status"
+                default-value="0"
+                :options="dict.sysNormalDisable"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-form-item
+          :label="t('views.system.user.permission')"
+          name="roleIds"
+          :label-col="{ span: 3 }"
+          v-perms:has="['system:user:editRole']"
+        >
+          <a-select
+            v-model:value="modalState.from.roleIds"
+            :allow-clear="false"
+            mode="multiple"
+            show-search
+            option-filter-prop="roleName"
+            option-label-prop="roleName"
+            :options="modalState.options.roles"
+            :field-names="{ label: 'roleName', value: 'roleId' }"
+          >
+          </a-select>
+        </a-form-item>
+
+        <a-form-item
+          :label="t('views.system.user.fromClass')"
+          name="deptId"
+          :label-col="{ span: 3 }"
+        >
           <a-tree-select
             v-model:value="modalState.from.deptId"
             show-search
@@ -1379,46 +1428,11 @@ onMounted(() => {
           </a-tree-select>
         </a-form-item>
 
-        <a-row :gutter="16">
+        <a-form-item
-          <a-col :lg="12" :md="12" :xs="24">
+          :label="t('views.system.user.userTip')"
-            <a-form-item
+          name="remark"
-              :label="t('views.system.user.userWork')"
+          :label-col="{ span: 3 }"
-              name="postIds"
+        >
-            >
-              <a-select
-                v-model:value="modalState.from.postIds"
-                allow-clear
-                mode="multiple"
-                show-search
-                option-filter-prop="postName"
-                option-label-prop="postName"
-                :options="modalState.options.posts"
-                :field-names="{ label: 'postName', value: 'postId' }"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.system.user.permission')"
-              name="roleIds"
-            >
-              <a-select
-                v-model:value="modalState.from.roleIds"
-                :allow-clear="false"
-                mode="multiple"
-                show-search
-                option-filter-prop="roleName"
-                option-label-prop="roleName"
-                :options="modalState.options.roles"
-                :field-names="{ label: 'roleName', value: 'roleId' }"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-form-item :label="t('views.system.user.userTip')" name="remark">
           <a-textarea
             v-model:value="modalState.from.remark"
             :auto-size="{ minRows: 4, maxRows: 6 }"

src/views/tool/help/index.vue

@@ -6,13 +6,14 @@ import { useRoute } from 'vue-router';
 import { VuePDF, usePDF } from '@tato30/vue-pdf';
 import '@tato30/vue-pdf/style.css';
 import saveAs from 'file-saver';
+import { parseUrlPath } from '@/plugins/file-static-url';
 const { t, currentLocale } = useI18n();
 const appStore = useAppStore();
 const route = useRoute();
 
 // 文档地址
 const docUrl = computed(() => {
-  let url = appStore.getHelpDoc;
+  let url = parseUrlPath(appStore.helpDoc);
   if (url.indexOf('{language}') === -1) {
     return url;
   }

src/views/traceManage/pcap/index.vue

@@ -136,6 +136,7 @@ function fnStart() {
         cmd: from.cmd,
       })
         .then(res => {
+          console.log(res)
           if (res.code === RESULT_CODE_SUCCESS) {
             message.success({
               content: t('views.traceManage.pcap.execSuccess'),
@@ -151,7 +152,7 @@ function fnStart() {
               msg.indexOf('tcpdump: listening on any,') !== -1;
           } else if (
             res.code === RESULT_CODE_ERROR &&
-            res.msg.includes('timeout')
+            res.msg.includes('imeout')
           ) {
             message.warning({
               content: t('views.traceManage.pcap.execBreak'),

vite.config.ts

@@ -70,7 +70,7 @@ export default defineConfig(({ mode }) => {
         verbose: false,
         algorithm: 'gzip',
         ext: '.gz',
-        disable: false, // 是否禁用
+        disable: true, // 是否禁用
       }),
     ],
   };