Skip to content

A
amos-station-module-view
Commit 4689b659 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.修改缺陷

parent dbda573f
Hide whitespace changes
Inline Side-by-side
Showing with 659 additions and 687 deletions
mods/components/3dviewConvertor/threeres/models/zmd/index.json
View file @ 4689b659
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
"target": [2.408441971875859, 1.3271790975878637, 3.918674823963386] "target": [2.408441971875859, 1.3271790975878637, 3.918674823963386]
} }
}, },
"models": [{ "objName": "building.obj", "mtlName": "building.mtl", "modelLevel": "Building", "models": [
{ "objName": "building.obj", "mtlName": "building.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "building", "key": "building",
"level": "root" , "level": "root" ,
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
} }
} }
}, },
{ "objName": "gis_01.obj", "mtlName": "gis_01.mtl", "modelLevel": "Building", { "objName": "gis_01.obj", "mtlName": "gis_01.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "gis_01", "key": "gis_01",
"level": "root" , "level": "root" ,
...@@ -56,641 +57,119 @@ ...@@ -56,641 +57,119 @@
} }
} }
}, },
{ "objName": "hlb_01_house.obj", "mtlName": "hlb_01_house.mtl", "modelLevel": "Building", { "objName": "hlb_01_house.obj", "mtlName": "hlb_01_house.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "hlb_01_house", "key": "hlb_01_house",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
} }
}
},
{ "objName": "hlb_02.obj", "mtlName": "hlb_02.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_02",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "hlb_03.obj", "mtlName": "hlb_03.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_03",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "hlb_03_house.obj", "mtlName": "hlb_03_house.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_03_house",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "hlb_cell#01.obj", "mtlName": "hlb_cell#01.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_cell_01",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "hlb_cell#02.obj", "mtlName": "hlb_cell#02.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_cell_02",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "hlb_cell#03.obj", "mtlName": "hlb_cell#03.mtl", "modelLevel": "Building",
"userData": {
"key": "hlb_cell_03",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_00.obj", "mtlName": "station_zmd_00.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_00",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_01.obj", "mtlName": "station_zmd_01.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_01",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_02.obj", "mtlName": "station_zmd_02.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_02",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_03.obj", "mtlName": "station_zmd_03.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_03",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_04.obj", "mtlName": "station_zmd_04.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_04",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_05.obj", "mtlName": "station_zmd_05.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_05",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_06.obj", "mtlName": "station_zmd_06.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_06",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_07.obj", "mtlName": "station_zmd_07.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_07",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_08.obj", "mtlName": "station_zmd_08.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_08",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_09.obj", "mtlName": "station_zmd_09.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_09",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_10.obj", "mtlName": "station_zmd_10.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_10",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_11.obj", "mtlName": "station_zmd_11.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_11",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_12.obj", "mtlName": "station_zmd_12.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_12",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_13.obj", "mtlName": "station_zmd_13.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_13",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_14.obj", "mtlName": "station_zmd_14.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_14",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_15.obj", "mtlName": "station_zmd_15.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_15",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_16.obj", "mtlName": "station_zmd_16.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_16",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_17.obj", "mtlName": "station_zmd_17.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_17",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_18.obj", "mtlName": "station_zmd_18.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_18",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_19.obj", "mtlName": "station_zmd_19.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_19",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_20.obj", "mtlName": "station_zmd_20.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_20",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_21.obj", "mtlName": "station_zmd_21.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_21",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_22.obj", "mtlName": "station_zmd_22.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_22",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_23.obj", "mtlName": "station_zmd_23.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_23",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_24.obj", "mtlName": "station_zmd_24.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_24",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_25.obj", "mtlName": "station_zmd_25.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_25",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_26.obj", "mtlName": "station_zmd_26.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_26",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_27.obj", "mtlName": "station_zmd_27.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_27",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_28.obj", "mtlName": "station_zmd_28.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_28",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_29.obj", "mtlName": "station_zmd_29.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_29",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_30.obj", "mtlName": "station_zmd_30.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_30",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_31.obj", "mtlName": "station_zmd_31.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_31",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_32.obj", "mtlName": "station_zmd_32.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_32",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_33.obj", "mtlName": "station_zmd_33.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_33",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_34.obj", "mtlName": "station_zmd_34.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_34",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_35.obj", "mtlName": "station_zmd_35.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_35",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_36.obj", "mtlName": "station_zmd_36.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_36",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_37.obj", "mtlName": "station_zmd_37.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_37",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_38.obj", "mtlName": "station_zmd_38.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_38",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_39.obj", "mtlName": "station_zmd_39.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_39",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_40.obj", "mtlName": "station_zmd_40.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_40",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_41.obj", "mtlName": "station_zmd_41.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_41",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_42.obj", "mtlName": "station_zmd_42.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_42",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_43.obj", "mtlName": "station_zmd_43.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_43",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_44.obj", "mtlName": "station_zmd_44.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_44",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_45.obj", "mtlName": "station_zmd_45.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_45",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_46.obj", "mtlName": "station_zmd_46.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_46",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_47.obj", "mtlName": "station_zmd_47.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_47",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_48.obj", "mtlName": "station_zmd_48.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_48",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_49.obj", "mtlName": "station_zmd_49.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_49",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_50.obj", "mtlName": "station_zmd_50.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_50",
"level": "root" ,
"parentKey": "",
"fitView": {
} }
}
}, },
{ "objName": "station_zmd_51.obj", "mtlName": "station_zmd_51.mtl", "modelLevel": "Building", { "objName": "hlb_02.obj", "mtlName": "hlb_02.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_51", "key": "hlb_02",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_52.obj", "mtlName": "station_zmd_52.mtl", "modelLevel": "Building", { "objName": "hlb_03.obj", "mtlName": "hlb_03.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_52", "key": "hlb_03",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_53.obj", "mtlName": "station_zmd_53.mtl", "modelLevel": "Building", { "objName": "hlb_03_house.obj", "mtlName": "hlb_03_house.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_53", "key": "hlb_03_house",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_54.obj", "mtlName": "station_zmd_54.mtl", "modelLevel": "Building", { "objName": "hlb_cell#01.obj", "mtlName": "hlb_cell#01.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_54", "key": "hlb_cell_01",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_55.obj", "mtlName": "station_zmd_55.mtl", "modelLevel": "Building", { "objName": "hlb_cell#02.obj", "mtlName": "hlb_cell#02.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_55", "key": "hlb_cell_02",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_56.obj", "mtlName": "station_zmd_56.mtl", "modelLevel": "Building", { "objName": "hlb_cell#03.obj", "mtlName": "hlb_cell#03.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_56", "key": "hlb_cell_03",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_57.obj", "mtlName": "station_zmd_57.mtl", "modelLevel": "Building", { "objName": "station_zmd_00.obj", "mtlName": "station_zmd_00.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_57", "key": "station_zmd_00",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
}, },
{ "objName": "station_zmd_58.obj", "mtlName": "station_zmd_58.mtl", "modelLevel": "Building", { "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_58", "key": "valve-hall_01",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
"position": [56.89320100543368, 11.412329598660357, 7.8422674792993945],
"target": [-84.63030384684673, 1.2896430645024852, -39.11169084269889]
} }
} }
}, },
{ "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building", { "objName": "valve-hall_02.obj", "mtlName": "valve-hall_02.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "valve-hall_01", "key": "valve-hall_02",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
"position": [56.89320100543368, 11.412329598660357, 7.8422674792993945], "position": [-36.51001053772929, 14.40190290718119, 34.75144868513701],
"target": [-84.63030384684673, 1.2896430645024852, -39.11169084269889] "target": [-57.93604514791863, -3.9901598918294336, -36.583352523189845]
} }
} }
},
{ "objName": "valve-hall_02.obj", "mtlName": "valve-hall_02.mtl", "modelLevel": "Building",
"userData": {
"key": "valve-hall_02",
"level": "root" ,
"parentKey": "",
"fitView": {
"position": [-36.51001053772929, 14.40190290718119, 34.75144868513701],
"target": [-57.93604514791863, -3.9901598918294336, -36.583352523189845]
}
}
}, },
{ "objName": "valve-hall_03.obj", "mtlName": "valve-hall_03.mtl", "modelLevel": "Building", { "objName": "valve-hall_03.obj", "mtlName": "valve-hall_03.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "valve-hall_03", "key": "valve-hall_03",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
"position": [-75.3221097450265, 9.42207234314477, -3.170890511127358], "position": [-75.3221097450265, 9.42207234314477, -3.170890511127358],
"target": [-99.59150282013933, 4.789862585422077, -5.547811778137931] "target": [-99.59150282013933, 4.789862585422077, -5.547811778137931]
} }
} }
}, },
{ "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building", { "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "wall", "key": "wall",
"level": "root" , "level": "root" ,
"parentKey": "", "parentKey": "",
"fitView": { "fitView": {
}
} }
}
} }
], ],
"asyncModels": [ "asyncModels": [
...@@ -720,7 +199,529 @@ ...@@ -720,7 +199,529 @@
{ "objName": "valve-hall_03#04.obj", "mtlName": "valve-hall_03#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_04", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#04.obj", "mtlName": "valve-hall_03#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_04", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#05.obj", "mtlName": "valve-hall_03#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_05", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#05.obj", "mtlName": "valve-hall_03#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_05", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#06.obj", "mtlName": "valve-hall_03#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_06", "level": "sub" ,"parentKey": "valve-hall_03"}}, { "objName": "valve-hall_03#06.obj", "mtlName": "valve-hall_03#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_06", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#tizi.obj", "mtlName": "valve-hall_03#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_tizi", "level": "sub" ,"parentKey": "valve-hall_03"}} { "objName": "valve-hall_03#tizi.obj", "mtlName": "valve-hall_03#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_tizi", "level": "sub" ,"parentKey": "valve-hall_03"}},
], { "objName": "station_zmd_01.obj", "mtlName": "station_zmd_01.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_01",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_02.obj", "mtlName": "station_zmd_02.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_02",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_03.obj", "mtlName": "station_zmd_03.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_03",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_04.obj", "mtlName": "station_zmd_04.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_04",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_05.obj", "mtlName": "station_zmd_05.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_05",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_06.obj", "mtlName": "station_zmd_06.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_06",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_07.obj", "mtlName": "station_zmd_07.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_07",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_08.obj", "mtlName": "station_zmd_08.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_08",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_09.obj", "mtlName": "station_zmd_09.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_09",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_10.obj", "mtlName": "station_zmd_10.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_10",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_11.obj", "mtlName": "station_zmd_11.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_11",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_12.obj", "mtlName": "station_zmd_12.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_12",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_13.obj", "mtlName": "station_zmd_13.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_13",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_14.obj", "mtlName": "station_zmd_14.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_14",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_15.obj", "mtlName": "station_zmd_15.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_15",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_16.obj", "mtlName": "station_zmd_16.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_16",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_17.obj", "mtlName": "station_zmd_17.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_17",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_18.obj", "mtlName": "station_zmd_18.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_18",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_19.obj", "mtlName": "station_zmd_19.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_19",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_20.obj", "mtlName": "station_zmd_20.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_20",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_21.obj", "mtlName": "station_zmd_21.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_21",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_22.obj", "mtlName": "station_zmd_22.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_22",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_23.obj", "mtlName": "station_zmd_23.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_23",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_24.obj", "mtlName": "station_zmd_24.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_24",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_25.obj", "mtlName": "station_zmd_25.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_25",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_26.obj", "mtlName": "station_zmd_26.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_26",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_27.obj", "mtlName": "station_zmd_27.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_27",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_28.obj", "mtlName": "station_zmd_28.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_28",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_29.obj", "mtlName": "station_zmd_29.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_29",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_30.obj", "mtlName": "station_zmd_30.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_30",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_31.obj", "mtlName": "station_zmd_31.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_31",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_32.obj", "mtlName": "station_zmd_32.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_32",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_33.obj", "mtlName": "station_zmd_33.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_33",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_34.obj", "mtlName": "station_zmd_34.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_34",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_35.obj", "mtlName": "station_zmd_35.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_35",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_36.obj", "mtlName": "station_zmd_36.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_36",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_37.obj", "mtlName": "station_zmd_37.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_37",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_38.obj", "mtlName": "station_zmd_38.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_38",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_39.obj", "mtlName": "station_zmd_39.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_39",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_40.obj", "mtlName": "station_zmd_40.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_40",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_41.obj", "mtlName": "station_zmd_41.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_41",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_42.obj", "mtlName": "station_zmd_42.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_42",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_43.obj", "mtlName": "station_zmd_43.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_43",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_44.obj", "mtlName": "station_zmd_44.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_44",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_45.obj", "mtlName": "station_zmd_45.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_45",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_46.obj", "mtlName": "station_zmd_46.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_46",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_47.obj", "mtlName": "station_zmd_47.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_47",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_48.obj", "mtlName": "station_zmd_48.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_48",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_49.obj", "mtlName": "station_zmd_49.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_49",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_50.obj", "mtlName": "station_zmd_50.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_50",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_51.obj", "mtlName": "station_zmd_51.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_51",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_52.obj", "mtlName": "station_zmd_52.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_52",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_53.obj", "mtlName": "station_zmd_53.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_53",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_54.obj", "mtlName": "station_zmd_54.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_54",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_55.obj", "mtlName": "station_zmd_55.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_55",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_56.obj", "mtlName": "station_zmd_56.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_56",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_57.obj", "mtlName": "station_zmd_57.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_57",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
},
{ "objName": "station_zmd_58.obj", "mtlName": "station_zmd_58.mtl", "modelLevel": "Building",
"userData": {
"key": "station_zmd_58",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
}
],
"version": "1.0.0" "version": "1.0.0"
} }
mods/components/3dviewConvertor/view/PointsPool.js
View file @ 4689b659
...@@ -65,26 +65,6 @@ class PointsPool extends Component { ...@@ -65,26 +65,6 @@ class PointsPool extends Component {
if (extData.isTableDb) {//控制安全执行类表双击最佳视角 if (extData.isTableDb) {//控制安全执行类表双击最佳视角
this.props.focusObject && this.props.focusObject(mc.node); this.props.focusObject && this.props.focusObject(mc.node);
} }
if (extData.hasOwnProperty('visible')){
let visible = extData.visible;
if (visible) {
if (extData.type === 'fireCar') {
mc.visible = visible;
mc.object2DPipe.pipeNode.visible = false;
mc.object2DPipe.pipeNode.elementVisible = false;
} else {
mc.show();
}
} else {
if (extData.type === 'fireCar') {
mc.visible = visible;
mc.object2DPipe.pipeNode.visible = false;
mc.object2DPipe.pipeNode.elementVisible = false;
} else {
mc.hide();
}
}
}
}); });
} }
......
mods/components/3dviewConvertor/view/View3D.js
View file @ 4689b659
...@@ -118,7 +118,7 @@ class View3D extends Component { ...@@ -118,7 +118,7 @@ class View3D extends Component {
alarmStarted: false, alarmStarted: false,
//编辑模式 //编辑模式
drawing: false,//画线状态 drawing: false,//画线状态
selectArea: '',//选中区域 selectArea: {},//选中区域
selectPoints: '',//选中点 selectPoints: '',//选中点
treeData: [],//左树 treeData: [],//左树
pointTypeArr: [], pointTypeArr: [],
...@@ -858,7 +858,7 @@ class View3D extends Component { ...@@ -858,7 +858,7 @@ class View3D extends Component {
} }
}); });
this.setState({ this.setState({
selectArea: '', selectArea: {},
selectPoints, selectPoints,
showRightPanel: true showRightPanel: true
}); });
...@@ -916,6 +916,7 @@ class View3D extends Component { ...@@ -916,6 +916,7 @@ class View3D extends Component {
onRegionCreated = (polygonRegion,item) => { onRegionCreated = (polygonRegion,item) => {
this.polygonRegion[item.id] = polygonRegion; this.polygonRegion[item.id] = polygonRegion;
} }
saveRoutePath =(data)=>{ saveRoutePath =(data)=>{
saveAreaDataAction(data).then(d => { saveAreaDataAction(data).then(d => {
message.success('保存成功！'); message.success('保存成功！');
...@@ -929,31 +930,35 @@ class View3D extends Component { ...@@ -929,31 +930,35 @@ class View3D extends Component {
message.error('保存失败！'); message.error('保存失败！');
}); });
} }
changeRoutePath = ( routePathNode ) => { changeRoutePath = ( routePathNode ) => {
this.state.routePathData.push(routePathNode); this.state.routePathData.push(routePathNode);
} }
//保存区域绑定 //保存区域绑定
saveAreaData = () => { saveAreaData = () => {
let { routePathData } = this.state; const { routePathData } = this.state;
this.setState({ isAreaSave: false });
saveAreaDataAction(routePathData).then(d => { saveAreaDataAction(routePathData).then(d => {
message.success('保存成功！');
this.a3dRef.changeDrawState(PEN_STATE.CLEARED);//清除当前路径 this.a3dRef.changeDrawState(PEN_STATE.CLEARED);//清除当前路径
// 结束绘制 this.setState({ isAreaSave: false, drawing: false,treeData: [] },()=>{
this.setState({ message.success('保存成功！');
drawing: false this.getAreaTree();
}); });
getAreaTreeAction().then(data => { }, err => {
this.setState({
treeData: data || [],
routePathData: []
});
});
}, eer => {
message.error('保存失败！'); message.error('保存失败！');
}); });
} }
getAreaTree = ()=>{
getAreaTreeAction().then(data => {
this.setState({
treeData: data || [],
routePathData: []
});
});
}
savePointDataBack = async()=>{ savePointDataBack = async()=>{
await this.savePointData(); await this.savePointData();
this.handleOutExceptModel(); this.handleOutExceptModel();
...@@ -1023,7 +1028,6 @@ class View3D extends Component { ...@@ -1023,7 +1028,6 @@ class View3D extends Component {
deletePointBind = () => { deletePointBind = () => {
let { selectPoints ,pointType } = this.state; let { selectPoints ,pointType } = this.state;
if (selectPoints && !selectPoints.isRegion) { if (selectPoints && !selectPoints.isRegion) {
let pointParams = []; let pointParams = [];
pointParams.push({ pointParams.push({
pointId: selectPoints.id, pointId: selectPoints.id,
...@@ -1079,30 +1083,26 @@ class View3D extends Component { ...@@ -1079,30 +1083,26 @@ class View3D extends Component {
//删除区域 //删除区域
deleteAreaBind = () => { deleteAreaBind = () => {
let { selectArea } = this.state; const { selectArea, routePathData = [] } = this.state;
if (selectArea) { if (selectArea && selectArea.id) {
getPointsByRegionIdAction(selectArea.id).then(d => { getPointsByRegionIdAction(selectArea.id).then(d => {
if (d && d.length === 0){ if (d && d.length === 0){
this.state.routePathData.push({ if (!routePathData.some(r=> r.riskSourceId === selectArea.id)){
riskSourceId: selectArea.id, routePathData.push({
routePath: '' riskSourceId: selectArea.id,
}); routePath: ''
//var tree = new Object(); });
//tree.children = treeData; }
//this.removeTreeDataRoutePathByChildId(selectArea.id,tree); const promptData = {
//this.getAreas(tree.children);
this.setState({
routePathData: this.state.routePathData,
//treeData: tree.children,
selectArea: ''
});
this.setState({ promptData: {
promptvisible: true, promptvisible: true,
promptContent: '确定将选中删除？', promptContent: '确定将选中删除？',
type: 'region', type: 'region',
btnType: 'isOk', btnType: 'isOk',
isback: false isback: false
} };
this.setState({
routePathData,
promptData
}); });
} else { } else {
message.danger('请先清除点的绑定再进行删除！'); message.danger('请先清除点的绑定再进行删除！');
...@@ -1160,7 +1160,7 @@ class View3D extends Component { ...@@ -1160,7 +1160,7 @@ class View3D extends Component {
this.setState( { this.setState( {
treeDataList: [], treeDataList: [],
dragItem: '', dragItem: '',
selectArea: '', selectArea: {},
selectPoints: '' selectPoints: ''
} ); } );
this.stagePilot.positionCtl.clearDrag();//清除已有选中 this.stagePilot.positionCtl.clearDrag();//清除已有选中
...@@ -1183,7 +1183,7 @@ class View3D extends Component { ...@@ -1183,7 +1183,7 @@ class View3D extends Component {
treeData: data || [], treeData: data || [],
pageType: 'point', pageType: 'point',
showRightPanel: false , showRightPanel: false ,
selectArea: '' selectArea: {}
}); });
}); });
this.enableCamera(); this.enableCamera();
...@@ -1195,7 +1195,7 @@ class View3D extends Component { ...@@ -1195,7 +1195,7 @@ class View3D extends Component {
pointType, pointType,
treeData: [], treeData: [],
treeDataList: [], treeDataList: [],
selectArea: '', selectArea: {},
selectPoints: '', selectPoints: '',
dragItem: '' dragItem: ''
}); });
...@@ -1631,7 +1631,7 @@ class View3D extends Component { ...@@ -1631,7 +1631,7 @@ class View3D extends Component {
isEditMode: false, //推出编辑模式 isEditMode: false, //推出编辑模式
errorAreaId: '', errorAreaId: '',
dragItem: '', dragItem: '',
selectArea: '', selectArea: {},
selectPoints: '', selectPoints: '',
showRightPanel: false, showRightPanel: false,
routePathData: [], routePathData: [],
......
mods/components/3dviewConvertor/view/dataProcessor.js
View file @ 4689b659
...@@ -247,19 +247,9 @@ export const parseLevelFilter = (instance, topic, data) => { ...@@ -247,19 +247,9 @@ export const parseLevelFilter = (instance, topic, data) => {
case 'fireResource': case 'fireResource':
(instance.markerList[pointLevel] || []).forEach(mc => { (instance.markerList[pointLevel] || []).forEach(mc => {
if (visible) { if (visible) {
if (mc.extData.type === 'fireCar') { mc.visible = true;
mc.node.visible = visible;
mc.object2DPipe.pipeNode.show();
} else {
mc.visible = true;
}
} else { } else {
if (mc.extData.type === 'fireCar') { mc.visible = false;
mc.node.visible = visible;
mc.object2DPipe.pipeNode.hide();
} else {
mc.visible = false;
}
} }
}); });
break; break;
......
mods/components/3dviewConvertor/view/sideControl/index.js
View file @ 4689b659
...@@ -82,7 +82,8 @@ SideControl.propTypes = { ...@@ -82,7 +82,8 @@ SideControl.propTypes = {
write: PropTypes.func, write: PropTypes.func,
toStr: PropTypes.func, toStr: PropTypes.func,
animationProps: PropTypes.object, animationProps: PropTypes.object,
errorAreaId: PropTypes.number errorAreaId: PropTypes.string,
activeAction: PropTypes.array
}; };
export default SideControl; export default SideControl;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment