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

src/graphic/Coordinate.js

@@ -22,7 +22,11 @@ export default class Coordinate {
   }
 
   setRes(res) {
-    this.res = res;
+    if (res) {
+      this.res = res;
+    } else {
+      this.res = defaultRes;
+    }
   }
 
   getRes() {

src/graphic/Layer.js

@@ -1124,6 +1124,7 @@ export default class Layer {
         needAutoRedraw = true;
         addCircle.finish(position);
         addCircle.clear();
+        this.uiControl.clearSelectUI();
         this.history.save();
         elementService.hideAll();
         break;
@@ -1243,7 +1244,6 @@ export default class Layer {
         break;
       case LayerEvents.MoveCircle:
         needAutoRedraw = true;
-        this.uiControl.clearSelectUI();
         this.history.save();
         break;
       case LayerEvents.AddPoint:

src/graphic/Load.js

@@ -393,9 +393,7 @@ export default class Load {
             bgImg.setBounding();
           }
         } catch (e) {}
-        if (data3d.meterPerPixel) {
-          coordinate.setRes(data3d.meterPerPixel);
-        }
+        coordinate.setRes(data3d.meterPerPixel);
         const width = bgImg.imageData.width;
         const height = bgImg.imageData.height;
         let angle = 0;