遗漏冲突处理

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://172.16.6.30:12345/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
-=======
     // const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
->>>>>>> 996b254d1fad04d6216e1dfab6417806a304ca82
     let basemap = null;
     let map = null;
     let view = null;

src/router/index.js

@@ -13,7 +13,7 @@ const routes = [{
 		name: 'Home',
 		component: Home,
 	},
-	{s
+	{
 		path: '/monitor/about',
 		name: 'About',
 		component: () =>