Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/graphic/Load.js

@@ -27,6 +27,11 @@ export default class Load {
   async load(dataLocal, data3d) {
     this.layer.initLocation();
     if (dataLocal) {
+      if(dataLocal.Settings){
+        for(let key in dataLocal.Settings){
+          Settings[key] = dataLocal.Settings[key]
+        }
+      }
       if (dataLocal.backgroundImg) {
         let bgImg = imageService.createBackgroundImg(
           dataLocal.backgroundImg.src,
@@ -302,7 +307,8 @@ export default class Load {
 
     const scale = res / (coordinate.zoom / coordinate.defaultZoom);
     dataService.setScale(scale);
-    return dataService.vectorData;
+    console.log(Settings)
+    return {...dataService.vectorData,Settings};
   }
 
   // 退出页面清除缓存及其他操作