Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2021-12-21 0e461a232cce6e52fbfd071788bdd7294d51e397

 src/components/mobilemap/index.vue

@@ -1,9 +1,11 @@
/* eslint-disable camelcase */
<template>
  <div id="mobile-viewer-container">
    <!-- 地图图标弹窗↓ -->
    <!-- 随地图改变图标弹窗↓ -->
    <div id="mobile-map_popup_content"></div>
    <mobileWindow></mobileWindow>
    <!-- 地图固定弹窗 -->
    <mobileWindowFixed></mobileWindowFixed>
    <!-- 地图图标弹窗↑ -->
    <!-- 控制↓ -->
    <mobileLeftNav ref="mobileLeftNav"></mobileLeftNav>
@@ -43,6 +45,7 @@
      "mBigPopupAfter",
      "iconHide",
      "popupsDom",
      "MobileWindowsHideFixed",
    ]),
  },
  watch: {
@@ -135,7 +138,7 @@
      });
      that.$refs.mobileLeftNav.initialize(viewer);
      that.$store.commit("MSET_VIEWER", viewer);
      that.$store.commit("MSET_DC", DC);
      // that.$store.commit("MSET_DC", DC);
      const popup = viewer.popup;

      popup.hide();
@@ -180,7 +183,12 @@
        if (!that.iconHide) {
          that.$store.commit("MSET_ICONHIDE", true);
        }
        that.$store.dispatch("closeMobileWindowsDom"); //关闭弹窗
        if (!that.MobileWindowsHide) {
          that.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
        }
        // if (!that.MobileWindowsHideFixed) {
        //   that.$store.dispatch("CLOSE_WIDOWFIXED"); //关闭固定弹窗
        // }
        // if (!that.MobileWindowsHide && that.popupsDom) {
        //   that.popupsDom.closeOur();
        //   that.$store.commit("MSET_MOBILEWINDOWSHIDE", true);
@@ -211,8 +219,8 @@
      viewer.use(new DC.Measure());

      tileset.setStyle(style);
      layer.addOverlay(tileset);
      viewer.flyTo(tileset);
      // layer.addOverlay(tileset);
      // viewer.flyTo(tileset);

      tileset.on(DC.MouseEventType.CLICK, (e) => {
        // that.popupFlag = true