gemercheung 1 год назад
Родитель
Сommit
8b014823f5
2 измененных файлов с 11 добавлено и 6 удалено
  1. 0 1
      src/views/map/addProjectModal.vue
  2. 11 5
      src/views/map/index.vue

+ 0 - 1
src/views/map/addProjectModal.vue

@@ -140,7 +140,6 @@
             immediate: true,
             immediate: true,
             listHeight: 160,
             listHeight: 160,
             allowClear: true,
             allowClear: true,
-
             onSelect: (_, item) => {
             onSelect: (_, item) => {
               const { lat, lon } = item;
               const { lat, lon } = item;
               console.log('选择场景', _, lat, lon);
               console.log('选择场景', _, lat, lon);

+ 11 - 5
src/views/map/index.vue

@@ -326,8 +326,8 @@
       .reduce((p: string[], c: { sceneList: any[] }) => p.concat(c['sceneList']), [])
       .reduce((p: string[], c: { sceneList: any[] }) => p.concat(c['sceneList']), [])
       .map((item) => {
       .map((item) => {
         const mapper = {} as any;
         const mapper = {} as any;
-        mapper.lat = Number(item.lat);
-        mapper.lng = Number(item.lon);
+        mapper.lat = item.lat ? Number(item.lat) : null;
+        mapper.lng = item.lon ? Number(item.lon) : null;
         mapper.title = item.title;
         mapper.title = item.title;
         item.num && (mapper.num = item.num);
         item.num && (mapper.num = item.num);
         item.id && (mapper.id = item.id);
         item.id && (mapper.id = item.id);
@@ -335,13 +335,19 @@
         return mapper;
         return mapper;
       });
       });
     console.log('list', list);
     console.log('list', list);
-    return list;
+    if (list.length === 0) {
+      const project = getMarkerData(data);
+      console.log('project', project);
+      return project;
+    } else {
+      return list;
+    }
   };
   };
   const getMarkerData = (data) => {
   const getMarkerData = (data) => {
     return data.map((item) => {
     return data.map((item) => {
       const mapper = {} as any;
       const mapper = {} as any;
-      mapper.lat = Number(item.lat);
-      mapper.lng = Number(item.lon);
+      mapper.lat = item.lat ? Number(item.lat) : null;
+      mapper.lng = item.lon ? Number(item.lon) : null;
       mapper.title = item.title;
       mapper.title = item.title;
       item.num && (mapper.num = item.num);
       item.num && (mapper.num = item.num);
       item.id && (mapper.id = item.id);
       item.id && (mapper.id = item.id);