Merge remote-tracking branch 'origin/dev' into dev

src/types/components.d.ts

@@ -109,7 +109,6 @@ declare module 'vue' {
     VideoContainer: typeof import('./../components/HKVideo/video-container.vue')['default']
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
-    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
   export interface ComponentCustomProperties {

src/views/globalMap/LeftMenu.vue

@@ -33,6 +33,9 @@
                 <div v-if="item.name === '防风防汛'" class="icon1" style="width: 79px; height: 87px"></div>
                 <div v-if="item.name === '危化品安全监测' || item.name === '危险化工品'" class="icon2"
                      style="width: 71px; height: 80px"></div>
+                <div v-if="item.name === '其他'" class="icon3" style="width: 71px; height: 80px"></div>
+                <div v-if="item.name === '水情监测'" class="icon4" style="width: 71px; height: 80px"></div>
+                <div v-if="item.name === '自然灾害监测'" class="icon5" style="width: 71px; height: 80px"></div>
                 <div>{{ item.name }}</div>
                 <div :class="item.show ? 'expand-icon down-icon' : 'expand-icon up-icon'"
                      @click="changeBoxShow(item)"></div>
@@ -305,6 +308,15 @@ onMounted(() => {
         .icon2 {
           background-image: url('@/assets/images/menu/icon2.png');
         }
+        .icon3 {
+          background-image: url('@/assets/images/menu/icon3.png');
+        }
+        .icon4 {
+          background-image: url('@/assets/images/menu/icon4.png');
+        }
+        .icon5 {
+          background-image: url('@/assets/images/menu/icon5.png');
+        }
 
         .expand-icon {
           position: absolute;

src/views/globalMap/data/mapData.ts

@@ -4157,7 +4157,26 @@ export const iconList = {
     image: 'src/assets/images/dotIcon/10_ship_dynamics.png',
     size: [40, 40]
   },
-
+  '11': {
+    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    size: [40, 40]
+  },
+  '12': {
+    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    size: [40, 40]
+  },
+  '13': {
+    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    size: [40, 40]
+  },
+  '14': {
+    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    size: [40, 40]
+  },
+  '15': {
+    image: 'src/assets/images/dotIcon/15_UAV.png',
+    size: [40, 40]
+  },
 
 };