diff --git a/public/webTotal/index.js b/public/webTotal/index.js
index 7e43e99..c5b6bf6 100644
--- a/public/webTotal/index.js
+++ b/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;
 
diff --git a/src/assets/images/largeScreen/screen1.png b/src/assets/images/largeScreen/screen1.png
index 0e5ef39..0629bb1 100644
Binary files a/src/assets/images/largeScreen/screen1.png and b/src/assets/images/largeScreen/screen1.png differ
diff --git a/src/assets/images/largeScreen/screen2.png b/src/assets/images/largeScreen/screen2.png
index 190f357..a201932 100644
Binary files a/src/assets/images/largeScreen/screen2.png and b/src/assets/images/largeScreen/screen2.png differ
diff --git a/src/assets/images/largeScreen/screen3.png b/src/assets/images/largeScreen/screen3.png
index 16b0252..8de3608 100644
Binary files a/src/assets/images/largeScreen/screen3.png and b/src/assets/images/largeScreen/screen3.png differ
diff --git a/src/assets/images/largeScreen/screen4.png b/src/assets/images/largeScreen/screen4.png
index f47d58d..81911c0 100644
Binary files a/src/assets/images/largeScreen/screen4.png and b/src/assets/images/largeScreen/screen4.png differ
diff --git a/src/assets/images/largeScreen/screen5.png b/src/assets/images/largeScreen/screen5.png
index 6e298ba..f810b61 100644
Binary files a/src/assets/images/largeScreen/screen5.png and b/src/assets/images/largeScreen/screen5.png differ
diff --git a/src/assets/images/largeScreen/screen6.png b/src/assets/images/largeScreen/screen6.png
index 03c9c8b..ddea1bc 100644
Binary files a/src/assets/images/largeScreen/screen6.png and b/src/assets/images/largeScreen/screen6.png differ
diff --git a/src/assets/images/largeScreen/screen7.png b/src/assets/images/largeScreen/screen7.png
index 3ce6311..752cb63 100644
Binary files a/src/assets/images/largeScreen/screen7.png and b/src/assets/images/largeScreen/screen7.png differ
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 787c16b..5e662c8 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/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>
diff --git a/src/views/storeManage/warehouse3D/readRoom/index.vue b/src/views/storeManage/warehouse3D/readRoom/index.vue
index 68bd4f3..ff808e2 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/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>