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 @@
"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": {
"key": "building",
"level": "root" ,
......@@ -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",
"userData": {
"key": "station_zmd_01",
......@@ -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": {
"key": "station_zmd_02",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_03",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_04",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_05",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_06",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_07",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_08",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_09",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_10",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_11",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_12",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_13",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_14",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_15",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_16",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_17",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_18",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_19",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_20",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_21",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_22",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_23",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_24",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_25",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_26",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_27",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_28",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_29",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_30",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_31",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_32",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_33",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_34",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_35",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_36",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_37",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_38",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_39",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_40",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_41",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_42",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_43",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_44",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_45",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_46",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_47",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_48",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_49",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_50",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_51",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_52",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_53",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_54",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_55",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_56",
"level": "root" ,
......@@ -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": {
"key": "station_zmd_57",
"level": "root" ,
......@@ -649,78 +721,7 @@
"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"
}
mods/components/3dviewConvertor/view/PointsPool.js
View file @ 4689b659
......@@ -65,26 +65,6 @@ class PointsPool extends Component {
if (extData.isTableDb) {//控制安全执行类表双击最佳视角
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 {
alarmStarted: false,
//编辑模式
drawing: false,//画线状态
selectArea: '',//选中区域
selectArea: {},//选中区域
selectPoints: '',//选中点
treeData: [],//左树
pointTypeArr: [],
......@@ -858,7 +858,7 @@ class View3D extends Component {
}
});
this.setState({
selectArea: '',
selectArea: {},
selectPoints,
showRightPanel: true
});
......@@ -916,6 +916,7 @@ class View3D extends Component {
onRegionCreated = (polygonRegion,item) => {
this.polygonRegion[item.id] = polygonRegion;
}
saveRoutePath =(data)=>{
saveAreaDataAction(data).then(d => {
message.success('保存成功！');
......@@ -929,31 +930,35 @@ class View3D extends Component {
message.error('保存失败！');
});
}
changeRoutePath = ( routePathNode ) => {
this.state.routePathData.push(routePathNode);
}
//保存区域绑定
saveAreaData = () => {
let { routePathData } = this.state;
this.setState({ isAreaSave: false });
const { routePathData } = this.state;
saveAreaDataAction(routePathData).then(d => {
message.success('保存成功！');
this.a3dRef.changeDrawState(PEN_STATE.CLEARED);//清除当前路径
// 结束绘制
this.setState({
drawing: false
this.setState({ isAreaSave: false, drawing: false,treeData: [] },()=>{
message.success('保存成功！');
this.getAreaTree();
});
}, err => {
message.error('保存失败！');
});
}
getAreaTree = ()=>{
getAreaTreeAction().then(data => {
this.setState({
treeData: data || [],
routePathData: []
});
});
}, eer => {
message.error('保存失败！');
});
}
savePointDataBack = async()=>{
await this.savePointData();
this.handleOutExceptModel();
......@@ -1023,7 +1028,6 @@ class View3D extends Component {
deletePointBind = () => {
let { selectPoints ,pointType } = this.state;
if (selectPoints && !selectPoints.isRegion) {
let pointParams = [];
pointParams.push({
pointId: selectPoints.id,
......@@ -1079,30 +1083,26 @@ class View3D extends Component {
//删除区域
deleteAreaBind = () => {
let { selectArea } = this.state;
if (selectArea) {
const { selectArea, routePathData = [] } = this.state;
if (selectArea && selectArea.id) {
getPointsByRegionIdAction(selectArea.id).then(d => {
if (d && d.length === 0){
this.state.routePathData.push({
if (!routePathData.some(r=> r.riskSourceId === selectArea.id)){
routePathData.push({
riskSourceId: selectArea.id,
routePath: ''
});
//var tree = new Object();
//tree.children = treeData;
//this.removeTreeDataRoutePathByChildId(selectArea.id,tree);
//this.getAreas(tree.children);
this.setState({
routePathData: this.state.routePathData,
//treeData: tree.children,
selectArea: ''
});
this.setState({ promptData: {
}
const promptData = {
promptvisible: true,
promptContent: '确定将选中删除？',
type: 'region',
btnType: 'isOk',
isback: false
}
};
this.setState({
routePathData,
promptData
});
} else {
message.danger('请先清除点的绑定再进行删除！');
......@@ -1160,7 +1160,7 @@ class View3D extends Component {
this.setState( {
treeDataList: [],
dragItem: '',
selectArea: '',
selectArea: {},
selectPoints: ''
} );
this.stagePilot.positionCtl.clearDrag();//清除已有选中
......@@ -1183,7 +1183,7 @@ class View3D extends Component {
treeData: data || [],
pageType: 'point',
showRightPanel: false ,
selectArea: ''
selectArea: {}
});
});
this.enableCamera();
......@@ -1195,7 +1195,7 @@ class View3D extends Component {
pointType,
treeData: [],
treeDataList: [],
selectArea: '',
selectArea: {},
selectPoints: '',
dragItem: ''
});
......@@ -1631,7 +1631,7 @@ class View3D extends Component {
isEditMode: false, //推出编辑模式
errorAreaId: '',
dragItem: '',
selectArea: '',
selectArea: {},
selectPoints: '',
showRightPanel: false,
routePathData: [],
......
mods/components/3dviewConvertor/view/dataProcessor.js
View file @ 4689b659
......@@ -247,20 +247,10 @@ export const parseLevelFilter = (instance, topic, data) => {
case 'fireResource':
(instance.markerList[pointLevel] || []).forEach(mc => {
if (visible) {
if (mc.extData.type === 'fireCar') {
mc.node.visible = visible;
mc.object2DPipe.pipeNode.show();
} else {
mc.visible = true;
}
} else {
if (mc.extData.type === 'fireCar') {
mc.node.visible = visible;
mc.object2DPipe.pipeNode.hide();
} else {
mc.visible = false;
}
}
});
break;
default:
......
mods/components/3dviewConvertor/view/sideControl/index.js
View file @ 4689b659
......@@ -82,7 +82,8 @@ SideControl.propTypes = {
write: PropTypes.func,
toStr: PropTypes.func,
animationProps: PropTypes.object,
errorAreaId: PropTypes.number
errorAreaId: PropTypes.string,
activeAction: PropTypes.array
};
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