diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 2ca03c7..092bb23 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,6 +4,7 @@
     <!-- 按钮控制区 -->
     <div class="btns">
       <button @click="loadWFS()">WFS服务</button>
+<<<<<<< HEAD
       <button @click="removeWFSLayer()">移除wFS服务图层</button>
       <button @click="loadWMS()">WMS服务</button>
       <button @click="removeWMSLayer()">移除WMS服务图层</button>
@@ -14,6 +15,13 @@
     </div>
     <div id="map"></div>
     <!-- <Service ref="service"/> -->
+=======
+      <button @click="loadWMS()">WMS服务</button>
+      <button @click="loadWMTS()">WMTS服务</button>
+      <button @click="loadTMS()">TMS服务</button>
+    </div>
+    <Service ref="service"/>
+>>>>>>> 449070ad2d3c0e373e07e7808f3910ee5dd79c00
   </div>
 </template>
 
@@ -145,6 +153,7 @@ export default {
        removeLayer(this.map, url);
     }
   },
+<<<<<<< HEAD
 };
 </script>
 <style lang="scss" scoped>
@@ -172,5 +181,49 @@ export default {
     height: 100%;
   }
 }
+=======
+  mounted(){
+     
+  },
+  methods:{
+     loadWFS(){
+       this.$refs.service.loadWFS()
+     },
+     loadWMS(){
+       let wmsUrl='http://192.168.11.35:8999/geoserver/ows?service=WMS&version=1.3.0&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=sz_pg%3Asz_pg_mb_building_area'
+       this.$refs.service.loadWMS(wmsUrl)
+     },
+     loadWMTS(){
+       this.$refs.service.loadWMTS()
+     },
+     loadTMS(){
+       this.$refs.service.loadTMS()
+     }
+  }
+}
+</script>
+<style lang="scss" scoped>
+     .content{
+       width:100vw;
+       height:100vh;
+       position:relative;
+       .btns{
+         width:100%;
+         height:40px;
+         position:absolute;
+        //  background-color:yellow;
+         top:0;
+         left:0;
+         z-index:100;
+         display:flex;
+         align-items:center;
+         padding-left:20px;
+         button{
+           margin-right:10px;
+         }
+       }
+     }
+
+>>>>>>> 449070ad2d3c0e373e07e7808f3910ee5dd79c00
 </style>