feat:解决代码合并问题
parent
d580a6f1dc
commit
6bcb4c6b0d
|
@ -26,7 +26,7 @@ export default [ {
|
||||||
color:COLOR.BOUNDS,
|
color:COLOR.BOUNDS,
|
||||||
selected:false,
|
selected:false,
|
||||||
pages:["closePark","peopleCar"]
|
pages:["closePark","peopleCar"]
|
||||||
}{
|
},{
|
||||||
name:"人员定位",
|
name:"人员定位",
|
||||||
ids:[] as string[],
|
ids:[] as string[],
|
||||||
type:"moveMarker",
|
type:"moveMarker",
|
||||||
|
@ -37,7 +37,7 @@ export default [ {
|
||||||
coordinateType:1,
|
coordinateType:1,
|
||||||
selected:false,
|
selected:false,
|
||||||
pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
|
pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
|
||||||
}{
|
},{
|
||||||
name:"车辆定位",
|
name:"车辆定位",
|
||||||
ids:[] as string[],
|
ids:[] as string[],
|
||||||
type:"moveMarker",
|
type:"moveMarker",
|
||||||
|
|
Loading…
Reference in New Issue