Merge remote-tracking branch 'origin/master'

@@ -186,6 +186,7 @@ import DriverInfo from "./views/dispatch/DriverInfo";
 import VehicleInfo from "./views/dispatch/VehicleInfo";
 import VehicleInfo from "./views/dispatch/VehicleInfo";
 import DispatchNode from "./views/dispatch/DispatchNode";
 import DispatchNode from "./views/dispatch/DispatchNode";
 import Dispatch from "./views/dispatch/Dispatch";
 import Dispatch from "./views/dispatch/Dispatch";
+import multiple from "./views/deploy/multiple";
 
 
 
 
 
 
@@ -572,6 +573,7 @@ let routes = [
             {path:'/trajectory',component:trajectory,name:'车辆轨迹'},
             {path:'/trajectory',component:trajectory,name:'车辆轨迹'},
             {path:'/attendance',component:attendance,name:'出勤历史'},
             {path:'/attendance',component:attendance,name:'出勤历史'},
             {path:'/conveyance',component:conveyance,name:'出勤车辆'},
             {path:'/conveyance',component:conveyance,name:'出勤车辆'},
+            {path:'/multiple',component:multiple,name:'多车定位'},
             {path:'/station',component:station,name:'场站管理'},
             {path:'/station',component:station,name:'场站管理'},
             {path:'/house',component:house,name:'仓库管理'},
             {path:'/house',component:house,name:'仓库管理'},
             {path:'/inventroyrecord',component:inventroyrecord,name:'库存变更记录'},
             {path:'/inventroyrecord',component:inventroyrecord,name:'库存变更记录'},