parent
3320c7bcec
commit
d29a67208b
|
@ -33,7 +33,6 @@ declare module 'vue' {
|
|||
ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
|
||||
CodemirrorPro: typeof import('./src/components/codemirror/CodemirrorPro.vue')['default']
|
||||
Digitalscroll: typeof import('./src/components/index/digitalscroll.vue')['default']
|
||||
Eldrawertransition: typeof import('./src/components/eldrawertransition.vue')['default']
|
||||
FormPro: typeof import('./src/components/form/FormPro.vue')['default']
|
||||
FullScreenContainer: typeof import('./src/components/fullScreenContainer.vue')['default']
|
||||
IconFont: typeof import('./src/components/iconfont/IconFont.vue')['default']
|
||||
|
|
|
@ -12,7 +12,10 @@
|
|||
<body>
|
||||
<div id="app"></div>
|
||||
<script
|
||||
src="https://webapi.amap.com/maps?v=1.4.15&key=8910226d8d36a41d856262b1a588850c&plugin=AMap.MarkerClusterer"></script>
|
||||
src="https://webapi.amap.com/maps?v=1.4.15&key=ca549d915cb38803582ca7e85c5f972c&plugin=AMap.MarkerClusterer"></script>
|
||||
<!-- <script
|
||||
src="https://webapi.amap.com/maps?v=2.0&key=ca549d915cb38803582ca7e85c5f972c&plugin=AMap.MarkerClusterer"></script> -->
|
||||
<!-- &plugin=AMap.MarkerClusterer -->
|
||||
|
||||
<script src="/haikang/h5player.min.js"></script>
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -17,7 +17,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||
"@amap/amap-jsapi-types": "^0.0.13",
|
||||
"@amap/amap-jsapi-types": "^0.0.15",
|
||||
"@ant-design/icons-vue": "^7.0.1",
|
||||
"@codemirror/lang-java": "^6.0.1",
|
||||
"@codemirror/lang-json": "^6.0.1",
|
||||
|
@ -41,7 +41,6 @@
|
|||
"echarts-gl": "^2.0.9",
|
||||
"element-china-area-data": "^6.1.0",
|
||||
"element-plus": "^2.4.2",
|
||||
"element-ui": "^2.15.14",
|
||||
"js-beautify": "^1.14.9",
|
||||
"js-md5": "^0.8.3",
|
||||
"jwt-decode": "^3.1.2",
|
||||
|
|
|
@ -1,88 +0,0 @@
|
|||
// el_drawer_transition.js
|
||||
<template>
|
||||
<el-drawer-transition>
|
||||
<slot />
|
||||
</el-drawer-transition>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
addClass,
|
||||
removeClass
|
||||
} from 'element-ui/lib/utils/dom'
|
||||
|
||||
export default {
|
||||
name: 'EkDrawerTransition',
|
||||
components: {
|
||||
'el-drawer-transition': {
|
||||
functional: true,
|
||||
render(createElement, context) {
|
||||
const data = {
|
||||
on: {
|
||||
beforeEnter(el) {
|
||||
addClass(el, 'drawer-transition')
|
||||
if (!el.dataset) el.dataset = {}
|
||||
|
||||
el.dataset.oldPaddingLeft = el.style.paddingLeft
|
||||
el.dataset.oldPaddingRight = el.style.paddingRight
|
||||
|
||||
el.style.width = '0'
|
||||
el.style.paddingLeft = 0
|
||||
el.style.paddingRight = 0
|
||||
},
|
||||
enter(el) {
|
||||
el.dataset.oldOverflow = el.style.overflow
|
||||
if (el.scrollWidth !== 0) {
|
||||
el.style.width = el.scrollWidth + 'px'
|
||||
el.style.paddingLeft = el.dataset.oldPaddingLeft
|
||||
el.style.paddingRight = el.dataset.oldPaddingRight
|
||||
} else {
|
||||
el.style.width = ''
|
||||
el.style.paddingLeft = el.dataset.oldPaddingLeft
|
||||
el.style.paddingRight = el.dataset.oldPaddingRight
|
||||
}
|
||||
el.style.overflow = 'hidden'
|
||||
},
|
||||
afterEnter(el) {
|
||||
removeClass(el, 'drawer-transition')
|
||||
el.style.width = ''
|
||||
el.style.overflow = el.dataset.oldOverflow
|
||||
},
|
||||
beforeLeave(el) {
|
||||
if (!el.dataset) el.dataset = {}
|
||||
el.dataset.oldPaddingLeft = el.style.paddingLeft
|
||||
el.dataset.oldPaddingRight = el.style.paddingRight
|
||||
el.dataset.oldOverflow = el.style.overflow
|
||||
|
||||
el.style.width = el.scrollWidth + 'px'
|
||||
el.style.overflow = 'hidden'
|
||||
},
|
||||
leave(el) {
|
||||
if (el.scrollWidth !== 0) {
|
||||
addClass(el, 'drawer-transition')
|
||||
el.style.width = 0
|
||||
el.style.paddingLeft = 0
|
||||
el.style.paddingRight = 0
|
||||
}
|
||||
},
|
||||
afterLeave(el) {
|
||||
removeClass(el, 'drawer-transition')
|
||||
el.style.width = ''
|
||||
el.style.overflow = el.dataset.oldOverflow
|
||||
el.style.paddingLeft = el.dataset.oldPaddingLeft
|
||||
el.style.paddingRight = el.dataset.oldPaddingRight
|
||||
}
|
||||
}
|
||||
}
|
||||
return createElement('transition', data, context.children)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.drawer-transition {
|
||||
transition: 0.3s width ease-in-out, 0.3s padding-left ease-in-out, 0.3s padding-right ease-in-out;
|
||||
}
|
||||
</style>
|
|
@ -11,8 +11,8 @@
|
|||
</li>
|
||||
<li>
|
||||
<img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
|
||||
<router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/offlinemap">安保力量</router-link>
|
||||
<!-- <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/index">安保力量</router-link> -->
|
||||
<!-- <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/offlinemap">安保力量</router-link> -->
|
||||
<router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/index">安保力量</router-link>
|
||||
</li>
|
||||
<li>
|
||||
<img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
|
||||
|
|
|
@ -834,6 +834,8 @@ const treedata = () => {
|
|||
points.push(marker)
|
||||
})
|
||||
var count = points.length
|
||||
// console.log('___________________________points', points)
|
||||
|
||||
// 聚合点样式
|
||||
var _renderClusterMarker = function (context: any) {
|
||||
var factor = Math.pow(context.count / count, 1 / 18)
|
||||
|
@ -867,6 +869,17 @@ const treedata = () => {
|
|||
console.log('当前地图的缩放级别是:' + zoom)
|
||||
cluster
|
||||
})
|
||||
|
||||
// var cluster = new AMap.MarkerCluster(state.map, points, {
|
||||
// gridSize: 80,
|
||||
// maxZoom: 12,
|
||||
// renderClusterMarker: _renderClusterMarker
|
||||
// })
|
||||
// state.map.plugin('AMap.MarkerCluster', () => {
|
||||
// let zoom = state.map.getZoom()
|
||||
// console.log('当前地图的缩放级别是:' + zoom)
|
||||
// cluster
|
||||
// })
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue