diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 8dfd2e29b..a4f4fd874 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -28,7 +28,7 @@ "@topology/activity-diagram": "^1.1.0", "@topology/chart-diagram": "^1.1.0", "@topology/class-diagram": "^1.1.0", - "@topology/core": "^1.1.32", + "@topology/core": "^1.1.34", "@topology/flow-diagram": "^1.1.1", "@topology/form-diagram": "^1.1.32", "@topology/sequence-diagram": "^1.1.0", diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index f694dca52..a13dcc7ef 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1083,7 +1083,11 @@ li { width:0 !important; background-color: $--background-color-base; } -.nz-table .el-table__fixed, .nz-table .el-table__fixed-right { +// .nz-table .el-table__fixed, .nz-table .el-table__fixed-right { +// height: 100% !important; +// z-index: 1; +// } +.nz-table .el-table__fixed, .nz-table,.nz-table-list .el-table__fixed-right { height: 100% !important; z-index: 1; } diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 50524c092..bf62c4bd5 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -135,7 +135,7 @@ export default { const z = urlParams[urlParams.length - 3] const x = urlParams[urlParams.length - 2] const y = urlParams[urlParams.length - 1] - const newUrl1 = `nzMap://static/Titles/${z}/${x}/${y}.pbf` + const newUrl1 = `nzMap:///static/Titles/${z}/${x}/${y}.pbf` return { url: newUrl1, credentials: 'include', @@ -145,7 +145,7 @@ export default { } if (resourceType === 'SpriteJSON') { return { - url: 'nzMap://static/Titles/sprite.json', + url: 'nzMap:///static/Titles/sprite.json', credentials: 'include', method: 'GET' // Include cookies for cross-origin requests @@ -153,7 +153,7 @@ export default { } if (resourceType === 'SpriteImage') { return { - url: 'nzMap://static/Titles/sprite.png', + 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 3ca65dbb5..394cc9b71 100644 --- a/nezha-fronted/src/components/chart/chart/mapStyle.js +++ b/nezha-fronted/src/components/chart/chart/mapStyle.js @@ -5,7 +5,7 @@ const mapAllStyle = { name: 'Maptiler.com: Basic', sources: { openmaptiles: { - url: 'static/Titles/tiles.json', + url: '/static/Titles/tiles.json', type: 'vector' }, maptiler_attribution: { @@ -15,7 +15,7 @@ const mapAllStyle = { }, layers: [{ id: 'background', type: 'background', paint: { 'background-color': 'rgb(242, 242, 242)' } }, { id: 'landuse_residential', type: 'fill', source: 'openmaptiles', 'source-layer': 'landuse', layout: { visibility: 'visible' }, paint: { 'fill-color': { stops: [[6, 'rgb(222, 222, 222)'], [14, 'rgb(253, 253, 253)'], [18, 'rgb(255, 255, 255)']] }, 'fill-opacity': 0.7 }, filter: ['all', ['in', 'class', 'residential', 'suburb', 'neighbourhood']] }, { id: 'landcover_grass', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(244, 244, 244)', 'fill-opacity': 0.4 }, filter: ['==', 'class', 'grass'] }, { id: 'landcover_wood', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(237, 237, 237)', 'fill-opacity': 0.8 }, filter: ['==', 'class', 'wood'] }, { id: 'landcover_sand', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(188, 188, 188)', 'fill-opacity': 0.3, 'fill-antialias': false }, metadata: {}, filter: ['all', ['in', 'class', 'sand']] }, { id: 'landcover_glacier', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(243, 243, 243)', 'fill-opacity': 1 }, filter: ['all', ['in', 'subclass', 'glacier', 'ice_shelf']] }, { id: 'water', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(217, 218, 221)' }, filter: ['all', ['!=', 'intermittent', 1], ['!=', 'brunnel', 'tunnel']] }, { id: 'water_intermittent', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(217, 218, 221)', 'fill-opacity': 0.7 }, filter: ['all', ['==', 'intermittent', 1]] }, { id: 'waterway_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': 1, 'line-opacity': 0.7, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel']] }, { id: 'waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1 }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['!=', 'intermittent', 1]] }, { id: 'waterway_intermittent', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(217, 218, 221)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1, 'line-dasharray': [2, 1] }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['==', 'intermittent', 1]] }, { id: 'building', type: 'fill', source: 'openmaptiles', 'source-layer': 'building', layout: { visibility: 'none' }, paint: { 'fill-color': 'rgba(212, 204, 176, 1)', 'fill-opacity': 0.6, 'fill-antialias': true } }, { id: 'road_area_pier', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(250, 250, 250)', 'fill-opacity': 1, 'fill-antialias': true }, metadata: {}, filter: ['all', ['==', '$type', 'Polygon'], ['==', 'class', 'pier']] }, { id: 'road_area_bridge', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: {}, paint: { 'fill-color': 'hsl(47, 26%, 88%)', 'fill-opacity': 0.7 }, filter: ['all', ['==', '$type', 'Polygon'], ['in', 'brunnel', 'bridge']] }, { id: 'road_pier', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round' }, paint: { 'line-color': 'hsl(47, 26%, 88%)', 'line-width': 1 }, metadata: {}, filter: ['all', ['in', 'class', 'pier']] }, { id: 'road_path', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 14, layout: { 'line-cap': 'square', 'line-join': 'bevel' }, paint: { 'line-color': 'hsl(0, 0%, 97%)', 'line-width': { base: 1.55, stops: [[14, 0.5], [20, 4]] }, 'line-dasharray': [1, 1] }, filter: ['all', ['in', 'class', 'path', 'track']] }, { id: 'road_minor', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 13, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'hsl(0, 0%, 97%)', 'line-width': { base: 1.55, stops: [[4, 0.25], [20, 24]] } }, filter: ['all', ['in', 'class', 'minor', 'service']] }, { id: 'road_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 24]] }, 'line-opacity': 0.75, 'line-dasharray': [0.28, 0.14] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk', 'minor_road']] }, { id: 'road_major', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 7, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['in', 'class', 'trunk', 'primary', 'secondary', 'tertiary'], ['!=', 'brunnel', 'tunnel'], ['!=', 'brunnel', 'bridge']] }, { id: 'road_motorway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'hsl(0, 0%, 100%)', 'line-width': { base: 1.4, stops: [[8, 1], [16, 10]] }, 'line-offset': 0 }, filter: ['all', ['==', 'class', 'motorway']] }, { id: 'railway_transit_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 0, layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['==', 'class', 'transit']] }, { id: 'railway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 11, layout: { visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5 }, filter: ['==', 'class', 'rail'] }, { id: 'railway_transit', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'line-color': 'hsl(34, 12%, 66%)', 'line-opacity': 0.5 }, filter: ['all', ['==', 'class', 'transit'], ['!=', 'brunnel', 'tunnel']] }, { id: 'aeroway_taxiway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 12, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgba(255, 255, 255, 1)', 'line-width': 1, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'taxiway']] }, { id: 'aeroway_runway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgba(255, 255, 255, 1)', 'line-width': 5, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'runway']] }, { id: 'bridge_waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'none' }, paint: { 'line-color': 'hsl(205, 56%, 73%)', 'line-width': 1 }, filter: ['all', ['==', 'brunnel', 'bridge']] }, { id: 'bridge', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': '#fff', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['==', 'brunnel', 'bridge'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk']] }, { id: 'admin_sub', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 3, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgba(184, 192, 201, 0.5)', 'line-width': 1.25, 'line-dasharray': [2, 1] }, filter: ['in', 'admin_level', 4, 6, 8] }, { id: 'admin_disputed', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 5, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(194, 201, 209)', 'line-width': 1, 'line-dasharray': [2, 2] }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['==', 'disputed', 1]] }, { id: 'admin_country', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 0, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(194, 201, 209)', 'line-width': 1 }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['!has', 'claimed_by']] }, { id: 'label_airport', type: 'symbol', source: 'openmaptiles', 'source-layer': 'aerodrome_label', minzoom: 10, layout: { 'icon-size': 1, 'text-font': ['Noto Sans Regular'], 'text-size': 11, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'top', 'text-offset': [0, 0.5], 'text-max-width': 8 }, paint: { 'text-color': 'rgb(215, 217, 220)', 'text-halo-blur': 1, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 1 }, filter: ['all', ['has', 'iata']] }, { id: 'label_road', type: 'symbol', source: 'openmaptiles', 'source-layer': 'transportation_name', minzoom: 13, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { base: 1.4, stops: [[10, 8], [20, 14]] }, 'text-field': '{name:latin} {name:nonlatin}', visibility: 'visible', 'text-transform': 'uppercase', 'symbol-placement': 'line', 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map' }, paint: { 'text-color': 'rgb(107, 115, 124)', 'text-halo-color': 'rgb(255, 255, 255)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'LineString'], ['!=', 'subclass', 'ferry']] }, { id: 'label_place_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', minzoom: 8, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[6, 10], [12, 14]] }, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'center', 'text-max-width': 6 }, paint: { 'text-color': 'rgb(174, 179, 185)', 'text-halo-blur': 0, 'text-halo-color': 'rgb(255, 255, 255)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['!in', 'class', 'city', 'state', 'country', 'continent']] }, { id: 'label_place_city', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 16, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 11], [8, 16]] }, 'text-field': '{name:latin}\n{name:nonlatin}', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(107, 115, 124)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']] }, { id: 'label_country_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(141, 148, 156)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']] }, { id: 'label_country', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Bold'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(141, 148, 156)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(255, 255, 255, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']] }], 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: 'static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', + glyphs: '/static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', sprite: 'https://www.maptiler.com/static/Titles/sprite', bearing: 0, pitch: 0, @@ -28,7 +28,7 @@ const mapAllStyle = { name: 'Maptiler.com: Basic', sources: { openmaptiles: { - url: 'static/Titles/tiles.json', + url: '/static/Titles/tiles.json', type: 'vector' }, maptiler_attribution: { @@ -38,7 +38,7 @@ const mapAllStyle = { }, layers: [{ id: 'background', type: 'background', paint: { 'background-color': 'rgb(33, 33, 33)' } }, { id: 'landuse_residential', type: 'fill', source: 'openmaptiles', 'source-layer': 'landuse', layout: { visibility: 'visible' }, paint: { 'fill-color': { stops: [[6, 'rgb(13, 13, 13)'], [14, 'rgb(44, 44, 44)'], [18, 'rgb(56, 56, 56)']] }, 'fill-opacity': 0.7 }, filter: ['all', ['in', 'class', 'residential', 'suburb', 'neighbourhood']] }, { id: 'landcover_grass', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(23, 23, 23)', 'fill-opacity': 0.4 }, filter: ['==', 'class', 'grass'] }, { id: 'landcover_wood', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(16, 16, 16)', 'fill-opacity': 0.8 }, filter: ['==', 'class', 'wood'] }, { id: 'landcover_sand', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', paint: { 'fill-color': 'rgb(0, 0, 0)', 'fill-opacity': 0.3, 'fill-antialias': false }, metadata: {}, filter: ['all', ['in', 'class', 'sand']] }, { id: 'landcover_glacier', type: 'fill', source: 'openmaptiles', 'source-layer': 'landcover', layout: { visibility: 'none' }, paint: { 'fill-color': 'rgba(236, 235, 230, 1)', 'fill-opacity': 1 }, filter: ['all', ['in', 'subclass', 'glacier', 'ice_shelf']] }, { id: 'water', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(0, 0, 0)' }, filter: ['all', ['!=', 'intermittent', 1], ['!=', 'brunnel', 'tunnel']] }, { id: 'water_intermittent', type: 'fill', source: 'openmaptiles', 'source-layer': 'water', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(0, 0, 0)', 'fill-opacity': 0.7 }, filter: ['all', ['==', 'intermittent', 1]] }, { id: 'waterway_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': 1, 'line-opacity': 0.7, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel']] }, { id: 'waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1 }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['!=', 'intermittent', 1]] }, { id: 'waterway_intermittent', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-width': { stops: [[8, 1], [15, 3]] }, 'line-opacity': 1, 'line-dasharray': [2, 1] }, filter: ['all', ['!in', 'brunnel', 'tunnel', 'bridge'], ['==', 'intermittent', 1]] }, { id: 'building', type: 'fill', source: 'openmaptiles', 'source-layer': 'building', paint: { 'fill-color': 'rgb(51, 51, 51)', 'fill-opacity': 0.6, 'fill-antialias': true } }, { id: 'road_area_pier', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'fill-color': 'rgb(41, 41, 41)', 'fill-opacity': 1, 'fill-antialias': true }, metadata: {}, filter: ['all', ['==', '$type', 'Polygon'], ['==', 'class', 'pier']] }, { id: 'road_area_bridge', type: 'fill', source: 'openmaptiles', 'source-layer': 'transportation', layout: {}, paint: { 'fill-color': 'rgb(24, 21, 14)', 'fill-opacity': 0.7 }, filter: ['all', ['==', '$type', 'Polygon'], ['in', 'brunnel', 'bridge']] }, { id: 'road_pier', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round' }, paint: { 'line-color': 'rgb(24, 21, 14)', 'line-width': 1 }, metadata: {}, filter: ['all', ['in', 'class', 'pier']] }, { id: 'road_path', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 14, layout: { 'line-cap': 'square', 'line-join': 'bevel' }, paint: { 'line-color': 'rgb(42, 42, 42)', 'line-width': { base: 1.55, stops: [[14, 0.5], [20, 4]] }, 'line-dasharray': [1, 1] }, filter: ['all', ['in', 'class', 'path', 'track']] }, { id: 'road_minor', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 13, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(42, 42, 42)', 'line-width': { base: 1.55, stops: [[4, 0.25], [20, 24]] } }, filter: ['all', ['in', 'class', 'minor', 'service']] }, { id: 'road_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 24]] }, 'line-opacity': 0.75, 'line-dasharray': [0.28, 0.14] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk', 'minor_road']] }, { id: 'road_major', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 7, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['in', 'class', 'trunk', 'primary', 'secondary', 'tertiary'], ['!=', 'brunnel', 'tunnel'], ['!=', 'brunnel', 'bridge']] }, { id: 'road_motorway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[8, 1], [16, 10]] }, 'line-offset': 0 }, filter: ['all', ['==', 'class', 'motorway']] }, { id: 'railway_transit_tunnel', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 0, layout: { 'line-cap': 'butt', 'line-join': 'miter', visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5, 'line-dasharray': [3, 3] }, filter: ['all', ['==', 'brunnel', 'tunnel'], ['==', 'class', 'transit']] }, { id: 'railway', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', minzoom: 11, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5 }, filter: ['==', 'class', 'rail'] }, { id: 'railway_transit', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { visibility: 'visible' }, paint: { 'line-color': 'rgb(0, 0, 0)', 'line-opacity': 0.5 }, filter: ['all', ['==', 'class', 'transit'], ['!=', 'brunnel', 'tunnel']] }, { id: 'aeroway_taxiway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 12, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': 1, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'taxiway']] }, { id: 'aeroway_runway', type: 'line', source: 'openmaptiles', 'source-layer': 'aeroway', minzoom: 4, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': 5, 'line-opacity': 1 }, metadata: { 'mapbox:group': '1444849345966.4436' }, filter: ['all', ['in', 'class', 'runway']] }, { id: 'bridge_waterway', type: 'line', source: 'openmaptiles', 'source-layer': 'waterway', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'none' }, paint: { 'line-color': 'hsl(205, 56%, 73%)', 'line-width': 1 }, filter: ['all', ['==', 'brunnel', 'bridge']] }, { id: 'bridge', type: 'line', source: 'openmaptiles', 'source-layer': 'transportation', layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(50, 50, 50)', 'line-width': { base: 1.4, stops: [[7, 0.5], [20, 28]] } }, filter: ['all', ['==', 'brunnel', 'bridge'], ['in', 'class', 'primary', 'secondary', 'tertiary', 'trunk']] }, { id: 'admin_sub', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 3, layout: { visibility: 'visible' }, paint: { 'line-color': 'rgba(59, 59, 59, 0.5)', 'line-width': 1.25, 'line-dasharray': [2, 1] }, filter: ['in', 'admin_level', 4, 6, 8] }, { id: 'admin_disputed', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 5, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(68, 68, 68)', 'line-width': 1, 'line-dasharray': [2, 2] }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['==', 'disputed', 1]] }, { id: 'admin_country', type: 'line', source: 'openmaptiles', 'source-layer': 'boundary', minzoom: 0, layout: { 'line-cap': 'round', 'line-join': 'round', visibility: 'visible' }, paint: { 'line-color': 'rgb(68, 68, 68)', 'line-width': 1 }, filter: ['all', ['<=', 'admin_level', 2], ['==', '$type', 'LineString'], ['!has', 'claimed_by']] }, { id: 'label_airport', type: 'symbol', source: 'openmaptiles', 'source-layer': 'aerodrome_label', minzoom: 10, layout: { 'icon-size': 1, 'text-font': ['Noto Sans Regular'], 'text-size': 11, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'top', 'text-offset': [0, 0.5], 'text-max-width': 8 }, paint: { 'text-color': 'rgb(110, 110, 110)', 'text-halo-blur': 1, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 1 }, filter: ['all', ['has', 'iata']] }, { id: 'label_road', type: 'symbol', source: 'openmaptiles', 'source-layer': 'transportation_name', minzoom: 13, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { base: 1.4, stops: [[10, 8], [20, 14]] }, 'text-field': '{name:latin} {name:nonlatin}', visibility: 'visible', 'text-transform': 'uppercase', 'symbol-placement': 'line', 'text-letter-spacing': 0.1, 'text-rotation-alignment': 'map' }, paint: { 'text-color': 'rgb(212, 212, 212)', 'text-halo-color': 'rgb(0, 0, 0)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'LineString'], ['!=', 'subclass', 'ferry']] }, { id: 'label_place_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', minzoom: 8, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[6, 10], [12, 14]] }, 'text-field': '{name:latin}\n{name:nonlatin}', visibility: 'visible', 'text-anchor': 'center', 'text-max-width': 6 }, paint: { 'text-color': 'rgb(148, 148, 148)', 'text-halo-blur': 0, 'text-halo-color': 'rgb(0, 0, 0)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['!in', 'class', 'city', 'state', 'country', 'continent']] }, { id: 'label_place_city', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 16, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 11], [8, 16]] }, 'text-field': '{name:latin}\n{name:nonlatin}', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(212, 212, 212)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'city']] }, { id: 'label_country_other', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Regular'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(179, 179, 179)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['!has', 'iso_a2']] }, { id: 'label_country', type: 'symbol', source: 'openmaptiles', 'source-layer': 'place', maxzoom: 12, layout: { 'text-font': ['Noto Sans Bold'], 'text-size': { stops: [[3, 12], [8, 22]] }, 'text-field': '{name:latin}', visibility: 'visible', 'text-max-width': 10 }, paint: { 'text-color': 'rgb(179, 179, 179)', 'text-halo-blur': 0, 'text-halo-color': 'rgba(0, 0, 0, 0.75)', 'text-halo-width': 2 }, filter: ['all', ['==', '$type', 'Point'], ['==', 'class', 'country'], ['has', 'iso_a2']] }], 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: 'static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', + glyphs: '/static/Titles/fonts/{fontstack}/{range}.pbf?key=rB2y2a2rG8i9SEjOXQXl', sprite: 'https://www.maptiler.com/static/Titles/sprite', bearing: 0, pitch: 0, diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 786f84377..697508dad 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -855,7 +855,7 @@ export default { gridColor: '#ededed', lineWidth: 1, ruleColor: '#4e4e4e', - pens:[] + pens: [] } this.projectInfoShow = true this.projectAlertShow = true @@ -864,6 +864,7 @@ export default { data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE' resolve(data) } else { + delete data.origin data.ruleColor = this.theme == 'light' ? '#4e4e4e' : '#BEBEBE' if (data.data) { this.topologyInfo = { diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 64556e77a..0fedd6e19 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -1,7 +1,7 @@