append

src/views/modules/visual/components/screen-map/index.vue

@@ -189,13 +189,8 @@ const vueGis = {
       ],
       //icon图标样式
       iconUrlArray: [],
-<<<<<<< HEAD
-      iconTextColor: "#ffffff",
-      distanceMax: null, //显示的坐标距离中心点的范围
-=======
       iconTextColor: '#ffffff',
       distanceMax: null,//显示的坐标距离中心点的范围
->>>>>>> feature/dev_party_mange
 
       input_lat: null,
       input_lon: null,
@@ -925,8 +920,4 @@ export default vueGis;
   // color: rgba(1, 17, 104, 1);
   color: #fff;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> feature/dev_party_mange