Merge branch 'sl' of http://61.161.152.110:10101/r/electronic-map into sl

src/components/arcgis/arcgis.vue

@@ -26,11 +26,7 @@
     import "@arcgis/core/assets/esri/themes/light/main.css";
 
     const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/nxmap/MapServer"; // ArcMap地址
-<<<<<<< HEAD
     // const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
-=======
-    // const mapUrl = "http://172.16.6.30:12345/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
->>>>>>> 84b3bdb1c8b5dee538537f2bc2e6fd922c5d99a0
     let basemap = null;
     let map = null;
     let view = null;