Skip to content

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

1.修改缺陷

parent dbda573f
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 190 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" ,
...@@ -128,6 +129,77 @@ ...@@ -128,6 +129,77 @@
} }
} }
}, },
{ "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building",
"userData": {
"key": "valve-hall_01",
"level": "root" ,
"parentKey": "",
"fitView": {
"position": [56.89320100543368, 11.412329598660357, 7.8422674792993945],
"target": [-84.63030384684673, 1.2896430645024852, -39.11169084269889]
}
}
},
{ "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",
"userData": {
"key": "valve-hall_03",
"level": "root" ,
"parentKey": "",
"fitView": {
"position": [-75.3221097450265, 9.42207234314477, -3.170890511127358],
"target": [-99.59150282013933, 4.789862585422077, -5.547811778137931]
}
}
},
{ "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building",
"userData": {
"key": "wall",
"level": "root" ,
"parentKey": "",
"fitView": {
}
}
}
],
"asyncModels": [
{ "objName": "valve-hall_01#01.obj", "mtlName": "valve-hall_01#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_01", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#02.obj", "mtlName": "valve-hall_01#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_02", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#03.obj", "mtlName": "valve-hall_01#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_03", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#04.obj", "mtlName": "valve-hall_01#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_04", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#05.obj", "mtlName": "valve-hall_01#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_05", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#06.obj", "mtlName": "valve-hall_01#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_06", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#tizi.obj", "mtlName": "valve-hall_01#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_tizi", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_02#01.obj", "mtlName": "valve-hall_02#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_01", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#02.obj", "mtlName": "valve-hall_02#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_02", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#03.obj", "mtlName": "valve-hall_02#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_03", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#04.obj", "mtlName": "valve-hall_02#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_04", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#05.obj", "mtlName": "valve-hall_02#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_05", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#06.obj", "mtlName": "valve-hall_02#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_06", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#07.obj", "mtlName": "valve-hall_02#07.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_07", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#08.obj", "mtlName": "valve-hall_02#08.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_08", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#09.obj", "mtlName": "valve-hall_02#09.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_09", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#10.obj", "mtlName": "valve-hall_02#10.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_10", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#11.obj", "mtlName": "valve-hall_02#11.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_11", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#12.obj", "mtlName": "valve-hall_02#12.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_12", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#tizi.obj", "mtlName": "valve-hall_02#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_tizi", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_03#01.obj", "mtlName": "valve-hall_03#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_01", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#02.obj", "mtlName": "valve-hall_03#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_02", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#03.obj", "mtlName": "valve-hall_03#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_03", "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#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": "station_zmd_01.obj", "mtlName": "station_zmd_01.mtl", "modelLevel": "Building", { "objName": "station_zmd_01.obj", "mtlName": "station_zmd_01.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_01", "key": "station_zmd_01",
...@@ -137,7 +209,7 @@ ...@@ -137,7 +209,7 @@
} }
} }
}, },
{ "objName": "station_zmd_02.obj", "mtlName": "station_zmd_02.mtl", "modelLevel": "Building", { "objName": "station_zmd_02.obj", "mtlName": "station_zmd_02.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_02", "key": "station_zmd_02",
"level": "root" , "level": "root" ,
...@@ -146,7 +218,7 @@ ...@@ -146,7 +218,7 @@
} }
} }
}, },
{ "objName": "station_zmd_03.obj", "mtlName": "station_zmd_03.mtl", "modelLevel": "Building", { "objName": "station_zmd_03.obj", "mtlName": "station_zmd_03.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_03", "key": "station_zmd_03",
"level": "root" , "level": "root" ,
...@@ -155,7 +227,7 @@ ...@@ -155,7 +227,7 @@
} }
} }
}, },
{ "objName": "station_zmd_04.obj", "mtlName": "station_zmd_04.mtl", "modelLevel": "Building", { "objName": "station_zmd_04.obj", "mtlName": "station_zmd_04.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_04", "key": "station_zmd_04",
"level": "root" , "level": "root" ,
...@@ -164,7 +236,7 @@ ...@@ -164,7 +236,7 @@
} }
} }
}, },
{ "objName": "station_zmd_05.obj", "mtlName": "station_zmd_05.mtl", "modelLevel": "Building", { "objName": "station_zmd_05.obj", "mtlName": "station_zmd_05.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_05", "key": "station_zmd_05",
"level": "root" , "level": "root" ,
...@@ -173,7 +245,7 @@ ...@@ -173,7 +245,7 @@
} }
} }
}, },
{ "objName": "station_zmd_06.obj", "mtlName": "station_zmd_06.mtl", "modelLevel": "Building", { "objName": "station_zmd_06.obj", "mtlName": "station_zmd_06.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_06", "key": "station_zmd_06",
"level": "root" , "level": "root" ,
...@@ -182,7 +254,7 @@ ...@@ -182,7 +254,7 @@
} }
} }
}, },
{ "objName": "station_zmd_07.obj", "mtlName": "station_zmd_07.mtl", "modelLevel": "Building", { "objName": "station_zmd_07.obj", "mtlName": "station_zmd_07.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_07", "key": "station_zmd_07",
"level": "root" , "level": "root" ,
...@@ -191,7 +263,7 @@ ...@@ -191,7 +263,7 @@
} }
} }
}, },
{ "objName": "station_zmd_08.obj", "mtlName": "station_zmd_08.mtl", "modelLevel": "Building", { "objName": "station_zmd_08.obj", "mtlName": "station_zmd_08.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_08", "key": "station_zmd_08",
"level": "root" , "level": "root" ,
...@@ -200,7 +272,7 @@ ...@@ -200,7 +272,7 @@
} }
} }
}, },
{ "objName": "station_zmd_09.obj", "mtlName": "station_zmd_09.mtl", "modelLevel": "Building", { "objName": "station_zmd_09.obj", "mtlName": "station_zmd_09.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_09", "key": "station_zmd_09",
"level": "root" , "level": "root" ,
...@@ -209,7 +281,7 @@ ...@@ -209,7 +281,7 @@
} }
} }
}, },
{ "objName": "station_zmd_10.obj", "mtlName": "station_zmd_10.mtl", "modelLevel": "Building", { "objName": "station_zmd_10.obj", "mtlName": "station_zmd_10.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_10", "key": "station_zmd_10",
"level": "root" , "level": "root" ,
...@@ -218,7 +290,7 @@ ...@@ -218,7 +290,7 @@
} }
} }
}, },
{ "objName": "station_zmd_11.obj", "mtlName": "station_zmd_11.mtl", "modelLevel": "Building", { "objName": "station_zmd_11.obj", "mtlName": "station_zmd_11.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_11", "key": "station_zmd_11",
"level": "root" , "level": "root" ,
...@@ -227,7 +299,7 @@ ...@@ -227,7 +299,7 @@
} }
} }
}, },
{ "objName": "station_zmd_12.obj", "mtlName": "station_zmd_12.mtl", "modelLevel": "Building", { "objName": "station_zmd_12.obj", "mtlName": "station_zmd_12.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_12", "key": "station_zmd_12",
"level": "root" , "level": "root" ,
...@@ -236,7 +308,7 @@ ...@@ -236,7 +308,7 @@
} }
} }
}, },
{ "objName": "station_zmd_13.obj", "mtlName": "station_zmd_13.mtl", "modelLevel": "Building", { "objName": "station_zmd_13.obj", "mtlName": "station_zmd_13.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_13", "key": "station_zmd_13",
"level": "root" , "level": "root" ,
...@@ -245,7 +317,7 @@ ...@@ -245,7 +317,7 @@
} }
} }
}, },
{ "objName": "station_zmd_14.obj", "mtlName": "station_zmd_14.mtl", "modelLevel": "Building", { "objName": "station_zmd_14.obj", "mtlName": "station_zmd_14.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_14", "key": "station_zmd_14",
"level": "root" , "level": "root" ,
...@@ -254,7 +326,7 @@ ...@@ -254,7 +326,7 @@
} }
} }
}, },
{ "objName": "station_zmd_15.obj", "mtlName": "station_zmd_15.mtl", "modelLevel": "Building", { "objName": "station_zmd_15.obj", "mtlName": "station_zmd_15.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_15", "key": "station_zmd_15",
"level": "root" , "level": "root" ,
...@@ -263,7 +335,7 @@ ...@@ -263,7 +335,7 @@
} }
} }
}, },
{ "objName": "station_zmd_16.obj", "mtlName": "station_zmd_16.mtl", "modelLevel": "Building", { "objName": "station_zmd_16.obj", "mtlName": "station_zmd_16.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_16", "key": "station_zmd_16",
"level": "root" , "level": "root" ,
...@@ -272,7 +344,7 @@ ...@@ -272,7 +344,7 @@
} }
} }
}, },
{ "objName": "station_zmd_17.obj", "mtlName": "station_zmd_17.mtl", "modelLevel": "Building", { "objName": "station_zmd_17.obj", "mtlName": "station_zmd_17.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_17", "key": "station_zmd_17",
"level": "root" , "level": "root" ,
...@@ -281,7 +353,7 @@ ...@@ -281,7 +353,7 @@
} }
} }
}, },
{ "objName": "station_zmd_18.obj", "mtlName": "station_zmd_18.mtl", "modelLevel": "Building", { "objName": "station_zmd_18.obj", "mtlName": "station_zmd_18.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_18", "key": "station_zmd_18",
"level": "root" , "level": "root" ,
...@@ -290,7 +362,7 @@ ...@@ -290,7 +362,7 @@
} }
} }
}, },
{ "objName": "station_zmd_19.obj", "mtlName": "station_zmd_19.mtl", "modelLevel": "Building", { "objName": "station_zmd_19.obj", "mtlName": "station_zmd_19.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_19", "key": "station_zmd_19",
"level": "root" , "level": "root" ,
...@@ -299,7 +371,7 @@ ...@@ -299,7 +371,7 @@
} }
} }
}, },
{ "objName": "station_zmd_20.obj", "mtlName": "station_zmd_20.mtl", "modelLevel": "Building", { "objName": "station_zmd_20.obj", "mtlName": "station_zmd_20.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_20", "key": "station_zmd_20",
"level": "root" , "level": "root" ,
...@@ -308,7 +380,7 @@ ...@@ -308,7 +380,7 @@
} }
} }
}, },
{ "objName": "station_zmd_21.obj", "mtlName": "station_zmd_21.mtl", "modelLevel": "Building", { "objName": "station_zmd_21.obj", "mtlName": "station_zmd_21.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_21", "key": "station_zmd_21",
"level": "root" , "level": "root" ,
...@@ -317,7 +389,7 @@ ...@@ -317,7 +389,7 @@
} }
} }
}, },
{ "objName": "station_zmd_22.obj", "mtlName": "station_zmd_22.mtl", "modelLevel": "Building", { "objName": "station_zmd_22.obj", "mtlName": "station_zmd_22.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_22", "key": "station_zmd_22",
"level": "root" , "level": "root" ,
...@@ -326,7 +398,7 @@ ...@@ -326,7 +398,7 @@
} }
} }
}, },
{ "objName": "station_zmd_23.obj", "mtlName": "station_zmd_23.mtl", "modelLevel": "Building", { "objName": "station_zmd_23.obj", "mtlName": "station_zmd_23.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_23", "key": "station_zmd_23",
"level": "root" , "level": "root" ,
...@@ -335,7 +407,7 @@ ...@@ -335,7 +407,7 @@
} }
} }
}, },
{ "objName": "station_zmd_24.obj", "mtlName": "station_zmd_24.mtl", "modelLevel": "Building", { "objName": "station_zmd_24.obj", "mtlName": "station_zmd_24.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_24", "key": "station_zmd_24",
"level": "root" , "level": "root" ,
...@@ -344,7 +416,7 @@ ...@@ -344,7 +416,7 @@
} }
} }
}, },
{ "objName": "station_zmd_25.obj", "mtlName": "station_zmd_25.mtl", "modelLevel": "Building", { "objName": "station_zmd_25.obj", "mtlName": "station_zmd_25.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_25", "key": "station_zmd_25",
"level": "root" , "level": "root" ,
...@@ -353,7 +425,7 @@ ...@@ -353,7 +425,7 @@
} }
} }
}, },
{ "objName": "station_zmd_26.obj", "mtlName": "station_zmd_26.mtl", "modelLevel": "Building", { "objName": "station_zmd_26.obj", "mtlName": "station_zmd_26.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_26", "key": "station_zmd_26",
"level": "root" , "level": "root" ,
...@@ -362,7 +434,7 @@ ...@@ -362,7 +434,7 @@
} }
} }
}, },
{ "objName": "station_zmd_27.obj", "mtlName": "station_zmd_27.mtl", "modelLevel": "Building", { "objName": "station_zmd_27.obj", "mtlName": "station_zmd_27.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_27", "key": "station_zmd_27",
"level": "root" , "level": "root" ,
...@@ -371,7 +443,7 @@ ...@@ -371,7 +443,7 @@
} }
} }
}, },
{ "objName": "station_zmd_28.obj", "mtlName": "station_zmd_28.mtl", "modelLevel": "Building", { "objName": "station_zmd_28.obj", "mtlName": "station_zmd_28.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_28", "key": "station_zmd_28",
"level": "root" , "level": "root" ,
...@@ -380,7 +452,7 @@ ...@@ -380,7 +452,7 @@
} }
} }
}, },
{ "objName": "station_zmd_29.obj", "mtlName": "station_zmd_29.mtl", "modelLevel": "Building", { "objName": "station_zmd_29.obj", "mtlName": "station_zmd_29.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_29", "key": "station_zmd_29",
"level": "root" , "level": "root" ,
...@@ -389,7 +461,7 @@ ...@@ -389,7 +461,7 @@
} }
} }
}, },
{ "objName": "station_zmd_30.obj", "mtlName": "station_zmd_30.mtl", "modelLevel": "Building", { "objName": "station_zmd_30.obj", "mtlName": "station_zmd_30.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_30", "key": "station_zmd_30",
"level": "root" , "level": "root" ,
...@@ -398,7 +470,7 @@ ...@@ -398,7 +470,7 @@
} }
} }
}, },
{ "objName": "station_zmd_31.obj", "mtlName": "station_zmd_31.mtl", "modelLevel": "Building", { "objName": "station_zmd_31.obj", "mtlName": "station_zmd_31.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_31", "key": "station_zmd_31",
"level": "root" , "level": "root" ,
...@@ -407,7 +479,7 @@ ...@@ -407,7 +479,7 @@
} }
} }
}, },
{ "objName": "station_zmd_32.obj", "mtlName": "station_zmd_32.mtl", "modelLevel": "Building", { "objName": "station_zmd_32.obj", "mtlName": "station_zmd_32.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_32", "key": "station_zmd_32",
"level": "root" , "level": "root" ,
...@@ -416,7 +488,7 @@ ...@@ -416,7 +488,7 @@
} }
} }
}, },
{ "objName": "station_zmd_33.obj", "mtlName": "station_zmd_33.mtl", "modelLevel": "Building", { "objName": "station_zmd_33.obj", "mtlName": "station_zmd_33.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_33", "key": "station_zmd_33",
"level": "root" , "level": "root" ,
...@@ -425,7 +497,7 @@ ...@@ -425,7 +497,7 @@
} }
} }
}, },
{ "objName": "station_zmd_34.obj", "mtlName": "station_zmd_34.mtl", "modelLevel": "Building", { "objName": "station_zmd_34.obj", "mtlName": "station_zmd_34.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_34", "key": "station_zmd_34",
"level": "root" , "level": "root" ,
...@@ -434,7 +506,7 @@ ...@@ -434,7 +506,7 @@
} }
} }
}, },
{ "objName": "station_zmd_35.obj", "mtlName": "station_zmd_35.mtl", "modelLevel": "Building", { "objName": "station_zmd_35.obj", "mtlName": "station_zmd_35.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_35", "key": "station_zmd_35",
"level": "root" , "level": "root" ,
...@@ -443,7 +515,7 @@ ...@@ -443,7 +515,7 @@
} }
} }
}, },
{ "objName": "station_zmd_36.obj", "mtlName": "station_zmd_36.mtl", "modelLevel": "Building", { "objName": "station_zmd_36.obj", "mtlName": "station_zmd_36.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_36", "key": "station_zmd_36",
"level": "root" , "level": "root" ,
...@@ -452,7 +524,7 @@ ...@@ -452,7 +524,7 @@
} }
} }
}, },
{ "objName": "station_zmd_37.obj", "mtlName": "station_zmd_37.mtl", "modelLevel": "Building", { "objName": "station_zmd_37.obj", "mtlName": "station_zmd_37.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_37", "key": "station_zmd_37",
"level": "root" , "level": "root" ,
...@@ -461,7 +533,7 @@ ...@@ -461,7 +533,7 @@
} }
} }
}, },
{ "objName": "station_zmd_38.obj", "mtlName": "station_zmd_38.mtl", "modelLevel": "Building", { "objName": "station_zmd_38.obj", "mtlName": "station_zmd_38.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_38", "key": "station_zmd_38",
"level": "root" , "level": "root" ,
...@@ -470,7 +542,7 @@ ...@@ -470,7 +542,7 @@
} }
} }
}, },
{ "objName": "station_zmd_39.obj", "mtlName": "station_zmd_39.mtl", "modelLevel": "Building", { "objName": "station_zmd_39.obj", "mtlName": "station_zmd_39.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_39", "key": "station_zmd_39",
"level": "root" , "level": "root" ,
...@@ -479,7 +551,7 @@ ...@@ -479,7 +551,7 @@
} }
} }
}, },
{ "objName": "station_zmd_40.obj", "mtlName": "station_zmd_40.mtl", "modelLevel": "Building", { "objName": "station_zmd_40.obj", "mtlName": "station_zmd_40.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_40", "key": "station_zmd_40",
"level": "root" , "level": "root" ,
...@@ -488,7 +560,7 @@ ...@@ -488,7 +560,7 @@
} }
} }
}, },
{ "objName": "station_zmd_41.obj", "mtlName": "station_zmd_41.mtl", "modelLevel": "Building", { "objName": "station_zmd_41.obj", "mtlName": "station_zmd_41.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_41", "key": "station_zmd_41",
"level": "root" , "level": "root" ,
...@@ -497,7 +569,7 @@ ...@@ -497,7 +569,7 @@
} }
} }
}, },
{ "objName": "station_zmd_42.obj", "mtlName": "station_zmd_42.mtl", "modelLevel": "Building", { "objName": "station_zmd_42.obj", "mtlName": "station_zmd_42.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_42", "key": "station_zmd_42",
"level": "root" , "level": "root" ,
...@@ -506,7 +578,7 @@ ...@@ -506,7 +578,7 @@
} }
} }
}, },
{ "objName": "station_zmd_43.obj", "mtlName": "station_zmd_43.mtl", "modelLevel": "Building", { "objName": "station_zmd_43.obj", "mtlName": "station_zmd_43.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_43", "key": "station_zmd_43",
"level": "root" , "level": "root" ,
...@@ -515,7 +587,7 @@ ...@@ -515,7 +587,7 @@
} }
} }
}, },
{ "objName": "station_zmd_44.obj", "mtlName": "station_zmd_44.mtl", "modelLevel": "Building", { "objName": "station_zmd_44.obj", "mtlName": "station_zmd_44.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_44", "key": "station_zmd_44",
"level": "root" , "level": "root" ,
...@@ -524,7 +596,7 @@ ...@@ -524,7 +596,7 @@
} }
} }
}, },
{ "objName": "station_zmd_45.obj", "mtlName": "station_zmd_45.mtl", "modelLevel": "Building", { "objName": "station_zmd_45.obj", "mtlName": "station_zmd_45.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_45", "key": "station_zmd_45",
"level": "root" , "level": "root" ,
...@@ -533,7 +605,7 @@ ...@@ -533,7 +605,7 @@
} }
} }
}, },
{ "objName": "station_zmd_46.obj", "mtlName": "station_zmd_46.mtl", "modelLevel": "Building", { "objName": "station_zmd_46.obj", "mtlName": "station_zmd_46.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_46", "key": "station_zmd_46",
"level": "root" , "level": "root" ,
...@@ -542,7 +614,7 @@ ...@@ -542,7 +614,7 @@
} }
} }
}, },
{ "objName": "station_zmd_47.obj", "mtlName": "station_zmd_47.mtl", "modelLevel": "Building", { "objName": "station_zmd_47.obj", "mtlName": "station_zmd_47.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_47", "key": "station_zmd_47",
"level": "root" , "level": "root" ,
...@@ -551,7 +623,7 @@ ...@@ -551,7 +623,7 @@
} }
} }
}, },
{ "objName": "station_zmd_48.obj", "mtlName": "station_zmd_48.mtl", "modelLevel": "Building", { "objName": "station_zmd_48.obj", "mtlName": "station_zmd_48.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_48", "key": "station_zmd_48",
"level": "root" , "level": "root" ,
...@@ -560,7 +632,7 @@ ...@@ -560,7 +632,7 @@
} }
} }
}, },
{ "objName": "station_zmd_49.obj", "mtlName": "station_zmd_49.mtl", "modelLevel": "Building", { "objName": "station_zmd_49.obj", "mtlName": "station_zmd_49.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_49", "key": "station_zmd_49",
"level": "root" , "level": "root" ,
...@@ -569,7 +641,7 @@ ...@@ -569,7 +641,7 @@
} }
} }
}, },
{ "objName": "station_zmd_50.obj", "mtlName": "station_zmd_50.mtl", "modelLevel": "Building", { "objName": "station_zmd_50.obj", "mtlName": "station_zmd_50.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_50", "key": "station_zmd_50",
"level": "root" , "level": "root" ,
...@@ -578,7 +650,7 @@ ...@@ -578,7 +650,7 @@
} }
} }
}, },
{ "objName": "station_zmd_51.obj", "mtlName": "station_zmd_51.mtl", "modelLevel": "Building", { "objName": "station_zmd_51.obj", "mtlName": "station_zmd_51.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_51", "key": "station_zmd_51",
"level": "root" , "level": "root" ,
...@@ -587,7 +659,7 @@ ...@@ -587,7 +659,7 @@
} }
} }
}, },
{ "objName": "station_zmd_52.obj", "mtlName": "station_zmd_52.mtl", "modelLevel": "Building", { "objName": "station_zmd_52.obj", "mtlName": "station_zmd_52.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_52", "key": "station_zmd_52",
"level": "root" , "level": "root" ,
...@@ -596,7 +668,7 @@ ...@@ -596,7 +668,7 @@
} }
} }
}, },
{ "objName": "station_zmd_53.obj", "mtlName": "station_zmd_53.mtl", "modelLevel": "Building", { "objName": "station_zmd_53.obj", "mtlName": "station_zmd_53.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_53", "key": "station_zmd_53",
"level": "root" , "level": "root" ,
...@@ -605,7 +677,7 @@ ...@@ -605,7 +677,7 @@
} }
} }
}, },
{ "objName": "station_zmd_54.obj", "mtlName": "station_zmd_54.mtl", "modelLevel": "Building", { "objName": "station_zmd_54.obj", "mtlName": "station_zmd_54.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_54", "key": "station_zmd_54",
"level": "root" , "level": "root" ,
...@@ -614,7 +686,7 @@ ...@@ -614,7 +686,7 @@
} }
} }
}, },
{ "objName": "station_zmd_55.obj", "mtlName": "station_zmd_55.mtl", "modelLevel": "Building", { "objName": "station_zmd_55.obj", "mtlName": "station_zmd_55.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_55", "key": "station_zmd_55",
"level": "root" , "level": "root" ,
...@@ -623,7 +695,7 @@ ...@@ -623,7 +695,7 @@
} }
} }
}, },
{ "objName": "station_zmd_56.obj", "mtlName": "station_zmd_56.mtl", "modelLevel": "Building", { "objName": "station_zmd_56.obj", "mtlName": "station_zmd_56.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_56", "key": "station_zmd_56",
"level": "root" , "level": "root" ,
...@@ -632,7 +704,7 @@ ...@@ -632,7 +704,7 @@
} }
} }
}, },
{ "objName": "station_zmd_57.obj", "mtlName": "station_zmd_57.mtl", "modelLevel": "Building", { "objName": "station_zmd_57.obj", "mtlName": "station_zmd_57.mtl", "modelLevel": "Building",
"userData": { "userData": {
"key": "station_zmd_57", "key": "station_zmd_57",
"level": "root" , "level": "root" ,
...@@ -649,78 +721,7 @@ ...@@ -649,78 +721,7 @@
"fitView": { "fitView": {
} }
} }
},
{ "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building",
"userData": {
"key": "valve-hall_01",
"level": "root" ,
"parentKey": "",
"fitView": {
"position": [56.89320100543368, 11.412329598660357, 7.8422674792993945],
"target": [-84.63030384684673, 1.2896430645024852, -39.11169084269889]
}
}
},
{ "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",
"userData": {
"key": "valve-hall_03",
"level": "root" ,
"parentKey": "",
"fitView": {
"position": [-75.3221097450265, 9.42207234314477, -3.170890511127358],
"target": [-99.59150282013933, 4.789862585422077, -5.547811778137931]
}
}
},
{ "objName": "wall.obj", "mtlName": "wall.mtl", "modelLevel": "Building",
"userData": {
"key": "wall",
"level": "root" ,
"parentKey": "",
"fitView": {
}
} }
} ],
],
"asyncModels": [
{ "objName": "valve-hall_01#01.obj", "mtlName": "valve-hall_01#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_01", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#02.obj", "mtlName": "valve-hall_01#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_02", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#03.obj", "mtlName": "valve-hall_01#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_03", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#04.obj", "mtlName": "valve-hall_01#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_04", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#05.obj", "mtlName": "valve-hall_01#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_05", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#06.obj", "mtlName": "valve-hall_01#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_06", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_01#tizi.obj", "mtlName": "valve-hall_01#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_01_tizi", "level": "sub" ,"parentKey": "valve-hall_01"}},
{ "objName": "valve-hall_02#01.obj", "mtlName": "valve-hall_02#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_01", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#02.obj", "mtlName": "valve-hall_02#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_02", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#03.obj", "mtlName": "valve-hall_02#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_03", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#04.obj", "mtlName": "valve-hall_02#04.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_04", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#05.obj", "mtlName": "valve-hall_02#05.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_05", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#06.obj", "mtlName": "valve-hall_02#06.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_06", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#07.obj", "mtlName": "valve-hall_02#07.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_07", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#08.obj", "mtlName": "valve-hall_02#08.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_08", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#09.obj", "mtlName": "valve-hall_02#09.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_09", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#10.obj", "mtlName": "valve-hall_02#10.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_10", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#11.obj", "mtlName": "valve-hall_02#11.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_11", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#12.obj", "mtlName": "valve-hall_02#12.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_12", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_02#tizi.obj", "mtlName": "valve-hall_02#tizi.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_02_tizi", "level": "sub" ,"parentKey": "valve-hall_02"}},
{ "objName": "valve-hall_03#01.obj", "mtlName": "valve-hall_03#01.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_01", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#02.obj", "mtlName": "valve-hall_03#02.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_02", "level": "sub" ,"parentKey": "valve-hall_03"}},
{ "objName": "valve-hall_03#03.obj", "mtlName": "valve-hall_03#03.mtl", "modelLevel": "Stuff", "userData": {"key": "valve-hall_03_03", "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#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"}}
],
"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();
});
}, err => {
message.error('保存失败！');
}); });
}
getAreaTree = ()=>{
getAreaTreeAction().then(data => { getAreaTreeAction().then(data => {
this.setState({ this.setState({
treeData: data || [], treeData: data || [],
routePathData: [] routePathData: []
}); });
}); });
}, eer => {
message.error('保存失败！');
});
} }
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)){
routePathData.push({
riskSourceId: selectArea.id, riskSourceId: selectArea.id,
routePath: '' routePath: ''
}); });
//var tree = new Object(); }
//tree.children = treeData; const promptData = {
//this.removeTreeDataRoutePathByChildId(selectArea.id,tree);
//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,20 +247,10 @@ export const parseLevelFilter = (instance, topic, data) => { ...@@ -247,20 +247,10 @@ 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.node.visible = visible;
mc.object2DPipe.pipeNode.show();
} else {
mc.visible = true; mc.visible = true;
}
} else {
if (mc.extData.type === 'fireCar') {
mc.node.visible = visible;
mc.object2DPipe.pipeNode.hide();
} else { } else {
mc.visible = false; mc.visible = false;
} }
}
}); });
break; break;
default: default:
......
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