diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index 4e04363..fc87f08 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <div style="overflow-y: hidden">
     <!--筛选条件-->
@@ -9,53 +8,34 @@
             <!--水表检查井编号/地址-->
             <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号/地址" clearable size="small"/>
           </el-form-item>
-          <!--<el-form-item>-->
-            <!--<el-select v-model="listQuery.wellType" placeholder="选择井类型" @change="changetype" clearable size="small">-->
-              <!--<el-option-->
-                <!--v-for="item in wellTypeList"-->
-                <!--:key="'welltype_'+item.value"-->
-                <!--:label="item.name"-->
-                <!--:value="item.value"/>-->
-            <!--</el-select>-->
-          <!--</el-form-item>-->
-
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getWellList" size="small" style="margin-top: 2px">搜索</el-button>
-          <!--<el-form-item style="margin-left:10px">-->
-            <!--<el-checkbox v-model="showAll">显示全部井</el-checkbox>-->
-          <!--</el-form-item>-->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" style="margin-top: 2px" @click="initPoints">搜索</el-button>
           <el-form-item style="margin-left: 10px">
-            <el-slider v-model="alpha" style="width: 150px"></el-slider>
+            <el-slider v-model="alpha" style="width: 150px"/>
           </el-form-item>
           <el-form-item style="margin-left:5px">
-            <el-button type="primary" size="small" icon="el-icon-map-location" circle @click="flytoinit"/>
+            <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-form-item style="margin-left: 5px">
             <el-switch
-              v-model="value"
+              v-model="sceneMode"
               active-color="#637F2C"
               inactive-color="#071a69"
               active-text="深蓝"
-              inactive-text="实景">
-            </el-switch>
+              inactive-text="实景"/>
           </el-form-item>
           <el-form-item style="margin-left: 5px">
             <el-switch
-              v-model="value1"
-              :disabled="value"
+              v-model="isShowFlow"
+              :disabled="sceneMode"
               active-text="开启流向"
-              inactive-text="关闭流向">
-            </el-switch>
+              inactive-text="关闭流向"/>
           </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"/>-->
-      <!--<el-button type="primary" icon="el-icon-refresh-right" circle @click="refreshAlarm"/>-->
-    <!--</div>-->
     <div v-if="showAlarm==true && alarmList.length>0" class="map-alarm-div">
       <div class="map-alarm-div-header">
         告警列表
@@ -90,753 +70,485 @@
 </template>
 
 <script>
-  import axios from 'axios'
-  import { mapGetters } from 'vuex'
-  import SelectTree from '@/components/SelectTree/singleSelect'
-  import { getWellType } from '@/api/well'
-  import { getWellList, getWellInfo, getAlarmsNow, getWellAlarms, getWellByCode,getMapping } from '@/api/overview'
-  import DeptSelect from '../../components/DeptSelect/index'
+import axios from 'axios'
+import { mapGetters } from 'vuex'
+import { getAlarmsNow, getMapping } from '@/api/overview'
 
-  import 'mars3d/dist/mars3d.css'
-  import * as mars3d from 'mars3d'
-  import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
-  var Cesium = require('../../../node_modules/cesium/Source/Cesium')
+import 'mars3d/dist/mars3d.css'
+import * as mars3d from 'mars3d'
+import 'cesium/Source/Widgets/widgets.css'// 导入必须的样式表
+var Cesium = require('../../../node_modules/cesium/Source/Cesium')
 
-  var rectangle = null
-  var alarmIcons= []
-  var typeList = []
-
-  var ysline = null
-  var  wsline = null
-  var  underground = null
-  var  img_layer = null
-  var  tile_layer = null
-  var  tiles3dLayer = null
-  var  sewage_point_layer = null
-  var  fly_layer = null
-  var building = null
-  var flow = null
-  var street = null
-  var well_model_layer = null
-  var watch_model_layer = null
-  var zs_model_layer = null
-  var well_pic_layer = null
-  var watch_pic_layer = null
-  var zs_pic_layer = null
-  export default {
-    name: 'OverviewSimple',
-    components: { DeptSelect, SelectTree },
-    data() {
-      return {
-        type: 'massMarkers', // 加载数据方式：massMarkers或cluster
-        refreshType: 'websocket', // 刷新数据方式：clock或websocket
-        value: true,
-        value1: true,
-        showAlarm: true, // 是否显示报警
-        showAll: false, // 是否显示全部井
-        alpha: 40, // 是否显示全部井
-        listQuery: {
-          keywords: '', // 关键字
-          wellType: '', // 井类型
-          // deptid: '', // 组织机构
-          // isAlarm: '1' // 是否报警
-        }, // 筛选条件
-        columns: [
-          {
-            text: '水表检查井编号',
-            value: 'wellCode',
-            width: 120,
-            align: 'center'
-          },
-          {
-            text: '设备编号',
-            value: 'devcode',
-            width: 130,
-            align: 'center'
-          },
-          {
-            text: '告警原因',
-            value: 'alarmContent',
-            align: 'center',
-            width: 200
-          },
-          {
-            text: '时间',
-            value: 'alarmTime',
-            width: 170,
-            align: 'center'
-          }
-        ], // 告警列表显示列
-        tableShow: true, // 是否显示告警列表
-        tableIcon: 'el-icon-arrow-up',
-        showWellType: this.showWellType(), // 是 否显示井类型下拉
-        wellTypeList: [], // 井类型列表
-        showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
-        center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
-        zoom: 12, // 地图缩放比例
-        alarmList: [], // 报警列表
-        alarmInfo: {
-          wellCode: '',
-          deptName: '',
-          position: '',
-          deep: '',
-          alarms: []
-        }, // 显示报警详情气泡内容
-        timer :null,
-        currentWindow: {
-          visible: false, // 窗体显示与否
-          position: [this.$store.getters.lng, this.$store.getters.lat],
-          windowType: 'info' // 窗体类型：详情info或报警alarm
-        }, // 当前窗体属性
-        deptShowTop: false, // 是否显示顶级
-        clock: null, // 计时器
-        hasAlarm: false, // 是否有报警,
-        loading: true, // 加载图标是否显示
-        trackPopUp:false,
-        removeHandler:null,
-        showClearBtn: false // 是否显示清除查询按钮
-      }
-    },
-    computed: {
-      ...mapGetters([
-        'needRefresh'
-      ])
-    },
-    mounted() {
-      this.initmars3d()
-    },
-    watch: {
-      value(val){
-        if(val){
-          window.map.basemap = 2011
-          building.show = false
-          flow.show = false
-          street.show = true
-        }else{
-          window.map.basemap = 2021
-          if(window.map.scene._mode === Cesium.SceneMode.SCENE3D){
-            building.show = true
-          }else{
-            building.show = false
-          }
-          if(!this.value1){
-            flow.show = false
-          }else{
-            flow.show = true
-          }
-          street.show = false
+var underground = null // 地球底层
+var building = null // 楼房建筑图层
+var flow = null // 流向图层
+var street = null // 街道图层
+var well_model_layer = null // 井模型层
+var watch_model_layer = null // 水表模型层
+var watch_icon_layer = null // 水表图标层
+var zs_model_layer = null // 噪声模型层
+var zs_icon_layer = null // 噪声图标层
+export default {
+  name: 'OverviewSimple',
+  components: {},
+  data() {
+    return {
+      type: 'massMarkers', // 加载数据方式：massMarkers或cluster
+      refreshType: 'websocket', // 刷新数据方式：clock或websocket
+      sceneMode: true,
+      isShowFlow: true,
+      showAlarm: true, // 是否显示报警
+      alpha: 40, // 是否显示全部井
+      listQuery: {
+        keywords: '', // 关键字
+        wellType: '' // 井类型
+      }, // 筛选条件
+      columns: [
+        {
+          text: '水表检查井编号',
+          value: 'wellCode',
+          width: 120,
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          width: 130,
+          align: 'center'
+        },
+        {
+          text: '告警原因',
+          value: 'alarmContent',
+          align: 'center',
+          width: 200
+        },
+        {
+          text: '时间',
+          value: 'alarmTime',
+          width: 170,
+          align: 'center'
         }
-      },
-      value1(val){
-        if(!val){
+      ], // 告警列表显示列
+      tableShow: true, // 是否显示告警列表
+      tableIcon: 'el-icon-arrow-up',
+      showWellType: this.showWellType(), // 是 否显示井类型下拉
+      wellTypeList: [], // 井类型列表
+      showDeptTree: 0, // 是否显示权属单位下拉,0不显示，1显示树，2显示平面
+      alarmList: [], // 报警列表
+      timer: null,
+      deptShowTop: false, // 是否显示顶级
+      clock: null, // 计时器
+      hasAlarm: false, // 是否有报警,
+      loading: true, // 加载图标是否显示
+      removeHandler: null,
+      showClearBtn: false // 是否显示清除查询按钮
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'needRefresh'
+    ])
+  },
+  watch: {
+    sceneMode(val) {
+      if (val) {
+        // 深蓝
+        window.map.basemap = 2011
+        building.show = false
+        flow.show = false
+        street.show = true
+      } else {
+        // 实景
+        window.map.basemap = 2021
+        if (window.map.scene._mode === Cesium.SceneMode.SCENE3D) {
+          building.show = true
+        } else {
+          building.show = false
+        }
+        if (!this.isShowFlow) {
           flow.show = false
-        }else{
+        } else {
           flow.show = true
         }
-      },
-      alpha(val){
-        window.map.basemap.opacity = val/100
-        underground.alpha = val/100
-        if(building !== null){
-          building.setStyle({
-            opacity: val/100
-          })
-        }
-      },
-      showAll(val) {
-        tile_layer.show = val
-      },
-      showAlarm(val){
-        if(!val && this.currentWindow.windowType=='alarm'){
-          this.currentWindow.visible = false
-        }
-        this.initpoints()
+        street.show = false
       }
     },
-    // created() {
-    //   this.fetchWellType()
-    // },
-    // computed: {
-    //   handler() {
-    //     return new Cesium.ScreenSpaceEventHandler(window.map.scene.canvas)
-    //   }
-    // },
-    methods: {
-      async initpoints() {
-        // 井
-        let params = ''
-        getMapping(params, this.listQuery.keywords).then(response => {
-          if (response.code === 200) {
-            if(well_model_layer!==null) window.map.removeLayer(well_model_layer)
-            well_model_layer = new mars3d.layer.GraphicLayer()
-            window.map.addLayer(well_model_layer)
-            if (response.data.length > 0) {
-              let maxLng = parseFloat(response.data[0].longitude)
-              let minLng = parseFloat(response.data[0].longitude)
-              let maxLat = parseFloat(response.data[0].latitude)
-              let minLat = parseFloat(response.data[0].latitude)
-              for (let i = 0; i < response.data.length; i++) {
-                if(parseFloat(response.data[i].latitude)>100) continue
-                let lng = parseFloat(response.data[i].longitude)
-                let lat = parseFloat(response.data[i].latitude)
-
-                if (lng > maxLng) maxLng = lng
-                if (lng < minLng) minLng = lng
-                if (lat > maxLat) maxLat = lat
-                if (lat< minLat) minLat = lat
-
-                well_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
-                  position: [lng, lat, 0],
-                  style: {
-                    url: '../static/model/ys.gltf',
-                    scale: 2
-                  },
-                  popup: `给水井<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`,
-                }))
-              }
-              let satrt = Cesium.Cartographic.fromDegrees(parseFloat(maxLng), parseFloat(maxLat))
-              let end = Cesium.Cartographic.fromDegrees(parseFloat(minLng), parseFloat(minLat))
-              let geodesic = new Cesium.EllipsoidGeodesic();
-              geodesic.setEndPoints(satrt, end);
-              let distance = geodesic.surfaceDistance
-              let center = { lat: (parseFloat(maxLat) + parseFloat(minLat)) / 2, lng: (parseFloat(maxLng) + parseFloat(minLng)) / 2, alt: distance+1500, heading: 360, pitch: -90 }
-              window.map.setCameraView(center)
-            }
-          }
+    isShowFlow(val) {
+      if (!val) {
+        flow.show = false
+      } else {
+        flow.show = true
+      }
+    },
+    alpha(val) {
+      window.map.basemap.opacity = val / 100
+      underground.alpha = val / 100
+      if (building !== null) {
+        building.setStyle({
+          opacity: val / 100
         })
-        params = '13'
-        getMapping(params, this.listQuery.keywords).then(response => {
-          if (response.code === 200) {
-            if(watch_model_layer!==null) window.map.removeLayer(watch_model_layer)
-            watch_model_layer = new mars3d.layer.GraphicLayer()
-            window.map.addLayer(watch_model_layer)
-            if(watch_pic_layer!==null) window.map.removeLayer(watch_pic_layer)
-            watch_pic_layer = new mars3d.layer.GraphicLayer()
-            window.map.addLayer(watch_pic_layer)
-            for(let i=0;i<response.data.length;i++){
-              watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
-                position: [response.data[i].longitude,response.data[i].latitude, -0.5],
-                style: {
-                  url: '../static/model/sb.glb',
-                  scale: 2,
-                  heading: 90
-                },
-                popup: `远程水表<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
-              }))
-              watch_pic_layer.addGraphic( new mars3d.graphic.BillboardEntity({
-                id: response.data[i].devcode,
-                position: [response.data[i].longitude,response.data[i].latitude, 1],
-                style: {
-                  image: '../static/images/icon/sb.png',
-                  scale: 1,
-                  horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                  verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                  scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
-                },
-                popup: `远程水表<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
-              }))
-            }
-            this.refreshAlarm()
-          }
-        })
-        params = '8'
-        getMapping(params, this.listQuery.keywords).then(response => {
-          if (response.code === 200) {
-            if(zs_model_layer!==null) window.map.removeLayer(zs_model_layer)
-            zs_model_layer = new mars3d.layer.GraphicLayer()
-            window.map.addLayer(zs_model_layer)
-
-            if(zs_pic_layer!==null) window.map.removeLayer(zs_pic_layer)
-            zs_pic_layer = new mars3d.layer.GraphicLayer()
-            window.map.addLayer(zs_pic_layer)
-            for(let i=0;i<response.data.length;i++){
-              zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
-                position: [response.data[i].longitude,response.data[i].latitude, 0],
-                style: {
-                  url: '../static/model/zs.glb',
-                  scale: 1,
-                  heading: 90
-                },
-                popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`,
-              }))
-              zs_pic_layer.addGraphic( new mars3d.graphic.BillboardEntity({
-                id: response.data[i].devcode,
-                position: [response.data[i].longitude,response.data[i].latitude, 1],
-                style: {
-                  image: '../static/images/icon/zs.png',
-                  scale: 1,
-                  horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                  verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                  scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
-                },
-                popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
-              }))
-            }
-            this.refreshAlarm()
-          }
-        })
-      },
-      // 初始化放这里
-      // lat: 35.9, lng: 120.2384, alt: 10000, heading: 360, pitch: -45
-      async initmars3d() {
-        var mapOptions = {
-          scene: {
-            sceneMode: Cesium.SceneMode.SCENE2D,
-            // 默认视角参数
-            // center: { lat: 35.97, lng: 120.2384, alt: 2000, heading: 360, pitch: -45 },
-            // [120.24058441929344,35.99170047670947]
-            center: { lat: 35.991700, lng: 120.2405844, alt: 4000, heading: 360, pitch: -90 },
-            // 以下是Cesium.Globe对象相关参数
-            globe: {
-              depthTestAgainstTerrain: true, // 是否启用深度监测
-              baseColor: '#071a69', // 地球默认背景色
-              showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
-              enableLighting: false // 是否显示昼夜区域
-            },
-            // 以下是Cesium.ScreenSpaceCameraController对象相关参数
-            cameraController: {
-              zoomFactor: 3.0, // 鼠标滚轮放大的步长参数
-              minimumZoomDistance: 1, // 地球放大的最小值（以米为单位）
-              maximumZoomDistance: 50000000, // 地球缩小的最大值（以米为单位）
-              enableRotate: true, // 2D和3D视图下，是否允许用户旋转相机
-              enableTranslate: true, // 2D和哥伦布视图下，是否允许用户平移地图
-              enableTilt: true, // 3D和哥伦布视图下，是否允许用户倾斜相机
-              enableZoom: true, // 是否允许 用户放大和缩小视图
-              enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
-            }
+      }
+    }
+  },
+  mounted() {
+    this.initMars3D()
+  },
+  methods: {
+    // 初始化地球
+    async initMars3D() {
+      var mapOptions = {
+        scene: {
+          sceneMode: Cesium.SceneMode.SCENE2D,
+          // 默认视角参数
+          center: { lat: 35.991700, lng: 120.2405844, alt: 4000, heading: 360, pitch: -90 },
+          // 以下是Cesium.Globe对象相关参数
+          globe: {
+            depthTestAgainstTerrain: true, // 是否启用深度监测
+            baseColor: '#071a69', // 地球默认背景色
+            showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
+            enableLighting: false // 是否显示昼夜区域
           },
-          control:{
-            infoBox: false,
-            sceneModePicker: true
+          // 以下是Cesium.ScreenSpaceCameraController对象相关参数
+          cameraController: {
+            zoomFactor: 3.0, // 鼠标滚轮放大的步长参数
+            minimumZoomDistance: 1, // 地球放大的最小值（以米为单位）
+            maximumZoomDistance: 50000000, // 地球缩小的最大值（以米为单位）
+            enableRotate: true, // 2D和3D视图下，是否允许用户旋转相机
+            enableTranslate: true, // 2D和哥伦布视图下，是否允许用户平移地图
+            enableTilt: true, // 3D和哥伦布视图下，是否允许用户倾斜相机
+            enableZoom: true, // 是否允许 用户放大和缩小视图
+            enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
+          }
+        },
+        control: {
+          infoBox: false,
+          sceneModePicker: true
+        },
+        basemaps: [
+          {
+            pid: 10,
+            id: 2011,
+            name: '天地图',
+            type: 'group',
+            layers: [
+              { name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
+              { name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
+            ]
           },
-          basemaps: [
-            {
-              pid: 10,
-              id: 2011,
-              name: "天地图",
-              type: "group",
-              layers: [
-                { name: "注记", type: "tdt", layer: "ter_z", key: ["216ee92889e17ab1b083fae665d522b8"] },
-                { name: "注记", type: "tdt", layer: "img_z", key: ["216ee92889e17ab1b083fae665d522b8"] },
-              ]
-            },
-            // {
-            //   pid: 10,
-            //   id: 2011,
-            //   name: "天地图",
-            //   type: "group",
-            //   layers: [
-            //     {
-            //       name: '行政区划界线',
-            //       type: 'xyz',
-            //       url: 'https://t{s}.tianditu.gov.cn/DataServer?T=ibo_w&x={x}&y={y}&l={z}&tk=216ee92889e17ab1b083fae665d522b8',
-            //       subdomains: '01234567',
-            //       maximumLevel: 10,
-            //       show: true,
-            //       id: 1,
-            //       templateValues: {
-            //         dataServer: 'http://data.marsgis.cn'
-            //       },
-            //       zIndex: 0
-            //     },
-            //     {
-            //       name: '天地图注记',
-            //       type: 'tdt',
-            //       layer: 'img_z',
-            //       key: ['216ee92889e17ab1b083fae665d522b8'],
-            //       show: true,
-            //       id: 2,
-            //       // templateValues: {dataServer: 'http://data.marsgis.cn'},
-            //       zIndex: 1
-            //     }
-            //   ]
-            // },
-            {
-              "id": 2021,
-              "pid": 10,
-              "name": "天地图影像",
-              "icon": "http://mars3d.cn/example/img/basemaps/tdt_img.png",
-              "type": "tdt",
-              "layer": "img_d",
-              "key": ["216ee92889e17ab1b083fae665d522b8"],
-              "show": true
-            },
-            // {
-            //   "id": 2020,
-            //   "pid": 10,
-            //   "name": "天地图电子",
-            //   "icon": "http://mars3d.cn/example/img/basemaps/tdt_vec.png",
-            //   "type": "group",
-            //   "layers": [
-            //     { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["216ee92889e17ab1b083fae665d522b8"] },
-            //     { "name": "注记", "type": "tdt", "layer": "vec_z", "key": ["216ee92889e17ab1b083fae665d522b8"] }
-            //   ]
-            // },
-            // {
-            //   crs: 'gcj',
-            //   enablePickFeatures: false,
-            //   icon: 'http://mars3d.cn/example/img/basemaps/bd-c-midnight.png',
-            //   id: 2017,
-            //   name: '蓝色底图(GCJ02偏移)',
-            //   type: 'arcgis',
-            //   url: 'http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer'
-            // }
-          ],
-        }
-        // 创建三维地球场景
-        let map = new mars3d.Map('mars3dContainer', mapOptions)
-        map.basemap = 2011
-        map.scene.screenSpaceCameraController.enableCollisionDetection = false
-        // 设置鼠标
-        map.scene.screenSpaceCameraController.tiltEventTypes = [ Cesium.CameraEventType.RIGHT_DRAG ]
-        // 缩放设置 重新设置缩放成员
-        map.scene.screenSpaceCameraController.zoomEventTypes = [Cesium.CameraEventType.MIDDLE_DRAG, Cesium.CameraEventType.WHEEL, Cesium.CameraEventType.PINCH]
-        // 鼠标左键平移
-        map.scene.screenSpaceCameraController.rotateEventTypes = [Cesium.CameraEventType.LEFT_DRAG]
-        let bloomEffect = new mars3d.effect.BloomEffect({
-          enabled: true
-        })
-        map.addEffect(bloomEffect)
-        window.map = map
-        underground = new mars3d.thing.Underground({
-          alpha: this.alpha/100,
-        })
-        map.addThing(underground)
-        window.map.basemap.opacity = this.alpha/100
-        // let that = this
-        // this.handler.setInputAction(function(movement) {
-        //   if(window.map.level<19){
-        //      ysline.show = true
-        //      wsline.show = true
-        //   }else{
-        //     if(that.alpha<90){
-        //        ysline.show = false
-        //        wsline.show = false
-        //     }
-        //   }
-        // }, Cesium.ScreenSpaceEventType.WHEEL)
-
-        // lat: 35.9, lng: 120.2384,
-        let graphicLayer = new mars3d.layer.GraphicLayer()
-        map.addLayer(graphicLayer)
-
-        building  = new mars3d.graphic.ModelPrimitive({
-          position: [120.242284, 35.983704, 0],
-          style: {
-            url: '../static/model/m1/m1.gltf',
-            scale: 1,
-            heading: 18.8,
-            opacity: this.alpha/100
+          {
+            id: 2021,
+            pid: 10,
+            name: '天地图影像',
+            icon: 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
+            type: 'tdt',
+            layer: 'img_d',
+            key: ['216ee92889e17ab1b083fae665d522b8'],
+            show: true
           }
-        })
-        graphicLayer.addGraphic(building)
-        building.show = false
-        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);
+        ]
+      }
+      // 创建三维地球场景
+      const map = new mars3d.Map('mars3dContainer', mapOptions)
+      map.basemap = 2011
+      map.scene.screenSpaceCameraController.enableCollisionDetection = false
+      // 设置鼠标
+      map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
+      // 缩放设置 重新设置缩放成员
+      map.scene.screenSpaceCameraController.zoomEventTypes = [Cesium.CameraEventType.MIDDLE_DRAG, Cesium.CameraEventType.WHEEL, Cesium.CameraEventType.PINCH]
+      // 鼠标左键平移
+      map.scene.screenSpaceCameraController.rotateEventTypes = [Cesium.CameraEventType.LEFT_DRAG]
+      const bloomEffect = new mars3d.effect.BloomEffect({
+        enabled: true
+      })
+      map.addEffect(bloomEffect)
+      window.map = map
 
-          var cartographic=Cesium.Cartographic.fromCartesian(cartesian);
+      // 地球底层
+      underground = new mars3d.thing.Underground({
+        alpha: this.alpha / 100
+      })
+      map.addThing(underground)
+      map.basemap.opacity = this.alpha / 100
 
-          var lng=Cesium.Math.toDegrees(cartographic.longitude);//经度值
+      const graphicLayer = new mars3d.layer.GraphicLayer()
+      map.addLayer(graphicLayer)
 
-          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)
-
-
-        map.on(mars3d.EventType.morphComplete, function (event) {
-          if(window.map.scene._mode !== Cesium.SceneMode.SCENE3D){
-            building.show = false
-          }else{
-            building.show = !this.value
-          }
-        })
-
-        axios.get('./static/position.json').then((result) => {
-          const positions = result.data.positions
-          flow = new mars3d.layer.GraphicLayer()
-          map.addLayer(flow)
-          street = new mars3d.layer.GraphicLayer()
-          map.addLayer(street)
-          for(let j=0;j<positions.length;j++){
-            flow.addGraphic(this.addFlow(positions[j].items,positions[j].repeat))
-            street.addGraphic(this.addStreet(positions[j].items))
-          }
-          flow.show = false
-        }).catch((error) => {
-          console.log('get position error...' + error)
-        })
-        // tile_layer = new mars3d.layer.ArcGisLayer({
-        //   url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer',
-        //   layers: '0,3',
-        //   show:false,
-        //   // maximumTerrainLevel: 19,
-        //   enablePickFeatures: false,
-        // })
-        // map.addLayer(tile_layer)
-        // let wfsLayer = new mars3d.layer.ArcGisWfsLayer({
-        //   name: '雨水管线',
-        //   url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer/4',
-        //   minimumLevel: 19,
-        //   symbol: {
-        //     type: 'polylineVolumeP',
-        //     styleOptions: {
-        //       color: '#375cad',
-        //       shape: 'pipeline',
-        //       radius: 0.1
-        //     },
-        //     callback: function (attr, styleOpt){
-        //       var val= {attr}.attr
-        //       return {setHeight: [-val.起始埋深,-val.终止埋深]}
-        //     }
-        //   },
-        //   popup: '名称：雨水管线<br />编号：{编号}<br />材质：{材质}<br />管径：{管径}<br />所属道路：{所属道路}',
-        // })
-        // map.addLayer(wfsLayer)
-        // let wfsLayer = new mars3d.layer.ArcGisWfsLayer({
-        //   name: '管线',//'污水管线',
-        //   url: 'http://223.82.47.232:11408/arcgis/rest/services/qd/MapServer/0',
-        //   minimumLevel: 19,
-        //   symbol: {
-        //     type: 'polylineVolumeP',
-        //     styleOptions: {
-        //       color: '#eb6b0c00',
-        //       shape: 'pipeline',
-        //       radius: 0.1
-        //     },
-        //     callback: function (attr, styleOpt){
-        //       var val= {attr}.attr
-        //       return {setHeight: [-val.起始埋深,-val.终止埋深]}
-        //     }
-        //   },
-        //   popup: '名称：给水管线<br />编号：{编号}<br />材质：{材质}<br />管径：{管径}<br />所属道路：{所属道路}',
-        // })
-        // map.addLayer(wfsLayer)
-        // ysline = new mars3d.layer.ArcGisWfsLayer({
-        //   name: '雨水线',
-        //   url: 'http://223.82.47.232:11408/arcgis/rest/services/crgx/MapServer/4',
-        //   // maximumLevel: 19,
-        //   enablePickFeatures: false,
-        //   symbol: {
-        //     type: 'polylineP',
-        //     styleOptions: {
-        //       color: '#375cad',
-        //       // radius: 0.1
-        //     },
-        //   },
-        // })
-        // map.addLayer(ysline)
-        // wsline = new mars3d.layer.ArcGisWfsLayer({
-        //   name: '管线',
-        //   url: 'http://223.82.47.232:11408/arcgis/rest/services/qd/MapServer/0',
-        //   // maximumLevel: 19,
-        //   enablePickFeatures: false,
-        //   symbol: {
-        //     type: 'polylineP',
-        //     styleOptions: {
-        //       color: '#eb6b0c',
-        //       // radius: 0.1
-        //     },
-        //   },
-        // })
-        // map.addLayer(wsline)
-        this.initpoints()
-      },
-      // 获取井类型，显示井类型下拉
-      // fetchWellType() {
-      //   getWellType().then(response => {
-      //     this.wellTypeList = []
-      //     // 如果该用户支持的井类型只有一个，则不显示该筛选框
-      //     // const wellTypes = this.$store.getters.wellTypes
-      //     for (const wellType of response.data) {
-      //       // if (wellTypes.indexOf(wellType.value) !== -1) {
-      //         this.wellTypeList.push(wellType)
-      //       // }
-      //     }
-      //     if (this.wellTypeList.length <= 1) {
-      //       this.showWellType = false
-      //     }
-      //   })
-      // },
-      addFlow(positions,repeat){
-        var style = {
-          width: 10,
-          material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
-            color: "#217bd9",
-            repeat: new Cesium.Cartesian2(repeat, 1),
-            image: '../static/images/line.png',
-            speed: 15
-          })
+      // 建筑模型
+      building = new mars3d.graphic.ModelPrimitive({
+        position: [120.242284, 35.983704, 0],
+        style: {
+          url: '../static/model/m1/m1.gltf',
+          scale: 1,
+          heading: 18.8,
+          opacity: this.alpha / 100
         }
-        var graphic = new mars3d.graphic.PolylineEntity({
-          positions: positions,
-          style: style
-        })
-        return graphic
-      },
-      addStreet(positions){
-        var graphic = new mars3d.graphic.PolylineEntity({
-          positions: positions,
-          style: {
-            width: 8,
-            color:  Cesium.Color.AQUA,
-            clampToGround: true
-          }
-        })
-        return graphic
-      },
-      randomPoint() {
-        //120.242, 35.98342
-        const jd = this.random(120.242 * 1000, 117.30 * 1000) / 1000
-        const wd = this.random(35.94342 * 1000, 35.98342 * 1000) / 1000
-        return new mars3d.LatLngPoint( wd, jd, 100)
-      },
-      random(min, max) {
-        return Math.floor(Math.random() * (max - min + 1) + min)
-      },
-      flytoinit(){
-        if(window.map._viewer.scene._mode === Cesium.SceneMode.SCENE3D){
-          var center = {  lat: 35.97, lng: 120.2384, alt: 2000, heading: 360, pitch: -45 }
-        }else{
-          var center = { lat: 35.991700, lng: 120.2405844, alt: 4000, heading: 360, pitch: -90 }
+      })
+      graphicLayer.addGraphic(building)
+      building.show = false
+
+      this.initDrawLines()
+      this.initPoints()
+
+      // 屏幕取点
+      const 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)// 纬度值
+        console.log('[' + lng + ',' + lat + '],')
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+
+      // 切换二三维响应函数
+      map.on(mars3d.EventType.morphComplete, function(event) {
+        if (window.map.scene._mode !== Cesium.SceneMode.SCENE3D) {
+          building.show = false
+        } else {
+          building.show = !this.sceneMode
         }
-        window.map.setCameraView(center)
-      },
-      // 获取全部井列表
-      getWellList() {
-        if(this.listQuery.keywords=== ''){
-          this.initpoints()
-          return
+      })
+    },
+    // 初始化街道、流向线
+    async initDrawLines() {
+      axios.get('./static/position.json').then((result) => {
+        const positions = result.data.positions
+        flow = new mars3d.layer.GraphicLayer()
+        window.map.addLayer(flow)
+        street = new mars3d.layer.GraphicLayer()
+        window.map.addLayer(street)
+        for (let j = 0; j < positions.length; j++) {
+          flow.addGraphic(this.addFlow(positions[j].items, positions[j].repeat))
+          street.addGraphic(this.addStreet(positions[j].items))
         }
-        getWellList(this.listQuery).then(response => {
-          if (response.code === 200) { // todo
-            let str = "1 <> 1"
-            for (const res of response.data) {
-              str += (" or 编号 = '" + res.wellCode + "'")
+        flow.show = false
+      }).catch((error) => {
+        console.log('get position error...' + error)
+      })
+    },
+    // 初始化井，设备
+    async initPoints() {
+      // 井
+      let params = ''
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (well_model_layer !== null) window.map.removeLayer(well_model_layer)
+          well_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(well_model_layer)
+          if (response.data.length > 0) {
+            let maxLng = parseFloat(response.data[0].longitude)
+            let minLng = parseFloat(response.data[0].longitude)
+            let maxLat = parseFloat(response.data[0].latitude)
+            let minLat = parseFloat(response.data[0].latitude)
+            for (let i = 0; i < response.data.length; i++) {
+              if (parseFloat(response.data[i].latitude) > 100) continue
+              const lng = parseFloat(response.data[i].longitude)
+              const lat = parseFloat(response.data[i].latitude)
+
+              if (lng > maxLng) maxLng = lng
+              if (lng < minLng) minLng = lng
+              if (lat > maxLat) maxLat = lat
+              if (lat < minLat) minLat = lat
+
+              well_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+                position: [lng, lat, 0],
+                style: {
+                  url: '../static/model/ys.gltf',
+                  scale: 2
+                },
+                popup: `给水井<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              }))
             }
-            this.initpoints(str)
+            const start = Cesium.Cartographic.fromDegrees(parseFloat(maxLng), parseFloat(maxLat))
+            const end = Cesium.Cartographic.fromDegrees(parseFloat(minLng), parseFloat(minLat))
+            const geodesic = new Cesium.EllipsoidGeodesic()
+            geodesic.setEndPoints(start, end)
+            const distance = geodesic.surfaceDistance
+            const center = { lat: (parseFloat(maxLat) + parseFloat(minLat)) / 2, lng: (parseFloat(maxLng) + parseFloat(minLng)) / 2, alt: distance + 1500, heading: 360, pitch: -90 }
+            window.map.setCameraView(center)
           }
-        })
-      },
-      // 点击井详情气泡
-      openInfoWindow(wellId) {
-        this.currentWindow.visible = false
-        getWellInfo(wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            this.wellInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              wellTypeName: wellInfo.wellTypeName,
-              deptName: wellInfo.deptName,
-              bfztName: wellInfo.bfztName,
-              deep: wellInfo.deep
-            }
-            this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode]
-            this.currentWindow.visible = true
-            this.currentWindow.windowType = 'info'
-            this.trackPopUp = true
+        }
+      })
+      params = '13'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (watch_model_layer !== null) window.map.removeLayer(watch_model_layer)
+          watch_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(watch_model_layer)
+          if (watch_icon_layer !== null) window.map.removeLayer(watch_icon_layer)
+          watch_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(watch_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            watch_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, -0.5],
+              style: {
+                url: '../static/model/sb.glb',
+                scale: 2,
+                heading: 90
+              },
+              popup: `远程水表<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            watch_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/sb.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `远程水表<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
           }
+          this.refreshAlarm()
+        }
+      })
+      params = '8'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (zs_model_layer !== null) window.map.removeLayer(zs_model_layer)
+          zs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(zs_model_layer)
+
+          if (zs_icon_layer !== null) window.map.removeLayer(zs_icon_layer)
+          zs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(zs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            zs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/zs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/zs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 流向线
+    addFlow(positions, repeat) {
+      var style = {
+        width: 10,
+        material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
+          color: '#217bd9',
+          repeat: new Cesium.Cartesian2(repeat, 1),
+          image: '../static/images/line.png',
+          speed: 15
         })
-      },
-      // 刷新报警列表
-      async refreshAlarm() {
-        this.count = 60
-        this.loading = true
-        getAlarmsNow().then(response => {
-          if (response.code === 200) {
-            this.loading = false
-            // 获取当前报警列表
-            this.alarmList = response.data
-            if (this.alarmList.length > 0) {
-              this.hasAlarm = true
-            }
-            for (const alarm of response.data) {
-              for(const watch of watch_pic_layer.graphics){
-                if(alarm.devcode === watch.options.id){
-                  if(!watch.popup.startsWith('报警')){
-                    watch.setStyle({
-                      image: '../static/images/icon/asb.png',
-                      scale: 1,
-                      horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                      verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                      scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
-                    })
-                    watch.popup =  `报警远程水表<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
-                  }
-                  break
+      }
+      var graphic = new mars3d.graphic.PolylineEntity({
+        positions: positions,
+        style: style
+      })
+      return graphic
+    },
+    // 道路线
+    addStreet(positions) {
+      var graphic = new mars3d.graphic.PolylineEntity({
+        positions: positions,
+        style: {
+          width: 8,
+          color: Cesium.Color.AQUA,
+          clampToGround: true
+        }
+      })
+      return graphic
+    },
+    // 回到原点
+    flyToInit() {
+      let center
+      if (window.map._viewer.scene._mode === Cesium.SceneMode.SCENE3D) {
+        center = { lat: 35.97, lng: 120.2384, alt: 2000, heading: 360, pitch: -45 }
+      } else {
+        center = { lat: 35.991700, lng: 120.2405844, alt: 4000, heading: 360, pitch: -90 }
+      }
+      window.map.setCameraView(center)
+    },
+    // 刷新报警列表
+    async refreshAlarm() {
+      this.count = 60
+      this.loading = true
+      getAlarmsNow().then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          // 获取当前报警列表
+          this.alarmList = response.data
+          if (this.alarmList.length > 0) {
+            this.hasAlarm = true
+          }
+          for (const alarm of response.data) {
+            for (const watch of watch_icon_layer.graphics) {
+              if (alarm.devcode === watch.options.id) {
+                if (!watch.popup.startsWith('报警')) {
+                  watch.setStyle({
+                    image: '../static/images/icon/asb.png',
+                    scale: 1,
+                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                    scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+                  })
+                  watch.popup = `报警远程水表<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
                 }
+                break
               }
-              for(const zs of zs_pic_layer.graphics){
-                if(alarm.devcode === zs.options.id){
-                  if(!zs.popup.startsWith('报警')){
-                    zs.setStyle({
-                      image: '../static/images/icon/azs.png',
-                      scale: 1,
-                      horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                      verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                      scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3),
-                    })
-                    zs.popup =  `报警噪声记录仪仪<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
-                  }
-                  break
+            }
+            for (const zs of zs_icon_layer.graphics) {
+              if (alarm.devcode === zs.options.id) {
+                if (!zs.popup.startsWith('报警')) {
+                  zs.setStyle({
+                    image: '../static/images/icon/azs.png',
+                    scale: 1,
+                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                    scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+                  })
+                  zs.popup = `报警噪声记录仪仪<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
                 }
+                break
               }
             }
           }
-        })
-      },
-      // 点击报警详情
-      openAlarmWindow(wellId, position) {
-        // 旧弹窗不显示
-        this.currentWindow.visible = false
-        // this.filterIcon()
-        getWellAlarms(wellId).then(response => {
-          if (response.code === 200) {
-            const wellInfo = response.data
-            this.alarmInfo = {
-              wellCode: wellInfo.wellCode,
-              position: wellInfo.position,
-              deptName: wellInfo.deptName,
-              wellTypeName: wellInfo.wellTypeName,
-              alarms: wellInfo.alarmList,
-              deep: wellInfo.deep
-            }
-            this.currentWindow.position = position
-            this.center = position
-            this.currentWindow.visible = true
-            this.currentWindow.windowType = 'alarm'
-            this.trackPopUp = true
-          }
-        })
-      },
-      // 点击报警列表
-      alarmRowClick(row, column, event) {
-        if(this.alpha<10){
-          this.alpha = 15
         }
-        // this.flytoinit()
-        for(const watch of watch_pic_layer.graphics){
-          if(row.devcode === watch.options.id){
-            var center = {lat: watch._point._lat, lng: watch._point._lng, alt: 50, heading: 360, pitch: -90}
-            window.map.setCameraView(center)
-            break
-          }
+      })
+    },
+    // 点击报警列表
+    alarmRowClick(row, column, event) {
+      if (this.alpha < 10) {
+        this.alpha = 15
+      }
+      let center
+      for (const watch of watch_icon_layer.graphics) {
+        if (row.devcode === watch.options.id) {
+          center = { lat: watch._point._lat, lng: watch._point._lng, alt: 50, heading: 360, pitch: -90 }
+          window.map.setCameraView(center)
+          break
         }
-        for(const zs of zs_pic_layer.graphics){
-          if(row.devcode === zs.options.id){
-            var center = {lat: zs._point._lat, lng: zs._point._lng, alt: 50, heading: 360, pitch: -90}
-            window.map.setCameraView(center)
-            break
-          }
+      }
+      for (const zs of zs_icon_layer.graphics) {
+        if (row.devcode === zs.options.id) {
+          center = { lat: zs._point._lat, lng: zs._point._lng, alt: 50, heading: 360, pitch: -90 }
+          window.map.setCameraView(center)
+          break
         }
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -879,7 +591,7 @@
   /deep/.mars3d-popup-close-button{
     top: 10px;
   }
-  @CHARSET "UTF-8";
+
   // 查询框
   .map-search-div{
     position: absolute;
@@ -946,16 +658,12 @@
     }
 
     .el-table th{
-      /*background-color: rgba(255, 229, 230, 0.8);*/
       padding: 7px 0px;
     }
     .el-table td{
-      /*background-color: rgba(255, 234, 241, 0.8);*/
       padding: 5px 0px;
-      /*line-height: 1;*/
     }
     .el-table td:hover{
-      /*background-color: rgba(255, 234, 241, 0.8);*/
     }
     .transition-box {
       margin-bottom: 10px;
@@ -994,10 +702,8 @@
   .el-divider--horizontal{
     margin: 5px 0;
   }
-  /*按钮样式*/
-  .add-button{
-  }
 </style>
+
 <style rel="stylesheet/scss" lang="scss">
   .map-alarm-div {
     .el-scrollbar__wrap {
@@ -1011,7 +717,6 @@
     position: absolute;
     bottom: 3px;
     left: 0px;
-    /*background-color: red;*/
     background-color: #122252;
     width: 130px;
     height: 32px;