diff --git a/frontend/.env.development b/frontend/.env.development
index 8c16fe7e..069b745b 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -14,11 +14,6 @@ VITE_APP_BASE_URL = 'http://localhost:8093'
 VITE_APP_BASE_URL = 'http://10.84.111.235:8093'
 # 李林 
 # VITE_APP_BASE_URL = 'http://10.84.111.25:8093'
-<<<<<<< HEAD
-=======
-# 小扈
-# VITE_APP_BASE_URL = 'http://10.84.111.182:8093'
->>>>>>> 0401f9354ff2bc8266a31aa2b2c445832e5da807
 
 ## 开发环境  附件服务地址
 VITE_APP_ATTACHMENT_URL = 'https://211.99.26.225:12125'
diff --git a/frontend/src/views/qiXiDi/shengTaiDiBaoHu.vue b/frontend/src/views/qiXiDi/shengTaiDiBaoHu.vue
index 4f48bc92..b0118642 100644
--- a/frontend/src/views/qiXiDi/shengTaiDiBaoHu.vue
+++ b/frontend/src/views/qiXiDi/shengTaiDiBaoHu.vue
@@ -5,16 +5,6 @@ import QiXiDiBaoHuGongZuoKaiZhan from '@/modules/qixidibaohugongzuokaizhanQK/ind
 import QixidijchuXx from '@/modules/qixidijchuXx/index.vue';
 import QiXiDiShuiWenBianHua from '@/modules/qixidishuiwenbianhua/index.vue';
 import QiXiDiLiuLiangBianHua from '@/modules/qixidiliuliangbianhua/index.vue';
-
-import { ref } from 'vue';
-
-const addMapLayer = () => {
-  console.log('叠加栖息地图层');
-};
-
-const showSingle = () => {
-  console.log('单个展示');
-};
 </script>
 
 <template>
@@ -24,10 +14,6 @@ const showSingle = () => {
     </div>
     <div class="rightContent">
       <RightDrawer>
-        <a-button type="primary" @click="addMapLayer">
-          叠加栖息地图层
-        </a-button>
-        <a-button type="primary" @click="showSingle"> 单个展示 </a-button>
         <QiXiDiBaoHuGongZuoKaiZhan />
         <QiXiDiShuiWenBianHua />
         <QiXiDiLiuLiangBianHua />