diff --git a/src/App.vue b/src/App.vue
index f01d431a..0b352af7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,6 +17,7 @@
import AppNavbar from '@/components/AppNavbar'
import AppFooter from '@/components/AppFooter'
import appSettings from '@/settings/app'
+ import apiSettings from '@/settings/api'
export default {
metaInfo: {
@@ -52,20 +53,17 @@
},
methods: {
fetchPlateBoundaries: function() {
- this.$http.get('/static/json/plate_boundaries.geo.json')
- .then(response => { this.$store.dispatch('setPlateBoundaries', response.data) })
- .catch(error => { console.log(error) })
+ this.$http.get('/static/json/plate_boundaries.geo.json').then(response => {
+ this.$store.dispatch('setPlateBoundaries', response.data)
+ })
},
fetchSystemInfo: function() {
- this.$http.get(appSettings.endpointSystemInfo)
- .then(response => {
- (data => {
- this.$store.dispatch('setMsk64ConfigVersion', data.msk64Config.data.config_version)
- this.$store.dispatch('setSrssDBVersion', data.srssCoreConfig.data.db_version)
- this.$store.dispatch('setTotalEventsCount', data.counters.reports)
- })(response.data.data)
- })
- .catch(error => { console.log(error) })
+ this.$http.get(apiSettings.endpointSystemInfo).then(response => {
+ const data = response.data.data
+ this.$store.dispatch('setMsk64ConfigVersion', data.msk64Config.data.config_version)
+ this.$store.dispatch('setSrssDBVersion', data.srssCoreConfig.data.db_version)
+ this.$store.dispatch('setTotalEventsCount', data.counters.reports)
+ })
}
},
mounted() {
diff --git a/src/assets/scss/_modal_map.scss b/src/assets/scss/_modal_map.scss
new file mode 100644
index 00000000..8eb04a3e
--- /dev/null
+++ b/src/assets/scss/_modal_map.scss
@@ -0,0 +1,41 @@
+
+@import '~scss/_variables';
+@import '~scss/_mixins';
+
+/deep/ .modal
+{
+ padding-left: 15px;
+ height: 100%;
+
+ .modal-dialog
+ {
+ @include calc(height, '100% - 57px', 100%);
+ max-width: none;
+
+ .modal-content
+ {
+ height: 100%;
+
+ .modal-header
+ {
+ padding: 0.6rem 1rem;
+
+ .modal-title {
+ text-align: center;
+ font-size: 1rem;
+ width: 100%;
+ }
+ }
+
+ .modal-body
+ {
+ padding: 2px;
+ height: 1%;
+
+ .map {
+ height: 100%;
+ }
+ }
+ }
+ }
+}
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 8da5c41f..51ff2701 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -217,3 +217,12 @@ details {
}
}
}
+
+.circle-marker-map {
+ > div {
+ border: 1px solid #222;
+ border-radius: 50%;
+ height: 100%;
+ width: 100%;
+ }
+}
diff --git a/src/components/StaticPage.vue b/src/components/StaticPage.vue
index 7c8a5d78..34f027b4 100644
--- a/src/components/StaticPage.vue
+++ b/src/components/StaticPage.vue
@@ -1,13 +1,26 @@
-
+
+
+
+
+
+
diff --git a/src/components/charts/ChartByRMSAllocation.vue b/src/components/charts/ChartByRMSAllocation.vue
index 6adb17a3..f4855be6 100644
--- a/src/components/charts/ChartByRMSAllocation.vue
+++ b/src/components/charts/ChartByRMSAllocation.vue
@@ -80,7 +80,6 @@ export default Line.extend({
this.renderChart(this.chartData, this.options)
})
- .catch(error => { console.log(error) })
}
},
watch: {
diff --git a/src/components/charts/ChartByStationCounts.vue b/src/components/charts/ChartByStationCounts.vue
index e02a9a5a..96076b44 100644
--- a/src/components/charts/ChartByStationCounts.vue
+++ b/src/components/charts/ChartByStationCounts.vue
@@ -80,7 +80,6 @@ export default Line.extend({
this.renderChart(this.chartData, this.options)
})
- .catch(error => { console.log(error) })
}
},
watch: {
diff --git a/src/components/maps/LDOs.vue b/src/components/maps/LDOs.vue
index 4d344b42..9e5af20d 100644
--- a/src/components/maps/LDOs.vue
+++ b/src/components/maps/LDOs.vue
@@ -3,18 +3,12 @@