From 6598f7c67b3ad9d70fe4e3a2ae204f769cd5254b Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Fri, 18 Jul 2025 16:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts           | 14 ++++--
 src/i18n/locales/zh-CN.ts           | 14 ++++--
 src/views/dashboard/mfCDR/index.vue | 76 +++++++++++++++++++----------
 3 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 771cd2c4..40213f65 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -519,10 +519,10 @@ export default {
         vehicleType:'Vehicle Type',
         messageIdentifier: 'Message Identifier',
         numberOfOccupants: 'Number Of Occupants',
-        n1latitudeDelta:'Recent Vehicle Location N1-Latitude Delta',
-        n1longitudeDelta: 'Recent Vehicle Location N1-Longitude Delta',
-        n2latitudeDelta:'Recent Vehicle Location N2-Latitude Delta',
-        n2longitudeDelta: 'Recent Vehicle Location N2-Longitude Delta',
+        n1latitudeDelta:'Latitude Delta',
+        n1longitudeDelta: 'Longitude Delta',
+        n2latitudeDelta:'Latitude Delta',
+        n2longitudeDelta: 'Longitude Delta',
         timestamp: 'Timestamp',
         vehicleDirection: 'Vehicle Direction',
         isovds: 'Vehicle Descriptor Section',
@@ -534,6 +534,12 @@ export default {
         dieselTankPresent: 'Diesel Tank Present',
         electricEnergyStorage: 'Electric Energy Storage',
         gasolineTankPresent: 'Gasoline Tank Present',
+        control:'Control',
+        recentVehicleLocationN1:'Recent Vehicle Location N1',
+        recentVehicleLocationN2:'Recent Vehicle Location N2',
+        vehicleIdentificationNumber:'Vehicle Identification Number',
+        vehicleLocation:'Vehicle Location',
+        vehiclePropulsionStorageType:'Vehicle Propulsion Storage Type',
       },
       ue: {
         eventType: "Event Type",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 162e847c..91ab932c 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -523,10 +523,10 @@ export default {
         vehicleType:'车辆类型',
         messageIdentifier: '消息标识',
         numberOfOccupants: '乘员数量',
-        n1latitudeDelta:'最近车辆位置N1-纬度增量',
-        n1longitudeDelta: '最近车辆位置N1-经度增量',
-        n2latitudeDelta:' 最近车辆位置N2-纬度增量',
-        n2longitudeDelta: '最近车辆位置N2-经度增量',
+        n1latitudeDelta:'纬度增量',
+        n1longitudeDelta: '经度增量',
+        n2latitudeDelta:' 纬度增量',
+        n2longitudeDelta: '经度增量',
         timestamp: '时间戳',
         vehicleDirection: '车辆行驶方向',
         isovds: '车辆描述段',
@@ -538,6 +538,12 @@ export default {
         dieselTankPresent: '柴油罐存在',
         electricEnergyStorage: '电力储能',
         gasolineTankPresent: '汽油罐存在',
+        control:'控制',
+        recentVehicleLocationN1:'最近车辆位置N1',
+        recentVehicleLocationN2:'最近车辆位置N2',
+        vehicleIdentificationNumber:'车辆识别号码',
+        vehicleLocation:'车辆位置',
+        vehiclePropulsionStorageType:'车辆推进存储类型',
       },
       ue: {
         eventType: "事件类型",
diff --git a/src/views/dashboard/mfCDR/index.vue b/src/views/dashboard/mfCDR/index.vue
index 2e86f5c7..5978fdcb 100644
--- a/src/views/dashboard/mfCDR/index.vue
+++ b/src/views/dashboard/mfCDR/index.vue
@@ -1010,16 +1010,20 @@ onBeforeUnmount(() => {
       :title="modalState.title"
       :confirm-loading="modalState.confirmLoading"
       @cancel="fnModalCancel"
-    :footer="null"
+      :footer="null"
     >
       <a-form
         name="modalStateFrom"
-        layout="horizontal"
-        :label-col="{ span: 6 }"
-        :labelWrap="true"
+        layout="vertical"
+        :label-col="{ style: { width: '100%' } }"
+        :labelWrap="false"
       >
-        <a-row>
-          <a-col :lg="24" :md="24" :xs="24">
+        <a-row :gutter="[32, 4]">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.control') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.automaticActivation')"
               name="automaticActivation"
@@ -1030,7 +1034,7 @@ onBeforeUnmount(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.positionCanBeTrusted')"
               name="positionCanBeTrusted"
@@ -1041,7 +1045,7 @@ onBeforeUnmount(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.testCall')"
               name="testCall"
@@ -1052,7 +1056,7 @@ onBeforeUnmount(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.vehicleType')"
               name="ticketId"
@@ -1064,7 +1068,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.messageIdentifier')"
               name="messageIdentifier"
@@ -1076,7 +1080,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.numberOfOccupants')"
               name="ticketId"
@@ -1088,7 +1092,11 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.recentVehicleLocationN1') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.n1latitudeDelta')"
               name="n1latitudeDelta"
@@ -1102,7 +1110,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.n1longitudeDelta')"
               name="n1longitudeDelta"
@@ -1116,7 +1124,11 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.recentVehicleLocationN2') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.n2latitudeDelta')"
               name="n2latitudeDelta"
@@ -1130,7 +1142,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.n2longitudeDelta')"
               name="n2longitudeDelta"
@@ -1144,7 +1156,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.timestamp')"
               name="timestamp"
@@ -1156,7 +1168,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.vehicleDirection')"
               name="vehicleDirection"
@@ -1168,7 +1180,11 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.vehicleIdentificationNumber') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item :label="t('views.dashboard.cdr.isovds')" name="isovds">
               <a-input
                 :disabled="true"
@@ -1179,7 +1195,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.isovisModelyear')"
               name="isovisModelyear"
@@ -1193,7 +1209,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.isovisSeqPlant')"
               name="isovisSeqPlant"
@@ -1207,7 +1223,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.isovisModelyear')"
               name="isowmi"
@@ -1221,7 +1237,11 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.vehicleLocation') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.positionLatitude')"
               name="positionLatitude"
@@ -1233,7 +1253,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.positionLongitude')"
               name="positionLongitude"
@@ -1247,7 +1267,11 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-divider orientation="left">
+            {{ t('views.dashboard.cdr.vehiclePropulsionStorageType') }}
+          </a-divider>
+
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.dieselTankPresent')"
               name="dieselTankPresent"
@@ -1261,7 +1285,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.electricEnergyStorage')"
               name="electricEnergyStorage"
@@ -1276,7 +1300,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="24" :md="24" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.gasolineTankPresent')"
               name="gasolineTankPresent"