Merge branch 'limingyu-20240429-气象监测地图' into pet

src/views/map/dialog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bi-different-dialog">
-    <el-dialog id="eldig" :visible="visible" :before-close="closeDialog" :title="title" :close-on-click-modal="false" :width="width">
+    <el-dialog id="eldig" :visible="visible" :before-close="closeDialog" :title="title" :close-on-click-modal="false" :width="width" top="50px">
       <!-- 动火 -->
       <!--消防模块对接-->
       <weatherstation v-if="type === '293187ddfd984c9ab3fd716aef58da0e'" :id="id" :type="type" :gangkou="gangkou"/>
@@ -59,6 +59,9 @@
       <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
       <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />
       <!-- 重点工程 end -->
+      <!-- 气象监测-右边栏 start-->
+      <meteorological-monitoring v-if="type === 'METEOROLOGICAL'" :id="id" :type="type" :gangkou="gangkou"/>
+      <!-- 气象监测-右边栏 end-->
     </el-dialog>
   </div>
 </template>
@@ -106,6 +109,8 @@ import peoplePositionYGS from './peoplePositionYGS.vue'
 import outSourceInfo from './outSourceInfo.vue'
 import outSourceVideoInfo from './outSourceVideoInfo.vue'
 import AlarmDevice from './alarmDevice'
+import meteorologicalMonitoring from './meteorologicalMonitoring.vue'
+
 
 export default {
   components: {
@@ -150,7 +155,8 @@ export default {
     peoplePositionYGS,
     outSourceInfo,
     outSourceVideoInfo,
-    MkGateMachineCmt
+    MkGateMachineCmt,
+    meteorologicalMonitoring
   },
   props: {
     title: {
@@ -230,7 +236,7 @@ export default {
       font-size: 14px;
       color: #fff;
       overflow-y: auto;
-      max-height: 60vh;
+      max-height: 85vh;
 
       //设置滚动条样式
       &::-webkit-scrollbar {

src/views/map/dialog/meteorologicalMonitoring.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="app-container print-work">
+    <iframe
+      :src="'http://192.168.42.57:8080/QinHuangDao'"
+      style="width: 100%;height: 80vh;"/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+  }
+}
+</script>
+<style lang="scss" scoped>
+  #main4{
+    width: 340px;
+    height: 380px;
+  }
+  #main5{
+    width: 340px;
+    height: 380px;
+  }
+  #main6{
+    width: 340px;
+    height: 380px;
+  }
+</style>

src/views/map/index.vue

@@ -429,6 +429,12 @@ export default {
           checkImg: require('../../assets/map/index/map_on.png'),
           check: false,
           label: '纯净地图'
+        },
+        {
+          img: require('../../assets/map/index/map.png'),
+          checkImg: require('../../assets/map/index/map_on.png'),
+          check: '',
+          label: '气象监测'
         }
       ],
       myEntityCollection: {},
@@ -1894,6 +1900,14 @@ export default {
         this.componentKey = Math.random()
         this.bottomOptionsKey = Math.random()
         this.bottomOptionsAnimationComplex = false
+      } else if (index === 6) {
+        this.dialog.visible = true
+        this.dialog.title = '气象监测'
+        this.dialog.type = 'METEOROLOGICAL'
+        this.dialog.id = 'METEOROLOGICAL'
+        this.dialog.corpInfoId = ''
+        this.dialog.infoname = ''
+        this.dialog.width = '96%'
       }
     },
     changeSceneMode(check) {