update

src/components/secondaryScreen/secondMap/components/footerDialog.vue

@@ -6,21 +6,22 @@
         </div>
         <div class="modal-body">
             <div class="info-left">
-                <div v-for="item in detailLeft" :key="item.key">
+                <div v-for="item in detailLeft" :key="item.key" style="display: flex">
                     <template v-if="item.customRender">
-                        <span class="info-label">{{ item.name }}：</span>
-                        <span class="info-value" v-html="item.customRender(item.value)"> </span>
+                        <div class="info-label">{{ item.name }}：</div>
+                        <div class="info-value" v-html="item.customRender(item.value)"></div>
                     </template>
                     <template v-else>
-                        <span class="info-label">{{ item.name }}：</span>
-                        <span class="info-value">{{ item.value }}</span>
+                        <div class="info-label">{{ item.name }}：</div>
+                        <div class="info-value">{{ item.value }}</div>
                     </template>
                 </div>
             </div>
             <div class="info-right">
-                <div v-for="item in detailRight" :key="item.key"
-                    ><span class="info-label">{{ item.name }}：</span><span class="info-value">{{ item.value }}</span></div
-                >
+                <div v-for="item in detailRight" :key="item.key" style="display: flex">
+                    <div class="info-label">{{ item.name }}：</div>
+                    <div class="info-value">{{ item.value }}</div>
+                </div>
             </div>
         </div>
     </div>
@@ -96,15 +97,18 @@
             padding: 2% 0 2% 5%;
             display: flex;
 
-            div {
-                flex: 1;
+            > div {
                 line-height: 28px;
+                flex: 1;
 
                 .info-label {
-                    display: inline-flex;
+                    text-align: right;
                     font-weight: bold;
-                    width: 70px;
-                    justify-content: flex-end;
+                    width: 100px;
+                }
+
+                .info-value {
+                    width: calc(100% - 100px);
                 }
             }
         }

src/components/secondaryScreen/secondMap/secondMap.vue

@@ -154,7 +154,7 @@
             Map.clearMarker();
             return;
         }
-        Map.createMarker(data);
+        Map.createMarker({ ...data, realName: data.userName });
     }
 </script>
 <style lang="less" scoped>

src/components/secondaryScreen/secondMap/secondMapHooks.ts

@@ -127,12 +127,12 @@ export function useAlarmDetail() {
         {
             name: '员工姓名',
             value: '',
-            key: 'realName',
+            key: 'userName',
         },
         {
             name: '部门名称',
             value: '',
-            key: 'orgName',
+            key: 'thirdDepart',
         },
         {
             name: '手机号码',
@@ -149,8 +149,8 @@ export function useAlarmDetail() {
             value: '',
             key: '',
             customRender: (record) => {
-                if (record?.lat) {
-                    return `${record.lat},${record.lon}`;
+                if (record?.address) {
+                    return `${record.address}`;
                 } else {
                     return `<span style="color: #eb3636;">${record?.gpsErrorMsg || ''}</span>`;
                 }
@@ -161,7 +161,7 @@ export function useAlarmDetail() {
         {
             name: '单位名称',
             value: '',
-            key: 'orgName2',
+            key: 'secondDepart',
         },
         {
             name: '事件类型',