diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ
diff --git a/static/images/icon/ywg.png b/static/images/icon/ywg.png
new file mode 100644
index 0000000..c402e0b
--- /dev/null
+++ b/static/images/icon/ywg.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ
diff --git a/static/images/icon/ywg.png b/static/images/icon/ywg.png
new file mode 100644
index 0000000..c402e0b
--- /dev/null
+++ b/static/images/icon/ywg.png
Binary files differ
diff --git a/static/images/icon/ywr.png b/static/images/icon/ywr.png
new file mode 100644
index 0000000..076b311
--- /dev/null
+++ b/static/images/icon/ywr.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ
diff --git a/static/images/icon/ywg.png b/static/images/icon/ywg.png
new file mode 100644
index 0000000..c402e0b
--- /dev/null
+++ b/static/images/icon/ywg.png
Binary files differ
diff --git a/static/images/icon/ywr.png b/static/images/icon/ywr.png
new file mode 100644
index 0000000..076b311
--- /dev/null
+++ b/static/images/icon/ywr.png
Binary files differ
diff --git a/static/images/icon/zsb.png b/static/images/icon/zsb.png
new file mode 100644
index 0000000..45d500d
--- /dev/null
+++ b/static/images/icon/zsb.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ
diff --git a/static/images/icon/ywg.png b/static/images/icon/ywg.png
new file mode 100644
index 0000000..c402e0b
--- /dev/null
+++ b/static/images/icon/ywg.png
Binary files differ
diff --git a/static/images/icon/ywr.png b/static/images/icon/ywr.png
new file mode 100644
index 0000000..076b311
--- /dev/null
+++ b/static/images/icon/ywr.png
Binary files differ
diff --git a/static/images/icon/zsb.png b/static/images/icon/zsb.png
new file mode 100644
index 0000000..45d500d
--- /dev/null
+++ b/static/images/icon/zsb.png
Binary files differ
diff --git a/static/images/icon/zsg.png b/static/images/icon/zsg.png
new file mode 100644
index 0000000..8405b1a
--- /dev/null
+++ b/static/images/icon/zsg.png
Binary files differ

diff --git a/src/settings.js b/src/settings.js
index b568ce0..b8159bf 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -3,7 +3,7 @@
    * @type {boolean} true | false
    * @description 是否显示设置按钮
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index c3b9722..3c4eb3f 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,6 +1,6 @@
 <!--suppress ALL -->
 <template>
-  <div>
+  <div style="overflow-y: hidden">
     <!--筛选条件-->
     <div class="map-search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -28,13 +28,16 @@
           <el-form-item style="margin-left:5px">
             <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
           </el-form-item>
+          <el-form-item style="margin-left:5px">
+            <el-button :type="showAlarm?'danger':'info'" size="small" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+          </el-form-item>
         </el-row>
       </el-form>
     </div>
-    <div v-if="refreshType=='websocket'" class="function-div">
-      <el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>
+    <!--<div v-if="refreshType=='websocket'" class="function-div">-->
+      <!--<el-button :type="showAlarm?'danger':'info'" icon="el-icon-bell" circle @click="showAlarm=!showAlarm"/>-->
       <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    </div>
+    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -330,6 +333,10 @@
               enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
             }
           },
+          control:{
+            infoBox: false,
+            sceneModePicker: true
+          },
           basemaps: [
             {
               pid: 10,
@@ -412,22 +419,23 @@
         })
         graphicLayer.addGraphic(building)
 
-        var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
-        handler.setInputAction(function(evt) {
-          var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        // var handler = new Cesium.ScreenSpaceEventHandler( map.viewer.canvas);
+        // handler.setInputAction(function(evt) {
+        //   var cartesian=map.viewer.camera.pickEllipsoid(evt.position,map.viewer.scene.globe.ellipsoid);
+        //
+        //   var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+        //
+        //   var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+        //
+        //   var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
+        //
+        //   var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
+        //
+        //   console.log('['+lng+','+lat+'],')
+        //
+        // }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
-
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
-
-          var lat=Cesium.Math.toDegrees(cartographic.latitude);//纬度值
-
-          var mapPosition={x:lng,y:lat,z:cartographic.height};//cartographic.height的值始终为零。
-
-          console.log('['+lng+','+lat+'],')
-
-        }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
+//  演示井+icon
 
         graphicLayer.addGraphic(new mars3d.graphic.ModelPrimitive({
           position: [120.24136131092753,35.98781839514239, 0],
@@ -438,6 +446,29 @@
           popup: '污水井<br />名称：测试污水井<br />坐标：120.24136131 , 35.98781839',
         }))
 
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0],
+          style: {
+            image: '../static/images/icon/fmg.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '阀门<br />设备编号：FM0001<br />设备类型：阀门<br />详细位置：120.2413613，35.9878183<br />'
+        }))
+
+        graphicLayer.addGraphic( new mars3d.graphic.BillboardEntity({
+          position: [120.24136131092753,35.98781839514239, 0.5],
+          style: {
+            image: '../static/images/icon/sbr.png',
+            scale: 1,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
+          },
+          popup: '报警水表<br />设备编号：FM0002<br />设备类型：水表<br />告警原因：日用水量超阈值报警<br />告警数值：106.00<br />告警时间：2022.03.21 12:35:06<br />详细位置：120.2413613，35.9878183<br />'
+        }))
 
         const positions = [
           {
@@ -652,7 +683,6 @@
         //       // radius: 0.1
         //     },
         //   },
-        //
         // })
         // map.addLayer(ysline)
 
@@ -868,6 +898,40 @@
     line-height: 1.9;
     font-size: 18px;
   }
+  /deep/ .cesium-toolbar-button {
+    margin-top: 5px !important;
+    width: 48px !important;
+    height: 48px !important;
+  }
+  /depp/ span.cesium-sceneModePicker-wrapper {
+    margin: 0 50px !important;
+  }
+  /deep/ .mars3d-popup-close-button {
+    top: 10px;
+    right: 10px;
+  }
+  /deep/ .mars3d-popup{
+    margin-top: -40px;
+  }
+  /deep/ .mars3d-popup-content {
+    margin: 15px;
+    line-height: 1.5;
+    font-size: 16px;
+  }
+  /deep/ .mars3d-popup-content-wrapper {
+    box-shadow: 0 2px 6px #00192faa;
+    max-height: 1000px;
+  }
+  /deep/ .mars3d-popup-background {
+    background: #00192faa;
+    border-radius: 10px;
+  }
+  /deep/ .mars3d-popup-tip {
+    border-radius: 0px !important;
+  }
+  /deep/.mars3d-popup-close-button{
+    top: 10px;
+  }
   @CHARSET "UTF-8";
   // 查询框
   .map-search-div{
@@ -883,8 +947,8 @@
   // 刷新框
   .function-div{
     position: absolute;
+    left: 0px;
     right: 10px;
-    top: 7px;
     z-index: 1100;
     padding: 10px;
     color: #ce8b74;
diff --git a/static/images/icon/fmb.png b/static/images/icon/fmb.png
new file mode 100644
index 0000000..a114c8c
--- /dev/null
+++ b/static/images/icon/fmb.png
Binary files differ
diff --git a/static/images/icon/fmg.png b/static/images/icon/fmg.png
new file mode 100644
index 0000000..7aada19
--- /dev/null
+++ b/static/images/icon/fmg.png
Binary files differ
diff --git a/static/images/icon/fmr.png b/static/images/icon/fmr.png
new file mode 100644
index 0000000..46d7266
--- /dev/null
+++ b/static/images/icon/fmr.png
Binary files differ
diff --git a/static/images/icon/sbb.png b/static/images/icon/sbb.png
new file mode 100644
index 0000000..587277f
--- /dev/null
+++ b/static/images/icon/sbb.png
Binary files differ
diff --git a/static/images/icon/sbg.png b/static/images/icon/sbg.png
new file mode 100644
index 0000000..ae66035
--- /dev/null
+++ b/static/images/icon/sbg.png
Binary files differ
diff --git a/static/images/icon/sbr.png b/static/images/icon/sbr.png
new file mode 100644
index 0000000..b417ee7
--- /dev/null
+++ b/static/images/icon/sbr.png
Binary files differ
diff --git a/static/images/icon/ywb.png b/static/images/icon/ywb.png
new file mode 100644
index 0000000..7ed1ada
--- /dev/null
+++ b/static/images/icon/ywb.png
Binary files differ
diff --git a/static/images/icon/ywg.png b/static/images/icon/ywg.png
new file mode 100644
index 0000000..c402e0b
--- /dev/null
+++ b/static/images/icon/ywg.png
Binary files differ
diff --git a/static/images/icon/ywr.png b/static/images/icon/ywr.png
new file mode 100644
index 0000000..076b311
--- /dev/null
+++ b/static/images/icon/ywr.png
Binary files differ
diff --git a/static/images/icon/zsb.png b/static/images/icon/zsb.png
new file mode 100644
index 0000000..45d500d
--- /dev/null
+++ b/static/images/icon/zsb.png
Binary files differ
diff --git a/static/images/icon/zsg.png b/static/images/icon/zsg.png
new file mode 100644
index 0000000..8405b1a
--- /dev/null
+++ b/static/images/icon/zsg.png
Binary files differ
diff --git a/static/images/icon/zsr.png b/static/images/icon/zsr.png
new file mode 100644
index 0000000..5968499
--- /dev/null
+++ b/static/images/icon/zsr.png
Binary files differ