From 5505de7f301a88693e95b8e377d322076cb60b41 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 22 Jul 2024 14:03:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=89=AB=E7=A0=81=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=82=B9=E4=BD=8D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?H5bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firefighting/points/components/list.vue   | 15 +++++----
 .../meteorologicalMonitoringDisplay/index.vue | 32 +++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue

diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue
index a16744e..d28bce7 100644
--- a/src/views/firefighting/points/components/list.vue
+++ b/src/views/firefighting/points/components/list.vue
@@ -246,13 +246,14 @@ export default {
     handleShowQr(ROW) {
       this.dialogFormShow = true
       this.qrInfo = ROW
-      // this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
-      const json = {
-        MANAGER_TYPE: 'fireListManager',
-        FIRE_POINT_ID: ROW.FIRE_POINT_ID
-      }
-      const jsonStr = JSON.stringify(json)
-      this.qrcodeStr = jsonStr
+      // 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun
+      this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
+      // const json = {
+      //   MANAGER_TYPE: 'fireListManager',
+      //   FIRE_POINT_ID: ROW.FIRE_POINT_ID
+      // }
+      // const jsonStr = JSON.stringify(json)
+      // this.qrcodeStr = jsonStr
     },
     handleEdit(FIRE_POINT_ID) {
       this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
diff --git a/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
new file mode 100644
index 0000000..efcee40
--- /dev/null
+++ b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-container">
+    <iframe
+      :src="'http://192.168.42.57:8080/QinHuangDao'"
+      width="100%"
+      height="100%"
+      allowfullscreen
+      style="overflow-y:hidden;overflow-x:hidden;"/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  components: {
+  },
+  data() {
+    return {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.iframe-container {
+  position: fixed;
+  top: 10;
+  left: 10;
+  width: 90%;
+  height: 90%;
+}
+</style>