diff --git a/package.json b/package.json index c41fff4..a58d9d6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.19.2", "echarts": "^4.7.0", "element-ui": "^2.13.1", + "ol": "^6.4.3", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", diff --git a/package.json b/package.json index c41fff4..a58d9d6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.19.2", "echarts": "^4.7.0", "element-ui": "^2.13.1", + "ol": "^6.4.3", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 801c3b3..188878b 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -135,6 +135,11 @@ > + + + 坐标拾取 + + -<<<<<<< HEAD - -======= ->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a + + + diff --git a/package.json b/package.json index c41fff4..a58d9d6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.19.2", "echarts": "^4.7.0", "element-ui": "^2.13.1", + "ol": "^6.4.3", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 801c3b3..188878b 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -135,6 +135,11 @@ > + + + 坐标拾取 + + -<<<<<<< HEAD - -======= ->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a + + + diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 971875d..0d6deec 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -1004,7 +1004,7 @@ ]) => { // create map with the given options at a DOM node w/ id 'mapNode' _this.map = new Map("previewOfSiteStatusMaps", { - center: [100, 35], + center: [114, 30], zoom: 5, logo: false, slider: false diff --git a/package.json b/package.json index c41fff4..a58d9d6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.19.2", "echarts": "^4.7.0", "element-ui": "^2.13.1", + "ol": "^6.4.3", "esri-loader": "^2.14.0", "html2canvas": "^1.0.0-rc.7", "js-file-download": "^0.4.12", diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue index 801c3b3..188878b 100644 --- a/src/components/ConfigManager/SiteManagement.vue +++ b/src/components/ConfigManager/SiteManagement.vue @@ -135,6 +135,11 @@ > + + + 坐标拾取 + + -<<<<<<< HEAD - -======= ->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a + + + diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 971875d..0d6deec 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -1004,7 +1004,7 @@ ]) => { // create map with the given options at a DOM node w/ id 'mapNode' _this.map = new Map("previewOfSiteStatusMaps", { - center: [100, 35], + center: [114, 30], zoom: 5, logo: false, slider: false diff --git a/static/img/yjznewpng.png b/static/img/yjznewpng.png new file mode 100644 index 0000000..086bd14 --- /dev/null +++ b/static/img/yjznewpng.png Binary files differ