From 71338670f0002b383a77e965ebd3dec88efa1e13 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Mon, 9 Sep 2024 18:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8E=92=E7=89=88=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts                   |  1 +
 src/i18n/locales/zh-CN.ts                   |  1 +
 src/views/perfManage/customTarget/index.vue | 81 +++++++++++++--------
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index d5678efc..c1737b86 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1069,6 +1069,7 @@ export default {
         symbol:'Symbol',
         element:'Element',
         granularity:'Granularity',
+        unit:'Unit',
       }
     },
     traceManage: {
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index fe59d903..b235130f 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1071,6 +1071,7 @@ export default {
         symbol:"符号",
         element:'元素',
         granularity:'颗粒度',
+        unit:'单位',
         }
     },
     traceManage: {
diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue
index 21ec15dd..de384b03 100644
--- a/src/views/perfManage/customTarget/index.vue
+++ b/src/views/perfManage/customTarget/index.vue
@@ -290,13 +290,25 @@ const modalStateFrom = Form.useForm(
           t('views.perfManage.customTarget.title') + t('common.unableNull'),
       },
     ],
+    unit: [
+      {
+        required: true,
+        message:
+          t('views.perfManage.customTarget.unit') + t('common.unableNull'),
+      },
+    ],
   })
 );
 
 /**性能测量数据集选择初始  value:neType*/
 function fnSelectPerformanceInit(value: any) {
   modalState.from.expression = '';
-  modalState.neTypPerformance = [{value:'granularity',label:t('views.perfManage.customTarget.granularity')}];
+  modalState.neTypPerformance = [
+    {
+      value: 'granularity',
+      label: t('views.perfManage.customTarget.granularity'),
+    },
+  ];
   // 当前语言
   var language = currentLocale.value.split('_')[0];
   if (language === 'zh') language = 'cn';
@@ -627,7 +639,10 @@ onMounted(() => {
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item :label="t('views.perfManage.customTarget.status')" name="status">
+            <a-form-item
+              :label="t('views.perfManage.customTarget.status')"
+              name="status"
+            >
               <a-select
                 v-model:value="modalState.from.status"
                 default-value="0"
@@ -671,34 +686,40 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-form-item
-          :label="t('views.perfManage.customTarget.expression')"
-          name="expression"
-          :label-col="{ span: 3 }"
-          v-bind="modalStateFrom.validateInfos.expression"
-        >
-          <a-input
-            v-model:value="modalState.from.expression"
-            style="width: 80%"
-            allow-clear
-          >
-          </a-input>
-
-          <a-auto-complete
-            v-model:value="modalState.from.unit"
-            :options="[
-              {
-                label: 'Mbps',
-                value: 'Mbps',
-              },
-              {
-                label: '%',
-                value: '%',
-              },
-            ]"
-            style="width: 20%"
-          ></a-auto-complete>
-        </a-form-item>
+        <a-row :gutter="16">
+          <a-col :lg="16" :md="16" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.customTarget.expression')"
+              name="expression"
+              :label-col="{ span: 4 }"
+              v-bind="modalStateFrom.validateInfos.expression"
+            >
+              <a-input v-model:value="modalState.from.expression" allow-clear>
+              </a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :md="8" :xs="24">
+            <a-form-item
+              :label="t('views.perfManage.customTarget.unit')"
+              name="expression"
+              v-bind="modalStateFrom.validateInfos.unit"
+            >
+              <a-auto-complete
+                v-model:value="modalState.from.unit"
+                :options="[
+                  {
+                    label: 'Mbps',
+                    value: 'Mbps',
+                  },
+                  {
+                    label: '%',
+                    value: '%',
+                  },
+                ]"
+              ></a-auto-complete>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item