From d27ddde2220cf209cb588edaeca48b6d30c09db2 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 11 Aug 2022 10:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/WarehouseWarning.vue             |  5 ++++-
 .../storeManage/warehouse3D/archivesStorage/index.vue | 10 +++-------
 .../storeManage/warehouse3D/collateRoom/index.vue     |  3 ++-
 src/views/storeManage/warehouse3D/readRoom/index.vue  | 11 ++++-------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
index 61bd66a..d283cc0 100644
--- a/src/views/components/WarehouseWarning.vue
+++ b/src/views/components/WarehouseWarning.vue
@@ -70,8 +70,11 @@ export default {
     //   this.tableData.push(...data)
     // })
     // this.openSocket()
+    console.log(111111)
     alarmApi.info({ storeroomId: this.storeroomId }).then((data) => {
-      this.tableData.push(...data)
+      if (data && data.length > 0) {
+        this.tableData.push(...data)
+      }
     })
   },
   destroyed() {
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index 60537dd..a33fdf8 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -61,7 +61,7 @@
     </div>
     <div class="warehouse-right">
       <!-- 报警记录 -->
-      <warehouse-warning :height="'calc(100% - 40px)'" />
+      <warehouse-warning :height="'calc(100% - 40px)'" :storeroom-id="roomId" />
       <!-- <div class="container-wrap" style="margin-bottom:20px">
         <span class="right-top-line" />
         <span class="left-bottom-line" />
@@ -107,7 +107,6 @@
 </template>
 
 <script>
-import data1 from '../data1.json'
 import WarehouseWarning from '@/views/components/WarehouseWarning'
 import SecurityDoor from '@/views/components/SecurityDoor'
 export default {
@@ -115,13 +114,13 @@ export default {
   components: { WarehouseWarning, SecurityDoor },
   data() {
     return {
-      tableData: [],
+      roomId: 'D6490DA3D4261E8C26D0E3',
       iframeWin: null,
       timer: null, // 定时器id 滚动表格
       isScroll: false // 是否滚动
     }
   },
-  created() {
+  async created() {
     window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
   },
   mounted() {
@@ -199,9 +198,6 @@ export default {
       // true 显示 false 隐藏
       window.frames['iframeMap'].setYangGanCanshow(deviceId, false)
     },
-    getData() {
-      this.tableData = data1.rows
-    },
     // 表格隔行变色
     rowBgColor({ row, rowIndex }) {
       if (rowIndex % 2 === 1) {
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 18569d6..ba6650c 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue
@@ -13,7 +13,7 @@
         />
       </div>
     </div>
-    <warehouse-warning :height="'calc(100vh - 235px)'" />
+    <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" />
   </div>
 </template>
 
@@ -24,6 +24,7 @@ export default {
   components: { WarehouseWarning },
   data() {
     return {
+      roomId: 'D5C48B49DF66183CF24974'
     }
   },
   created() {
diff --git a/src/views/storeManage/warehouse3D/readRoom/index.vue b/src/views/storeManage/warehouse3D/readRoom/index.vue
index effa2f3..942d277 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/readRoom/index.vue
@@ -6,13 +6,12 @@
         <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)'" />
+    <warehouse-warning :height="'calc(100vh - 235px)'" :storeroom-id="roomId" />
   </div>
 </template>
 
 <script>
 import WarehouseWarning from '@/views/components/WarehouseWarning'
-import storeroomApi from '@/api/storeManage/deviceManage/storeroom'
 import displayConfigApi from '@/api/storeManage/displayConfig'
 export default {
   name: 'ReadRoom',
@@ -20,16 +19,14 @@ export default {
   data() {
     return {
       tableData: [],
-      roomId: '',
+      roomId: '9E0A527462BB8A060EB165',
       displayConfigData: []
     }
   },
-  async created() {
+  created() {
     window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
-    const roomsData = await storeroomApi.getRooms()
-    this.roomId = roomsData[0].children.find((x) => { return x.name === '阅览室' }).id
     if (this.roomId) {
-      this.displayConfigData = await displayConfigApi.list({ storeroomId: this.roomId })
+      this.displayConfigData = displayConfigApi.list({ storeroomId: this.roomId })
     }
   },
   mounted() {