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

# Conflicts:
#	src/graphic/Controls/MovePoint.js

src/graphic/Controls/LocationModeControl.js

@@ -114,6 +114,7 @@ export default class LocationModeControl {
       if (basePointCount == 0) {
         return Msg.UnBasePoint;
       } else if (fixPointCount == 0) {
+        uiService.setSelectLocationMode(null)
         return Msg.UnFixPoint;
       } else if (Settings.baseLineId == null) {
         return Msg.UnBaseLine;