diff --git a/nezha-fronted/src/assets/img/starCloud1.svg b/nezha-fronted/src/assets/img/starCloud1.svg new file mode 100644 index 000000000..bca604316 --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud1.svg @@ -0,0 +1 @@ +Gas-1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud2.svg b/nezha-fronted/src/assets/img/starCloud2.svg new file mode 100644 index 000000000..ceb58fddc --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud2.svg @@ -0,0 +1 @@ +Gas-2_1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud3.svg b/nezha-fronted/src/assets/img/starCloud3.svg new file mode 100644 index 000000000..8f277a6b5 --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud3.svg @@ -0,0 +1 @@ +Gas-3_1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud4.svg b/nezha-fronted/src/assets/img/starCloud4.svg new file mode 100644 index 000000000..2d3a4e598 --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud4.svg @@ -0,0 +1 @@ +Gas-4_1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud5.svg b/nezha-fronted/src/assets/img/starCloud5.svg new file mode 100644 index 000000000..9282b9b6a --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud5.svg @@ -0,0 +1 @@ +Gas-5_1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud6.svg b/nezha-fronted/src/assets/img/starCloud6.svg new file mode 100644 index 000000000..b6a753c3a --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud6.svg @@ -0,0 +1 @@ +Gas-6_1 \ No newline at end of file diff --git a/nezha-fronted/src/assets/img/starCloud7.svg b/nezha-fronted/src/assets/img/starCloud7.svg new file mode 100644 index 000000000..e5b7fcb11 --- /dev/null +++ b/nezha-fronted/src/assets/img/starCloud7.svg @@ -0,0 +1 @@ +Gas-7_1 \ No newline at end of file diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 9e97b43d3..c7a98fd68 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -147,18 +147,21 @@ export default { // Include cookies for cross-origin requests } } - if (resourceType === 'Glyphs') { - // // console.log(url) - // window.open(url) - // const str = url.split('Roboto')[1] - // console.log(str[1]) - // if (str[0] == 'M') { - // self.pbfUrl.m.push(url) - // } else { - // self.pbfUrl.c.push(url) - // } - // console.log(self.pbfUrl) - // // window.open(url) + if (resourceType === 'SpriteJSON') { + return { + url: 'nzMap://static/Titles/sprite.json', + credentials: 'include', + method: 'GET' + // Include cookies for cross-origin requests + } + } + if (resourceType === 'SpriteImage') { + return { + url: 'nzMap://static/Titles/sprite.png', + credentials: 'include', + method: 'GET' + // Include cookies for cross-origin requests + } } } }) diff --git a/nezha-fronted/src/components/chart/chart/mapStyle.js b/nezha-fronted/src/components/chart/chart/mapStyle.js index cffba3034..89925a92b 100644 --- a/nezha-fronted/src/components/chart/chart/mapStyle.js +++ b/nezha-fronted/src/components/chart/chart/mapStyle.js @@ -1461,8 +1461,8 @@ const mapStyle = { paint: { 'text-color': 'hsla(60, 83%, 60%, 0.69)' } }], metadata: { 'maptiler:copyright': 'This style was generated on MapTiler Cloud. Usage outside of MapTiler Cloud or MapTiler Server requires valid MapTiler Data package: https://www.maptiler.com/data/ -- please contact us.' }, - glyphs: 'https://api.maptiler.com/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', - sprite: 'https://api.maptiler.com/maps/13a5a9a7-498d-45dd-9e80-5cbefb010836/sprite', + glyphs: 'static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', + sprite: 'https://www.maptiler.com/static/Titles/sprite', bearing: 0, pitch: 0, center: [130, -20], diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue index 58a69dd79..0f6c8d94f 100644 --- a/nezha-fronted/src/components/common/latlngPicker.vue +++ b/nezha-fronted/src/components/common/latlngPicker.vue @@ -55,6 +55,16 @@ export default { } }, mounted () { + const arr = [] + mapStyle.layers.forEach(item => { + if (item.layout['text-font']) { + const font = item.layout['text-font'].join(',') + if (arr.indexOf(font) === -1) { + arr.push(font) + } + } + }) + console.log(arr) }, methods: { initMap () { diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 285db311b..76eea54a9 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -1,6 +1,9 @@