From 2202a7456d7434e301da65630c875cedee892b6b Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Mon, 15 Aug 2022 10:49:57 +0800
Subject: [PATCH] =?UTF-8?q?3D=E5=BA=93=E6=88=BF=E9=85=8D=E7=BD=AEBug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C3D=E5=BA=93=E6=88=BF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E5=BA=93=E6=88=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse3D/archivesStorage/index.vue     | 49 +++++++++++--------
 .../warehouse3D/readRoom/index.vue            |  8 ++-
 .../storeManage/warehouse3DConfig/index.vue   |  9 ++--
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index a33fdf8..c533fff 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -3,15 +3,7 @@
     <!-- <h1>全景图</h1> -->
     <div class="warehouse-left">
       <div class="left-3d">
-        <iframe
-          id="myIframe"
-          ref="myIframe"
-          name="iframeMap"
-          class="iframe_box"
-          src="/webA/index.html"
-          frameborder="0"
-          scrolling="no"
-        />
+        <iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webA/index.html" frameborder="0" scrolling="no" />
         <ul class="msg-list">
           <li>
             <svg-icon icon-class="temperature" class-name="msg-list-svg" />
@@ -109,19 +101,27 @@
 <script>
 import WarehouseWarning from '@/views/components/WarehouseWarning'
 import SecurityDoor from '@/views/components/SecurityDoor'
+import displayConfigApi from '@/api/storeManage/displayConfig'
 export default {
   name: 'FullView',
   components: { WarehouseWarning, SecurityDoor },
   data() {
     return {
       roomId: 'D6490DA3D4261E8C26D0E3',
-      iframeWin: null,
-      timer: null, // 定时器id 滚动表格
-      isScroll: false // 是否滚动
+      TopDisplayConfigData: [],
+      OaoDisplayConfigData: []
+      // ,
+      // iframeWin: null,
+      // timer: null, // 定时器id 滚动表格
+      // isScroll: false // 是否滚动
     }
   },
-  async created() {
+  created() {
     window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
+    displayConfigApi.list({ storeroomId: this.roomId }).then((data) => {
+      this.TopDisplayConfigData = data.filter((item) => { return item.divPosition.includes('TOP') })
+      this.OaoDisplayConfigData = data.filter((item) => { return item.divPosition.includes('OAO') })
+    })
   },
   mounted() {
     const _this = this
@@ -137,7 +137,14 @@ export default {
     getIframeLoading(value) {
       // console.log(`我是iframe传过来的参数：${value}`)
       if (value === 'false') {
-        this.handleHide('DAK_MO_OAO_001')
+        const oaoDisplayParams = []
+        this.OaoDisplayConfigData.array.forEach(element => {
+          if (!element.isDisplay || !element.bindState) {
+            this.handleHide(element.divPosition)
+          } else {
+            oaoDisplayParams.push({ deviceSpecParams: element.deviceSpecParams })
+          }
+        })
         this.handleAlarm('DAK_MO_OAO_003')
       }
     },
@@ -248,16 +255,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~@/assets/styles/lend-manage.scss';
-  .warehouse-left{
-    position: relative;
-  }
-.container-wrap{
+@import "~@/assets/styles/lend-manage.scss";
+.warehouse-left {
+  position: relative;
+}
+.container-wrap {
   min-height: auto;
-  height: calc(100%/2 - 10px);
+  height: calc(100% / 2 - 10px);
   overflow: hidden;
 }
-.container-wrap{
+.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 e7ee8e4..bc5a663 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/readRoom/index.vue
@@ -25,11 +25,9 @@ export default {
   },
   created() {
     window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
-    if (this.roomId) {
-      displayConfigApi.list({ storeroomId: this.roomId }).then((data) => {
-        this.displayConfigData = data
-      })
-    }
+    displayConfigApi.list({ storeroomId: this.roomId }).then((data) => {
+      this.displayConfigData = data
+    })
   },
   mounted() {
     // const _this = this
diff --git a/src/views/storeManage/warehouse3DConfig/index.vue b/src/views/storeManage/warehouse3DConfig/index.vue
index 3225d84..f6cc643 100644
--- a/src/views/storeManage/warehouse3DConfig/index.vue
+++ b/src/views/storeManage/warehouse3DConfig/index.vue
@@ -155,13 +155,16 @@ export default {
           }
           this.devOptions = data.content.map(data => { return { value: data.id, label: data.deviceName, info: isCamera ? data.videoRoute : data.deviceId, self: data } })
         })
+        // 温湿度感应器
         if (!isCAM && this.form.deviceInfo.id) {
           this.getParamsOptionsList()
         }
         if (this.form.deviceSpecParams && this.form.deviceSpecParams.length > 0) {
-          const deviceSpecParams = this.form.deviceSpecParams.map((item) => { return item.id })
-          this.$set(this.form, 'deviceSpecParams', deviceSpecParams)
-          // this.form.deviceSpecParams.splice(0, this.form.deviceSpecParams.length, ...deviceSpecParams)
+          let formParams = this.form.deviceSpecParams.map((item) => { return item.id })
+          if (this.form.divPosition.includes('TOP')) {
+            formParams = formParams[0]
+          }
+          this.$set(this.form, 'deviceSpecParams', formParams)
         }
         this.dialogVisible = true
       } else {