diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue index 5a749dc3..90074daa 100644 --- a/components/AiDvRender.vue +++ b/components/AiDvRender.vue @@ -165,24 +165,23 @@ export default { let {lib: AMap, map} = this this.timer && clearInterval(this.timer) if (AMap && map) { - let infoWin = new AMap.InfoWindow({content: ""}) + const infoWin = new AMap.InfoWindow({isCustom: true, content: ""}) map.clearMap() - this.values.filter(e => e.lng).map(e => { + map.on('click', () => infoWin.close()) + this.values.filter(e => e.lng).map((e) => { + const {icon = "https://cdn.cunwuyun.cn/dvcp/h5/Location2.png"} = e return new AMap.Marker({ map, content: e.content || `
- + ${e.label}
`, position: [e.lng, e.lat] }).on('click', () => { if (!!e.openWin || e.infoWindowHtml) { map.clearInfoWindow() - infoWin.setContent(e.infoWindowHtml || - [`
`, - `${e.label}`, - '
' - ].join('') + infoWin.setContent(e.infoWindowHtml ? `
${e.infoWindowHtml}
` : + [`
`, `${e.label}`, '
'].join('') ) infoWin.open(map, [e.lng, e.lat]) } @@ -275,5 +274,16 @@ export default { white-space: nowrap; } } + + :deep(.mapInfoWin) { + padding: 16px 8px; + max-width: 800px; + background-color: rgba(255, 255, 255, 0.25); + backdrop-filter: blur(6px); + border: 1px solid rgba(255, 255, 255, 0.18); + box-shadow: rgba(142, 142, 142, 0.19) 0px 6px 15px 0px; + border-radius: 4px; + color: rgba(255, 255, 255, 0.75); + } } diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue index 7649cdef..47de6e20 100644 --- a/packages/bigscreen/designer/components/form/DataConfig.vue +++ b/packages/bigscreen/designer/components/form/DataConfig.vue @@ -136,7 +136,7 @@ - + diff --git a/vue.config.js b/vue.config.js index 4ba5c853..0380fc7e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -28,8 +28,7 @@ module.exports = { .add(path.resolve(__dirname, 'examples')) .add(path.resolve(__dirname, 'ui')) .end().use('babel').loader('babel-loader').tap(options => options); - config.plugins.delete("friendly-errors"); - config.plugin("limit").use(require("webpack/lib/optimize/LimitChunkCountPlugin"), [{maxChunks: 5}]).tap(options => options) + config.plugin("limit").use(require("webpack/lib/optimize/LimitChunkCountPlugin"), [{maxChunks: 10}]).tap(options => options) }, devServer: { host: '0.0.0.0', //主机地址