From f7273457e950d607ba7715b6185e50abe0dace75 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 23 Sep 2024 17:24:02 +0800
Subject: [PATCH 01/15] =?UTF-8?q?feat:=20=E8=B7=9F=E8=B8=AA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E7=9C=8Bpcap=E5=86=85=E5=AE=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trace/task.ts                  |  15 ++
 src/i18n/locales/en-US.ts              |   5 +-
 src/i18n/locales/zh-CN.ts              |   5 +-
 src/views/traceManage/task/analyze.vue | 287 +++++++++++++++++++++++++
 src/views/traceManage/task/index.vue   |  60 ++++--
 5 files changed, 346 insertions(+), 26 deletions(-)
 create mode 100644 src/views/traceManage/task/analyze.vue

diff --git a/src/api/trace/task.ts b/src/api/trace/task.ts
index f48ac1db..e5620942 100644
--- a/src/api/trace/task.ts
+++ b/src/api/trace/task.ts
@@ -65,6 +65,21 @@ export async function delTraceTask(ids: string) {
   });
 }
 
+/**
+ * 跟踪任务文件
+ * @param query 对象
+ * @returns object
+ */
+export function filePullTask(traceId: string) {
+  return request({
+    url: '/trace/task/filePull',
+    method: 'get',
+    params: { traceId },
+    responseType: 'blob',
+    timeout: 60_000,
+  });
+}
+
 /**
  * 获取网元跟踪接口列表
  * @returns object
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 890401d9..3a4d3601 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1126,9 +1126,7 @@ export default {
         stopNotRun: "{title} not running",
       },
       task: {
-        neTypePlease: 'Query network element type',
-        neType: 'NE Type',
-        neID: 'NE ID',
+        traceId: 'Tracing No',
         trackType: 'Tracing Type',
         trackTypePlease: 'Please select a tracing type',
         creater: 'Created by',
@@ -1165,6 +1163,7 @@ export default {
         delTaskTip: 'Are you sure to delete the data item with record ID {id} ?',
         stopTask: 'Successful cessation of tasks {id}',
         stopTaskTip: 'Confirm stopping the task with record ID {id} ?',
+        pcapView: "Tracking Data Analysis",
         traceFile: "Tracking File",
         errMsg: "Error Message",
         imsiORmsisdn: "imsi or msisdn is null, cannot start task",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index c5c07ff9..ac006a9e 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1126,9 +1126,7 @@ export default {
         stopNotRun: "{title} 任务未运行",
       },
       task: {
-        neTypePlease: '请选择网元类型',
-        neType: '网元类型',
-        neID: '网元内部标识',
+        traceId: '跟踪编号', 
         trackType: '跟踪类型',
         trackTypePlease: '请选择跟踪类型',
         creater: '创建人',
@@ -1165,6 +1163,7 @@ export default {
         delTaskTip: '确认删除记录编号为 {id} 的数据项?',
         stopTask: '成功停止任务 {id}',
         stopTaskTip: '确认停止记录编号为 {id} 的任务?',
+        pcapView: "跟踪数据分析",
         traceFile: "跟踪文件",
         errMsg: "错误信息",
         imsiORmsisdn: "imsi 或 msisdn 是空值，不能开始任务",
diff --git a/src/views/traceManage/task/analyze.vue b/src/views/traceManage/task/analyze.vue
new file mode 100644
index 00000000..ad90b71b
--- /dev/null
+++ b/src/views/traceManage/task/analyze.vue
@@ -0,0 +1,287 @@
+<script setup lang="ts">
+import { onBeforeUnmount, ref, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { PageContainer } from 'antdv-pro-layout';
+import DissectionTree from '../tshark/components/DissectionTree.vue';
+import DissectionDump from '../tshark/components/DissectionDump.vue';
+import PacketTable from '../tshark/components/PacketTable.vue';
+import { usePCAP, NO_SELECTION } from '../tshark/hooks/usePCAP';
+import {
+  RESULT_CODE_ERROR,
+  RESULT_CODE_SUCCESS,
+} from '@/constants/result-constants';
+import { filePullTask } from '@/api/trace/task';
+import { OptionsType, WS } from '@/plugins/ws-websocket';
+import useI18n from '@/hooks/useI18n';
+import useTabsStore from '@/store/modules/tabs';
+const route = useRoute();
+const router = useRouter();
+const tabsStore = useTabsStore();
+const ws = new WS();
+const { t } = useI18n();
+const {
+  state,
+  handleSelectedTreeEntry,
+  handleSelectedFindSelection,
+  handleSelectedFrame,
+  handleScrollBottom,
+  handleFilterFrames,
+  handleLoadFile,
+} = usePCAP();
+
+/**跟踪编号 */
+const traceId = ref<string>(route.query.traceId as string);
+
+/**关闭跳转 */
+function fnClose() {
+  const to = tabsStore.tabClose(route.path);
+  if (to) {
+    router.push(to);
+  } else {
+    router.back();
+  }
+}
+
+/**获取PCAP文件 */
+function fnFilePCAP() {
+  filePullTask(traceId.value).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      handleLoadFile(res.data);
+    }
+  });
+}
+
+/**接收数据后回调 */
+function wsMessage(res: Record<string, any>) {
+  const { code, requestId, data } = res;
+  if (code === RESULT_CODE_ERROR) {
+    console.warn(res.msg);
+    return;
+  }
+
+  // 建联时发送请求
+  if (!requestId && data.clientId) {
+    fnFilePCAP();
+    return;
+  }
+
+  // 订阅组信息
+  if (!data?.groupId) {
+    return;
+  }
+  if (data.groupId === `2_${traceId.value}`) {
+    fnFilePCAP();
+  }
+}
+
+/**建立WS连接 */
+function fnWS() {
+  const options: OptionsType = {
+    url: '/ws',
+    params: {
+      /**订阅通道组
+       *
+       * 跟踪任务PCAP文件 (GroupID:2_traceId)
+       */
+      subGroupID: `2_${traceId.value}`,
+    },
+    onmessage: wsMessage,
+    onerror: (ev: any) => {
+      // 接收数据后回调
+      console.error(ev);
+    },
+  };
+  //建立连接
+  ws.connect(options);
+}
+
+watch(
+  () => state.initialized,
+  v => {
+    v && fnWS();
+  }
+);
+
+onBeforeUnmount(() => {
+  ws.close();
+});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card
+      :bordered="false"
+      :loading="!state.initialized"
+      :body-style="{ padding: '12px' }"
+    >
+      <div class="toolbar">
+        <a-space :size="8" class="toolbar-oper">
+          <a-button type="default" @click.prevent="fnClose()">
+            <template #icon><CloseOutlined /></template>
+            {{ t('common.close') }}
+          </a-button>
+          <span>
+            跟踪编号：
+            <strong>{{ traceId }}</strong>
+          </span>
+        </a-space>
+
+        <div class="toolbar-info">
+          <a-tag color="green" v-show="!!state.currentFilter">
+            {{ state.currentFilter }}
+          </a-tag>
+          <span> Matched Frame: {{ state.totalFrames }} </span>
+        </div>
+
+        <!-- 包信息 -->
+        <a-popover
+          trigger="click"
+          placement="bottomLeft"
+          v-if="state.summary.filename"
+        >
+          <template #content>
+            <div class="summary">
+              <div class="summary-item">
+                <span>Type:</span>
+                <span>{{ state.summary.file_type }}</span>
+              </div>
+              <div class="summary-item">
+                <span>Encapsulation:</span>
+                <span>{{ state.summary.file_encap_type }}</span>
+              </div>
+              <div class="summary-item">
+                <span>Packets:</span>
+                <span>{{ state.summary.packet_count }}</span>
+              </div>
+              <div class="summary-item">
+                <span>Duration:</span>
+                <span>{{ Math.round(state.summary.elapsed_time) }}s</span>
+              </div>
+            </div>
+          </template>
+          <InfoCircleOutlined />
+        </a-popover>
+      </div>
+
+      <!-- 包数据表过滤 -->
+      <a-input-group compact>
+        <a-input
+          v-model:value="state.filter"
+          placeholder="display filter, example: tcp"
+          :allow-clear="true"
+          style="width: calc(100% - 100px)"
+          @pressEnter="handleFilterFrames"
+        >
+          <template #prefix>
+            <FilterOutlined />
+          </template>
+        </a-input>
+        <a-button
+          type="primary"
+          html-type="submit"
+          style="width: 100px"
+          @click="handleFilterFrames"
+        >
+          Filter
+        </a-button>
+      </a-input-group>
+      <a-alert
+        :message="state.filterError"
+        type="error"
+        v-if="state.filterError != null"
+      />
+
+      <!-- 包数据表 -->
+      <PacketTable
+        :columns="state.columns"
+        :data="state.packetFrames"
+        :selectedFrame="state.selectedFrame"
+        :onSelectedFrame="handleSelectedFrame"
+        :onScrollBottom="handleScrollBottom"
+      ></PacketTable>
+
+      <a-row :gutter="20">
+        <a-col :lg="12" :md="12" :xs="24" class="tree">
+          <!-- 帧数据 -->
+          <DissectionTree
+            id="root"
+            :select="handleSelectedTreeEntry"
+            :selected="state.selectedTreeEntry"
+            :tree="state.selectedPacket.tree"
+          />
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24" class="dump">
+          <!-- 报文数据 -->
+          <a-tabs
+            v-model:activeKey="state.selectedDataSourceIndex"
+            :tab-bar-gutter="16"
+            :tab-bar-style="{ marginBottom: '8px' }"
+          >
+            <a-tab-pane
+              :key="idx"
+              :tab="v.name"
+              v-for="(v, idx) in state.selectedPacket.data_sources"
+              style="overflow: auto"
+            >
+              <DissectionDump
+                :base64="v.data"
+                :select="(pos:number)=>handleSelectedFindSelection(idx, pos)"
+                :selected="
+                  idx === state.selectedTreeEntry.idx
+                    ? state.selectedTreeEntry
+                    : NO_SELECTION
+                "
+              />
+            </a-tab-pane>
+          </a-tabs>
+        </a-col>
+      </a-row>
+    </a-card>
+  </PageContainer>
+</template>
+
+<style scoped>
+.toolbar {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+.toolbar-info {
+  flex: 1;
+  text-align: right;
+  padding-right: 8px;
+}
+
+.summary {
+  display: flex;
+  flex-direction: column;
+}
+.summary-item > span:first-child {
+  font-weight: 600;
+  margin-right: 6px;
+}
+
+.tree {
+  font-size: 0.8125rem;
+  line-height: 1.5rem;
+  padding-bottom: 0.75rem;
+  padding-top: 0.75rem;
+  white-space: nowrap;
+  overflow-y: auto;
+  user-select: none;
+  height: 100%;
+}
+.tree > ul.tree {
+  min-height: 15rem;
+}
+
+.dump {
+  padding-bottom: 0.75rem;
+  padding-top: 0.75rem;
+  overflow-y: auto;
+  height: 100%;
+}
+.dump .ant-tabs-tabpane {
+  min-height: calc(15rem - 56px);
+}
+</style>
diff --git a/src/views/traceManage/task/index.vue b/src/views/traceManage/task/index.vue
index 4c7cdab2..4cb13711 100644
--- a/src/views/traceManage/task/index.vue
+++ b/src/views/traceManage/task/index.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { reactive, onMounted, toRaw, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import { PageContainer } from 'antdv-pro-layout';
 import { Form, message, Modal } 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 { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
 import useNeInfoStore from '@/store/modules/neinfo';
@@ -23,6 +25,8 @@ import { parseObjHumpToLine } from '@/utils/parse-utils';
 const neInfoStore = useNeInfoStore();
 const { getDict } = useDictStore();
 const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
 
 /**字典数据 */
 let dict: {
@@ -94,34 +98,34 @@ let tableState: TabeStateType = reactive({
 /**表格字段列 */
 let tableColumns: ColumnsType = [
   {
-    title: t('common.rowId'),
-    dataIndex: 'id',
-    align: 'center',
-  },
-  {
-    title: t('views.traceManage.task.neType'),
+    title: t('views.ne.common.neType'),
     dataIndex: 'neType',
-    align: 'center',
+    align: 'left',
     sorter: {
       compare: (a, b) => 1,
       multiple: 1,
     },
   },
   {
-    title: t('views.traceManage.task.neID'),
+    title: t('views.ne.common.neId'),
     dataIndex: 'neId',
-    align: 'center',
+    align: 'left',
+  },
+  {
+    title: t('views.traceManage.task.traceId'),
+    dataIndex: 'traceId',
+    align: 'left',
   },
   {
     title: t('views.traceManage.task.trackType'),
     dataIndex: 'traceType',
     key: 'traceType',
-    align: 'center',
+    align: 'left',
   },
   {
     title: t('views.traceManage.task.startTime'),
     dataIndex: 'startTime',
-    align: 'center',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
       return parseDateToStr(opt.value);
@@ -131,7 +135,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('views.traceManage.task.endTime'),
     dataIndex: 'endTime',
-    align: 'center',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
       return parseDateToStr(opt.value);
@@ -140,7 +144,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('common.operate'),
     key: 'id',
-    align: 'center',
+    align: 'left',
   },
 ];
 
@@ -312,6 +316,7 @@ let modalState: ModalStateType = reactive({
     id: '',
     neType: '',
     neId: '',
+    traceId: '',
     traceType: '3',
     startTime: undefined,
     endTime: undefined,
@@ -545,6 +550,16 @@ function fnModalCancel() {
   modalState.neTypeInterface = [];
 }
 
+/**跳转PCAP文件详情页面 */
+function fnRecordPCAPView(row: Record<string, any>) {
+  router.push({
+    path: `${route.path}${MENU_PATH_INLINE}/analyze`,
+    query: {
+      traceId: row.traceId,
+    },
+  });
+}
+
 onMounted(() => {
   // 初始字典数据
   Promise.allSettled([getDict('trace_type')]).then(resArr => {
@@ -600,15 +615,12 @@ 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.traceManage.task.neType')"
-              name="neType "
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType ">
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="neCascaderOptions"
                 allow-clear
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -751,7 +763,7 @@ onMounted(() => {
           </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
-              <a-tooltip>
+              <a-tooltip placement="topRight">
                 <template #title>{{ t('common.editText') }}</template>
                 <a-button
                   type="link"
@@ -760,7 +772,15 @@ onMounted(() => {
                   <template #icon><FormOutlined /></template>
                 </a-button>
               </a-tooltip>
-              <a-tooltip>
+              <a-tooltip placement="topRight">
+                <template #title>{{
+                  t('views.traceManage.task.pcapView')
+                }}</template>
+                <a-button type="link" @click.prevent="fnRecordPCAPView(record)">
+                  <template #icon><ContainerOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip placement="topRight">
                 <template #title>{{ t('common.deleteText') }}</template>
                 <a-button
                   type="link"

From 909d30694281f612e8bc73bb3e5ec855f1f161a8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 23 Sep 2024 17:24:55 +0800
Subject: [PATCH 02/15] =?UTF-8?q?perf:=20wg=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=B0=81=E8=A3=85hooks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{wiregasm.js => wiregasm_load.js}         |   0
 public/wiregasm/worker.js                     |   4 +-
 src/views/traceManage/tshark/hooks/usePCAP.ts | 317 +++++++++++++++++
 src/views/traceManage/tshark/index.vue        | 321 ++----------------
 4 files changed, 338 insertions(+), 304 deletions(-)
 rename public/wiregasm/{wiregasm.js => wiregasm_load.js} (100%)
 create mode 100644 src/views/traceManage/tshark/hooks/usePCAP.ts

diff --git a/public/wiregasm/wiregasm.js b/public/wiregasm/wiregasm_load.js
similarity index 100%
rename from public/wiregasm/wiregasm.js
rename to public/wiregasm/wiregasm_load.js
diff --git a/public/wiregasm/worker.js b/public/wiregasm/worker.js
index e4f1c208..1d650b5a 100644
--- a/public/wiregasm/worker.js
+++ b/public/wiregasm/worker.js
@@ -1,7 +1,7 @@
 // load the Wiregasm library
 importScripts(
-  '/wiregasm/wiregasm_new.js',
-  '/wiregasm/wiregasm.js'
+  '/wiregasm/wiregasm_new.js', // self-compilation es5
+  '/wiregasm/wiregasm_load.js'
   // 'https://cdn.jsdelivr.net/npm/@goodtools/wiregasm/dist/wiregasm.js'
 );
 
diff --git a/src/views/traceManage/tshark/hooks/usePCAP.ts b/src/views/traceManage/tshark/hooks/usePCAP.ts
new file mode 100644
index 00000000..0d40a51f
--- /dev/null
+++ b/src/views/traceManage/tshark/hooks/usePCAP.ts
@@ -0,0 +1,317 @@
+import { onBeforeUnmount, onMounted, reactive } from 'vue';
+import { scriptUrl } from '@/assets/js/wiregasm_worker';
+import { WK, OptionsType } from '@/plugins/wk-worker';
+const wk = new WK();
+
+export const NO_SELECTION = { id: '', idx: 0, start: 0, length: 0 };
+
+type StateType = {
+  /**初始化 */
+  initialized: boolean;
+  /**pcap信息 */
+  summary: {
+    filename: string;
+    file_type: string;
+    file_length: number;
+    file_encap_type: string;
+    packet_count: number;
+    start_time: number;
+    stop_time: number;
+    elapsed_time: number;
+  };
+  /**字段 */
+  columns: string[];
+  /**过滤条件 */
+  filter: string;
+  /**过滤条件错误信息 */
+  filterError: string | null;
+  /**当前过滤条件 */
+  currentFilter: string;
+  /**当前选中的帧编号 */
+  selectedFrame: number;
+  /**当前选中的帧数据 */
+  selectedPacket: { tree: any[]; data_sources: any[] };
+  /**pcap包帧数据 */
+  packetFrameData: Map<string, any> | null;
+  /**当前选中的帧数据-空占位 */
+  selectedTreeEntry: typeof NO_SELECTION;
+  /**选择帧的Dump数据标签 */
+  selectedDataSourceIndex: number;
+  /**处理完成状态 */
+  finishedProcessing: boolean;
+  /**pcap包帧数，匹配帧数 */
+  totalFrames: number;
+  /**pcap包帧数据 */
+  packetFrames: any[];
+  /**加载帧数 */
+  nextPageSize: number;
+  /**加载页数 */
+  nextPageNum: number;
+  /**加载下一页 */
+  nextPageLoad: boolean;
+};
+
+export function usePCAP() {
+  const state = reactive<StateType>({
+    initialized: false,
+    summary: {
+      filename: '',
+      file_type: 'Wireshark/tcpdump/... - pcap',
+      file_length: 0,
+      file_encap_type: 'Ethernet',
+      packet_count: 0,
+      start_time: 0,
+      stop_time: 0,
+      elapsed_time: 0,
+    },
+    columns: [],
+    filter: '',
+    filterError: null,
+    currentFilter: '',
+    selectedFrame: 1,
+    /**当前选中的帧数据 */
+    selectedPacket: { tree: [], data_sources: [] },
+    packetFrameData: null, // 注意：Map 需要额外处理
+    selectedTreeEntry: NO_SELECTION, // NO_SELECTION 需要定义
+    /**选择帧的Dump数据标签 */
+    selectedDataSourceIndex: 0,
+    /**处理完成状态 */
+    finishedProcessing: false,
+    totalFrames: 0,
+    packetFrames: [],
+    nextPageNum: 1,
+    nextPageSize: 40,
+    nextPageLoad: false,
+  });
+
+  // 清除帧数据和报文信息状态
+  function handleStateReset() {
+    // 加载pcap包的数据
+    state.nextPageNum = 1;
+    // 选择帧的数据
+    state.selectedFrame = 0;
+    state.selectedPacket = { tree: [], data_sources: [] };
+    state.packetFrameData = null;
+    state.selectedTreeEntry = NO_SELECTION;
+    state.selectedDataSourceIndex = 0;
+  }
+
+  /**解析帧数据为简单结构 */
+  function parseFrameData(id: string, node: Record<string, any>) {
+    let map = new Map();
+
+    if (node.tree && node.tree.length > 0) {
+      for (let i = 0; i < node.tree.length; i++) {
+        const subMap = parseFrameData(`${id}-${i}`, node.tree[i]);
+        subMap.forEach((value, key) => {
+          map.set(key, value);
+        });
+      }
+    } else if (node.length > 0) {
+      map.set(id, {
+        id: id,
+        idx: node.data_source_idx,
+        start: node.start,
+        length: node.length,
+      });
+    }
+
+    return map;
+  }
+
+  /**帧数据点击选中 */
+  function handleSelectedTreeEntry(e: any) {
+    console.log('fnSelectedTreeEntry', e);
+    state.selectedTreeEntry = e;
+  }
+  /**报文数据点击选中 */
+  function handleSelectedFindSelection(src_idx: number, pos: number) {
+    console.log('fnSelectedFindSelection', pos);
+    if (state.packetFrameData == null) return;
+    // find the smallest one
+    let current = null;
+    for (let [k, pp] of state.packetFrameData) {
+      if (pp.idx !== src_idx) continue;
+
+      if (pos >= pp.start && pos <= pp.start + pp.length) {
+        if (
+          current != null &&
+          state.packetFrameData.get(current).length > pp.length
+        ) {
+          current = k;
+        } else {
+          current = k;
+        }
+      }
+    }
+    if (current != null) {
+      state.selectedTreeEntry = state.packetFrameData.get(current);
+    }
+  }
+  /**包数据表点击选中 */
+  function handleSelectedFrame(no: number) {
+    console.log('fnSelectedFrame', no, state.totalFrames);
+    state.selectedFrame = no;
+    wk.send({ type: 'select', number: state.selectedFrame });
+  }
+  /**包数据表滚动底部加载 */
+  function handleScrollBottom() {
+    const totalFetched = state.packetFrames.length;
+    console.log('fnScrollBottom', totalFetched);
+    if (!state.nextPageLoad && totalFetched < state.totalFrames) {
+      state.nextPageLoad = true;
+      state.nextPageNum++;
+      loaldFrames(state.filter, state.nextPageNum);
+    }
+  }
+  /**包数据表过滤 */
+  function handleFilterFrames() {
+    console.log('fnFilterFinish', state.filter);
+    wk.send({ type: 'check-filter', filter: state.filter });
+  }
+  /**包数据表加载 */
+  function loaldFrames(filter: string, page: number = 1) {
+    if (!(state.initialized && state.finishedProcessing)) return;
+    const limit = state.nextPageSize;
+    wk.send({
+      type: 'frames',
+      filter: filter,
+      skip: (page - 1) * limit,
+      limit: limit,
+    });
+  }
+
+  /**加载包文件 */
+  function handleLoadFile(file: File | Blob) {
+    state.summary = {
+      filename: '',
+      file_type: 'Wireshark/tcpdump/... - pcap',
+      file_length: 0,
+      file_encap_type: 'Ethernet',
+      packet_count: 0,
+      start_time: 0,
+      stop_time: 0,
+      elapsed_time: 0,
+    };
+    state.finishedProcessing = false; 
+    
+    wk.send({ type: 'process', file: file });
+  }
+
+  /**本地示例文件 */
+  async function handleLoadExample() {
+    const name = 'test_ethernet.pcap';
+    const res = await fetch('/wiregasm/test_ethernet.pcap');
+    const body = await res.arrayBuffer();
+
+    state.summary = {
+      filename: '',
+      file_type: 'Wireshark/tcpdump/... - pcap',
+      file_length: 0,
+      file_encap_type: 'Ethernet',
+      packet_count: 0,
+      start_time: 0,
+      stop_time: 0,
+      elapsed_time: 0,
+    };
+    state.finishedProcessing = false;
+
+    wk.send({ type: 'process-data', name: name, data: body });
+  }
+
+  /**接收数据后回调 */
+  function wkMessage(res: Record<string, any>) {
+    switch (res.type) {
+      case 'status':
+        console.info(res.status);
+        break;
+      case 'error':
+        console.warn(res.error);
+        break;
+      case 'init':
+        wk.send({ type: 'columns' });
+        state.initialized = true;
+        break;
+      case 'columns':
+        state.columns = res.data;
+        break;
+      case 'frames':
+        // console.log(res.data);
+        const { matched, frames } = res.data;
+        state.totalFrames = matched;
+
+        if (state.nextPageNum == 1) {
+          state.packetFrames = frames;
+          // 有匹配的选择第一个
+          if (frames.length > 0) {
+            state.selectedFrame = frames[0].number;
+            handleSelectedFrame(state.selectedFrame);
+          }
+        } else {
+          state.packetFrames = state.packetFrames.concat(frames);
+          state.nextPageLoad = false;
+        }
+        break;
+      case 'selected':
+        state.selectedPacket = res.data;
+        state.packetFrameData = parseFrameData('root', res.data);
+        state.selectedTreeEntry = NO_SELECTION;
+        state.selectedDataSourceIndex = 0;
+        break;
+      case 'processed':
+        // setStatus(`Error: non-zero return code (${e.data.code})`);
+        state.finishedProcessing = true;
+        if (res.data.code === 0) {
+          state.summary = res.data.summary;
+        }
+
+        // 加载数据
+        handleStateReset();
+        loaldFrames(state.filter);
+        break;
+      case 'filter':
+        const filterRes = res.data;
+        if (filterRes.ok) {
+          state.currentFilter = state.filter;
+          state.filterError = null;
+          // 加载数据
+          handleStateReset();
+          loaldFrames(state.filter);
+        } else {
+          state.filterError = filterRes.error;
+        }
+        break;
+      default:
+        console.warn(res);
+        break;
+    }
+  }
+
+  onMounted(() => {
+    // 建立链接
+    const options: OptionsType = {
+      url: scriptUrl,
+      onmessage: wkMessage,
+      onerror: (ev: any) => {
+        console.error(ev);
+      },
+    };
+    wk.connect(options);
+  });
+
+  onBeforeUnmount(() => {
+    wk.close();
+  });
+
+  return {
+    state,
+    handleSelectedTreeEntry,
+    handleSelectedFindSelection,
+    handleSelectedFrame,
+    handleScrollBottom,
+    handleFilterFrames,
+    handleLoadExample,
+    handleLoadFile,
+  };
+}
+export default usePCAP;
diff --git a/src/views/traceManage/tshark/index.vue b/src/views/traceManage/tshark/index.vue
index 3e19bca1..53bfed62 100644
--- a/src/views/traceManage/tshark/index.vue
+++ b/src/views/traceManage/tshark/index.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { reactive, onMounted } from 'vue';
 import { message, Upload } from 'ant-design-vue/lib';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
@@ -7,210 +6,20 @@ import { PageContainer } from 'antdv-pro-layout';
 import DissectionTree from './components/DissectionTree.vue';
 import DissectionDump from './components/DissectionDump.vue';
 import PacketTable from './components/PacketTable.vue';
-import { scriptUrl } from '@/assets/js/wiregasm_worker';
+import { usePCAP, NO_SELECTION } from './hooks/usePCAP';
 import { parseSizeFromFile } from '@/utils/parse-utils';
-import { WK, OptionsType } from '@/plugins/wk-worker';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
-const wk = new WK();
-
-const NO_SELECTION = { id: '', idx: 0, start: 0, length: 0 };
-
-type StateType = {
-  /**初始化 */
-  initialized: boolean;
-  /**pcap信息 */
-  summary: {
-    filename: string;
-    file_type: string;
-    file_length: number;
-    file_encap_type: string;
-    packet_count: number;
-    start_time: number;
-    stop_time: number;
-    elapsed_time: number;
-  };
-  /**字段 */
-  columns: string[];
-  /**过滤条件 */
-  filter: string;
-  /**过滤条件错误信息 */
-  filterError: string | null;
-  /**当前过滤条件 */
-  currentFilter: string;
-  /**当前选中的帧编号 */
-  selectedFrame: number;
-  /**当前选中的帧数据 */
-  selectedPacket: { tree: any[]; data_sources: any[] };
-  /**pcap包帧数据 */
-  packetFrameData: Map<string, any> | null;
-  /**当前选中的帧数据-空占位 */
-  selectedTreeEntry: typeof NO_SELECTION;
-  /**选择帧的Dump数据标签 */
-  selectedDataSourceIndex: number;
-  /**处理完成状态 */
-  finishedProcessing: boolean;
-  /**pcap包帧数，匹配帧数 */
-  totalFrames: number;
-  /**pcap包帧数据 */
-  packetFrames: any[];
-  /**加载帧数 */
-  nextPageSize: number;
-  /**加载页数 */
-  nextPageNum: number;
-  /**加载下一页 */
-  nextPageLoad: boolean;
-};
-
-const state = reactive<StateType>({
-  initialized: false,
-  summary: {
-    filename: '',
-    file_type: 'Wireshark/tcpdump/... - pcap',
-    file_length: 0,
-    file_encap_type: 'Ethernet',
-    packet_count: 0,
-    start_time: 0,
-    stop_time: 0,
-    elapsed_time: 0,
-  },
-  columns: [],
-  filter: '',
-  filterError: null,
-  currentFilter: '',
-  selectedFrame: 1,
-  /**当前选中的帧数据 */
-  selectedPacket: { tree: [], data_sources: [] },
-  packetFrameData: null, // 注意：Map 需要额外处理
-  selectedTreeEntry: NO_SELECTION, // NO_SELECTION 需要定义
-  /**选择帧的Dump数据标签 */
-  selectedDataSourceIndex: 0,
-  /**处理完成状态 */
-  finishedProcessing: false,
-  totalFrames: 0,
-  packetFrames: [],
-  nextPageNum: 1,
-  nextPageSize: 40,
-  nextPageLoad: false,
-});
-
-// 清除帧数据和报文信息状态
-function fnStateReset() {
-  // 加载pcap包的数据
-  state.nextPageNum = 1;
-  // 选择帧的数据
-  state.selectedFrame = 0;
-  state.selectedPacket = { tree: [], data_sources: [] };
-  state.packetFrameData = null;
-  state.selectedTreeEntry = NO_SELECTION;
-  state.selectedDataSourceIndex = 0;
-}
-
-/**解析帧数据为简单结构 */
-function parseFrameData(id: string, node: Record<string, any>) {
-  let map = new Map();
-
-  if (node.tree && node.tree.length > 0) {
-    for (let i = 0; i < node.tree.length; i++) {
-      const subMap = parseFrameData(`${id}-${i}`, node.tree[i]);
-      subMap.forEach((value, key) => {
-        map.set(key, value);
-      });
-    }
-  } else if (node.length > 0) {
-    map.set(id, {
-      id: id,
-      idx: node.data_source_idx,
-      start: node.start,
-      length: node.length,
-    });
-  }
-
-  return map;
-}
-
-/**帧数据点击选中 */
-function fnSelectedTreeEntry(e: any) {
-  console.log('fnSelectedTreeEntry', e);
-  state.selectedTreeEntry = e;
-}
-/**报文数据点击选中 */
-function fnSelectedFindSelection(src_idx: number, pos: number) {
-  console.log('fnSelectedFindSelection', pos);
-  if (state.packetFrameData == null) return;
-  // find the smallest one
-  let current = null;
-  for (let [k, pp] of state.packetFrameData) {
-    if (pp.idx !== src_idx) continue;
-
-    if (pos >= pp.start && pos <= pp.start + pp.length) {
-      if (
-        current != null &&
-        state.packetFrameData.get(current).length > pp.length
-      ) {
-        current = k;
-      } else {
-        current = k;
-      }
-    }
-  }
-  if (current != null) {
-    state.selectedTreeEntry = state.packetFrameData.get(current);
-  }
-}
-/**包数据表点击选中 */
-function fnSelectedFrame(no: number) {
-  console.log('fnSelectedFrame', no, state.totalFrames);
-  state.selectedFrame = no;
-  wk.send({ type: 'select', number: state.selectedFrame });
-}
-/**包数据表滚动底部加载 */
-function fnScrollBottom() {
-  const totalFetched = state.packetFrames.length;
-  console.log('fnScrollBottom', totalFetched);
-  if (!state.nextPageLoad && totalFetched < state.totalFrames) {
-    state.nextPageLoad = true;
-    state.nextPageNum++;
-    fnLoaldFrames(state.filter, state.nextPageNum);
-  }
-}
-/**包数据表过滤 */
-function fnFilterFrames() {
-  console.log('fnFilterFinish', state.filter);
-  wk.send({ type: 'check-filter', filter: state.filter });
-}
-/**包数据表记载 */
-function fnLoaldFrames(filter: string, page: number = 1) {
-  if (!(state.initialized && state.finishedProcessing)) return;
-  const limit = state.nextPageSize;
-  wk.send({
-    type: 'frames',
-    filter: filter,
-    skip: (page - 1) * limit,
-    limit: limit,
-  });
-}
-
-/**本地示例文件 */
-async function fnLoadExample() {
-  const name = 'test_ethernet.pcap';
-  const res = await fetch('/wiregasm/test_ethernet.pcap');
-  const body = await res.arrayBuffer();
-
-  state.summary = {
-    filename: '',
-    file_type: 'Wireshark/tcpdump/... - pcap',
-    file_length: 0,
-    file_encap_type: 'Ethernet',
-    packet_count: 0,
-    start_time: 0,
-    stop_time: 0,
-    elapsed_time: 0,
-  };
-  state.finishedProcessing = false;
-
-  wk.send({ type: 'process-data', name: name, data: body });
-}
+const {
+  state,
+  handleSelectedTreeEntry,
+  handleSelectedFindSelection,
+  handleSelectedFrame,
+  handleScrollBottom,
+  handleFilterFrames,
+  handleLoadExample,
+  handleLoadFile,
+} = usePCAP();
 
 /**上传前检查或转换压缩 */
 function fnBeforeUpload(file: FileType) {
@@ -229,100 +38,8 @@ function fnBeforeUpload(file: FileType) {
 
 /**表单上传文件 */
 function fnUpload(up: UploadRequestOption) {
-  state.summary = {
-    filename: '',
-    file_type: 'Wireshark/tcpdump/... - pcap',
-    file_length: 0,
-    file_encap_type: 'Ethernet',
-    packet_count: 0,
-    start_time: 0,
-    stop_time: 0,
-    elapsed_time: 0,
-  };
-  state.finishedProcessing = false;
-
-  wk.send({ type: 'process', file: up.file });
+  handleLoadFile(up.file as File);
 }
-
-/**接收数据后回调 */
-function wkMessage(res: Record<string, any>) {
-  switch (res.type) {
-    case 'status':
-      console.info(res.status);
-      break;
-    case 'error':
-      console.warn(res.error);
-      break;
-    case 'init':
-      wk.send({ type: 'columns' });
-      state.initialized = true;
-      break;
-    case 'columns':
-      state.columns = res.data;
-      break;
-    case 'frames':
-      // console.log(res.data);
-      const { matched, frames } = res.data;
-      state.totalFrames = matched;
-
-      if (state.nextPageNum == 1) {
-        state.packetFrames = frames;
-        // 有匹配的选择第一个
-        if (frames.length > 0) {
-          state.selectedFrame = frames[0].number;
-          fnSelectedFrame(state.selectedFrame);
-        }
-      } else {
-        state.packetFrames = state.packetFrames.concat(frames);
-        state.nextPageLoad = false;
-      }
-      break;
-    case 'selected':
-      state.selectedPacket = res.data;
-      state.packetFrameData = parseFrameData('root', res.data);
-      state.selectedTreeEntry = NO_SELECTION;
-      state.selectedDataSourceIndex = 0;
-      break;
-    case 'processed':
-      // setStatus(`Error: non-zero return code (${e.data.code})`);
-      state.finishedProcessing = true;
-      if (res.data.code === 0) {
-        state.summary = res.data.summary;
-      }
-
-      // 加载数据
-      fnStateReset();
-      fnLoaldFrames(state.filter);
-      break;
-    case 'filter':
-      const filterRes = res.data;
-      if (filterRes.ok) {
-        state.currentFilter = state.filter;
-        state.filterError = null;
-        // 加载数据
-        fnStateReset();
-        fnLoaldFrames(state.filter);
-      } else {
-        state.filterError = filterRes.error;
-      }
-      break;
-    default:
-      console.log(res);
-      break;
-  }
-}
-
-onMounted(() => {
-  // 建立链接
-  const options: OptionsType = {
-    url: scriptUrl,
-    onmessage: wkMessage,
-    onerror: (ev: any) => {
-      console.error(ev);
-    },
-  };
-  wk.connect(options);
-});
 </script>
 
 <template>
@@ -345,7 +62,7 @@ onMounted(() => {
           >
             <a-button type="primary"> Upload </a-button>
           </a-upload>
-          <a-button @click="fnLoadExample">Example</a-button>
+          <a-button @click="handleLoadExample()">Example</a-button>
         </a-space>
 
         <div class="toolbar-info">
@@ -396,7 +113,7 @@ onMounted(() => {
           placeholder="display filter, example: tcp"
           :allow-clear="true"
           style="width: calc(100% - 100px)"
-          @pressEnter="fnFilterFrames"
+          @pressEnter="handleFilterFrames"
         >
           <template #prefix>
             <FilterOutlined />
@@ -406,7 +123,7 @@ onMounted(() => {
           type="primary"
           html-type="submit"
           style="width: 100px"
-          @click="fnFilterFrames"
+          @click="handleFilterFrames"
         >
           Filter
         </a-button>
@@ -422,8 +139,8 @@ onMounted(() => {
         :columns="state.columns"
         :data="state.packetFrames"
         :selectedFrame="state.selectedFrame"
-        :onSelectedFrame="fnSelectedFrame"
-        :onScrollBottom="fnScrollBottom"
+        :onSelectedFrame="handleSelectedFrame"
+        :onScrollBottom="handleScrollBottom"
       ></PacketTable>
 
       <a-row :gutter="20">
@@ -431,7 +148,7 @@ onMounted(() => {
           <!-- 帧数据 -->
           <DissectionTree
             id="root"
-            :select="fnSelectedTreeEntry"
+            :select="handleSelectedTreeEntry"
             :selected="state.selectedTreeEntry"
             :tree="state.selectedPacket.tree"
           />
@@ -451,7 +168,7 @@ onMounted(() => {
             >
               <DissectionDump
                 :base64="v.data"
-                :select="(pos:number)=>fnSelectedFindSelection(idx, pos)"
+                :select="(pos:number)=>handleSelectedFindSelection(idx, pos)"
                 :selected="
                   idx === state.selectedTreeEntry.idx
                     ? state.selectedTreeEntry

From b9105c1e77935c55464f3b663cfbc3b16dff1a6a Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 23 Sep 2024 17:25:26 +0800
Subject: [PATCH 03/15] =?UTF-8?q?style:=20=E6=B3=A8=E9=87=8A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A7=A3=E6=9E=90html=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/traceManage/analysis/index.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/traceManage/analysis/index.vue b/src/views/traceManage/analysis/index.vue
index 26137c6a..2c038703 100644
--- a/src/views/traceManage/analysis/index.vue
+++ b/src/views/traceManage/analysis/index.vue
@@ -202,15 +202,15 @@ function fnModalVisible(row: Record<string, any>) {
   const rawData = convertToReadableFormat(hexString);
   modalState.from.rawData = rawData;
   // RAW解析HTML
-  getTraceRawInfo(row.id).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS) {
-      const htmlString = rawDataHTMLScript(res.msg);
-      modalState.from.rawDataHTML = htmlString;
-      modalState.from.downBtn = true;
-    } else {
-      modalState.from.rawDataHTML = t('views.traceManage.analysis.noData');
-    }
-  });
+  // getTraceRawInfo(row.id).then(res => {
+  //   if (res.code === RESULT_CODE_SUCCESS) {
+  //     const htmlString = rawDataHTMLScript(res.msg);
+  //     modalState.from.rawDataHTML = htmlString;
+  //     modalState.from.downBtn = true;
+  //   } else {
+  //     modalState.from.rawDataHTML = t('views.traceManage.analysis.noData');
+  //   }
+  // });
   modalState.title = t('views.traceManage.analysis.taskTitle', {
     num: row.imsi,
   });
@@ -495,7 +495,7 @@ onMounted(() => {
         <a-col class="txt" :span="10">{{ v.asciiText }}</a-col>
       </a-row>
       <a-divider />
-      <div class="raw-title">
+      <!-- <div class="raw-title">
         {{ t('views.traceManage.analysis.signalDetail') }}
         <a-button
           type="dashed"
@@ -508,8 +508,8 @@ onMounted(() => {
           </template>
           {{ t('views.traceManage.analysis.taskDownText') }}
         </a-button>
-      </div>
-      <div class="raw-html" v-html="modalState.from.rawDataHTML"></div>
+      </div> -->
+      <!-- <div class="raw-html" v-html="modalState.from.rawDataHTML"></div> -->
     </ProModal>
   </PageContainer>
 </template>

From 45f66afe520a8ee312d962458bb160dfa1e00ad9 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 23 Sep 2024 17:44:16 +0800
Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=8F=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neInfo/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue
index 198ab8fb..57d2e0b0 100644
--- a/src/views/ne/neInfo/index.vue
+++ b/src/views/ne/neInfo/index.vue
@@ -237,7 +237,9 @@ function fnModalEditOk(from: Record<string, any>) {
         item.neName = from.neName;
         item.ip = from.ip;
         item.port = from.port;
-        item.status = res.data.online ? '1' : '0';
+        if (item.status !== '2') {
+          item.status = res.data.online ? '1' : '0';
+        }
         Object.assign(item.serverState, res.data);
         const resouresUsage = parseResouresUsage(item.serverState);
         Reflect.set(item, 'resoures', resouresUsage);

From 94886e255e007dddc741e8d31f560805660139f4 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 24 Sep 2024 10:52:28 +0800
Subject: [PATCH 05/15] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E6=95=B0=E6=8D=AE=E6=94=AF=E6=8C=81=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?pcap=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/traceManage/task/analyze.vue | 50 +++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/views/traceManage/task/analyze.vue b/src/views/traceManage/task/analyze.vue
index ad90b71b..9e055a31 100644
--- a/src/views/traceManage/task/analyze.vue
+++ b/src/views/traceManage/task/analyze.vue
@@ -2,6 +2,7 @@
 import { onBeforeUnmount, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { PageContainer } from 'antdv-pro-layout';
+import { message, Modal } from 'ant-design-vue/lib';
 import DissectionTree from '../tshark/components/DissectionTree.vue';
 import DissectionDump from '../tshark/components/DissectionDump.vue';
 import PacketTable from '../tshark/components/PacketTable.vue';
@@ -14,6 +15,7 @@ import { filePullTask } from '@/api/trace/task';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import useI18n from '@/hooks/useI18n';
 import useTabsStore from '@/store/modules/tabs';
+import saveAs from 'file-saver';
 const route = useRoute();
 const router = useRouter();
 const tabsStore = useTabsStore();
@@ -42,6 +44,44 @@ function fnClose() {
   }
 }
 
+/**下载触发等待 */
+let downLoading = ref<boolean>(false);
+
+/**信息文件下载 */
+function fnDownloadFile() {
+  if (downLoading.value) return;
+  const fileName = `trace_${traceId.value}.pcap`
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.logManage.neFile.downTip', { fileName }),
+    onOk() {
+      downLoading.value = true;
+      const hide = message.loading(t('common.loading'), 0);
+      filePullTask(traceId.value)
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('common.msgSuccess', {
+                msg: t('common.downloadText'),
+              }),
+              duration: 2,
+            });
+            saveAs(res.data, `${fileName}`);
+          } else {
+            message.error({
+              content: t('views.logManage.neFile.downTipErr'),
+              duration: 2,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          downLoading.value = false;
+        });
+    },
+  });
+}
+
 /**获取PCAP文件 */
 function fnFilePCAP() {
   filePullTask(traceId.value).then(res => {
@@ -120,8 +160,16 @@ onBeforeUnmount(() => {
             <template #icon><CloseOutlined /></template>
             {{ t('common.close') }}
           </a-button>
+          <a-button
+            type="primary"
+            :loading="downLoading"
+            @click.prevent="fnDownloadFile()"
+          >
+            <template #icon><DownloadOutlined /></template>
+            {{ t('common.downloadText') }}
+          </a-button>
           <span>
-            跟踪编号：
+            {{ t('views.traceManage.task.traceId') }}:&nbsp;
             <strong>{{ traceId }}</strong>
           </span>
         </a-space>

From 6bea64f3456d8032f7dc6b1586d6804d4093eddf Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 24 Sep 2024 10:53:33 +0800
Subject: [PATCH 06/15] =?UTF-8?q?style:=20=E5=A4=9A=E8=AF=AD=E8=A8=80views?=
 =?UTF-8?q?.traceManage.task=E5=8F=96=E5=80=BC=E5=8F=98=E6=9B=B4views.ne.c?=
 =?UTF-8?q?ommon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perfManage/customTarget/index.vue  | 10 +++++-----
 src/views/perfManage/goldTarget/index.vue    |  2 +-
 src/views/perfManage/kpiCReport/index.vue    |  2 +-
 src/views/perfManage/perfThreshold/index.vue | 10 +++++-----
 src/views/perfManage/taskManage/index.vue    | 12 ++++++------
 src/views/traceManage/task/index.vue         |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue
index 00cf5631..3da08739 100644
--- a/src/views/perfManage/customTarget/index.vue
+++ b/src/views/perfManage/customTarget/index.vue
@@ -265,7 +265,7 @@ const modalStateFrom = Form.useForm(
     neType: [
       {
         required: true,
-        message: t('views.traceManage.task.neTypePlease'),
+        message: t('views.ne.common.neTypePlease'),
       },
     ],
     expression: [
@@ -466,14 +466,14 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType "
             >
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="neCascaderOptions"
                 allow-clear
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -624,7 +624,7 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType"
               v-bind="modalStateFrom.validateInfos.neType"
             >
@@ -633,7 +633,7 @@ onMounted(() => {
                 :options="neCascaderOptions"
                 @change="fnSelectPerformanceInit"
                 :allow-clear="false"
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               >
               </a-select>
             </a-form-item>
diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue
index 0dfbc726..5aaf1bd9 100644
--- a/src/views/perfManage/goldTarget/index.vue
+++ b/src/views/perfManage/goldTarget/index.vue
@@ -649,7 +649,7 @@ onBeforeUnmount(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
               name="neType"
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
             >
               <a-cascader
                 v-model:value="state.neType"
diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue
index 1f07224c..ed147d0f 100644
--- a/src/views/perfManage/kpiCReport/index.vue
+++ b/src/views/perfManage/kpiCReport/index.vue
@@ -661,7 +661,7 @@ onBeforeUnmount(() => {
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
               name="neType"
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
             >
               <a-cascader
                 v-model:value="state.neType"
diff --git a/src/views/perfManage/perfThreshold/index.vue b/src/views/perfManage/perfThreshold/index.vue
index 16ebd3b9..8801b797 100644
--- a/src/views/perfManage/perfThreshold/index.vue
+++ b/src/views/perfManage/perfThreshold/index.vue
@@ -250,7 +250,7 @@ const modalStateFrom = Form.useForm(
     neType: [
       {
         required: true,
-        message: t('views.traceManage.task.neTypePlease'),
+        message: t('views.ne.common.neTypePlease'),
       },
     ],
 
@@ -513,14 +513,14 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType "
             >
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="useNeInfoStore().getNeSelectOtions"
                 allow-clear
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -686,7 +686,7 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType"
               v-bind="modalStateFrom.validateInfos.neType"
             >
@@ -695,7 +695,7 @@ onMounted(() => {
                 :options="useNeInfoStore().getNeSelectOtions"
                 @change="fnSelectPerformanceInit"
                 :allow-clear="false"
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               >
               </a-select>
             </a-form-item>
diff --git a/src/views/perfManage/taskManage/index.vue b/src/views/perfManage/taskManage/index.vue
index a2be812b..81b134de 100644
--- a/src/views/perfManage/taskManage/index.vue
+++ b/src/views/perfManage/taskManage/index.vue
@@ -308,7 +308,7 @@ const modalStateFrom = Form.useForm(
     neId: [
       {
         required: true,
-        message: t('views.traceManage.task.neTypePlease'),
+        message: t('views.ne.common.neTypePlease'),
       },
     ],
     granulOption: [
@@ -725,14 +725,14 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType "
             >
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="neInfoStore.getNeSelectOtions"
                 allow-clear
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -891,7 +891,7 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType"
             >
               <a-cascader
@@ -1007,7 +1007,7 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               name="neType"
               v-bind="modalStateFrom.validateInfos.neId"
             >
@@ -1016,7 +1016,7 @@ onMounted(() => {
                 :options="neInfoStore.getNeCascaderOptions"
                 @change="fnNeChange"
                 :allow-clear="false"
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
diff --git a/src/views/traceManage/task/index.vue b/src/views/traceManage/task/index.vue
index 4cb13711..9e254eb8 100644
--- a/src/views/traceManage/task/index.vue
+++ b/src/views/traceManage/task/index.vue
@@ -347,7 +347,7 @@ const modalStateFrom = Form.useForm(
     neId: [
       {
         required: true,
-        message: t('views.traceManage.task.neTypePlease'),
+        message: t('views.ne.common.neTypePlease'),
       },
     ],
     endTime: [
@@ -818,7 +818,7 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.neType')"
+              :label="t('views.ne.common.neType')"
               :label-col="{ span: 8 }"
               name="neType"
               v-bind="modalStateFrom.validateInfos.neId"
@@ -828,7 +828,7 @@ onMounted(() => {
                 :options="neCascaderOptions"
                 @change="fnNeChange"
                 :allow-clear="false"
-                :placeholder="t('views.traceManage.task.neTypePlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>

From b995ac378a58827f12fbccc8cbfcf3efd88cb8b0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Sep 2024 17:20:01 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=90=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=BB=A7=E7=BB=AD=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts        | 4 ++--
 src/i18n/locales/zh-CN.ts        | 4 ++--
 src/views/ne/neVersion/index.vue | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 3a4d3601..85f56c4d 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -739,11 +739,11 @@ export default {
         upgrade: "Upgrade To New Version",
         upgradeTip: "Confirmed to upgrade to the new version?",
         upgradeTipEmpty: "There are currently no new versions available",
-        upgradeTipEqual: "Current version is the same as the new version",
+        upgradeTipEqual: "The current version is the same as the new version, confirmed to update?",
         rollback: 'Switch to previous version',
         rollbackTip: "Confirm switching to the previous version?",
         rollbackTipEmpty: "There is currently no previous version available",
-        rollbackTipEqual: 'The current version is the same as the previous version',
+        rollbackTipEqual: 'The current version is the same as the previous version, are you sure you want to make the switch?',
         version: "Current Version",
         preVersion: "Previous Version",
         newVersion: "New Version",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index ac006a9e..9280e038 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -739,11 +739,11 @@ export default {
         upgrade: "升级到新版本",
         upgradeTip: "确认要升级到新版本吗？",
         upgradeTipEmpty: "当前没有可用的新版本",
-        upgradeTipEqual: "当前版本与新版本相同",
+        upgradeTipEqual: "当前版本与新版本相同，确认要进行更新吗？",
         rollback: '切换到上一个版本',
         rollbackTip: "确认切换到上一个版本吗？",
         rollbackTipEmpty: "目前没有可用的上一个版本",
-        rollbackTipEqual: '当前版本与之前版本相同',
+        rollbackTipEqual: '当前版本与之前版本相同，确认要进行切换吗？',
         version: "当前版本",
         preVersion: "上一个版本",
         newVersion: "新版本",
diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue
index 50add735..4bebcd6c 100644
--- a/src/views/ne/neVersion/index.vue
+++ b/src/views/ne/neVersion/index.vue
@@ -294,8 +294,7 @@ function fnRecordVersion(
       return;
     }
     if (row.newVersion === row.version) {
-      message.warning(t('views.ne.neVersion.upgradeTipEqual'), 3);
-      return;
+      contentTip = t('views.ne.neVersion.upgradeTipEqual');
     }
   }
   if (action === 'rollback') {
@@ -305,8 +304,7 @@ function fnRecordVersion(
       return;
     }
     if (row.preVersion === row.version) {
-      message.warning(t('views.ne.neVersion.rollbackTipEqual'), 3);
-      return;
+      contentTip = t('views.ne.neVersion.rollbackTipEqual');
     }
   }
 

From c33000045a1e08e299a905abe7eda938bcba3fe8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Sep 2024 17:23:24 +0800
Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8Cwg=E5=85=B3=E9=97=AD=E9=94=80=E6=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/wiregasm/worker.js                     | 3 +++
 src/views/traceManage/tshark/hooks/usePCAP.ts | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/wiregasm/worker.js b/public/wiregasm/worker.js
index 1d650b5a..7b5872af 100644
--- a/public/wiregasm/worker.js
+++ b/public/wiregasm/worker.js
@@ -63,6 +63,9 @@ function replacer(key, value) {
 this.onmessage = ev => {
   const data = ev.data;
   switch (data.type) {
+    case 'close':
+      wg.destroy();
+      break;
     case 'columns':
       const columns = wg.columns();
       if (Array.isArray(columns)) {
diff --git a/src/views/traceManage/tshark/hooks/usePCAP.ts b/src/views/traceManage/tshark/hooks/usePCAP.ts
index 0d40a51f..83e9b490 100644
--- a/src/views/traceManage/tshark/hooks/usePCAP.ts
+++ b/src/views/traceManage/tshark/hooks/usePCAP.ts
@@ -193,8 +193,8 @@ export function usePCAP() {
       stop_time: 0,
       elapsed_time: 0,
     };
-    state.finishedProcessing = false; 
-    
+    state.finishedProcessing = false;
+
     wk.send({ type: 'process', file: file });
   }
 
@@ -300,7 +300,7 @@ export function usePCAP() {
   });
 
   onBeforeUnmount(() => {
-    wk.close();
+    wk.send({ type: 'close' }) && wk.close();
   });
 
   return {

From 977286d6b3906ec29a4f822332df9dc9a7f42a28 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 26 Sep 2024 17:31:57 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=E9=A9=BC=E5=B3=B0=E5=92=8C?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF=E4=BA=92=E8=BD=AC=E5=87=BD=E6=95=B0=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E9=9D=9E=E5=AF=B9=E8=B1=A1=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/parse-utils.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/utils/parse-utils.ts b/src/utils/parse-utils.ts
index bfaed055..508f6a6d 100644
--- a/src/utils/parse-utils.ts
+++ b/src/utils/parse-utils.ts
@@ -37,7 +37,10 @@ export function parseStrLineToHump(str: string): string {
  */
 export function parseStrHumpToLine(str: string): string {
   if (!str) return str;
-  return str.replace(/([A-Z])/g, '_$1').toLowerCase().replace(/^_/, '');
+  return str
+    .replace(/([A-Z])/g, '_$1')
+    .toLowerCase()
+    .replace(/^_/, '');
 }
 
 /**
@@ -63,9 +66,6 @@ export function parseObjHumpToLine(obj: any): any {
     });
     return obj;
   }
-  if (typeof obj === 'string') {
-    return parseStrHumpToLine(obj);
-  }
   return obj;
 }
 
@@ -92,9 +92,6 @@ export function parseObjLineToHump(obj: any): any {
     });
     return obj;
   }
-  if (typeof obj === 'string') {
-    return parseStrLineToHump(obj);
-  }
   return obj;
 }
 

From adfce5d2f7195d9c046799a984af55599909e9f0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Sep 2024 10:05:45 +0800
Subject: [PATCH 10/15] =?UTF-8?q?style:=20SMSC-CDR=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=B8=A6result,cause?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/smscCDR/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/smscCDR/index.vue b/src/views/dashboard/smscCDR/index.vue
index 736269d3..30fc6a5b 100644
--- a/src/views/dashboard/smscCDR/index.vue
+++ b/src/views/dashboard/smscCDR/index.vue
@@ -167,12 +167,12 @@ let tableColumns: ColumnsType = [
     dataIndex: 'cdrJSON',
     key: 'cause',
     align: 'left',
-    width: 120,
+    width: 200,
   },
   {
     title: t('views.dashboard.cdr.time'),
     dataIndex: 'cdrJSON',
-    align: 'center',
+    align: 'left',
     width: 150,
     customRender(opt) {
       const cdrJSON = opt.value;
@@ -673,6 +673,7 @@ onBeforeUnmount(() => {
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'cause'">
             <span v-if="record.cdrJSON.result === 0">
+              {{ t('views.dashboard.cdr.resultFail') }},
               <DictTag
                 :options="dict.cdrCauseCode"
                 :value="record.cdrJSON.cause"
@@ -734,6 +735,7 @@ onBeforeUnmount(() => {
             <div>
               <span>{{ t('views.dashboard.cdr.result') }}: </span>
               <span v-if="record.cdrJSON.result === 0">
+                {{ t('views.dashboard.cdr.resultFail') }},
                 <DictTag
                   :options="dict.cdrCauseCode"
                   :value="record.cdrJSON.cause"

From 39a417368a095febc9cc69b752c393648cc9a3a5 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Sep 2024 11:11:54 +0800
Subject: [PATCH 11/15] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7c385343..0e0f4c60 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,8 @@
 ## 测试环境
 
 ```text
-Jenkins: http://192.168.2.166:3185/
 Nginx: http://192.168.2.166:3188/#/index
 后端暴露端口: http://192.168.2.166:33030
-
-
-新网管：192.168.5.13
-旧网管：192.168.5.14
-登录账户：manager/manager
 ```
 
 ## 程序命令
@@ -59,16 +53,5 @@ export NODE_OPTIONS=--max-old-space-size=50000
 
 ```text
 https://192.168.5.23/
-admin
-admin
-```
-
-## k8s
-
-master 192.168.5.27 agtuser/admin123
-
-https://192.168.5.27:31325/#/workloads?namespace=default
-
-```text
-eyJhbGciOiJSUzI1NiIsImtpZCI6ImZFVUhIb1puLW04M1dfSUYyRU8zWlZueXBpNUh4T0hTRVlzU19jNlVGQ0kifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlcm5ldGVzLWRhc2hib2FyZCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi11c2VyLXRva2VuLW44ZzRtIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImFkbWluLXVzZXIiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI2M2NmYjAyNS01ZmQ0LTQ0ZTgtOTdiNC0yYWRiYWIxNzc5M2MiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6a3ViZXJuZXRlcy1kYXNoYm9hcmQ6YWRtaW4tdXNlciJ9.R3GRygFOjngTj-mEMBAHDeBxm3lpsXZYvC6cdTxByONtLrcMXDebwNVeKtAZ1V9qh2OrjD8n9CIygjULGPdfV6S520vjMh7Oa2q68nOyW49DNWQyYD8xLo-dQ6sX07fI7X_I3H35YUWW80jJAXjJawqIGXBSMG5intlo4tLTUSXmjCfhoQvFsgeRWu0j76pDvhMAvLPcgEXfTCi9tyL3yqJBIKONcKwmMlJeaKSR3pQk3KiibqrBO0MZclRozpke6J0ulfzTemwDDyCqBZmLsRPZ2yDd5hVBIJ9bHEcK0a25NmSFFzmd8XWQPZwg3Y4IbbY-8UhByGq0p9xS-7pGCQ
+admin / admin
 ```

From d81b8cdf389074442198adb24b7fcec1ca371eda Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Sep 2024 11:13:25 +0800
Subject: [PATCH 12/15] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=20240927?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 .env.production  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 521e2116..422867bd 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"
 
 # 应用版本
-VITE_APP_VERSION = "2.240920"
+VITE_APP_VERSION = "2.240927"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/.env.production b/.env.production
index 0859613f..5c1fdad0 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"
 
 # 应用版本
-VITE_APP_VERSION = "2.240920"
+VITE_APP_VERSION = "2.240927"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

From 2f04562a34828a2281d324f9119ad007901d2636 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 30 Sep 2024 21:02:01 +0800
Subject: [PATCH 13/15] =?UTF-8?q?feat:=20=E4=BF=A1=E4=BB=A4=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trace/packet.ts                       |  64 +++
 .../tshark/components/PacketTable.vue         |  14 +-
 src/views/traceManage/wireshark/index.vue     | 507 +++++++++++++++++-
 3 files changed, 570 insertions(+), 15 deletions(-)
 create mode 100644 src/api/trace/packet.ts

diff --git a/src/api/trace/packet.ts b/src/api/trace/packet.ts
new file mode 100644
index 00000000..dd6c2535
--- /dev/null
+++ b/src/api/trace/packet.ts
@@ -0,0 +1,64 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 信令跟踪网卡设备列表
+ * @returns
+ */
+export function packetDevices() {
+  return request({
+    url: '/trace/packet/devices',
+    method: 'get',
+  });
+}
+
+/**
+ * 信令跟踪开始
+ * @param data 对象
+ * @returns
+ */
+export function packetStart(data: Record<string, any>) {
+  return request({
+    url: '/trace/packet/start',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 信令跟踪结束
+ * @param data 对象
+ * @returns
+ */
+export function packetStop(taskNo: string) {
+  return request({
+    url: '/trace/packet/stop',
+    method: 'post',
+    data: { taskNo },
+  });
+}
+
+/**
+ * 信令跟踪过滤
+ * @param data 对象
+ * @returns
+ */
+export function packetFilter(taskNo: string, expr: string) {
+  return request({
+    url: '/trace/packet/filter',
+    method: 'put',
+    data: { taskNo, expr },
+  });
+}
+
+/**
+ * 信令跟踪续期保活
+ * @param data 对象
+ * @returns
+ */
+export function packetKeep(taskNo: string, duration: number = 120) {
+  return request({
+    url: '/trace/packet/keep-alive',
+    method: 'put',
+    data: { taskNo, duration },
+  });
+}
diff --git a/src/views/traceManage/tshark/components/PacketTable.vue b/src/views/traceManage/tshark/components/PacketTable.vue
index 770a38f4..f31e66c4 100644
--- a/src/views/traceManage/tshark/components/PacketTable.vue
+++ b/src/views/traceManage/tshark/components/PacketTable.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { reactive, ref, computed, unref, onUpdated, watchEffect } from 'vue';
+import { reactive, ref, computed, unref, watchEffect } from 'vue';
 
 const props = defineProps({
   /**列表高度 */
@@ -122,8 +122,6 @@ const onScroll = (e: any) => {
   }
 };
 
-onUpdated(() => {});
-
 watchEffect(() => {
   clientData.value.forEach((_, index) => {
     const currentIndex = state.start + index;
@@ -136,10 +134,6 @@ watchEffect(() => {
     };
   });
 });
-
-const tableState = reactive({
-  selected: false,
-});
 </script>
 
 <template>
@@ -167,13 +161,13 @@ const tableState = reactive({
                 item.number === props.selectedFrame
                   ? 'blue'
                   : item.bg
-                  ? `#${item.bg.toString(16).padStart(6, '0')}`
+                  ? `#${Number(item.bg).toString(16).padStart(6, '0')}`
                   : '',
               color:
                 item.number === props.selectedFrame
                   ? 'white'
                   : item.fg
-                  ? `#${item.fg.toString(16).padStart(6, '0')}`
+                  ? `#${Number(item.fg).toString(16).padStart(6, '0')}`
                   : '',
             }"
             @click="onSelectedFrame(item.number)"
@@ -219,7 +213,7 @@ const tableState = reactive({
   display: flex;
   flex-direction: row;
   align-items: center;
-  border-top: 1px #f0f0f0 solid; 
+  border-top: 1px #f0f0f0 solid;
   cursor: pointer;
 }
 .tbody-item {
diff --git a/src/views/traceManage/wireshark/index.vue b/src/views/traceManage/wireshark/index.vue
index e38520f1..a36427c8 100644
--- a/src/views/traceManage/wireshark/index.vue
+++ b/src/views/traceManage/wireshark/index.vue
@@ -1,16 +1,513 @@
 <script setup lang="ts">
-import { reactive, onMounted, toRaw } from 'vue';
+import { onBeforeUnmount, onMounted, reactive, ref } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
+import { message, Modal } from 'ant-design-vue/lib';
+import DissectionTree from '../tshark/components/DissectionTree.vue';
+import DissectionDump from '../tshark/components/DissectionDump.vue';
+import PacketTable from '../tshark/components/PacketTable.vue';
+import {
+  RESULT_CODE_ERROR,
+  RESULT_CODE_SUCCESS,
+} from '@/constants/result-constants';
+import { filePullTask } from '@/api/trace/task';
+import { OptionsType, WS } from '@/plugins/ws-websocket';
+import useI18n from '@/hooks/useI18n';
+import saveAs from 'file-saver';
+import {
+  packetDevices,
+  packetStart,
+  packetStop,
+  packetFilter,
+} from '@/api/trace/packet';
+import { s } from 'vite/dist/node/types.d-aGj9QkWt';
+const ws = new WS();
+const { t } = useI18n();
 
-onMounted(() => {});
+const NO_SELECTION = { id: '', idx: 0, start: 0, length: 0 };
+
+type StateType = {
+  /**网卡设备列表 */
+  devices: { id: string; label: string; children: any[] }[];
+  /**初始化 */
+  initialized: boolean;
+  /**任务 */
+  task: {
+    taskNo: string;
+    device: string;
+    filter: string;
+    outputPCAP: boolean;
+  };
+  /**字段 */
+  columns: string[];
+
+  /**过滤条件 */
+  filter: string;
+  /**过滤条件错误信息 */
+  filterError: string | null;
+
+  /**当前选中的帧编号 */
+  selectedFrame: number;
+  /**当前选中的帧数据 */
+  packetFrame: { tree: any[]; data_sources: any[] };
+  /**pcap包帧数据 */
+  packetFrameTreeMap: Map<string, any> | null;
+  /**当前选中的帧数据 */
+  selectedTree: typeof NO_SELECTION;
+  /**选择帧的Dump数据标签 */
+  selectedDataSourceIndex: number;
+
+  /**包总数 */
+  totalPackets: number;
+  /**包数据 */
+  packetList: any[];
+};
+
+const state = reactive<StateType>({
+  devices: [],
+  initialized: false,
+  task: {
+    taskNo: 'laYlTbq',
+    device: '192.168.5.58',
+    filter: 'tcp and (port 33030 or 8080)',
+    outputPCAP: false,
+  },
+  columns: [
+    'No.',
+    'Time',
+    'Source',
+    'Destination',
+    'Protocol',
+    'Length',
+    'Info',
+  ],
+  filter: 'tcp and (port 33030 or 8080)',
+  filterError: null,
+  selectedFrame: 1,
+  /**当前选中的帧数据 */
+  packetFrame: { tree: [], data_sources: [] },
+  packetFrameTreeMap: null, // 注意：Map 需要额外处理
+  selectedTree: NO_SELECTION, // NO_SELECTION 需要定义
+  /**选择帧的Dump数据标签 */
+  selectedDataSourceIndex: 0,
+  // 包数据
+  totalPackets: 0,
+  packetList: [],
+});
+
+/**清除帧数据和报文信息状态 */
+function fnReset() {
+  state.initialized = false;
+  // 选择帧的数据
+  state.selectedFrame = 0;
+  state.packetFrame = { tree: [], data_sources: [] };
+  state.packetFrameTreeMap = null;
+  state.selectedTree = NO_SELECTION;
+  state.selectedDataSourceIndex = 0;
+  // 过滤条件
+  state.filter = 'tcp and (port 33030 or 8080)';
+  state.filterError = null;
+  // 包数据
+  state.totalPackets = 0;
+  state.packetList = [];
+}
+
+/**解析帧数据为简单结构 */
+function parseFrameTree(id: string, node: Record<string, any>) {
+  let map = new Map();
+
+  if (node.tree && node.tree.length > 0) {
+    for (let i = 0; i < node.tree.length; i++) {
+      const subMap = parseFrameTree(`${id}-${i}`, node.tree[i]);
+      subMap.forEach((value, key) => {
+        map.set(key, value);
+      });
+    }
+  } else if (node.length > 0) {
+    map.set(id, {
+      id: id,
+      idx: node.data_source_idx,
+      start: node.start,
+      length: node.length,
+    });
+  }
+
+  return map;
+}
+
+/**帧数据点击选中 */
+function handleSelectedTreeEntry(e: any) {
+  console.log('fnSelectedTreeEntry', e);
+  state.selectedTree = e;
+}
+/**报文数据点击选中 */
+function handleSelectedFindSelection(src_idx: number, pos: number) {
+  console.log('fnSelectedFindSelection', pos);
+  if (state.packetFrameTreeMap == null) return;
+  // find the smallest one
+  let current = null;
+  for (let [k, pp] of state.packetFrameTreeMap) {
+    if (pp.idx !== src_idx) continue;
+
+    if (pos >= pp.start && pos <= pp.start + pp.length) {
+      if (
+        current != null &&
+        state.packetFrameTreeMap.get(current).length > pp.length
+      ) {
+        current = k;
+      } else {
+        current = k;
+      }
+    }
+  }
+  if (current != null) {
+    state.selectedTree = state.packetFrameTreeMap.get(current);
+  }
+}
+
+/**包数据表点击选中 */
+function handleSelectedFrame(num: number) {
+  console.log('fnSelectedFrame', num, state.totalPackets);
+  const packet = state.packetList.find((v: any) => v.number === num);
+  if (!packet) return;
+  const packetFrame = packet.frame;
+  state.selectedFrame = packet.number;
+  state.packetFrame = packetFrame;
+  state.packetFrameTreeMap = parseFrameTree('root', packetFrame);
+  state.selectedTree = NO_SELECTION;
+  state.selectedDataSourceIndex = 0;
+}
+/**包数据表滚动底部加载 */
+function handleScrollBottom(index: any) {
+  console.log('handleScrollBottom', index);
+}
+
+/**开始跟踪 */
+function fnStart() {
+  // state.task.taskNo = 'laYlTbq';
+  state.task.taskNo = Number(Date.now()).toString(16);
+  state.task.outputPCAP = false;
+  packetStart(state.task).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      fnReset();
+      fnWS();
+    } else {
+      message.error(t('common.operateErr'), 3);
+    }
+  });
+}
+
+/**停止跟踪 */
+function fnStop() {
+  packetStop(state.task.taskNo).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      ws.close();
+      state.initialized = false;
+      state.filter = '';
+      state.filterError = null;
+    } else {
+      message.warning(res.msg, 3);
+    }
+  });
+}
+
+/**跟踪数据表过滤 */
+function handleFilterFrames() {
+  packetFilter(state.task.taskNo, state.filter).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      state.task.filter = state.filter;
+    } else {
+      state.filterError = res.msg;
+    }
+  });
+}
+
+/**开始跟踪 */
+function fnDevice(v: string) {
+  state.task.device = v;
+}
+
+/**下载触发等待 */
+let downLoading = ref<boolean>(false);
+
+/**信息文件下载 */
+function fnDownloadPCAP() {
+  if (downLoading.value) return;
+  const fileName = `trace_packet_${state.task.taskNo}.pcap`;
+  Modal.confirm({
+    title: t('common.tipTitle'),
+    content: t('views.logManage.neFile.downTip', { fileName }),
+    onOk() {
+      downLoading.value = true;
+      const hide = message.loading(t('common.loading'), 0);
+      filePullTask(state.task.taskNo)
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('common.msgSuccess', {
+                msg: t('common.downloadText'),
+              }),
+              duration: 2,
+            });
+            saveAs(res.data, `${fileName}`);
+          } else {
+            message.error({
+              content: t('views.logManage.neFile.downTipErr'),
+              duration: 2,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          downLoading.value = false;
+        });
+    },
+  });
+}
+
+/**接收数据后回调 */
+function wsMessage(res: Record<string, any>) {
+  const { code, requestId, data } = res;
+  if (code === RESULT_CODE_ERROR) {
+    console.warn(res.msg);
+    return;
+  }
+
+  // 建联时发送请求
+  if (!requestId && data.clientId) {
+    state.initialized = true;
+    return;
+  }
+
+  // 订阅组信息
+  if (!data?.groupId) {
+    return;
+  }
+  if (data.groupId === `4_${state.task.taskNo}`) {
+    const packetData = data.data;
+    state.totalPackets = packetData.number;
+    state.packetList.push(packetData);
+  }
+}
+
+/**建立WS连接 */
+function fnWS() {
+  const options: OptionsType = {
+    url: '/ws',
+    params: {
+      /**订阅通道组
+       *
+       * 信令跟踪Packet (GroupID:4_taskNo)
+       */
+      subGroupID: `4_${state.task.taskNo}`,
+    },
+    onmessage: wsMessage,
+    onerror: (ev: any) => {
+      // 接收数据后回调
+      console.error(ev);
+    },
+  };
+  //建立连接
+  ws.connect(options);
+}
+
+onMounted(() => {
+  packetDevices().then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      state.devices = res.data;
+      if (res.data.length === 0) return;
+      state.task.device = res.data[0].id;
+    }
+  });
+});
+
+onBeforeUnmount(() => {
+  ws.close();
+});
 </script>
 
 <template>
   <PageContainer>
-    <a-card :bordered="false" :body-style="{ padding: '0px' }">
-      <h1>JS</h1>
+    <a-card :bordered="false" :body-style="{ padding: '12px' }">
+      <div class="toolbar">
+        <a-space :size="8" class="toolbar-oper">
+          <a-dropdown-button
+            type="primary"
+            :disabled="state.initialized"
+            @click="fnStart"
+          >
+            <PlayCircleOutlined />
+            Start Trace
+            <template #overlay>
+              <a-menu
+                @click="({ key }:any) => fnDevice(key)"
+                :selectedKeys="[state.task.device]"
+              >
+                <a-menu-item v-for="v in state.devices" :key="v.id">
+                  <a-popover placement="rightTop" trigger="hover">
+                    <template #content>
+                      <div v-for="c in v.children">{{ c.id }}</div>
+                    </template>
+                    <template #title>
+                      <span>IP Address</span>
+                    </template>
+                    <div>{{ v.label }}</div>
+                  </a-popover>
+                </a-menu-item>
+              </a-menu>
+            </template>
+            <template #icon><DownOutlined /></template>
+          </a-dropdown-button>
+
+          <a-button danger @click.prevent="fnStop()" v-if="state.initialized">
+            <template #icon><CloseCircleOutlined /></template>
+            Stop Trace
+          </a-button>
+          <a-button
+            type="primary"
+            :loading="downLoading"
+            @click.prevent="fnDownloadPCAP()"
+          >
+            <template #icon><DownloadOutlined /></template>
+            {{ t('common.downloadText') }}
+          </a-button>
+          <a-tag
+            color="green"
+            v-show="!!state.task.filter && state.initialized"
+          >
+            {{ state.task.filter }}
+          </a-tag>
+        </a-space>
+
+        <a-space :size="8" class="toolbar-info">
+          <span>
+            {{ t('views.traceManage.task.traceId') }}:&nbsp;
+            <strong>{{ state.task.taskNo }}</strong>
+          </span>
+          <span> Packets: {{ state.totalPackets }} </span>
+        </a-space>
+      </div>
+
+      <!-- 包数据表过滤 -->
+      <a-input-group compact v-show="state.initialized">
+        <a-input
+          v-model:value="state.filter"
+          placeholder="display filter, example: tcp"
+          :allow-clear="true"
+          style="width: calc(100% - 100px)"
+          @pressEnter="handleFilterFrames"
+        >
+          <template #prefix>
+            <FilterOutlined />
+          </template>
+        </a-input>
+        <a-button
+          type="primary"
+          html-type="submit"
+          style="width: 100px"
+          @click="handleFilterFrames"
+        >
+          Filter
+        </a-button>
+      </a-input-group>
+      <a-alert
+        :message="state.filterError"
+        type="error"
+        v-if="state.filterError != null"
+      />
+
+      <!-- 包数据表 -->
+      <PacketTable
+        :columns="state.columns"
+        :data="state.packetList"
+        :selectedFrame="state.selectedFrame"
+        :onSelectedFrame="handleSelectedFrame"
+        :onScrollBottom="handleScrollBottom"
+      ></PacketTable>
+
+      <a-row :gutter="20">
+        <a-col :lg="12" :md="12" :xs="24" class="tree">
+          <!-- 帧数据 -->
+          <DissectionTree
+            id="root"
+            :select="handleSelectedTreeEntry"
+            :selected="state.selectedTree"
+            :tree="state.packetFrame.tree"
+          />
+        </a-col>
+        <a-col :lg="12" :md="12" :xs="24" class="dump">
+          <!-- 报文数据 -->
+          <a-tabs
+            v-model:activeKey="state.selectedDataSourceIndex"
+            :tab-bar-gutter="16"
+            :tab-bar-style="{ marginBottom: '8px' }"
+          >
+            <a-tab-pane
+              :key="idx"
+              :tab="v.name"
+              v-for="(v, idx) in state.packetFrame.data_sources"
+              style="overflow: auto"
+            >
+              <DissectionDump
+                :base64="v.data"
+                :select="(pos:number)=>handleSelectedFindSelection(idx, pos)"
+                :selected="
+                  idx === state.selectedTree.idx
+                    ? state.selectedTree
+                    : NO_SELECTION
+                "
+              />
+            </a-tab-pane>
+          </a-tabs>
+        </a-col>
+      </a-row>
     </a-card>
   </PageContainer>
 </template>
 
-<style lang="less" scoped></style>
+<style scoped>
+.toolbar {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+}
+.toolbar-oper {
+  flex: 1;
+}
+.toolbar-info {
+  text-align: right;
+  padding-right: 8px;
+}
+
+.summary {
+  display: flex;
+  flex-direction: column;
+}
+.summary-item > span:first-child {
+  font-weight: 600;
+  margin-right: 6px;
+}
+
+.tree {
+  font-size: 0.8125rem;
+  line-height: 1.5rem;
+  padding-bottom: 0.75rem;
+  padding-top: 0.75rem;
+  white-space: nowrap;
+  overflow-y: auto;
+  user-select: none;
+  height: 100%;
+}
+.tree > ul.tree {
+  min-height: 15rem;
+}
+
+.dump {
+  padding-bottom: 0.75rem;
+  padding-top: 0.75rem;
+  overflow-y: auto;
+  height: 100%;
+}
+.dump .ant-tabs-tabpane {
+  min-height: calc(15rem - 56px);
+}
+</style>

From b992225e288e6090f545ff3d3ada93f84683e2f5 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 1 Oct 2024 13:02:06 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E5=AE=89=E8=A3=85=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ne/neQuickSetup/components/NeInfoConfig.vue      |  2 +-
 .../components/NeInfoSoftwareInstall.vue             | 12 ++++--------
 .../components/NeInfoSoftwareLicense.vue             |  2 +-
 src/views/ne/neQuickSetup/hooks/useStep.ts           |  4 +---
 src/views/ne/neQuickSetup/index.vue                  |  1 +
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/views/ne/neQuickSetup/components/NeInfoConfig.vue b/src/views/ne/neQuickSetup/components/NeInfoConfig.vue
index 4e37c975..756ed0f5 100644
--- a/src/views/ne/neQuickSetup/components/NeInfoConfig.vue
+++ b/src/views/ne/neQuickSetup/components/NeInfoConfig.vue
@@ -268,7 +268,7 @@ function fnStepPrev() {
     title: t('common.tipTitle'),
     content: t('views.ne.neQuickSetup.stepPrevTip'),
     onOk() {
-      fnRestStepState();
+      fnRestStepState(t);
       fnToStepName('Start');
     },
   });
diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue
index 7427a194..ec8da3a5 100644
--- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue
+++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
-import { Modal, TableColumnsType, message } from 'ant-design-vue/lib';
-import { defineAsyncComponent, onMounted, reactive, ref, toRaw } from 'vue';
+import { Modal, message } from 'ant-design-vue/lib';
+import { defineAsyncComponent, onMounted, reactive, toRaw } from 'vue';
 import { fnToStepName, stepState } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
-import { listNeVersion, operateNeVersion } from '@/api/ne/neVersion';
+import { operateNeVersion } from '@/api/ne/neVersion';
 import {
   RESULT_CODE_ERROR,
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
-import {
-  addNeSoftware,
-  listNeSoftware,
-  newNeVersion,
-} from '@/api/ne/neSoftware';
+import { listNeSoftware, newNeVersion } from '@/api/ne/neSoftware';
 import { parseDateToStr } from '@/utils/date-utils';
 import { ColumnsType } from 'ant-design-vue/lib/table';
 const { t } = useI18n();
diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
index 3d9bf582..ae8f512c 100644
--- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
+++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
@@ -82,7 +82,7 @@ function fnStepEnd() {
     title: t('common.tipTitle'),
     content: t('views.ne.neQuickSetup.licenseEndTip'),
     onOk() {
-      fnRestStepState();
+      fnRestStepState(t);
     },
   });
 }
diff --git a/src/views/ne/neQuickSetup/hooks/useStep.ts b/src/views/ne/neQuickSetup/hooks/useStep.ts
index 0db07b25..8de8ade3 100644
--- a/src/views/ne/neQuickSetup/hooks/useStep.ts
+++ b/src/views/ne/neQuickSetup/hooks/useStep.ts
@@ -52,6 +52,7 @@ export function fnRestStepState(t?: any) {
   stepState.current = -1;
   stepState.neHost = {};
   stepState.neInfo = {};
+
   // 多语言翻译
   if (t) {
     stepState.steps = [
@@ -104,8 +105,5 @@ export function useStep({ t }: any) {
     }
   );
 
-  onMounted(() => {
-    fnRestStepState(t);
-  });
   return { currentComponent };
 }
diff --git a/src/views/ne/neQuickSetup/index.vue b/src/views/ne/neQuickSetup/index.vue
index e8f1c95c..4a87e8cf 100644
--- a/src/views/ne/neQuickSetup/index.vue
+++ b/src/views/ne/neQuickSetup/index.vue
@@ -24,6 +24,7 @@ watch(
 );
 
 onMounted(() => {
+  fnRestStepState(t);
   fnReloadData();
 });
 

From 630e2a16ad8bf86fc36ce2f6e3d26e20526126f9 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 10 Oct 2024 19:45:45 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E9=99=90=E5=88=B6=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=8C=87=E6=A0=87=E8=BE=93=E5=85=A5=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perfManage/customTarget/index.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue
index 3da08739..f407a8ed 100644
--- a/src/views/perfManage/customTarget/index.vue
+++ b/src/views/perfManage/customTarget/index.vue
@@ -647,7 +647,11 @@ onMounted(() => {
               name="title"
               v-bind="modalStateFrom.validateInfos.title"
             >
-              <a-input v-model:value="modalState.from.title" allow-clear>
+              <a-input
+                v-model:value="modalState.from.title"
+                :maxlength="255"
+                allow-clear
+              >
               </a-input>
             </a-form-item>
           </a-col>
@@ -657,7 +661,11 @@ onMounted(() => {
               name="kpiId"
               v-bind="modalStateFrom.validateInfos.kpiId"
             >
-              <a-input v-model:value="modalState.from.kpiId" allow-clear>
+              <a-input
+                v-model:value="modalState.from.kpiId"
+                :maxlength="16"
+                allow-clear
+              >
               </a-input>
             </a-form-item>
           </a-col>
@@ -669,7 +677,11 @@ onMounted(() => {
           :label-col="{ span: 3 }"
           v-bind="modalStateFrom.validateInfos.expression"
         >
-          <a-input v-model:value="modalState.from.expression" allow-clear>
+          <a-input
+            v-model:value="modalState.from.expression"
+            :maxlength="1024"
+            allow-clear
+          >
           </a-input>
         </a-form-item>