fix

virgo.wzfrontend/console/src/config/demo.js

@@ -0,0 +1,573 @@
+export default [{
+	"roomId": 1,
+	"boundary": [{
+			"x": 65308.08492905811,
+			"y": 29617.51444567245,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 58511.4296403937,
+			"y": 29599.977182049774,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 58518.63672454507,
+			"y": 30094.335435808793,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 57016.60855727008,
+			"y": 30176.47760120609,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 56887.6218559024,
+			"y": 46968.28739478864,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 57451.324623253975,
+			"y": 47518.01057125536,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 58523.734766020396,
+			"y": 48315.44375433271,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 59829.87532451795,
+			"y": 48782.90458579183,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 61163.51357898389,
+			"y": 48851.64882571229,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 62469.65413748145,
+			"y": 48507.927626109995,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 63597.0596721846,
+			"y": 47792.9875309372,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 64518.23248712499,
+			"y": 46830.56817205076,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 65109.43295044494,
+			"y": 45606.92070146656,
+			"z": 51764.507072695415
+		},
+		{
+			"x": 65269.726693125165,
+			"y": 44333.674101917604,
+			"z": 51764.507072695415
+		}
+	],
+	"height": 3735.476451626171,
+	"color": 'rgba(96, 173, 207, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 60609.722372129756,
+		"y": 38426.27697446687,
+		"z": 55499.983566530864
+	}
+}, {
+	"roomId": 2,
+	"boundary": [{
+		"x": 65301.002908259376,
+		"y": 29393.802197628767,
+		"z": 51727.57574782008
+	}, {
+		"x": 56887.63949329394,
+		"y": 29375.37031837835,
+		"z": 51727.57574782008
+	}, {
+		"x": 56887.07137246728,
+		"y": 22868.91696958714,
+		"z": 51727.57574782008
+	}, {
+		"x": 65282.57102908603,
+		"y": 22904.222759627923,
+		"z": 51727.57574782008
+	}],
+	"height": 3772.4428519722933,
+	"color": 'rgba(83, 205, 155, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 60609.92364837881,
+		"y": 26027.70155633194,
+		"z": 55500.018565508086
+	}
+}, {
+	"roomId": 3,
+	"boundary": [{
+		"x": 65300.015756627545,
+		"y": 7708.564249362347,
+		"z": 51727.66702773713
+	}, {
+		"x": 56887.82463781443,
+		"y": 7701.890357865949,
+		"z": 51727.66702773713
+	}, {
+		"x": 56887.11585056524,
+		"y": 22694.934346040158,
+		"z": 51727.66702773713
+	}, {
+		"x": 65282.79725091247,
+		"y": 22660.681684285173,
+		"z": 51727.66702773713
+	}],
+	"height": 3761.004364804612,
+	"color": 'rgba(89, 220, 89, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 60609.52849793746,
+		"y": 15341.182488294236,
+		"z": 55488.671475674135
+	},
+}, {
+	"roomId": 4,
+	"boundary": [{
+		"x": 65298.97739890984,
+		"y": 7486.95513177144,
+		"z": 51739.37694575865
+	}, {
+		"x": 56887.39862729889,
+		"y": 7465.771499255684,
+		"z": 51739.37694575865
+	}, {
+		"x": 56887.214994786,
+		"y": 136.2346489944593,
+		"z": 51739.37694575865
+	}, {
+		"x": 65235.42650137118,
+		"y": 134.55507182463234,
+		"z": 51739.37694575865
+	}],
+	"height": 3760.6065785629253,
+	"color": 'rgba(220, 208, 94, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 60609.49580146522,
+		"y": 4188.358264994062,
+		"z": 55499.983473087144
+	}
+}, {
+	"roomId": 5,
+	"boundary": [{
+		"x": 64282.100800101376,
+		"y": -4581.677828517527,
+		"z": 51726.91655361816
+	}, {
+		"x": 61778.98823700754,
+		"y": -3715.9362500489406,
+		"z": 51726.91655361816
+	}, {
+		"x": 40540.38319271916,
+		"y": -10655.39203978944,
+		"z": 51726.91655361816
+	}, {
+		"x": 41534.90684203548,
+		"y": -13507.205685249892,
+		"z": 51726.91655361816
+	}, {
+		"x": 42883.03889999759,
+		"y": -15562.554560489742,
+		"z": 51726.91655361816
+	}, {
+		"x": 45048.890402953126,
+		"y": -16844.385041822123,
+		"z": 51726.91655361816
+	}, {
+		"x": 47833.5566210388,
+		"y": -16976.9881950634,
+		"z": 51726.91655361816
+	}, {
+		"x": 55347.73530476206,
+		"y": -14435.427757938858,
+		"z": 51726.91655361816
+	}, {
+		"x": 58596.512559195355,
+		"y": -12424.279933779433,
+		"z": 51726.91655361816
+	}, {
+		"x": 61425.37982836176,
+		"y": -9661.714241252754,
+		"z": 51726.91655361816
+	}, {
+		"x": 63215.52239713112,
+		"y": -7031.73130682522,
+		"z": 51726.91655361816
+	}],
+	"height": 3769.654197662574,
+	"color": 'rgba(202, 127, 77, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 52719.8253610701,
+		"y": -10529.198177480825,
+		"z": 55496.57082760499
+	}
+}, {
+	"roomId": 6,
+	"boundary": [{
+		"x": 46929.27703547801,
+		"y": -5197.181378704704,
+		"z": 51718.82444935819
+	}, {
+		"x": 39559.57408641113,
+		"y": -7591.770766418368,
+		"z": 51718.82444935819
+	}, {
+		"x": 36038.85159802831,
+		"y": 3128.930619364195,
+		"z": 51718.82444935819
+	}, {
+		"x": 43439.65694851592,
+		"y": 5528.7603970144,
+		"z": 51718.82444935819
+	}],
+	"height": 3748.4203000716443,
+	"color": 'rgba(199, 137, 125, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 41907.34820094069,
+		"y": -1162.0082262849783,
+		"z": 55467.24468785306
+	}
+}, {
+	"roomId": 7,
+	"boundary": [{
+		"x": 42594.739981004575,
+		"y": 14855.186601365698,
+		"z": 51721.05590526123
+	}, {
+		"x": 41787.04096331181,
+		"y": 11519.452124935875,
+		"z": 51721.05590526123
+	}, {
+		"x": 43573.67248639963,
+		"y": 5570.511487462243,
+		"z": 51721.05590526123
+	}, {
+		"x": 36104.798419382634,
+		"y": 3220.7533540345444,
+		"z": 51721.05590526123
+	}, {
+		"x": 32514.679812774466,
+		"y": 13650.288267779772,
+		"z": 51721.05590526123
+	}, {
+		"x": 32072.140585876554,
+		"y": 15629.443253651863,
+		"z": 51721.05590526123
+	}, {
+		"x": 31949.213022849362,
+		"y": 17474.450130121422,
+		"z": 51721.05590526123
+	}],
+	"height": 3746.729285699381,
+	"color": 'rgba(204, 13, 117, 0.6)',
+	"name": "电梯",
+	"position": {
+		"x": 38101.47859328097,
+		"y": 10611.779880936629,
+		"z": 55467.78527919312
+	}
+}, {
+	"roomId": 8,
+	"boundary": [{
+		"x": 42441.66661344225,
+		"y": 14932.08086138849,
+		"z": 51742.27363810754
+	}, {
+		"x": 43660.806557495765,
+		"y": 19928.400707781082,
+		"z": 51742.27363810754
+	}, {
+		"x": 33139.92207445006,
+		"y": 22472.385070666372,
+		"z": 51742.27363810754
+	}, {
+		"x": 32428.468820473612,
+		"y": 20724.89010378616,
+		"z": 51742.27363810754
+	}, {
+		"x": 32126.640167271482,
+		"y": 19237.30602729998,
+		"z": 51742.27363810754
+	}, {
+		"x": 31975.725840670413,
+		"y": 17491.011676642287,
+		"z": 51742.27363810754
+	}],
+	"height": 3722.137169847243,
+	"color": 'rgba(116, 86, 206, 0.6)',
+	"name": "电梯通道",
+	"position": {
+		"x": 38157.633945966416,
+		"y": 18671.28235882953,
+		"z": 55464.41085086083
+	}
+}, {
+	"roomId": 9,
+	"boundary": [{
+		"x": 42825.12563595749,
+		"y": 20151.739052021494,
+		"z": 51732.71106249732
+	}, {
+		"x": 43951.40010790957,
+		"y": 24990.292720575555,
+		"z": 51732.71106249732
+	}, {
+		"x": 41351.83088710645,
+		"y": 27638.55750254204,
+		"z": 51732.71106249732
+	}, {
+		"x": 42435.24730308051,
+		"y": 28744.25640737783,
+		"z": 51732.71106249732
+	}, {
+		"x": 40561.83975045869,
+		"y": 30595.107327453326,
+		"z": 51732.71106249732
+	}, {
+		"x": 34475.51975156392,
+		"y": 24563.831449026347,
+		"z": 51732.71106249732
+	}, {
+		"x": 33118.89786789789,
+		"y": 22453.456483195616,
+		"z": 51732.71106249732
+	}],
+	"height": 3737.0624306093378,
+	"color": 'rgba(105, 203, 189, 0.6)',
+	"name": "公共区域",
+	"position": {
+		"x": 39401.15495731793,
+		"y": 24291.843686290817,
+		"z": 55469.773516720954
+	}
+}, {
+	"roomId": 10,
+	"boundary": [{
+		"x": 52836.60279716242,
+		"y": 42880.53144980387,
+		"z": 51726.43279453355
+	}, {
+		"x": 53413.889616341905,
+		"y": 42303.24463059887,
+		"z": 51726.43279453355
+	}, {
+		"x": 53389.80565615653,
+		"y": 39554.316924804836,
+		"z": 51726.43279453355
+	}, {
+		"x": 42688.440360875604,
+		"y": 28895.307372536055,
+		"z": 51726.43279453355
+	}, {
+		"x": 40730.09129915936,
+		"y": 30741.750773570348,
+		"z": 51726.43279453355
+	}],
+	"height": 3769.4747474747346,
+	"color": 'rgba(204, 52, 66, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 47441.610373927724,
+		"y": 35709.88870428097,
+		"z": 55495.907539330314
+	}
+}, {
+	"roomId": 11,
+	"boundary": [{
+		"x": 54496.08601807141,
+		"y": 37579.34293369458,
+		"z": 51748.782908166
+	}, {
+		"x": 54499.99253539135,
+		"y": 30787.44876532506,
+		"z": 51748.782908166
+	}, {
+		"x": 53632.05489467044,
+		"y": 29890.356335418095,
+		"z": 51748.782908166
+	}, {
+		"x": 50494.592629392886,
+		"y": 29905.40395116185,
+		"z": 51748.782908166
+	}, {
+		"x": 49511.97752897472,
+		"y": 30915.301689931544,
+		"z": 51748.782908166
+	}, {
+		"x": 49491.20277787227,
+		"y": 33241.55027337962,
+		"z": 51748.782908166
+	}, {
+		"x": 53847.30485730486,
+		"y": 37579.09202801483,
+		"z": 51748.782908166
+	}],
+	"height": 3751.2356916263743,
+	"color": 'rgba(94, 160, 206, 0.6)',
+	"name": "杂物间",
+	"position": {
+		"x": 52343.30570844126,
+		"y": 32625.787573432277,
+		"z": 55500.01863166149
+	}
+}, {
+	"roomId": 12,
+	"boundary": [{
+		"x": 53587.99519867442,
+		"y": 29787.65483279155,
+		"z": 51739.68176673229
+	}, {
+		"x": 50703.62809283503,
+		"y": 29801.793887229833,
+		"z": 51739.68176673229
+	}, {
+		"x": 50704.434134481475,
+		"y": 27299.654701546286,
+		"z": 51739.68176673229
+	}, {
+		"x": 49500.00250434939,
+		"y": 27290.0162374829,
+		"z": 51739.68176673229
+	}, {
+		"x": 49475.55523423974,
+		"y": 14430.994824389465,
+		"z": 51739.68176673229
+	}, {
+		"x": 53220.52418704308,
+		"y": 14416.588883508253,
+		"z": 51739.68176673229
+	}, {
+		"x": 53615.229282335,
+		"y": 14743.899036166835,
+		"z": 51739.68176673229
+	}],
+	"height": 3746.4709275529385,
+	"color": 'rgba(109, 25, 207, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 51714.23479087421,
+		"y": 22762.2494335807,
+		"z": 55999.983473087166
+	}
+}, {
+	"roomId": 13,
+	"boundary": [{
+		"x": 49352.55600221703,
+		"y": 30904.252336682046,
+		"z": 51746.60974390112
+	}, {
+		"x": 48055.31037291093,
+		"y": 30894.645024304074,
+		"z": 51746.60974390112
+	}, {
+		"x": 47627.208636314455,
+		"y": 31313.498343955132,
+		"z": 51746.60974390112
+	}, {
+		"x": 44472.70102630195,
+		"y": 28229.612674782435,
+		"z": 51746.60974390112
+	}, {
+		"x": 46931.121062419326,
+		"y": 25837.676667344946,
+		"z": 51746.60974390112
+	}, {
+		"x": 45448.00934693329,
+		"y": 19677.05877229064,
+		"z": 51746.60974390112
+	}, {
+		"x": 46161.04382553235,
+		"y": 19420.366359996708,
+		"z": 51746.60974390112
+	}, {
+		"x": 45111.41541493256,
+		"y": 14887.514999665891,
+		"z": 51746.60974390112
+	}, {
+		"x": 45174.746600735765,
+		"y": 14549.748675384428,
+		"z": 51746.60974390112
+	}, {
+		"x": 45501.95772738564,
+		"y": 14370.245249887064,
+		"z": 51746.60974390112
+	}, {
+		"x": 49392.121706034246,
+		"y": 14414.130589567581,
+		"z": 51746.60974390112
+	}, {
+		"x": 49414.10467024525,
+		"y": 27448.74999800304,
+		"z": 51746.60974390112
+	}, {
+		"x": 50606.2698989961,
+		"y": 27412.106422163513,
+		"z": 51746.60974390112
+	}, {
+		"x": 50606.2698989961,
+		"y": 29788.93901812445,
+		"z": 51746.60974390112
+	}, {
+		"x": 50475.67470141494,
+		"y": 29780.232671619095,
+		"z": 51746.60974390112
+	}],
+	"height": 3749.8882093231223,
+	"color": 'rgba(204, 0, 4, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 47802.1180741872,
+		"y": 23395.217773115517,
+		"z": 55496.49792558753
+	}
+}, {
+	"roomId": 14,
+	"boundary": [{
+		"x": 53252.583244723704,
+		"y": 11770.939687664955,
+		"z": 51755.810563242536
+	}, {
+		"x": 45051.42118506986,
+		"y": 11770.939687686008,
+		"z": 51755.810563242536
+	}, {
+		"x": 44737.847341612505,
+		"y": 11286.64027836041,
+		"z": 51755.810563242536
+	}, {
+		"x": 47391.16447855934,
+		"y": 3183.8405888967004,
+		"z": 51755.810563242536
+	}, {
+		"x": 53542.03602329972,
+		"y": 3230.2046080489345,
+		"z": 51755.810563242536
+	}, {
+		"x": 53566.15708818105,
+		"y": 11407.24560276627,
+		"z": 51755.810563242536
+	}],
+	"height": 3779.0131870802215,
+	"color": 'rgba(23, 205, 166, 0.6)',
+	"name": "xxxx数据科技有限公司",
+	"position": {
+		"x": 48936.719108250945,
+		"y": 7910.906933673414,
+		"z": 55534.82372013342
+	}
+}]

virgo.wzfrontend/console/src/uitls/controls.js

@@ -384,6 +384,33 @@ class bimView {
 		}
 		this.clearAllRooms = () => {
 			if (roomManager) roomManager.clearAllRooms();
+		}
+		this.editRoom = option => {
+			// 创建房间编辑器工具条的配置
+			if (roomEditorToolbar) return;
+			let roomEditorToolbarConfig = new Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarConfig();
+			roomEditorToolbarConfig.viewer = viewer3D;
+			roomEditorToolbarConfig.roomId = option.roomId;
+			// 创建房间编辑器工具条
+			roomEditorToolbar = new Glodon.Bimface.Plugins.Rooms.RoomEditorToolbar(roomEditorToolbarConfig);
+			// 注册房间编辑器工具条的监听事件
+			roomEditorToolbar.addEventListener(Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarEvent.Saved,
+				data => {
+					if (roomSaved) {
+						roomSaved(data)
+						this.exitRoom();
+					}
+				});
+			roomEditorToolbar.addEventListener(Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarEvent.Cancelled,
+				data => {
+					this.exitRoom();
+				});
+		}
+		this.exitRoom = () => {
+			if (roomEditorToolbar) {
+				roomEditorToolbar.exit();
+				roomEditorToolbar = null;
+			}
 		}
 		this.add3DMaker = (markerType, position, imageSrc, clickFn, id) => {
 			if (!marker3D) {
@@ -520,33 +547,6 @@ class bimView {
 		this.getTreeList = callback => {
 			model3D.getModelTree(callback);
 		}
-		this.editRoom = option => {
-			// 创建房间编辑器工具条的配置
-			if (roomEditorToolbar) return;
-			let roomEditorToolbarConfig = new Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarConfig();
-			roomEditorToolbarConfig.viewer = viewer3D;
-			roomEditorToolbarConfig.roomId = option.roomId;
-			// 创建房间编辑器工具条
-			roomEditorToolbar = new Glodon.Bimface.Plugins.Rooms.RoomEditorToolbar(roomEditorToolbarConfig);
-			// 注册房间编辑器工具条的监听事件
-			roomEditorToolbar.addEventListener(Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarEvent.Saved,
-				data => {
-					if (roomSaved) {
-						roomSaved(data)
-						this.exitRoom();
-					}
-				});
-			roomEditorToolbar.addEventListener(Glodon.Bimface.Plugins.Rooms.RoomEditorToolbarEvent.Cancelled,
-				data => {
-					this.exitRoom();
-				});
-		}
-		this.exitRoom = () => {
-			if (roomEditorToolbar) {
-				roomEditorToolbar.exit();
-				roomEditorToolbar = null;
-			}
-		}
 		this.setGlowEffect = option => { //gis发光
 			if (!layerId || !layerMng) return;
 			viewerGIS.enableGlowEffect(true);

virgo.wzfrontend/console/src/views/work/bim/distribution.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="distribution-index">
 		<div class="">
-			<el-button @click="getCamera">视角</el-button>
+			<el-button @click="getCamera" size="medium">恢复视角</el-button>
 		</div>
 		<div :id="'previewBim'+_uid" class="previewBim"></div>
 	</div>
@@ -12,286 +12,19 @@
 		getBimViewToken,
 	} from '@/httpApi/bim'
 	import bimView from '@/uitls/controls'
+	import list from '@/config/demo'
 	export default {
 		data() {
 			return {
 				room: {
-					id: 3
+					id: 10
 				},
 				form: {
-					color: 'rgba(19, 206, 102, 0.8)'
+					color: 'rgba(19, 206, 102, 0.6)'
 				},
 				bimViewer: {},
 				positionData: [],
-				roomList: [{
-					"roomId": 1,
-					"boundary": [{
-						"x": 65301.002908259376,
-						"y": 29393.802197628767,
-						"z": 51727.57574782008
-					}, {
-						"x": 58499.63949329394,
-						"y": 29375.37031837835,
-						"z": 51727.57574782008
-					}, {
-						"x": 58518.07137246728,
-						"y": 22868.91696958714,
-						"z": 51727.57574782008
-					}, {
-						"x": 65282.57102908603,
-						"y": 22904.222759627923,
-						"z": 51727.57574782008
-					}],
-					"height": 3772.4428519722933,
-					"color": 'rgba(19, 206, 102, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 61909.92364837881,
-						"y": 26027.70155633194,
-						"z": 55500.018565508086
-					}
-				}, {
-					"roomId": 2,
-					"boundary": [{
-						"x": 65300.015756627545,
-						"y": 7708.564249362347,
-						"z": 51727.66702773713
-					}, {
-						"x": 58533.82463781443,
-						"y": 7701.890357865949,
-						"z": 51727.66702773713
-					}, {
-						"x": 58524.11585056524,
-						"y": 22694.934346040158,
-						"z": 51727.66702773713
-					}, {
-						"x": 65282.79725091247,
-						"y": 22660.681684285173,
-						"z": 51727.66702773713
-					}],
-					"height": 3761.004364804612,
-					"color": 'rgba(212, 99, 50, 0.8)',
-					"name": "常州红信数据科技有限公司",
-					"position": {
-						"x": 61909.52849793746,
-						"y": 15341.182488294236,
-						"z": 55488.671475674135
-					},
-				}, {
-					"roomId": 3,
-					"boundary": [{
-						"x": 65298.97739890984,
-						"y": 7486.95513177144,
-						"z": 51739.37694575865
-					}, {
-						"x": 58541.39862729889,
-						"y": 7465.771499255684,
-						"z": 51739.37694575865
-					}, {
-						"x": 58520.214994786,
-						"y": 136.2346489944593,
-						"z": 51739.37694575865
-					}, {
-						"x": 65235.42650137118,
-						"y": 134.55507182463234,
-						"z": 51739.37694575865
-					}],
-					"height": 3760.6065785629253,
-					"color": 'rgba(217, 28, 13, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 61644.49580146522,
-						"y": 4188.358264994062,
-						"z": 55499.983473087144
-					}
-				}, {
-					"roomId": 4,
-					"boundary": [{
-						"x": 64282.100800101376,
-						"y": -4581.677828517527,
-						"z": 51726.91655361816
-					}, {
-						"x": 61778.98823700754,
-						"y": -3715.9362500489406,
-						"z": 51726.91655361816
-					}, {
-						"x": 40540.38319271916,
-						"y": -10655.39203978944,
-						"z": 51726.91655361816
-					}, {
-						"x": 41534.90684203548,
-						"y": -13507.205685249892,
-						"z": 51726.91655361816
-					}, {
-						"x": 42883.03889999759,
-						"y": -15562.554560489742,
-						"z": 51726.91655361816
-					}, {
-						"x": 45048.890402953126,
-						"y": -16844.385041822123,
-						"z": 51726.91655361816
-					}, {
-						"x": 47833.5566210388,
-						"y": -16976.9881950634,
-						"z": 51726.91655361816
-					}, {
-						"x": 55347.73530476206,
-						"y": -14435.427757938858,
-						"z": 51726.91655361816
-					}, {
-						"x": 58596.512559195355,
-						"y": -12424.279933779433,
-						"z": 51726.91655361816
-					}, {
-						"x": 61425.37982836176,
-						"y": -9661.714241252754,
-						"z": 51726.91655361816
-					}, {
-						"x": 63215.52239713112,
-						"y": -7031.73130682522,
-						"z": 51726.91655361816
-					}],
-					"height": 3769.654197662574,
-					"color": 'rgba(146, 129, 203, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 52719.8253610701,
-						"y": -10529.198177480825,
-						"z": 55496.57082760499
-					}
-				}, {
-					"roomId": 5,
-					"boundary": [{
-						"x": 52836.60279716242,
-						"y": 42880.53144980387,
-						"z": 54450.43279453355
-					}, {
-						"x": 53413.889616341905,
-						"y": 42303.24463059887,
-						"z": 54450.43279453355
-					}, {
-						"x": 53389.80565615653,
-						"y": 39554.316924804836,
-						"z": 54450.43279453355
-					}, {
-						"x": 42688.440360875604,
-						"y": 28895.307372536055,
-						"z": 54450.43279453355
-					}, {
-						"x": 40730.09129915936,
-						"y": 30741.750773570348,
-						"z": 54450.43279453355
-					}],
-					"height": 3769.4747474747346,
-					"color": 'rgba(43, 98, 206, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 48190.05608818472,
-						"y": 35246.636819550826,
-						"z": 58219.907539330314
-					}
-				}, {
-					"roomId": 6,
-					"boundary": [{
-						"x": 53252.583244723704,
-						"y": 11770.939687664955,
-						"z": 51755.810563242536
-					}, {
-						"x": 45051.42118506986,
-						"y": 11770.939687686008,
-						"z": 51755.810563242536
-					}, {
-						"x": 44737.847341612505,
-						"y": 11286.64027836041,
-						"z": 51755.810563242536
-					}, {
-						"x": 47391.16447855934,
-						"y": 3183.8405888967004,
-						"z": 51755.810563242536
-					}, {
-						"x": 53542.03602329972,
-						"y": 3230.2046080489345,
-						"z": 51755.810563242536
-					}, {
-						"x": 53566.15708818105,
-						"y": 11407.24560276627,
-						"z": 51755.810563242536
-					}],
-					"height": 3779.0131870802215,
-					"color": 'rgba(23, 205, 166, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 48936.719108250945,
-						"y": 7910.906933673414,
-						"z": 55534.82372013342
-					}
-				}, {
-					"roomId": 7,
-					"boundary": [{
-						"x": 46929.27703547801,
-						"y": -5197.181378704704,
-						"z": 51718.82444935819
-					}, {
-						"x": 39559.57408641113,
-						"y": -7591.770766418368,
-						"z": 51718.82444935819
-					}, {
-						"x": 36038.85159802831,
-						"y": 3128.930619364195,
-						"z": 51718.82444935819
-					}, {
-						"x": 43439.65694851592,
-						"y": 5528.7603970144,
-						"z": 51718.82444935819
-					}],
-					"height": 3748.4203000716443,
-					"color": 'rgba(161, 204, 56, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 41907.34820094069,
-						"y": -1162.0082262849783,
-						"z": 55467.24468785306
-					}
-				}, {
-					"roomId": 8,
-					"boundary": [{
-						"x": 53587.99519867442,
-						"y": 29787.65483279155,
-						"z": 51739.68176673229
-					}, {
-						"x": 50703.62809283503,
-						"y": 29801.793887229833,
-						"z": 51739.68176673229
-					}, {
-						"x": 50704.434134481475,
-						"y": 27299.654701546286,
-						"z": 51739.68176673229
-					}, {
-						"x": 49500.00250434939,
-						"y": 27290.0162374829,
-						"z": 51739.68176673229
-					}, {
-						"x": 49475.55523423974,
-						"y": 14430.994824389465,
-						"z": 51739.68176673229
-					}, {
-						"x": 53220.52418704308,
-						"y": 14416.588883508253,
-						"z": 51739.68176673229
-					}, {
-						"x": 53615.229282335,
-						"y": 14743.899036166835,
-						"z": 51739.68176673229
-					}],
-					"height": 3746.4709275529385,
-					"color": 'rgba(109, 25, 207, 0.8)',
-					"name": "温州有极数据科技有限公司",
-					"position": {
-						"x": 51714.23479087421,
-						"y": 22762.2494335807,
-						"z": 55999.983473087166
-					}
-				}],
+				roomList: [],
 				cameraState: {
 					"name": "persp",
 					"position": {
@@ -320,6 +53,7 @@
 			}
 		},
 		created() {
+			this.roomList = list;
 			this.init();
 		},
 		beforeDestroy() {
@@ -339,8 +73,9 @@
 				}
 			},
 			getCamera() {
-				if (!this.bimViewer) return;
-				console.log(this.bimViewer.getCameraState());
+				if (!this.bimViewer) return;
+				this.bimViewer.setStatus(this.cameraState);
+				// console.log(this.bimViewer.getCameraState());
 			},
 			successFunc(res) {
 				if (res.state) {
@@ -348,7 +83,8 @@
 						dom: document.getElementById('previewBim' + this._uid),
 						viewToken: res.data,
 						renderSuccess: () => {
-							this.bimViewer.setStatus(this.cameraState);
+							this.bimViewer.setStatus(this.cameraState);
+							this.bimViewer.setToolbars(true)
 							for (var i = 0; i < this.roomList.length; i++) {
 								this.bimViewer.insertRooms({
 									id: this.roomList[i].id,
@@ -357,8 +93,7 @@
 									},
 									height: this.roomList[i].height,
 									roomColor: this.returnRGBA(this.roomList[i].color)
-								})
-								console.log(this.roomList[i].position);
+								})
 								this.bimViewer.addDrawable({
 									position: this.roomList[i].position,
 									offsetX: -75,
@@ -375,27 +110,26 @@
 						},
 						click: data => {
 							let point = data.worldPosition;
-							console.log(point);
-							if (!point) return this.$message.warning('请点击模型范围内的点');
-							this.positionData.push(point);
-							this.bimViewer.add3DMaker('image', point);
-							if (this.positionData.length == 3) {
-								this.isSet = false;
-								this.bimViewer.insertRooms({
-									id: this.room.id,
-									boundary: {
-										"outer": this.positionData
-									},
-									height: 500,
-									roomColor: this.returnRGBA(this.form.color)
-								})
-								this.bimViewer.clear3DMaker();
-								this.positionData = [];
-								this.bimViewer.editRoom({
-									roomId: this.room.id
-								})
-								this.room.id++;
-							}
+							// console.log(point);
+							// if (!point) return this.$message.warning('请点击模型范围内的点');
+							// this.positionData.push(point);
+							// this.bimViewer.add3DMaker('image', point);
+							// if (this.positionData.length == 3) {
+							// 	this.bimViewer.insertRooms({
+							// 		id: this.room.id,
+							// 		boundary: {
+							// 			"outer": this.positionData
+							// 		},
+							// 		height: 500,
+							// 		roomColor: this.returnRGBA(this.form.color)
+							// 	})
+							// 	this.bimViewer.clear3DMaker();
+							// 	this.positionData = [];
+							// 	this.bimViewer.editRoom({
+							// 		roomId: this.room.id
+							// 	})
+							// 	this.room.id++;
+							// }
 						}
 					})
 				}