From 11b09e9564096ae404b2d7d6036046c93d4d8e37 Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Thu, 18 Aug 2022 15:45:09 +0800 Subject: [PATCH] =?UTF-8?q?3D=E5=BA=93=E6=88=BF=20=E6=B8=A9=E6=B9=BF?= =?UTF-8?q?=E5=BA=A6=E6=84=9F=E5=BA=94=E5=99=A8=E6=95=B0=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse3D/archivesStorage/index.vue | 6 +- .../warehouse3D/collateRoom/index.vue | 86 ++++++++++++++--- .../warehouse3D/readRoom/index.vue | 96 ++++++++++++++----- 3 files changed, 150 insertions(+), 38 deletions(-) diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue index 50f454f..9b51dd1 100644 --- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue +++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue @@ -162,14 +162,14 @@ export default { window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象 this.allDisplayConfigData = await displayConfigApi.list({ storeroomId: this.roomId }) this.allDisplayConfigData.forEach(element => { - if (element.isDisplay && element.bindState) { + if (element.isDisplay && element.bindState && element.deviceInfo && (element.divPosition.includes('OAO') || element.divPosition.includes('TOP'))) { this.allDeviceIds.push(element.deviceInfo.deviceId) if (!this.url) { this.url = 'http://' + element.deviceInfo.deviceIp + ':' + element.deviceInfo.devicePort } } }) - this.displayConfigData = this.allDisplayConfigData.filter((item) => { return item.isDisplay && item.bindState }) + this.displayConfigData = this.allDisplayConfigData.filter((item) => { return item.isDisplay && item.bindState && item.deviceInfo && (item.divPosition.includes('OAO') || item.divPosition.includes('TOP')) }) await this.getRealTimeData() }, mounted() { @@ -184,7 +184,7 @@ export default { this.timer = setInterval(async() => { await _this.getRealTimeData() _this.handleAQI() - }, 4000) + }, 10000) }, beforeDestroy() { clearInterval(this.timer) diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue index ba6650c..e3c9a69 100644 --- a/src/views/storeManage/warehouse3D/collateRoom/index.vue +++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue @@ -19,16 +19,33 @@