From b92e225fd45d806092a2bc68c9c980cd419e1263 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 17 Oct 2023 19:21:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UPF=E6=8A=93=E5=8C=85=E8=B5=B0=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=89=A7=E8=A1=8C=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/traceManage/pcap/index.vue | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/traceManage/pcap/index.vue b/src/views/traceManage/pcap/index.vue
index 5bf5dc2c..4c0c1395 100644
--- a/src/views/traceManage/pcap/index.vue
+++ b/src/views/traceManage/pcap/index.vue
@@ -62,8 +62,12 @@ function fnNeChange(_: any, item: any) {
 const modalStateFrom = Form.useForm(
   modalState.from,
   reactive({
-    cmd: [{ required: true, message: t('views.traceManage.pcap.capArgPlease') }],
-    timeout: [{ required: true, message: t('views.traceManage.pcap.capTimePlease') }],
+    cmd: [
+      { required: true, message: t('views.traceManage.pcap.capArgPlease') },
+    ],
+    timeout: [
+      { required: true, message: t('views.traceManage.pcap.capTimePlease') },
+    ],
     upfStart: [
       { required: true, message: t('views.traceManage.pcap.capArgUPFPlease') },
     ],
@@ -188,12 +192,8 @@ function fnDownPCAP() {
 
 /**UPF抓包执行 */
 function fnUPF(runType: 'start' | 'stop') {
-  let validateArr = ['upfStop'];
-  if (runType === 'start') {
-    validateArr = ['upfStart'];
-  }
   modalStateFrom
-    .validate(validateArr)
+    .validate([runType === 'start' ? 'upfStart' : 'upfStop'])
     .then(() => {
       modalState.confirmLoading = true;
       const from = toRaw(modalState.from);
@@ -201,8 +201,8 @@ function fnUPF(runType: 'start' | 'stop') {
       tcpdumpNeUPFTask({
         neType: modalState.neType[0],
         neId: modalState.neType[1],
-        runType: runType,
-        cmd: from.upfStart,
+        runType: runType === 'start' ? 'start_str' : 'stop_str',
+        cmd: runType === 'start' ? from.upfStart : from.upfStop,
       })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
@@ -288,7 +288,10 @@ onMounted(() => {
             :label-col="{ span: 5 }"
             labelWrap
           >
-            <a-form-item :label="t('views.traceManage.pcap.neType')" name="neType">
+            <a-form-item
+              :label="t('views.traceManage.pcap.neType')"
+              name="neType"
+            >
               <a-cascader
                 v-model:value="modalState.neType"
                 :options="useNeInfoStore().getNeCascaderOtions"
@@ -385,7 +388,9 @@ onMounted(() => {
                     <template #icon><ApiOutlined /></template>
                     {{
                       runTime != 0
-                        ? t('views.traceManage.pcap.runTimeText', { s: runTime })
+                        ? t('views.traceManage.pcap.runTimeText', {
+                            s: runTime,
+                          })
                         : t('views.traceManage.pcap.runText')
                     }}
                   </a-button>