From 886fb7a7c053312a5af5010838bd5a95a962c361 Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Fri, 8 Aug 2025 09:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9msdData=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/mfCDR/index.vue | 37 +++++++++++++----------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/views/dashboard/mfCDR/index.vue b/src/views/dashboard/mfCDR/index.vue
index fb4d6c5c..29c16ba6 100644
--- a/src/views/dashboard/mfCDR/index.vue
+++ b/src/views/dashboard/mfCDR/index.vue
@@ -567,7 +567,15 @@ function wsMessage(res: Record<string, any>) {
 function fnModalVisibleByEdit(record: Record<string, any>) {
   modalState.title = t('common.viewText') + t('views.dashboard.cdr.msd');
   modalState.openByView = true;
-  modalState.from = Object.assign(modalState.from, record.cdrJSON.msdData);
+
+  let msdDataObj = {};
+
+  try {
+    msdDataObj = JSON.parse(record.cdrJSON.msdData);
+  } catch (e) {
+    msdDataObj = {};
+  }
+  modalState.from = Object.assign(modalState.from, msdDataObj);
   // if (!record || !record.cdrJSON) return;
   // const cdrJSON = record.cdrJSON;
   // Modal.info({
@@ -855,9 +863,11 @@ onBeforeUnmount(() => {
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'msdData'">
-            <a-button type="link" @click.prevent="fnModalVisibleByEdit(record)"
-            :disabled="!record.cdrJSON.msdData"
-           >
+            <a-button
+              type="link"
+              @click.prevent="fnModalVisibleByEdit(record)"
+              :disabled="!record.cdrJSON.msdData"
+            >
               <template #icon><InfoCircleOutlined /></template>
             </a-button>
           </template>
@@ -1019,8 +1029,7 @@ onBeforeUnmount(() => {
         :labelWrap="false"
       >
         <a-row :gutter="[32, 4]">
-
-                    <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.messageIdentifier')"
               name="messageIdentifier"
@@ -1044,9 +1053,7 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-
-
-            <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.timestamp')"
               name="timestamp"
@@ -1070,9 +1077,6 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-
-
-
           <a-divider orientation="left">
             {{ t('views.dashboard.cdr.control') }}
           </a-divider>
@@ -1122,8 +1126,6 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-
-
           <a-divider orientation="left">
             {{ t('views.dashboard.cdr.recentVehicleLocationN1') }}
           </a-divider>
@@ -1188,8 +1190,6 @@ onBeforeUnmount(() => {
             </a-form-item>
           </a-col>
 
-
-
           <a-divider orientation="left">
             {{ t('views.dashboard.cdr.vehicleIdentificationNumber') }}
           </a-divider>
@@ -1234,10 +1234,7 @@ onBeforeUnmount(() => {
           </a-col>
 
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.dashboard.cdr.isowmi')"
-              name="isowmi"
-            >
+            <a-form-item :label="t('views.dashboard.cdr.isowmi')" name="isowmi">
               <a-input
                 :disabled="true"
                 v-model:value="