From dff94061e22fa41b6089553714d2602454fb4de0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 14:36:49 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix:=20MML=E5=91=BD=E4=BB=A4=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=8F=91=E9=80=81=E5=A4=9A=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mmlManage/neOperate.ts  | 18 +++++++++++++++---
 src/api/mmlManage/omcOperate.ts |  6 +++---
 src/api/mmlManage/udmOperate.ts |  6 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/api/mmlManage/neOperate.ts b/src/api/mmlManage/neOperate.ts
index 2b227719..0be5b6e9 100644
--- a/src/api/mmlManage/neOperate.ts
+++ b/src/api/mmlManage/neOperate.ts
@@ -36,18 +36,30 @@ export async function getMMLByNE(neType: string) {
 export async function sendMMlByNE(
   neType: string,
   neId: string,
-  cmdStr: string
+  cmdArr: string[]
 ) {
   // 发起请求
   const result = await request({
     url: `/api/rest/operationManagement/v1/elementType/${neType}/objectType/mml?ne_id=${neId}`,
     method: 'post',
-    data: { mml: [cmdStr] },
+    data: { mml: cmdArr },
     timeout: 180_000,
   });
   // 解析数据
   if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
-    result.data = result.data.data[0];
+    result.data = result.data.data;
   }
   return result;
 }
+
+/**
+ * 发送文件到网元端
+ * @returns object
+ */
+export function transferToNeFile(data: Record<string, any>) {
+  return request({
+    url: `/ne/action/pushFile`,
+    method: 'post',
+    data,
+  });
+}
diff --git a/src/api/mmlManage/omcOperate.ts b/src/api/mmlManage/omcOperate.ts
index f7d27a04..e129391e 100644
--- a/src/api/mmlManage/omcOperate.ts
+++ b/src/api/mmlManage/omcOperate.ts
@@ -31,17 +31,17 @@ export async function getMMLByOMC() {
  * @param cmdStr 命令串
  * @returns
  */
-export async function sendMMlByOMC(neId: string, cmdStr: string) {
+export async function sendMMlByOMC(neId: string, cmdArr: string[]) {
   // 发起请求
   const result = await request({
     url: `/api/rest/operationManagement/v1/elementType/OMC/objectType/mml?ne_id=${neId}`,
     method: 'post',
-    data: { mml: [cmdStr] },
+    data: { mml: cmdArr },
     timeout: 180_000,
   });
   // 解析数据
   if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
-    result.data = result.data.data[0];
+    result.data = result.data.data;
   }
   return result;
 }
diff --git a/src/api/mmlManage/udmOperate.ts b/src/api/mmlManage/udmOperate.ts
index a6a7d9fe..56b8ab6b 100644
--- a/src/api/mmlManage/udmOperate.ts
+++ b/src/api/mmlManage/udmOperate.ts
@@ -31,17 +31,17 @@ export async function getMMLByUDM() {
  * @param cmdStr 命令串
  * @returns
  */
-export async function sendMMlByUDM(neId: string, cmdStr: string) {
+export async function sendMMlByUDM(neId: string, cmdArr: string[]) {
   // 发起请求
   const result = await request({
     url: `/api/rest/operationManagement/v1/elementType/UDM/objectType/mml?ne_id=${neId}`,
     method: 'post',
-    data: { mml: [cmdStr] },
+    data: { mml: cmdArr },
     timeout: 180_000,
   });
   // 解析数据
   if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
-    result.data = result.data.data[0];
+    result.data = result.data.data;
   }
   return result;
 }

From a41936a1999989f7df9a5366dfc0e17e1470dfe8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 14:37:17 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20UDM=E9=89=B4=E6=9D=83=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts       | 2 +-
 src/api/neUser/auth.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 3d622b2b..c2f450af 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -84,7 +84,7 @@ export function getSysConf() {
  */
 export function transferHelpDoc(data: Record<string, any>) {
   return request({
-    url: `/help-doc`,
+    url: `/helpDoc`,
     method: 'post',
     data,
   });
diff --git a/src/api/neUser/auth.ts b/src/api/neUser/auth.ts
index aad5efd9..e3b3d49f 100644
--- a/src/api/neUser/auth.ts
+++ b/src/api/neUser/auth.ts
@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function exportAuth(query: Record<string, any>) {
   return request({
-    url: '/ne/udm/sub/export',
+    url: '/ne/udm/auth/export',
     method: 'post',
     data: query,
     responseType: 'blob',
@@ -22,7 +22,7 @@ export function exportAuth(query: Record<string, any>) {
  */
 export function importAuthData(data: FormData) {
   return request({
-    url: `/ne/udm/sub/import`,
+    url: `/ne/udm/auth/import`,
     method: 'post',
     data,
     dataType: 'form-data',

From 9f16fb3df61d412b45267259b1d30c55145f3321 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 14:38:12 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20MML=E6=93=8D=E4=BD=9C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E6=9D=A1=E5=8F=91=E9=80=81/=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=88=B0=E7=BD=91=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mmlManage/neOperate/index.vue  | 91 +++++++++++++++++++++---
 src/views/mmlManage/omcOperate/index.vue | 90 ++++++++++++++++++++---
 src/views/mmlManage/udmOperate/index.vue | 90 ++++++++++++++++++++---
 3 files changed, 238 insertions(+), 33 deletions(-)

diff --git a/src/views/mmlManage/neOperate/index.vue b/src/views/mmlManage/neOperate/index.vue
index edafac6e..032d0d38 100644
--- a/src/views/mmlManage/neOperate/index.vue
+++ b/src/views/mmlManage/neOperate/index.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
-import { message } from 'ant-design-vue/lib';
+import { Modal, message } from 'ant-design-vue/lib';
 import CodemirrorEdite from '@/components/CodemirrorEdite/index.vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import useI18n from '@/hooks/useI18n';
 import { getMMLByNE, sendMMlByNE } from '@/api/mmlManage/neOperate';
+import { transferToNeFile } from '@/api/mmlManage/neOperate';
+import { uploadFileChunk } from '@/api/tool/file';
+import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 const { t } = useI18n();
 
 /**网元参数 */
@@ -48,6 +51,7 @@ let state: StateType = reactive({
     param: [],
   },
   from: {
+    uploadLoading: false,
     sendLoading: false,
   },
   autoCompleteValue: '',
@@ -88,7 +92,7 @@ function fnSendMML() {
     return;
   }
 
-  let cmdStr = '';
+  let cmdArr: string[] = [];
   const operation = state.mmlSelect.operation;
   const object = state.mmlSelect.object;
   // 根据参数取值
@@ -126,6 +130,7 @@ function fnSendMML() {
 
     // 拼装命令
     const argsStr = argsArr.join(',');
+    let cmdStr = '';
     if (object && argsStr) {
       cmdStr = `${operation} ${object} ${argsStr}`;
     } else if (object) {
@@ -133,35 +138,76 @@ function fnSendMML() {
     } else {
       cmdStr = `${operation} ${argsStr}`;
     }
-    cmdStr = cmdStr.trim();
+    cmdArr = [cmdStr.trim()];
   }
 
-  if (cmdStr) {
-    state.autoCompleteValue = cmdStr;
+  if (cmdArr.length > 0) {
+    state.autoCompleteValue = cmdArr[0];
   } else {
     let value = state.autoCompleteValue;
     if (value.indexOf('\n') !== -1) {
       value = value.replace(/(\r\n|\n)/g, ';');
     }
-    cmdStr = value;
+    cmdArr = value.split(';');
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
   const [neType, neId] = state.neType;
-  sendMMlByNE(neType, neId, cmdStr).then(res => {
+  sendMMlByNE(neType, neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
-      let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
-      state.mmlCmdLog += `${resultStr}\n`;
+      let resultArr = res.data;
+      for (const str of resultArr) {
+        const logStr = str.replace(/(\r\n|\n)/g, '\n');
+        state.mmlCmdLog += `${logStr}\n`;
+      }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }
 
+/**上传变更 */
+function fnUpload(up: UploadRequestOption, name: string) {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.mmlManage.uploadFileTip'),
+    onOk() {
+      const hide = message.loading(t('common.loading'), 0);
+      state.from.uploadLoading = true;
+      uploadFileChunk(up.file as File, 5, 'import')
+        .then(res => {
+          // 文件上传
+          if (res.code === RESULT_CODE_SUCCESS) {
+            const [neType, neId] = state.neType;
+            return transferToNeFile({
+              uploadPath: res.data.fileName,
+              neType: neType,
+              neId: neId,
+            });
+          } else {
+            return res;
+          }
+        })
+        .then(res => {
+          // 文件转存
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('views.mmlManage.uploadFileOk'), 3);
+            state.from[name] = res.data;
+          } else {
+            message.error(res.msg, 3);
+          }
+        })
+        .finally(() => {
+          state.from.uploadLoading = false;
+          hide();
+        });
+    },
+  });
+}
+
 /**规则校验 */
 function ruleVerification(
   row: Record<string, any>,
@@ -588,6 +634,29 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input-group compact v-else-if="item.type === 'file'">
+                        <a-input
+                          v-model:value="state.from[item.name]"
+                          style="width: calc(100% - 32px)"
+                        />
+                        <a-upload
+                          name="file"
+                          list-type="text"
+                          :accept="item.filter"
+                          :max-count="1"
+                          :show-upload-list="false"
+                          :custom-request="v => fnUpload(v, item.name)"
+                        >
+                          <a-button
+                            type="primary"
+                            :loading="state.from.uploadLoading"
+                          >
+                            <template #icon>
+                              <UploadOutlined />
+                            </template>
+                          </a-button>
+                        </a-upload>
+                      </a-input-group>
                       <a-input
                         v-else
                         v-model:value="state.from[item.name]"
diff --git a/src/views/mmlManage/omcOperate/index.vue b/src/views/mmlManage/omcOperate/index.vue
index 7c4f1e80..595a4314 100644
--- a/src/views/mmlManage/omcOperate/index.vue
+++ b/src/views/mmlManage/omcOperate/index.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
-import { message } from 'ant-design-vue/lib';
+import { Modal, message } from 'ant-design-vue/lib';
 import CodemirrorEdite from '@/components/CodemirrorEdite/index.vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import useI18n from '@/hooks/useI18n';
 import { getMMLByOMC, sendMMlByOMC } from '@/api/mmlManage/omcOperate';
+import { transferToNeFile } from '@/api/mmlManage/neOperate';
+import { uploadFileChunk } from '@/api/tool/file';
+import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 const { t } = useI18n();
 
 /**网元参数 */
@@ -45,6 +48,7 @@ let state: StateType = reactive({
     param: [],
   },
   from: {
+    uploadLoading: false,
     sendLoading: false,
   },
   autoCompleteValue: '',
@@ -85,7 +89,7 @@ function fnSendMML() {
     return;
   }
 
-  let cmdStr = '';
+  let cmdArr: string[] = [];
   const operation = state.mmlSelect.operation;
   const object = state.mmlSelect.object;
   // 根据参数取值
@@ -123,6 +127,7 @@ function fnSendMML() {
 
     // 拼装命令
     const argsStr = argsArr.join(',');
+    let cmdStr = '';
     if (object && argsStr) {
       cmdStr = `${operation} ${object}:${argsStr}`;
     } else if (object) {
@@ -130,34 +135,74 @@ function fnSendMML() {
     } else {
       cmdStr = `${operation} ${argsStr}`;
     }
-    cmdStr = cmdStr.trim();
+    cmdArr = [cmdStr.trim()];
   }
 
-  if (cmdStr) {
-    state.autoCompleteValue = cmdStr;
+  if (cmdArr.length > 0) {
+    state.autoCompleteValue = cmdArr[0];
   } else {
     let value = state.autoCompleteValue;
     if (value.indexOf('\n') !== -1) {
       value = value.replace(/(\r\n|\n)/g, ';');
     }
-    cmdStr = value;
+    cmdArr = value.split(';');
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
-  sendMMlByOMC(state.neId, cmdStr).then(res => {
+  sendMMlByOMC(state.neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
-      let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
-      state.mmlCmdLog += `${resultStr}\n`;
+      let resultArr = res.data;
+      for (const str of resultArr) {
+        const logStr = str.replace(/(\r\n|\n)/g, '\n');
+        state.mmlCmdLog += `${logStr}\n`;
+      }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }
 
+/**上传变更 */
+function fnUpload(up: UploadRequestOption, name: string) {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.mmlManage.uploadFileTip'),
+    onOk() {
+      const hide = message.loading(t('common.loading'), 0);
+      state.from.uploadLoading = true;
+      uploadFileChunk(up.file as File, 5, 'import')
+        .then(res => {
+          // 文件上传
+          if (res.code === RESULT_CODE_SUCCESS) {
+            return transferToNeFile({
+              uploadPath: res.data.fileName,
+              neType: 'OMC',
+              neId: state.neId,
+            });
+          } else {
+            return res;
+          }
+        })
+        .then(res => {
+          // 文件转存
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('views.mmlManage.uploadFileOk'), 3);
+            state.from[name] = res.data;
+          } else {
+            message.error(res.msg, 3);
+          }
+        })
+        .finally(() => {
+          state.from.uploadLoading = false;
+          hide();
+        });
+    },
+  });
+}
+
 /**规则校验 */
 function ruleVerification(
   row: Record<string, any>,
@@ -563,6 +608,29 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input-group compact v-else-if="item.type === 'file'">
+                        <a-input
+                          v-model:value="state.from[item.name]"
+                          style="width: calc(100% - 32px)"
+                        />
+                        <a-upload
+                          name="file"
+                          list-type="text"
+                          :accept="item.filter"
+                          :max-count="1"
+                          :show-upload-list="false"
+                          :custom-request="v => fnUpload(v, item.name)"
+                        >
+                          <a-button
+                            type="primary"
+                            :loading="state.from.uploadLoading"
+                          >
+                            <template #icon>
+                              <UploadOutlined />
+                            </template>
+                          </a-button>
+                        </a-upload>
+                      </a-input-group>
                       <a-input
                         v-else
                         v-model:value="state.from[item.name]"
diff --git a/src/views/mmlManage/udmOperate/index.vue b/src/views/mmlManage/udmOperate/index.vue
index a5c1b27f..774a3019 100644
--- a/src/views/mmlManage/udmOperate/index.vue
+++ b/src/views/mmlManage/udmOperate/index.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
-import { message } from 'ant-design-vue/lib';
+import { Modal, message } from 'ant-design-vue/lib';
 import CodemirrorEdite from '@/components/CodemirrorEdite/index.vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import useI18n from '@/hooks/useI18n';
 import { getMMLByUDM, sendMMlByUDM } from '@/api/mmlManage/udmOperate';
+import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
+import { uploadFileChunk } from '@/api/tool/file';
+import { transferToNeFile } from '@/api/mmlManage/neOperate';
 const { t } = useI18n();
 
 /**网元参数 */
@@ -45,6 +48,7 @@ let state: StateType = reactive({
     param: [],
   },
   from: {
+    uploadLoading: false,
     sendLoading: false,
   },
   autoCompleteValue: '',
@@ -85,7 +89,7 @@ function fnSendMML() {
     return;
   }
 
-  let cmdStr = '';
+  let cmdArr: string[] = [];
   const operation = state.mmlSelect.operation;
   const object = state.mmlSelect.object;
   // 根据参数取值
@@ -123,6 +127,7 @@ function fnSendMML() {
 
     // 拼装命令
     const argsStr = argsArr.join(',');
+    let cmdStr = '';
     if (object && argsStr) {
       cmdStr = `${operation} ${object}:${argsStr}`;
     } else if (object) {
@@ -130,34 +135,74 @@ function fnSendMML() {
     } else {
       cmdStr = `${operation} ${argsStr}`;
     }
-    cmdStr = cmdStr.trim();
+    cmdArr = [cmdStr.trim()];
   }
 
-  if (cmdStr) {
-    state.autoCompleteValue = cmdStr;
+  if (cmdArr.length > 0) {
+    state.autoCompleteValue = cmdArr[0];
   } else {
     let value = state.autoCompleteValue;
     if (value.indexOf('\n') !== -1) {
       value = value.replace(/(\r\n|\n)/g, ';');
     }
-    cmdStr = value;
+    cmdArr = value.split(';');
   }
 
   // 发送
-  state.mmlCmdLog += `${cmdStr}\n`;
+  state.mmlCmdLog += `${cmdArr.join('\n')}\n`;
   state.from.sendLoading = true;
-  sendMMlByUDM(state.neId, cmdStr).then(res => {
+  sendMMlByUDM(state.neId, cmdArr).then(res => {
     state.from.sendLoading = false;
     if (res.code === RESULT_CODE_SUCCESS) {
-      let resultStr = res.data;
-      resultStr = resultStr.replace(/(\r\n|\n)/g, '\n');
-      state.mmlCmdLog += `${resultStr}\n`;
+      let resultArr = res.data;
+      for (const str of resultArr) {
+        const logStr = str.replace(/(\r\n|\n)/g, '\n');
+        state.mmlCmdLog += `${logStr}\n`;
+      }
     } else {
       state.mmlCmdLog += `${res.msg}\n`;
     }
   });
 }
 
+/**上传变更 */
+function fnUpload(up: UploadRequestOption, name: string) {
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.mmlManage.uploadFileTip'),
+    onOk() {
+      const hide = message.loading(t('common.loading'), 0);
+      state.from.uploadLoading = true;
+      uploadFileChunk(up.file as File, 5, 'import')
+        .then(res => {
+          // 文件上传
+          if (res.code === RESULT_CODE_SUCCESS) {
+            return transferToNeFile({
+              uploadPath: res.data.fileName,
+              neType: 'UDM',
+              neId: state.neId,
+            });
+          } else {
+            return res;
+          }
+        })
+        .then(res => {
+          // 文件转存
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success(t('views.mmlManage.uploadFileOk'), 3);
+            state.from[name] = res.data;
+          } else {
+            message.error(res.msg, 3);
+          }
+        })
+        .finally(() => {
+          state.from.uploadLoading = false;
+          hide();
+        });
+    },
+  });
+}
+
 /**规则校验 */
 function ruleVerification(
   row: Record<string, any>,
@@ -563,6 +608,29 @@ onMounted(() => {
                           {{ k }}
                         </a-select-option>
                       </a-select>
+                      <a-input-group compact v-else-if="item.type === 'file'">
+                        <a-input
+                          v-model:value="state.from[item.name]"
+                          style="width: calc(100% - 32px)"
+                        />
+                        <a-upload
+                          name="file"
+                          list-type="text"
+                          :accept="item.filter"
+                          :max-count="1"
+                          :show-upload-list="false"
+                          :custom-request="v => fnUpload(v, item.name)"
+                        >
+                          <a-button
+                            type="primary"
+                            :loading="state.from.uploadLoading"
+                          >
+                            <template #icon>
+                              <UploadOutlined />
+                            </template>
+                          </a-button>
+                        </a-upload>
+                      </a-input-group>
                       <a-input
                         v-else
                         v-model:value="state.from[item.name]"

From 44c9f0879bd238edfacc26db6d144a90010e1a5c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 14:40:18 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix:=20mml=E7=AE=A1=E7=90=86=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts | 2 ++
 src/i18n/locales/zh-CN.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 20d2151a..ef9e1110 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1300,6 +1300,8 @@ export default {
       clearLog: "Clear Logs",
       exec: "Execute",
       cmdAwait: "Waiting for a command to be sent", 
+      uploadFileTip: 'Are you sure you want to upload the file?',
+      uploadFileOk: 'File Upload Successful',
       omcOperate:{
         noOMC: "No OMC network elements",
       },
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index a804c18b..02ef0078 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1304,6 +1304,8 @@ export default {
       clearLog: "清除日志",
       exec: "执行",
       cmdAwait: "等待发送命令", 
+      uploadFileTip: '确认要上传文件吗?',
+      uploadFileOk: '文件上传成功',
       omcOperate:{
         noOMC: "暂无OMC网元",
       },

From 252ed66ff84ccf04fbc8917dc58b6ab733e21655 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 14:48:02 +0800
Subject: [PATCH 05/10] =?UTF-8?q?style:=20=E6=96=87=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BF=A1=E6=81=AF=E8=BE=93=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/auth/index.vue | 1 +
 src/views/neUser/sub/index.vue  | 1 +
 src/views/system/user/index.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index cf36b7ad..83a9cce5 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -1275,6 +1275,7 @@ onMounted(() => {
           :hidden="!uploadImportState.msg"
           :value="uploadImportState.msg"
           :auto-size="{ minRows: 2, maxRows: 8 }"
+          style="background-color: transparent; color: rgba(0, 0, 0, 0.85)"
         />
       </template>
     </UploadModal>
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 4cd2db98..bf29cd81 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -2067,6 +2067,7 @@ onMounted(() => {
           :hidden="!uploadImportState.msg"
           :value="uploadImportState.msg"
           :auto-size="{ minRows: 2, maxRows: 8 }"
+          style="background-color: transparent; color: rgba(0, 0, 0, 0.85)"
         />
       </template>
     </UploadModal>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b7e71aa4..9677632a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1501,6 +1501,7 @@ onMounted(() => {
           :hidden="!uploadImportState.msg"
           :value="uploadImportState.msg"
           :auto-size="{ minRows: 2, maxRows: 8 }"
+          style="background-color: transparent; color: rgba(0, 0, 0, 0.85)"
         />
       </template>
     </UploadModal>

From 55981f893682c71c523ceeb61b504c703c508d2c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 15:12:51 +0800
Subject: [PATCH 06/10] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4UDM=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=A0=BC=E9=9D=A0=E5=B7=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/neUser/base5G.ts          |  3 +++
 src/views/neUser/auth/index.vue   | 19 +++++++-------
 src/views/neUser/base5G/index.vue | 35 ++++++++++++-------------
 src/views/neUser/sub/index.vue    | 43 +++++++++++++++----------------
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/api/neUser/base5G.ts b/src/api/neUser/base5G.ts
index 95317280..d8f4150e 100644
--- a/src/api/neUser/base5G.ts
+++ b/src/api/neUser/base5G.ts
@@ -26,5 +26,8 @@ export async function listBase5G(query: Record<string, any>) {
     data.total = rows.length;
     data.rows = rows;
   }
+  // 模拟数据
+  // data.rows =[{"address":"192.168.1.137:38412","id":"217","name":"","ueNum":0}]
+
   return data;
 }
diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index 83a9cce5..ee5e5c08 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -75,7 +75,7 @@ type TabeStateType = {
 /**表格状态 */
 let tableState: TabeStateType = reactive({
   loading: false,
-  size: 'middle',
+  size: 'small',
   striped: false,
   seached: true,
   data: [],
@@ -88,19 +88,19 @@ let tableColumns: ColumnsType = [
     dataIndex: 'imsi',
     align: 'left',
     sorter: true,
-    width: 200,
+    width: 150,
   },
   {
     title: 'AMF',
     dataIndex: 'amf',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 100,
   },
   {
     title: 'Status',
     dataIndex: 'status',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 100,
   },
   // {
   //   title: 'KI',
@@ -117,14 +117,13 @@ let tableColumns: ColumnsType = [
   {
     title: 'Algo Index',
     dataIndex: 'algoIndex',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 100,
   },
   {
     title: t('common.operate'),
     key: 'imsi',
-    align: 'center',
-    width: 100,
+    align: 'left',
   },
 ];
 
diff --git a/src/views/neUser/base5G/index.vue b/src/views/neUser/base5G/index.vue
index c76d4e12..323914ee 100644
--- a/src/views/neUser/base5G/index.vue
+++ b/src/views/neUser/base5G/index.vue
@@ -57,7 +57,7 @@ type TabeStateType = {
 /**表格状态 */
 let tableState: TabeStateType = reactive({
   loading: false,
-  size: 'middle',
+  size: 'small',
   striped: false,
   seached: true,
   data: [],
@@ -69,26 +69,25 @@ let tableColumns: ColumnsType = [
   {
     title: 'GNB ID',
     dataIndex: 'id',
-    align: 'center',
-    width: 2,
-  },
-  {
-    title: 'GNB Address',
-    dataIndex: 'address',
-    align: 'center',
-    width: 3,
-  },
-  {
-    title: 'GNB Name',
-    dataIndex: 'name',
-    align: 'center',
-    width: 2,
+    align: 'left',
+    width: 100,
   },
   {
     title: 'UE Number',
     dataIndex: 'ueNum',
-    align: 'center',
-    width: 2,
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: 'GNB Name',
+    dataIndex: 'name',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: 'GNB Address',
+    dataIndex: 'address',
+    align: 'left',
   },
 ];
 
@@ -292,7 +291,7 @@ onMounted(() => {
         :size="tableState.size"
         :row-class-name="fnTableStriped"
         :pagination="tablePagination"
-        :scroll="{ x: 1000, y: 400 }"
+        :scroll="{ y: 450 }"
       >
       </a-table>
     </a-card>
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index bf29cd81..797824de 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -78,7 +78,7 @@ type TabeStateType = {
 /**表格状态 */
 let tableState: TabeStateType = reactive({
   loading: false,
-  size: 'middle',
+  size: 'small',
   striped: false,
   seached: true,
   data: [],
@@ -111,55 +111,54 @@ let tableColumns: ColumnsType = [
   {
     title: 'Subscribed AMBR Temp',
     dataIndex: 'ambr',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'Subscribed SNSSAIs Temp',
     dataIndex: 'sar',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'RAT Restriction',
     dataIndex: 'rat',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'Forbidden Areas Temp',
     dataIndex: 'arfb',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'Service Area Restrict Temp',
     dataIndex: 'nssai',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'CN Type Restriction',
     dataIndex: 'cn',
-    align: 'center',
-    minWidth: 100,
-  },
-  {
-    title: 'Subscribed Data',
-    dataIndex: 'smData',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 200,
   },
   {
     title: 'EPS Flag',
     dataIndex: 'epsFlag',
-    align: 'center',
-    minWidth: 100,
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: 'Subscribed Data',
+    dataIndex: 'smData',
+    align: 'left',
   },
   {
     title: t('common.operate'),
     key: 'imsi',
-    align: 'center',
+    align: 'left',
     fixed: 'right',
     width: 100,
   },

From c21fbd133ad5db759ae07c9d5905cfddb4c4f90d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 15:19:20 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=BC=96=E8=BE=91=E5=8F=AA=E8=AF=BB=E9=A1=B9=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configParamTreeTable/index.vue            | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue
index f9528882..0dd3b558 100644
--- a/src/views/configManage/configParamTreeTable/index.vue
+++ b/src/views/configManage/configParamTreeTable/index.vue
@@ -1330,11 +1330,7 @@ onMounted(() => {
               <!-- 多列数据渲染 -->
               <template #bodyCell="{ column, text, record }">
                 <template v-if="column?.key === 'index'">
-                  <a-space
-                    :size="16"
-                    align="center"
-                    v-if="!['read-only', 'ro'].includes(text.access)"
-                  >
+                  <a-space :size="16" align="center">
                     <a-tooltip>
                       <template #title>{{ t('common.editText') }}</template>
                       <a-button type="link" @click.prevent="arrayEdit(text)">
@@ -1423,11 +1419,7 @@ onMounted(() => {
                   </template>
                   <template #bodyCell="{ column, text, record }">
                     <template v-if="column?.key === 'index'">
-                      <a-space
-                        :size="8"
-                        align="center"
-                        v-if="!['read-only', 'ro'].includes(text.access)"
-                      >
+                      <a-space :size="8" align="center">
                         <a-tooltip>
                           <template #title>{{ t('common.editText') }}</template>
                           <a-button
@@ -1519,6 +1511,7 @@ onMounted(() => {
             <template #title v-if="item.comment">
               {{ item.comment }}
             </template>
+
             <div>
               <div
                 v-if="
@@ -1529,7 +1522,7 @@ onMounted(() => {
                 <a-input-number
                   v-if="item['type'] === 'int'"
                   v-model:value="modalState.from[item.name]['value']"
-                  :disabled="item.name === 'index'"
+                  :disabled="['read-only', 'ro'].includes(item.access)"
                   style="width: 100%"
                 ></a-input-number>
                 <a-switch
@@ -1537,10 +1530,12 @@ onMounted(() => {
                   v-model:checked="modalState.from[item.name]['value']"
                   :checked-children="t('common.switch.open')"
                   :un-checked-children="t('common.switch.shut')"
+                  :disabled="['read-only', 'ro'].includes(item.access)"
                 ></a-switch>
                 <a-select
                   v-else-if="item['type'] === 'enum'"
                   v-model:value="modalState.from[item.name]['value']"
+                  :disabled="['read-only', 'ro'].includes(item.access)"
                   :allow-clear="true"
                   style="width: 100%"
                 >
@@ -1555,7 +1550,7 @@ onMounted(() => {
                 <a-input
                   v-else
                   v-model:value="modalState.from[item.name]['value']"
-                  :disabled="item.name === 'index'"
+                  :disabled="['read-only', 'ro'].includes(item.access)"
                 ></a-input>
               </div>
               <div v-else>

From a22213eae3d2a406d9456c32061ce8f8750473df Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 15:22:00 +0800
Subject: [PATCH 08/10] =?UTF-8?q?chore:=20config.js=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development         |  2 +-
 public/default/config.js | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index c8e86be9..4ae1f773 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.231124.8"
+VITE_APP_VERSION = "2.231128.8"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/public/default/config.js b/public/default/config.js
index 25d86329..98d65367 100644
--- a/public/default/config.js
+++ b/public/default/config.js
@@ -2,15 +2,16 @@
  * =============== Zh ===============
  * - Nginx部署
  * 删除loading.js同级下同名文件，Nginx代理地址: /omc-api
- *
- * Nginx Deployment
- * Delete the file with the same name under the same level of loading.js, Nginx proxy address: /omc-api
- *
+ * 
  * - 非Nginx部署
  * 请将当前文件与loading.js同级，将host变量值修改为数据服务访问地址
  * !!!注意: 修改当前文件后，建议关闭浏览器后重新访问
+ * 
+ * =============== En ===============
+ * - Nginx Deployment
+ * Delete the file with the same name under the same level of loading.js, Nginx proxy address: /omc-api
  *
- * Non-Nginx Deployment
+ * - Non-Nginx Deployment
  * Please make the current file the same level as the loading.js, change the host variable value to the data service access address
  * !!! Note: After modifying the current file, it is recommended to revisit it after closing the browser.
  *

From 534f261bd4ebc5f9163843d07b66961a1e3889a8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 28 Nov 2023 16:43:51 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E5=B8=AE?=
 =?UTF-8?q?=E5=8A=A9=E6=96=87=E6=A1=A3=E8=B7=B3=E8=BD=AC404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout.vue                   | 13 +++++++++++--
 src/layouts/components/RightContent.vue       | 12 +++++++++++-
 .../setting/components/change-help-doc.vue    | 19 +++++++++++--------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index 30e281ee..6eb53133 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -120,6 +120,16 @@ function fnComponentSetName(component: any, to: any) {
 // 清空导航栏标签
 tabsStore.clear();
 
+/**系统使用手册跳转 */
+function fnClickHelpDoc(language?: string) {
+  const routeData = router.resolve({ name: 'HelpDoc' });
+  let href = routeData.href;
+  if (language) {
+    href = `${routeData.href}?language=${language}`;
+  }
+  window.open(href, '_blank');
+}
+
 /**
  * 国际化翻译转换
  */
@@ -285,9 +295,8 @@ document.addEventListener('visibilitychange', function () {
               </a-button>
               <a-button
                 type="link"
-                href="/help"
-                target="_blank"
                 size="small"
+                @click="fnClickHelpDoc()"
                 v-if="appStore.getHelpDoc !== '#'"
               >
                 {{ t('loayouts.basic.helpDoc') }}
diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue
index 5a4b3c95..f608b151 100644
--- a/src/layouts/components/RightContent.vue
+++ b/src/layouts/components/RightContent.vue
@@ -32,6 +32,16 @@ function fnClickAlarm() {
   router.push({ path: '/faultManage/active-alarm' });
 }
 
+/**系统使用手册跳转 */
+function fnClickHelpDoc(language?: string) {
+  const routeData = router.resolve({ name: 'HelpDoc' });
+  let href = routeData.href;
+  if (language) {
+    href = `${routeData.href}?language=${language}`;
+  }
+  window.open(href, '_blank');
+}
+
 /**改变多语言 */
 function fnChangeLocale(e: any) {
   changeLocale(e.key);
@@ -54,7 +64,7 @@ function fnChangeLocale(e: any) {
 
     <a-tooltip placement="bottom" v-if="appStore.getHelpDoc !== '#'">
       <template #title>{{ t('loayouts.rightContent.helpDoc') }}</template>
-      <a-button type="text" href="/help" target="_blank">
+      <a-button type="text" @click="fnClickHelpDoc()">
         <template #icon>
           <QuestionCircleOutlined />
         </template>
diff --git a/src/views/system/setting/components/change-help-doc.vue b/src/views/system/setting/components/change-help-doc.vue
index a271e1a7..ee0dec57 100644
--- a/src/views/system/setting/components/change-help-doc.vue
+++ b/src/views/system/setting/components/change-help-doc.vue
@@ -1,16 +1,13 @@
 <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 { 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 { sessionGet } from '@/utils/cache-session-utils';
 import { useRouter } from 'vue-router';
-const appStore = useAppStore();
 const router = useRouter();
 const { t, currentLocale, optionsLocale } = useI18n();
 
@@ -99,6 +96,16 @@ function fnSave() {
   });
 }
 
+/**系统使用手册跳转 */
+function fnClickHelpDoc(language?: string) {
+  const routeData = router.resolve({ name: 'HelpDoc' });
+  let href = routeData.href;
+  if (language) {
+    href = `${routeData.href}?language=${language}`;
+  }
+  window.open(href, '_blank');
+}
+
 onMounted(() => {
   state.language = currentLocale.value;
 });
@@ -168,11 +175,7 @@ onMounted(() => {
                   {{ opt.label }}
                 </a-select-option>
               </a-select>
-              <a-button
-                type="link"
-                :href="'/help?language=' + state.language"
-                target="_blank"
-              >
+              <a-button type="link" @click="fnClickHelpDoc(state.language)">
                 <template #icon>
                   <QuestionCircleOutlined />
                   {{ t('views.system.setting.sysHelpDocOpen') }}

From ac93726a0faee4e11e3c4ae6b30f1d3ef5219918 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 28 Nov 2023 19:21:26 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/perfManage/perfData.ts          | 13 +++++-
 src/views/perfManage/perfData/index.vue | 62 +++++++++++++++++++------
 2 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/api/perfManage/perfData.ts b/src/api/perfManage/perfData.ts
index 1544404f..92e84f58 100644
--- a/src/api/perfManage/perfData.ts
+++ b/src/api/perfManage/perfData.ts
@@ -16,15 +16,24 @@ export async function listperfData(query: Record<string, any>) {
   if (query.neType) {
     querySQL += ` and ne_type like '%${query.neType}%' `;
   }
+  if (query.taskId) {
+    querySQL += ` and task_id like '%${query.taskId}%' `;
+  }
   if (query.beginTime) {
     querySQL += ` and start_time >= '${query.beginTime}' `;
   }
   if (query.endTime) {
-    querySQL += ` and start_time <= '${query.endTime}' `;
+    querySQL += ` and end_time <= '${query.endTime}' `;
   }
 
   // 排序
-  let sortSql = ' order by start_time ';
+  let sortSql = ' order by  ';
+  if (query.sortField) {
+    sortSql += ` ${query.sortField} `;
+  }else{
+    sortSql += ` start_time `;
+  }
+  
   if (query.sortOrder === 'asc') {
     sortSql += ' asc ';
   } else {
diff --git a/src/views/perfManage/perfData/index.vue b/src/views/perfManage/perfData/index.vue
index 5744f3e0..89ff8246 100644
--- a/src/views/perfManage/perfData/index.vue
+++ b/src/views/perfManage/perfData/index.vue
@@ -30,6 +30,12 @@ let queryParams = reactive({
   neType: '',
   /**记录时间 */
   beginTime: '',
+  /**任务ID */
+  taskId: '',
+  /**排序字段 */
+  sortField: 'value',
+  /**排序方式 */
+  sortOrder: 'asc',
   endTime: '',
   /**当前页数 */
   pageNum: 1,
@@ -43,6 +49,8 @@ function fnQueryReset() {
     neType: '',
     beginTime: '',
     endTime: '',
+    sortField: 'value',
+    sortOrder: 'asc',
     pageNum: 1,
     pageSize: 20,
   });
@@ -108,34 +116,31 @@ let tableColumns: ColumnsType = [
   {
     title: t('views.perfManage.perfData.value'),
     dataIndex: 'value',
+    key: 'value',
     align: 'center',
-    sorter: (a: any, b: any) => {
-      return 1;
-    },
+    sorter: true,
   },
   {
     title: t('views.perfManage.perfData.startTime'),
     dataIndex: 'startTime',
+    key: 'start_time',
     align: 'center',
     customRender(opt) {
       if (!opt.value) return '';
       return parseDateToStr(opt.value);
     },
-    sorter: (a: any, b: any) => {
-      return 1;
-    },
+    sorter: true,
   },
   {
     title: t('views.perfManage.perfData.endTime'),
     dataIndex: 'endTime',
     align: 'center',
+    key: 'end_time',
     customRender(opt) {
       if (!opt.value) return '';
       return parseDateToStr(opt.value);
     },
-    sorter: (a: any, b: any) => {
-      return 1;
-    },
+    sorter: true,
   },
 ];
 
@@ -176,7 +181,7 @@ function fnTableSize({ key }: MenuInfo) {
 function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
-  if(pageNum){
+  if (pageNum) {
     queryParams.pageNum = pageNum;
   }
   if (!queryRangePicker.value) {
@@ -193,6 +198,18 @@ function fnGetList(pageNum?: number) {
   });
 }
 
+/**表格分页、排序、筛选变化时触发操作, 排序方式，取值为 ascend descend */
+function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
+  const { columnKey, order } = sorter;
+  if (order) {
+    queryParams.sortField = columnKey;
+    queryParams.sortOrder = order.replace('end', '');
+  } else {
+    queryParams.sortOrder = 'asc';
+  }
+  fnGetList(1);
+}
+
 onMounted(() => {
   // 初始字典数据
   Promise.allSettled([getDict('alarm_status')]).then(resArr => {
@@ -217,8 +234,11 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.perfManage.perfData.type')" name="neType">
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.perfData.type')"
+              name="neType"
+            >
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="useNeInfoStore().getNeSelectOtions"
@@ -226,8 +246,21 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item :label="t('views.perfManage.perfData.startTime')" name="queryRangePicker">
+
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.perfData.taskId')"
+              name="taskId"
+            >
+              <a-input v-model:value="queryParams.taskId" allow-clear></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :lg="10" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.perfData.startTime')"
+              name="queryRangePicker"
+            >
               <a-range-picker
                 v-model:value="queryRangePicker"
                 allow-clear
@@ -316,6 +349,7 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
+        @change="fnTableChange"
         :scroll="{ x: true }"
       >
         <template #bodyCell="{ column, record }">