feat:解决代码合并问题
parent
d580a6f1dc
commit
6bcb4c6b0d
|
@ -25,8 +25,8 @@ export default [ {
|
||||||
value:"bounds",
|
value:"bounds",
|
||||||
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",
|
||||||
|
@ -36,8 +36,8 @@ export default [ {
|
||||||
assetPath:"/JC_CustomAssets/VehicleLibrary/Exhibition/重型货车_01",
|
assetPath:"/JC_CustomAssets/VehicleLibrary/Exhibition/重型货车_01",
|
||||||
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",
|
||||||
|
@ -51,5 +51,5 @@ export default [ {
|
||||||
],
|
],
|
||||||
coordinateType:1,
|
coordinateType:1,
|
||||||
selected:false,
|
selected:false,
|
||||||
pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
|
pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
|
||||||
}]
|
}]
|
||||||
|
|
Loading…
Reference in New Issue