0731-3D5楼多摄像头/banner换图

public/webTotal/index.js

@@ -454,6 +454,12 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () {
   scene.getMeshByName("档案架09_primitive4").material = scene.getMaterialByName("02.002");
   scene.getMeshByName("档案架10_primitive3").material = scene.getMaterialByName("01.002");
 
+
+
+  console.log(scene.getMeshByName("圆柱_10"));
+  scene.getMeshByName("圆柱_10").setEnabled(false)
+  scene.getMeshByName("球体_4").setEnabled(false)
+
   //scene.getTransformNodeByName("档案柜01").setEnabled(false);
   //scene.getTransformNodeByName("档案柜02").setEnabled(false);
   var v1 = scene.getMeshByName("钢轨01");
@@ -591,6 +597,8 @@ var createScene = function () {
   h1.blurHorizontalSize = 0.1;
   var showx = 0;
   var showx2 = 2;
+
+
   scene.registerAfterRender(() => {
     h1.blurHorizontalSize = h1.blurVerticalSize + currentx;
 

src/views/storeManage/warehouse3D/collateRoom/index.vue

@@ -13,17 +13,24 @@
         />
       </div>
     </div>
-    <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" />
+    <!-- <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" /> -->
+    <div class="warehouse-right">
+      <!-- 报警记录 -->
+      <warehouse-warning :height="'calc(100% - 40px)'" :storeroom-id="roomId" />
+      <!-- 门禁记录 -->
+      <security-door :height="'calc(100% - 40px)'" />
+    </div>
   </div>
 </template>
 
 <script>
 import WarehouseWarning from '@/views/components/WarehouseWarning'
+import SecurityDoor from '@/views/components/SecurityDoor'
 import displayConfigApi from '@/api/storeManage/displayConfig'
 import thirdApi from '@/api/thirdApi'
 export default {
   name: 'CollateRoom',
-  components: { WarehouseWarning },
+  components: { WarehouseWarning, SecurityDoor },
   data() {
     return {
       roomId: 'D5C48B49DF66183CF24974',
@@ -160,4 +167,13 @@ export default {
     }
   }
 
+  .container-wrap {
+    min-height: auto;
+    height: calc(100% / 2 - 10px);
+    overflow: hidden;
+  }
+  .container-wrap {
+    margin-bottom: 20px;
+  }
+
 </style>

src/views/storeManage/warehouse3D/readRoom/index.vue

@@ -6,17 +6,24 @@
         <iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webC/index.html" frameborder="0" scrolling="no" />
       </div>
     </div>
-    <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" />
+    <!-- <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" /> -->
+    <div class="warehouse-right">
+      <!-- 报警记录 -->
+      <warehouse-warning :height="'calc(100% - 40px)'" :storeroom-id="roomId" />
+      <!-- 门禁记录 -->
+      <security-door :height="'calc(100% - 40px)'" />
+    </div>
   </div>
 </template>
 
 <script>
 import WarehouseWarning from '@/views/components/WarehouseWarning'
+import SecurityDoor from '@/views/components/SecurityDoor'
 import displayConfigApi from '@/api/storeManage/displayConfig'
 import thirdApi from '@/api/thirdApi'
 export default {
   name: 'ReadRoom',
-  components: { WarehouseWarning },
+  components: { WarehouseWarning, SecurityDoor },
   data() {
     return {
       roomId: '9E0A527462BB8A060EB165',
@@ -147,4 +154,13 @@ export default {
     font-size: 16px;
   }
 }
+
+.container-wrap {
+  min-height: auto;
+  height: calc(100% / 2 - 10px);
+  overflow: hidden;
+}
+.container-wrap {
+  margin-bottom: 20px;
+}
 </style>