whx 4 months ago
parent
commit
18aaafb6dd
100 changed files with 296 additions and 219 deletions
  1. 2 2
      virgo.wzfrontend/console/src/components/work/bim/operationModel.vue
  2. 227 150
      virgo.wzfrontend/console/src/components/work/common/model.vue
  3. 1 1
      virgo.wzfrontend/console/src/views/work/energy/electrical/lift.vue
  4. 1 1
      virgo.wzfrontend/console/src/views/work/energy/water/supply/firefighting.vue
  5. 1 1
      virgo.wzfrontend/console/src/views/work/iot/firefighting/thoroughfare.vue
  6. 1 1
      virgo.wzfrontend/console/src/views/work/iot/security/accessControl.vue
  7. 1 1
      virgo.wzfrontend/console/src/views/work/iot/security/electronicPatrol.vue
  8. 1 1
      virgo.wzfrontend/console/src/views/work/iot/security/infrared.vue
  9. 1 1
      virgo.wzfrontend/console/src/views/work/iot/security/monitor.vue
  10. 1 1
      virgo.wzfrontend/src/main/resources/static/console/index.html
  11. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/1088.4a136c23.css
  12. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/2217.eb2d7c9e.css
  13. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/2319.5ead6c8a.css
  14. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/2663.7c138caa.css
  15. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/3181.d8191c97.css
  16. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/4106.b01ee7b6.css
  17. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/411.5ead6c8a.css
  18. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/4220.2ce76ddb.css
  19. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/5122.5947691c.css
  20. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/6493.5947691c.css
  21. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/6666.4a136c23.css
  22. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/8415.00353a9c.css
  23. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/9305.d8191c97.css
  24. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/9691.00353a9c.css
  25. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/9757.eb2d7c9e.css
  26. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/9805.b01ee7b6.css
  27. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1000.f99677c8.js
  28. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2453.83e6167f.js
  29. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1187-legacy.cd1b758e.js
  30. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1706-legacy.627edf2d.js
  31. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1801.e2419e55.js
  32. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2033.2a8e717c.js
  33. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5503.bbd44c5c.js
  34. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1517.ff474fbd.js
  35. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/260.35281b16.js
  36. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2623-legacy.44e6911a.js
  37. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/2663-legacy.4c9b6f5e.js
  38. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/2663.2cbe34c3.js
  39. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/287-legacy.857b5d04.js
  40. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3911.d3d0692a.js
  41. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/3181-legacy.53b6bbe7.js
  42. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3313-legacy.6deb3e2c.js
  43. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.dbd5415a.js
  44. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3845-legacy.12457ba1.js
  45. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/3845-legacy.ea27211c.js
  46. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3028.743d72b3.js
  47. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3922.82936010.js
  48. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4027.5facb77f.js
  49. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/4106.58645554.js
  50. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4108-legacy.ac300b77.js
  51. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/411-legacy.5b96108e.js
  52. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4135-legacy.47c3f57a.js
  53. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/4220-legacy.17191e39.js
  54. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/4220.fffb9c1c.js
  55. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4265-legacy.880f95f4.js
  56. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4265.87c2563e.js
  57. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4755-legacy.98d872ae.js
  58. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4827.a3d04397.js
  59. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/483.ba86087a.js
  60. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4985-legacy.e67b14ec.js
  61. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9924.74e8c8ea.js
  62. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5139.cbe44b0c.js
  63. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5257-legacy.efda69a3.js
  64. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5545-legacy.e997cf4a.js
  65. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5644.ee66554d.js
  66. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5749.36627d0b.js
  67. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6049.08bf8874.js
  68. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6338-legacy.d3c228d3.js
  69. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6418-legacy.fc500b03.js
  70. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9387-legacy.f41e5f92.js
  71. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6613-legacy.59678bdf.js
  72. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6615.5cc325a7.js
  73. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/6666-legacy.a316397c.js
  74. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6720-legacy.a19a2471.js
  75. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7110.36187826.js
  76. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7224.dd068aeb.js
  77. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7342-legacy.b8062ab9.js
  78. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.92f4def3.js
  79. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7870.129999e5.js
  80. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7920.dd46b223.js
  81. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8184-legacy.4a040a23.js
  82. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8261-legacy.cf46d5b8.js
  83. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/8261.3dc44abc.js
  84. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/6742.15cd05e1.js
  85. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/859-legacy.a20b9c71.js
  86. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/859-legacy.edc82b90.js
  87. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9305.b1b5ecfa.js
  88. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9314-legacy.b5816dcb.js
  89. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9349-legacy.79af2807.js
  90. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9462-legacy.01318e97.js
  91. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9462-legacy.7170d8b5.js
  92. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9516.106e6b41.js
  93. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9608.2cbb7dce.js
  94. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9665.b754ad03.js
  95. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9600-legacy.91ccab64.js
  96. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2363-legacy.264748c8.js
  97. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/9805-legacy.2c9f7c84.js
  98. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/9955-legacy.8c189612.js
  99. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.1b53fb4e.js
  100. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/app.0f646821.js

+ 2 - 2
virgo.wzfrontend/console/src/components/work/bim/operationModel.vue

@@ -53,7 +53,7 @@
 	export default {
 		data() {
 			return {
-				roomId: 1,
+				roomId: 100,
 				bimViewer: null,
 				positionData: [],
 				titleList: [{
@@ -672,7 +672,7 @@
 						},
 						click: data => {
 							console.log(data);
-							// this.setRoom(data);
+							this.setRoom(data);
 						}
 					})
 				}

+ 227 - 150
virgo.wzfrontend/console/src/components/work/common/model.vue

@@ -14,61 +14,66 @@
 		data() {
 			return {
 				bimViewer: null,
+				monitorState: {
+					"name": "persp",
+					"position": {
+						"x": -29199.759874394706,
+						"y": 56228.99034295019,
+						"z": 135224.7752068727
+					},
+					"target": {
+						"x": 13904.302096186619,
+						"y": 56018.97550295713,
+						"z": 51379.509739637324
+					},
+					"up": {
+						"x": 0.8893455691936829,
+						"y": -0.004341169977023856,
+						"z": 0.4572150618678207
+					},
+					"near": 82106.61640846003,
+					"far": 157522.25491443858,
+					"zoom": 0.6584655424812111,
+					"version": 1,
+					"fov": 45,
+					"aspect": 1.0961791831357048,
+					"coordinateSystem": "world"
+				},
 				accessControlPosition: [{
-					"x": 41486.393958441135,
-					"y": 20486.876589681855,
-					"z": 2350.976612813646
+					"x": 25987.56348152631,
+					"y": 29543.25089264843,
+					"z": 18902.539903298024
 				}, {
-					"x": 40118.936654208715,
-					"y": 15107.470449747207,
-					"z": 2542.0675343682433
+					"x": 26344.200730380406,
+					"y": 25613.42265492873,
+					"z": 18903.338880743828
 				}],
 				accessControlState: {
 					"name": "persp",
 					"position": {
-						"x": 24135.43575367589,
-						"y": 436.21120934330844,
-						"z": 21188.168501586944
+						"x": -10117.50882039926,
+						"y": 55269.88187799346,
+						"z": 91765.81430511932
 					},
 					"target": {
-						"x": 94975.98090647973,
-						"y": 74569.92725177901,
-						"z": -33013.13517772488
+						"x": 32986.55315018207,
+						"y": 55059.86703800041,
+						"z": 7920.5488378839345
 					},
 					"up": {
-						"x": 0.3228594603427823,
-						"y": 0.33786410274305995,
-						"z": 0.8840868831425983
+						"x": 0.8893455691937225,
+						"y": -0.004341169977024489,
+						"z": 0.4572150618677433
 					},
-					"near": 8.815307997111978,
-					"far": 87627.57190545162,
-					"zoom": 2.313002027572293,
+					"near": 34729.39603198974,
+					"far": 110145.03453796833,
+					"zoom": 0.9918329044792272,
 					"version": 1,
 					"fov": 45,
-					"aspect": 2.133676092544987,
+					"aspect": 2.0698254364089776,
 					"coordinateSystem": "world"
 				},
-				infraredPath: [{
-					"x": 46250.00190734864,
-					"y": 8.76882117968938,
-					"z": 25087.53599154626
-				}, {
-					"x": 274.80185054007273,
-					"y": 7.564761033395837,
-					"z": 25100.160948932167
-				}, {
-					"x": -50.00114440918067,
-					"y": 46092.93824194108,
-					"z": 25086.06053930691
-				}, {
-					"x": 46150.135483630074,
-					"y": 46125.96945691116,
-					"z": 25100.160948932167
-				}, {
-					"x": 46250.00190734864,
-					"y": 8.76882117968938,
-					"z": 25087.53599154626
-				}],
+				infraredPath: [],
 				carState: {
 					"name": "persp",
 					"position": {
@@ -147,26 +152,26 @@
 				electronicPatrolState: {
 					"name": "persp",
 					"position": {
-						"x": 11693.193942189686,
-						"y": -2814.766456198332,
-						"z": 41686.863999369
+						"x": -10117.50882039926,
+						"y": 55269.88187799346,
+						"z": 91765.81430511932
 					},
 					"target": {
-						"x": 78775.65657695424,
-						"y": 64267.94258575774,
-						"z": -25395.352227298925
+						"x": 32986.55315018207,
+						"y": 55059.86703800041,
+						"z": 7920.5488378839345
 					},
 					"up": {
-						"x": 0,
-						"y": -0.000003673205104770231,
-						"z": 0.999999999993254
+						"x": 0.8893455691937225,
+						"y": -0.004341169977024489,
+						"z": 0.4572150618677433
 					},
-					"near": 5139.564334500344,
-					"far": 98209.03496154794,
-					"zoom": 2.2417814678680723,
+					"near": 34729.39603198974,
+					"far": 110145.03453796833,
+					"zoom": 0.9918329044792272,
 					"version": 1,
 					"fov": 45,
-					"aspect": 2.133676092544987,
+					"aspect": 2.0698254364089776,
 					"coordinateSystem": "world"
 				},
 				facilitiesState: {
@@ -197,71 +202,111 @@
 				thoroughfareState: {
 					"name": "persp",
 					"position": {
-						"x": 4889.081910092037,
-						"y": 7249.830700210317,
-						"z": 50438.42795034506
+						"x": -10117.50882039926,
+						"y": 55269.88187799346,
+						"z": 91765.81430511932
 					},
 					"target": {
-						"x": 39669.98506878919,
-						"y": 39006.698129453434,
-						"z": -9675.98735751202
+						"x": 32986.55315018207,
+						"y": 55059.86703800041,
+						"z": 7920.5488378839345
 					},
 					"up": {
-						"x": 0.5813174818537612,
-						"y": 0.530768708547021,
-						"z": 0.6167289220707342
+						"x": 0.8893455691937225,
+						"y": -0.004341169977024489,
+						"z": 0.4572150618677433
 					},
-					"near": 10910.494845190624,
-					"far": 60352.04088339407,
-					"zoom": 2.2432918199570335,
+					"near": 34729.39603198974,
+					"far": 110145.03453796833,
+					"zoom": 0.9918329044792272,
 					"version": 1,
 					"fov": 45,
-					"aspect": 2.133676092544987,
+					"aspect": 2.0698254364089776,
 					"coordinateSystem": "world"
 				},
 				thoroughfareBox: {
 					"roomId": 9,
 					"boundary": [{
-							"x": 13629.5055006166,
-							"y": 29737.806241337094,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 13629.5055006166,
-							"y": 30975.038946192344,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 7594.918695797806,
-							"y": 30997.385049044813,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 7589.611252505921,
-							"y": 19329.261449293062,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 11103.768010814118,
-							"y": 19370.849103237255,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 11093.371097327998,
-							"y": 21075.94291494926,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 9097.721510222394,
-							"y": 21088.510085646267,
-							"z": 25100.16094893217
-						},
-						{
-							"x": 9081.677324312814,
-							"y": 29770.410193069187,
-							"z": 25100.16094893217
-						}
-					],
+						"x": 26628.020385196083,
+						"y": 70101.5468657465,
+						"z": 15591.97543946871
+					}, {
+						"x": 24764.43637268342,
+						"y": 70089.52374308521,
+						"z": 15591.97543946871
+					}, {
+						"x": 24755.15843161096,
+						"y": 47296.8526323751,
+						"z": 15591.97543946871
+					}, {
+						"x": 19375.94161728345,
+						"y": 47290.264283777426,
+						"z": 15591.97543946871
+					}, {
+						"x": 19375.94161728345,
+						"y": 43167.43008169759,
+						"z": 15591.97543946871
+					}, {
+						"x": 20137.769676368553,
+						"y": 43182.36788677758,
+						"z": 15591.97543946871
+					}, {
+						"x": 20165.17654526978,
+						"y": 12267.187787209636,
+						"z": 15591.97543946871
+					}, {
+						"x": 32863.17564912872,
+						"y": 12229.53063197179,
+						"z": 15591.97543946871
+					}, {
+						"x": 32880.33328742367,
+						"y": 21065.714353810603,
+						"z": 15591.97543946871
+					}, {
+						"x": 30992.99307497935,
+						"y": 21065.714353810603,
+						"z": 15591.97543946871
+					}, {
+						"x": 31027.30835156925,
+						"y": 14099.713206108547,
+						"z": 15591.97543946871
+					}, {
+						"x": 21985.232970131437,
+						"y": 14134.014780131636,
+						"z": 15591.97543946871
+					}, {
+						"x": 21975.119701220876,
+						"y": 45408.100843697495,
+						"z": 15591.97543946871
+					}, {
+						"x": 31010.150713274314,
+						"y": 45395.24545588327,
+						"z": 15591.97543946871
+					}, {
+						"x": 31010.15071327432,
+						"y": 35975.702032020155,
+						"z": 15591.97543946871
+					}, {
+						"x": 32897.49092571864,
+						"y": 35975.70203202017,
+						"z": 15591.97543946871
+					}, {
+						"x": 32914.64856401358,
+						"y": 43181.91011584988,
+						"z": 15591.97543946871
+					}, {
+						"x": 33635.26937240141,
+						"y": 43216.22539243955,
+						"z": 15591.97543946871
+					}, {
+						"x": 33669.58464899132,
+						"y": 47265.42803002003,
+						"z": 15591.97543946871
+					}, {
+						"x": 26669.180632275435,
+						"y": 47257.5796787184,
+						"z": 15591.97543946871
+					}],
 					"height": 500
 				},
 				flammabilityState: {
@@ -506,26 +551,26 @@
 				liftState: {
 					"name": "persp",
 					"position": {
-						"x": 21884.294047958407,
-						"y": 2715.4771955175197,
-						"z": 20045.941537331455
+						"x": 14821.851450987035,
+						"y": 15209.844369528131,
+						"z": 35165.8018404002
 					},
 					"target": {
-						"x": 91308.33426916912,
-						"y": 72139.7724249987,
-						"z": -49377.843674672076
+						"x": 70568.14020719328,
+						"y": 84985.20193599568,
+						"z": -45350.301196757915
 					},
 					"up": {
-						"x": 0,
-						"y": -0.000003673205104626221,
-						"z": 0.9999999999932537
+						"x": 0.41795674987340176,
+						"y": 0.5231344834343695,
+						"z": 0.7427263745667835
 					},
-					"near": 8.815307997112054,
-					"far": 83128.9574251355,
-					"zoom": 2.631024977995118,
+					"near": 9.861841459676988,
+					"far": 90769.08004536365,
+					"zoom": 0.04374272377965836,
 					"version": 1,
 					"fov": 45,
-					"aspect": 1.119842829076621,
+					"aspect": 1.3435700575815739,
 					"coordinateSystem": "world"
 				},
 				coldState: {
@@ -837,6 +882,7 @@
 			setData(list) {
 				if (!this.modeRender) return this.list = list;
 				if (this.type === 'monitor') {
+					this.bimViewer.setCameraState(this.monitorState);
 					this.bimViewer.clear3DMaker();
 					for (var i = 0; i < list.length; i++) {
 						this.bimViewer.add3DMaker('image', list[i].position, './assets/shexiangtou.png', (data) => {
@@ -853,6 +899,7 @@
 						)
 					}
 				} else if (this.type === 'infrared') {
+					this.bimViewer.setCameraState(this.accessControlState);
 					this.bimViewer.createWallEffect({
 						height: 4000,
 						duration: 3500,
@@ -871,15 +918,15 @@
 					this.bimViewer.setCameraState(this.electronicPatrolState);
 					this.bimViewer.addDrawable({
 						position: {
-							"x": 39900.85721764856,
-							"y": 20964.111754915448,
-							"z": 15499.993324279789
+							"x": 26201.497826549115,
+							"y": 29560.48513017595,
+							"z": 18472.466825574982
 						},
 						html: `<div class="tips-11" style="transform: scale(0.7);transform-origin: 0% 0%;">
 									<div class="title">
 										<img src="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/34e112ef844245d79d500d120d256fbf"
 											alt="" />
-										<div class="name">电梯打卡器1</div>
+										<div class="name">2号打卡器</div>
 									</div>
 									<div class="content">
 										<div class="item">
@@ -1264,33 +1311,33 @@
 						html: `<div class="tips-14 success">多联机1</div>`,
 					}, data => {})
 				} else if (this.type === 'indoor3d') {
-					this.bimViewer.setCameraState(this.indoor3dState);
-					this.bimViewer.HideOthers();
-					this.bimViewer.hideComponentsByObjectData([{
-						"family": "TJ双扇平开门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "单扇推拉门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "TJ单扇平开门",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "TJ子母门",
-						"levelName": "A_4F(14.500)"
-					}])
-					this.bimViewer.overrideComponentsColorByObjectData([{
-						"family": "楼板",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "幕墙",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "基本墙",
-						"levelName": "A_4F(14.500)"
-					}, {
-						"family": "常规模型 39",
-						"levelName": "A_4F(14.500)"
+					this.bimViewer.setCameraState(this.indoor3dState);
+					this.bimViewer.HideOthers();
+					this.bimViewer.hideComponentsByObjectData([{
+						"family": "TJ双扇平开门",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "单扇推拉门",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "TJ单扇平开门",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "TJ子母门",
+						"levelName": "A_4F(14.500)"
+					}])
+					this.bimViewer.overrideComponentsColorByObjectData([{
+						"family": "楼板",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "幕墙",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "基本墙",
+						"levelName": "A_4F(14.500)"
+					}, {
+						"family": "常规模型 39",
+						"levelName": "A_4F(14.500)"
 					}])
 				}
 			},
@@ -1304,6 +1351,36 @@
 						background: this.type === 'monitor' ? false : true,
 						renderSuccess: () => {
 							this.modeRender = true;
+							if (this.fileId == 10000892771892) {
+								console.log('123');
+								this.bimViewer.HideOthers();
+								this.bimViewer.hideComponentsByObjectData([{
+									"family": "TJ双扇平开门",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "单扇推拉门",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "TJ单扇平开门",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "TJ子母门",
+									"levelName": "A_4F(14.500)"
+								}])
+								this.bimViewer.overrideComponentsColorByObjectData([{
+									"family": "楼板",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "幕墙",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "基本墙",
+									"levelName": "A_4F(14.500)"
+								}, {
+									"family": "常规模型 39",
+									"levelName": "A_4F(14.500)"
+								}])
+							}
 							this.setData(this.list);
 						},
 						click: (data) => {

+ 1 - 1
virgo.wzfrontend/console/src/views/work/energy/electrical/lift.vue

@@ -118,7 +118,7 @@
 						</div>
 					</div>
 					<div class="bim-box">
-						<model ref="model" type="lift" fileId="10000786668492"></model>
+						<model ref="model" type="lift" fileId="10000892771892"></model>
 					</div>
 				</div>
 			</div>

+ 1 - 1
virgo.wzfrontend/console/src/views/work/energy/water/supply/firefighting.vue

@@ -7,7 +7,7 @@
 					<div class="firefighting-center">
 						<test-alarm ref="testAlarm" :type="20"></test-alarm>
 						<div class="bim-box">
-							<!-- <model type="firefighting" fileId="10000815010702"></model> -->
+							<model type="firefighting" fileId="10000815010702"></model>
 						</div>
 					</div>
 					<div class="firefighting-right">

+ 1 - 1
virgo.wzfrontend/console/src/views/work/iot/firefighting/thoroughfare.vue

@@ -63,7 +63,7 @@
 							</div>
 						</div>
 						<div class="bim-box">
-							<model type="thoroughfare" fileId="10000754876737"></model>
+							<model type="thoroughfare" fileId="10000892771892"></model>
 						</div>
 					</div>
 					<div class="access-control-right">

+ 1 - 1
virgo.wzfrontend/console/src/views/work/iot/security/accessControl.vue

@@ -63,7 +63,7 @@
 							</div>
 						</div>
 						<div class="bim-box">
-							<model type="accessControl" fileId="10000786668492"></model>
+							<model type="accessControl" fileId="10000892771892"></model>
 						</div>
 					</div>
 					<div class="access-control-right">

+ 1 - 1
virgo.wzfrontend/console/src/views/work/iot/security/electronicPatrol.vue

@@ -7,7 +7,7 @@
 					<div class="electronic-patrol-center">
 						<test-alarm ref="testAlarm" :type="3"></test-alarm>
 						<div class="bim-box">
-							<model type="electronicPatrol" fileId="10000786668235"></model>
+							<model type="electronicPatrol" fileId="10000892771892"></model>
 						</div>
 					</div>
 					<div class="electronic-patrol-right">

+ 1 - 1
virgo.wzfrontend/console/src/views/work/iot/security/infrared.vue

@@ -7,7 +7,7 @@
 					<div class="infrared-center">
 						<test-alarm ref="testAlarm" :type="1"></test-alarm>
 						<div class="bim-box">
-							<model type="infrared" fileId="10000754876737"></model>
+							<model type="infrared" fileId="10000892771892"></model>
 						</div>
 					</div>
 					<div class="infrared-right">

+ 1 - 1
virgo.wzfrontend/console/src/views/work/iot/security/monitor.vue

@@ -3,7 +3,7 @@
 		<div class="yui-tree-box">
 			<project-item-tree @treeclick="treeclick"></project-item-tree>
 			<div class="hui-tree-content">
-				<model ref="model" type="monitor" fileId="10000786668235" @tipClick="tipClick"></model>
+				<model ref="model" type="monitor" fileId="10000892771892" @tipClick="tipClick"></model>
 			</div>
 			<div class="placeholder"></div>
 		</div>

File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/index.html


virgo.wzfrontend/src/main/resources/static/console/static/css/2453.4a136c23.css → virgo.wzfrontend/src/main/resources/static/console/static/css/1088.4a136c23.css


virgo.wzfrontend/src/main/resources/static/console/static/css/2363.eb2d7c9e.css → virgo.wzfrontend/src/main/resources/static/console/static/css/2217.eb2d7c9e.css


virgo.wzfrontend/src/main/resources/static/console/static/css/1517.5ead6c8a.css → virgo.wzfrontend/src/main/resources/static/console/static/css/2319.5ead6c8a.css


virgo.wzfrontend/src/main/resources/static/console/static/css/4265.7c138caa.css → virgo.wzfrontend/src/main/resources/static/console/static/css/2663.7c138caa.css


virgo.wzfrontend/src/main/resources/static/console/static/css/287.d8191c97.css → virgo.wzfrontend/src/main/resources/static/console/static/css/3181.d8191c97.css


virgo.wzfrontend/src/main/resources/static/console/static/css/1187.b01ee7b6.css → virgo.wzfrontend/src/main/resources/static/console/static/css/4106.b01ee7b6.css


virgo.wzfrontend/src/main/resources/static/console/static/css/3313.5ead6c8a.css → virgo.wzfrontend/src/main/resources/static/console/static/css/411.5ead6c8a.css


virgo.wzfrontend/src/main/resources/static/console/static/css/8261.2ce76ddb.css → virgo.wzfrontend/src/main/resources/static/console/static/css/4220.2ce76ddb.css


virgo.wzfrontend/src/main/resources/static/console/static/css/9387.5947691c.css → virgo.wzfrontend/src/main/resources/static/console/static/css/5122.5947691c.css


virgo.wzfrontend/src/main/resources/static/console/static/css/9924.5947691c.css → virgo.wzfrontend/src/main/resources/static/console/static/css/6493.5947691c.css


virgo.wzfrontend/src/main/resources/static/console/static/css/4985.4a136c23.css → virgo.wzfrontend/src/main/resources/static/console/static/css/6666.4a136c23.css


virgo.wzfrontend/src/main/resources/static/console/static/css/6742.00353a9c.css → virgo.wzfrontend/src/main/resources/static/console/static/css/8415.00353a9c.css


virgo.wzfrontend/src/main/resources/static/console/static/css/483.d8191c97.css → virgo.wzfrontend/src/main/resources/static/console/static/css/9305.d8191c97.css


virgo.wzfrontend/src/main/resources/static/console/static/css/9600.00353a9c.css → virgo.wzfrontend/src/main/resources/static/console/static/css/9691.00353a9c.css


virgo.wzfrontend/src/main/resources/static/console/static/css/5503.eb2d7c9e.css → virgo.wzfrontend/src/main/resources/static/console/static/css/9757.eb2d7c9e.css


virgo.wzfrontend/src/main/resources/static/console/static/css/1801.b01ee7b6.css → virgo.wzfrontend/src/main/resources/static/console/static/css/9805.b01ee7b6.css


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1000.f99677c8.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2453.83e6167f.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1187-legacy.cd1b758e.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1706-legacy.627edf2d.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1801.e2419e55.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2033.2a8e717c.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5503.bbd44c5c.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1517.ff474fbd.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/260.35281b16.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2623-legacy.44e6911a.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/2663-legacy.4c9b6f5e.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/2663.2cbe34c3.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/287-legacy.857b5d04.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3911.d3d0692a.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/3181-legacy.53b6bbe7.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3313-legacy.6deb3e2c.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.dbd5415a.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3845-legacy.12457ba1.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/3845-legacy.ea27211c.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3028.743d72b3.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3922.82936010.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4027.5facb77f.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/4106.58645554.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4108-legacy.ac300b77.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/411-legacy.5b96108e.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4135-legacy.47c3f57a.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/4220-legacy.17191e39.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/4220.fffb9c1c.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4265-legacy.880f95f4.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4265.87c2563e.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4755-legacy.98d872ae.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4827.a3d04397.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/483.ba86087a.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4985-legacy.e67b14ec.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9924.74e8c8ea.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5139.cbe44b0c.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5257-legacy.efda69a3.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5545-legacy.e997cf4a.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5644.ee66554d.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5749.36627d0b.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6049.08bf8874.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6338-legacy.d3c228d3.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6418-legacy.fc500b03.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9387-legacy.f41e5f92.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6613-legacy.59678bdf.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6615.5cc325a7.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/6666-legacy.a316397c.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6720-legacy.a19a2471.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7110.36187826.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7224.dd068aeb.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7342-legacy.b8062ab9.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/3475-legacy.92f4def3.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7870.129999e5.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7920.dd46b223.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8184-legacy.4a040a23.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8261-legacy.cf46d5b8.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/8261.3dc44abc.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/6742.15cd05e1.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/859-legacy.a20b9c71.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/859-legacy.edc82b90.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/9305.b1b5ecfa.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9314-legacy.b5816dcb.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9349-legacy.79af2807.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/9462-legacy.01318e97.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9462-legacy.7170d8b5.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9516.106e6b41.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9608.2cbb7dce.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9665.b754ad03.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9600-legacy.91ccab64.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2363-legacy.264748c8.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/9805-legacy.2c9f7c84.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/9955-legacy.8c189612.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.1b53fb4e.js


+ 0 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/app.0f646821.js


Some files were not shown because too many files changed in this diff