Merge branch 'master' of http://git.omniview.pro/yaominguo/east-nanjing-new into dist

src/components/MyComponent/MyMap/my-map.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, nextTick, onMounted, PropType } from 'vue'
+import { computed, defineComponent, PropType } from 'vue'
 import store from '@/store'
 declare const SMap: any
 declare const Plugins: any
@@ -43,7 +43,7 @@ export default defineComponent({
         viewMode: '3D',
         center: [1019.614669, 54.167243],
         // center: [-135.98002789627407, -722.1597065437004],
-        zooms: [7, 12],
+        zooms: [7, 20],
         zoom: 8,
         pitch: 45,
         mapStyle: 'smap://styles/dark',
@@ -51,7 +51,6 @@ export default defineComponent({
         ...config,
         ...props.config,
       }).on(SMap.MapEvent.maploaded, () => {
-        setMouseEvent(false)
         // setBuildingBlock()
         ctx.emit('complete', map)
         addListener()

src/store/index.ts

@@ -65,7 +65,6 @@ export interface GlobalStateProps {
   curView: ViewType
   curMapType: string
   showCommunityPoints: boolean
-  mapDragable: boolean
   readonly zhenxing: any
   readonly weihai: any
   readonly workArea1: any

src/store/mutations.ts

@@ -26,9 +26,6 @@ export default {
   SET_SHOW_COMMUNITY_POINTS(state: GlobalStateProps, val: boolean): void {
     state.showCommunityPoints = val
   },
-  SET_MAP_DRAGABLE(state: GlobalStateProps, val: boolean): void {
-    state.mapDragable = val
-  },
   SET_PROPERTY_SUMMARY(
     state: GlobalStateProps,
     val: { [key: string]: number }

src/store/state.ts

@@ -5,7 +5,6 @@ export default {
   curMapType: '2D',
   curView: { name: '南京东路街道', type: 'street' },
   showCommunityPoints: false,
-  mapDragable: false,
   viewOptions: [
     { name: '南京东路街道', type: 'street' },
     { name: '第一工作站', type: 'work1', id: '01001' },

src/view/community.vue

@@ -77,14 +77,6 @@
         />
         <template #title> 缩小地图 </template>
       </a-tooltip>
-      <a-tooltip placement="left">
-        <img
-          draggable="false"
-          src="@/assets/images/map-btn8.png"
-          @click="setMapDrag"
-        />
-        <template #title> 开启/关闭地图拖拽 </template>
-      </a-tooltip>
     </div>
     <m-modal
       v-model="showMonitor"
@@ -371,10 +363,6 @@ export default defineComponent({
       map.value.zoom(type)
     }
     const dragAble = ref(false)
-    const setMapDrag = () => {
-      dragAble.value = !dragAble.value
-      map.value.setMouseEvent(dragAble.value)
-    }
     return {
       prefix,
       rotation,
@@ -395,7 +383,6 @@ export default defineComponent({
       isCommunityPointsShowNow,
       showCommunityPoints,
       zoomMap,
-      setMapDrag,
     }
   },
 })

src/view/components/map-btns.vue

@@ -64,7 +64,6 @@ import btn4 from '@/assets/images/map-btn4.png'
 import btn5 from '@/assets/images/map-btn5.png'
 import btn6 from '@/assets/images/map-btn6.png'
 import btn7 from '@/assets/images/map-btn7.png'
-import btn8 from '@/assets/images/map-btn8.png'
 import d2 from '@/assets/images/2d.png'
 import d3 from '@/assets/images/3d.png'
 import zoomIn from '@/assets/images/zoom-in.png'
@@ -125,8 +124,6 @@ export default defineComponent({
             !store.state.showCommunityPoints
           )
           break
-        case 'dragable':
-          store.commit('SET_MAP_DRAGABLE', !store.state.mapDragable)
         default:
           break
       }

src/view/hooks/useSwitchMap.ts

@@ -13,12 +13,6 @@ export default function useSwitchMap(map: any) {
     },
     { immediate: true }
   )
-  watch(
-    () => store.state.mapDragable,
-    (val) => {
-      map.value.setMouseEvent(val)
-    }
-  )
   watch(
     () => store.state.showCommunityPoints,
     (val) => {