diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index 6799041..ab7a8d2 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,7 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      debugger
+      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]

diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index 6799041..ab7a8d2 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,7 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      debugger
+      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index ea80a31..0f332ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,7 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    debugger
+    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,

diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index 6799041..ab7a8d2 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,7 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      debugger
+      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index ea80a31..0f332ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,7 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    debugger
+    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 0f6d5a6..17ed4e1 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -31,7 +31,7 @@
     children: [
       {
         path: '/overview3d',
-        component: () => import('@/views/overview/overview3dzq'),
+        component: () => import('@/views/overview/overview3d'),
         name: 'overview3d',
         meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] }
       }

diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index 6799041..ab7a8d2 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,7 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      debugger
+      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index ea80a31..0f332ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,7 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    debugger
+    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 0f6d5a6..17ed4e1 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -31,7 +31,7 @@
     children: [
       {
         path: '/overview3d',
-        component: () => import('@/views/overview/overview3dzq'),
+        component: () => import('@/views/overview/overview3d'),
         name: 'overview3d',
         meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] }
       }
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index 67f9ba9..70b0691 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -308,10 +308,10 @@
       window.map = map
       underground = new mars3d.thing.Underground({ alpha: this.alpha / 100 })
       map.addThing(underground)
-      this.bloomEffect = new mars3d.effect.BloomEffect({
-        enabled: true
-      })
-      map.addEffect(this.bloomEffect)
+      // this.bloomEffect = new mars3d.effect.BloomEffect({
+      //   enabled: true
+      // })
+      // map.addEffect(this.bloomEffect)
       window.map.basemap.opacity = this.alpha / 100
       // 崩溃后刷新
       // map.on(mars3d.EventType.renderError, function(event) {

diff --git a/src/components/Amap/utils/convert-helper.js b/src/components/Amap/utils/convert-helper.js
index 6799041..ab7a8d2 100644
--- a/src/components/Amap/utils/convert-helper.js
+++ b/src/components/Amap/utils/convert-helper.js
@@ -76,7 +76,7 @@
     AMapLoader.load({
       key: store.getters.amapKey // 秘钥
     }).then((AMap) => {
-      debugger
+      // debugger
       AMap.convertFrom(coordinate, 'gps', (status, result) => {
         if (result.info === 'ok') {
           const lnglats = result.locations[0]
diff --git a/src/permission.js b/src/permission.js
index ea80a31..0f332ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,7 +33,7 @@
     const oldUser = getUser()
     const username = to.query.username
     const password = to.query.pwd
-    debugger
+    // debugger
     if (loginByUsername && username && password && !oldUser) { // 登陆后跳转
       const loginForm = {
         username: username,
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 0f6d5a6..17ed4e1 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -31,7 +31,7 @@
     children: [
       {
         path: '/overview3d',
-        component: () => import('@/views/overview/overview3dzq'),
+        component: () => import('@/views/overview/overview3d'),
         name: 'overview3d',
         meta: { title: '管网运行总览', icon: 'icon-config', permission: ['/overview/3d'] }
       }
diff --git a/src/views/overview/overview3d.vue b/src/views/overview/overview3d.vue
index 67f9ba9..70b0691 100644
--- a/src/views/overview/overview3d.vue
+++ b/src/views/overview/overview3d.vue
@@ -308,10 +308,10 @@
       window.map = map
       underground = new mars3d.thing.Underground({ alpha: this.alpha / 100 })
       map.addThing(underground)
-      this.bloomEffect = new mars3d.effect.BloomEffect({
-        enabled: true
-      })
-      map.addEffect(this.bloomEffect)
+      // this.bloomEffect = new mars3d.effect.BloomEffect({
+      //   enabled: true
+      // })
+      // map.addEffect(this.bloomEffect)
       window.map.basemap.opacity = this.alpha / 100
       // 崩溃后刷新
       // map.on(mars3d.EventType.renderError, function(event) {
diff --git a/src/views/overview/overview3dzq.vue b/src/views/overview/overview3dzq.vue
index 988c5a8..732b3b9 100644
--- a/src/views/overview/overview3dzq.vue
+++ b/src/views/overview/overview3dzq.vue
@@ -2,7 +2,14 @@
 <template>
   <div style="overflow: hidden;height: 100%">
     <div id="mars3dContainer" class="mars3d-container" />
-    <div class="cover" />
+    <div class="cover">
+      <div v-for="(item,index) in layerName" :key="item" class="cover-item">
+        <span v-if="index===1"><img :src="'/../../../static/images/'+layerName[index]+'.png'" style="width: 17px;height:17px"></span>
+        <span v-else-if="index===0" style="color: #FF7FE9;font-weight: 900">==</span>
+        <span v-else><img :src="'/../../../static/images/标识器.png'" style="width: 17px;height:17px"></span>
+        <span style="position: absolute;left: 50px">{{ item }}</span>
+      </div>
+    </div>
     <div v-if="loadToken" class="overview-map-container">
       <!--搜索框-->
       <map-search-comp :list="resultList" placeholder="点位编号/名称/位置" style="background: #00000000" @search="search" @change-page="searchPageChange" @click-item="searchItemClick" @clear="clearSearch" />
@@ -48,20 +55,23 @@
 let underground = null
 let layer2021 = null
 let layer2020 = null
-let rqline_layer = null
+const rqline_layer = null
 let rqpoint_layer = null
 let rqpoint3D_layer = null
-let queryLineserver = null
+const queryLineserver = null
 let queryPointserver = null
 export default {
-  name: 'Overview3dzq',
+  name: 'Overview3D',
   components: { MapSearchComp, PopupLocation, PopupDataFilter, ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect },
   data() {
     return {
+      layerName: ['燃气管线', '燃气附属物', '中燃燃气标识器', '圣井燃气标识器'],
       baseLayer: 'gaode_vec', // 底图图层
-      layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表
+      layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'line', name: '管线图层', children: [] }, { id: 'dev', name: '设备图层', children: [] }, { id: 'alarm', name: '报警图层' }], // 图层列表
       checkedLayer: [], // 选中的图层
       center: ['117.5', '36.42'], // 地图中心
+      showLine: true,
+      showModel: false,
       // center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
       zoom: 12, // 地图缩放比例
       type: this.baseConfig.showPointType, // 加载数据方式：massMarkers海量点或cluster聚合点
@@ -132,10 +142,10 @@
       })
       underground.alpha = val / 100
       if (val <= 90 && window.map.level >= 19) {
-        rqline_layer.show = false
+        // rqline_layer.show = false
         rqpoint_layer.show = false
       } else {
-        rqline_layer.show = true
+        // rqline_layer.show = true
         rqpoint_layer.show = true
       }
     },
@@ -167,6 +177,7 @@
   },
   beforeCreate: function() { // 从后台获取系统配置，根据配置判断是否加载验证码控件
     this.$store.dispatch('GetConfig').then(() => {
+      // debugger
       this.$message.success('连接服务器成功')
       this.handleLogin()
     }).catch((e) => {
@@ -178,8 +189,8 @@
     handleLogin() {
       const loginForm = {
         sid: this.$store.getters.sid,
-        username: 'admin',
-        password: RSAencrypt('1q2W3E4R')
+        username: 'sykb',
+        password: RSAencrypt('111111')
       }
       this.$store.dispatch('Login', loginForm).then(() => {
         // this.$message.success('登录成功')
@@ -209,103 +220,7 @@
       // window.viewer.zoomTo(layer)
       return layer
     },
-    // 初始化放这里
-    async initmars3d() {
-      const mapOptions = {
-        scene: {
-          // 默认视角参数
-          center: { lat: this.center[1], lng: this.center[0], alt: 30000, heading: 360, pitch: -45 },
-          showSun: true,
-          // mapProjection: new Cesium.MapProjection.
-          // showMoon: true,
-          // showSkyBox: true,
-          showSkyAtmosphere: false, // 关闭球周边的白色轮廓 map.scene.skyAtmosphere = false
-          fog: true,
-          fxaa: true,
-          // 以下是Cesium.Globe对象相关参数
-          globe: {
-            depthTestAgainstTerrain: true, // 是否启用深度监测
-            baseColor: '#1A2126', // 地球默认背景色
-            showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
-            enableLighting: false // 是否显示昼夜区域
-          },
-          control: {
-            infoBox: false
-          },
-          // 以下是Cesium.ScreenSpaceCameraController对象相关参数
-          cameraController: {
-            zoomFactor: 3.0, // 鼠标滚轮放大的步长参数
-            minimumZoomDistance: 1, // 地球放大的最小值（以米为单位）
-            maximumZoomDistance: 5000000, // 地球缩小的最大值（以米为单位）
-            enableRotate: true, // 2D和3D视图下，是否允许用户旋转相机
-            enableTranslate: true, // 2D和哥伦布视图下，是否允许用户平移地图
-            enableTilt: true, // 3D和哥伦布视图下，是否允许用户倾斜相机
-            enableZoom: true, // 是否允许 用户放大和缩小视图
-            enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
-          }
-        },
-        // terrain: {
-        //   url: 'http://data.mars3d.cn/terrain',
-        //   show: true
-        // },
-        basemaps: [
-          {
-            pid: 10,
-            id: 1111,
-            name: '天地图',
-            type: 'group',
-            layers: [
-              { name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
-              { name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
-            ]
-          }
-          // {
-          //   'id': 1112,
-          //   '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'] }
-          //   ]
-          // },
-          // {
-          //   'id': 1113,
-          //   'pid': 10,
-          //   'name': '天地图影像',
-          //   'icon': 'http://mars3d.cn/example/img/basemaps/tdt_img.png',
-          //   'type': 'tdt',
-          //   'layer': 'img_d',
-          //   'key': ['216ee92889e17ab1b083fae665d522b8'],
-          //   'show': true
-          // }
-        ]
-      }
-      Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
-      // 创建viewer实例
-      window.viewer = new Cesium.Viewer('mars3dContainer', {
-        geocoder: false, // 是否显示地名查找控件
-        infoBox: false,
-        animation: false, // 是否显示动画控件(左下方那个)
-        timeline: false, // 是否显示时间线控件
-        shadows: false, // 阴影是否被太阳投射
-        showldAnimate: true, // 让场景中的动画自动播放
-        sceneModePicker: false, // 是否显示投影方式控件
-        fullscreenButton: false, // 全屏按钮不显示
-        homeButton: false,
-        navigationHelpButton: false, // 帮助按钮
-        baseLayerPicker: false,
-        imageryProvider: new Cesium.TileMapServiceImageryProvider({
-          url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
-        })
-      })
-      // window.viewer.imageryLayers._layers[0].show = false
-      // window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
-      window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
-      // mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
-      const map = new mars3d.Map(window.viewer, mapOptions)
-
+    initBaseMap() {
       const url2021 = 'http://172.20.90.108:8081/geoesb/proxy/5a44607b2e814658b463b76f9675bd3e/9bf164775ad94a18a5324f0eb681deea'
       const url2020 = 'http://172.20.90.108:8081/geoesb/proxy/4fb75f7491c94356a9dd58a44d0dc57b/9bf164775ad94a18a5324f0eb681deea'
 
@@ -334,9 +249,83 @@
       layer2020.alpha = this.alpha / 100
 
       layer2021.show = false
-
       // layer2021 = this.SuperMap3DImageryProvider(url2021)
       // layer2020 = this.SuperMap3DImageryProvider(url2020)
+    },
+    // 初始化放这里
+    async initmars3d() {
+      const mapOptions = {
+        scene: {
+          // 默认视角参数
+          center: { lat: this.center[1], lng: this.center[0], alt: 30000, heading: 360, pitch: -45 },
+          showSun: true,
+          // mapProjection: new Cesium.MapProjection.
+          // showMoon: true,
+          // showSkyBox: true,
+          showSkyAtmosphere: false, // 关闭球周边的白色轮廓 map.scene.skyAtmosphere = false
+          fog: true,
+          fxaa: true,
+          // 以下是Cesium.Globe对象相关参数
+          globe: {
+            depthTestAgainstTerrain: true, // 是否启用深度监测
+            baseColor: '#1A2126', // 地球默认背景色
+            showGroundAtmosphere: false, // 是否在地球上绘制的地面大气
+            enableLighting: false // 是否显示昼夜区域
+          },
+          control: {
+            infoBox: false
+          },
+          // 以下是Cesium.ScreenSpaceCameraController对象相关参数
+          cameraController: {
+            zoomFactor: 3.0, // 鼠标滚轮放大的步长参数
+            minimumZoomDistance: 1, // 地球放大的最小值（以米为单位）
+            maximumZoomDistance: 5000, // 地球缩小的最大值（以米为单位）
+            enableRotate: true, // 2D和3D视图下，是否允许用户旋转相机
+            enableTranslate: true, // 2D和哥伦布视图下，是否允许用户平移地图
+            enableTilt: true, // 3D和哥伦布视图下，是否允许用户倾斜相机
+            enableZoom: true, // 是否允许 用户放大和缩小视图
+            enableCollisionDetection: true // 是否允许 地形相机的碰撞检测
+          }
+        },
+        basemaps: [
+          {
+            pid: 10,
+            id: 1111,
+            name: '天地图',
+            type: 'group',
+            layers: [
+              { name: '注记', type: 'tdt', layer: 'ter_z', key: ['216ee92889e17ab1b083fae665d522b8'] },
+              { name: '注记', type: 'tdt', layer: 'img_z', key: ['216ee92889e17ab1b083fae665d522b8'] }
+            ]
+          }
+        ]
+      }
+      Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0N2E2M2ZmYi1iMDhjLTQwN2QtODZmOC0zNDZjNTMxYjgyNWEiLCJpZCI6MzY5MDMsImlhdCI6MTYwNzMzMTE2Nn0.5xsFCB0dxpcNGUkJOEpsVhUW9bf66XZIwV3hkZl09UI'
+      // 创建viewer实例
+      window.viewer = new Cesium.Viewer('mars3dContainer', {
+        geocoder: false, // 是否显示地名查找控件
+        infoBox: false,
+        animation: false, // 是否显示动画控件(左下方那个)
+        timeline: false, // 是否显示时间线控件
+        shadows: false, // 阴影是否被太阳投射
+        showldAnimate: true, // 让场景中的动画自动播放
+        sceneModePicker: false, // 是否显示投影方式控件
+        fullscreenButton: false, // 全屏按钮不显示
+        homeButton: false,
+        navigationHelpButton: false, // 帮助按钮
+        baseLayerPicker: false,
+        imageryProvider: new Cesium.TileMapServiceImageryProvider({
+          url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
+        })
+      })
+      // window.viewer.imageryLayers._layers[0].show = false
+      // window.viewer.scene.globe.baseColor = Cesium.Color.WHITE;
+      window.viewer._cesiumWidget._creditContainer.style.display = 'none' //	去除版权信息
+      // mars3d.Map也可以直接传入外部已经构造好的viewer, 支持config.json所有参数
+      const map = new mars3d.Map(window.viewer, mapOptions)
+
+      // this.initBaseMap()
+
       // map.scene.screenSpaceCameraController.enableCollisionDetection = false
       // 设置鼠标
       map.scene.screenSpaceCameraController.tiltEventTypes = [Cesium.CameraEventType.RIGHT_DRAG]
@@ -361,65 +350,54 @@
         that.initLine()
         that.initPoint()
         that.mapReady()
+        window.map.on(mars3d.EventType.cameraChanged, that.cameraChange, that)
       })
     },
     initLine() {
-      queryLineserver = new mars3d.query.QueryArcServer({
-        // url: 'http://111.198.10.15:13002/arcgis/rest/services/gas/MapServer/1',
-        url: 'http://111.198.10.15:13002/arcgis/rest/services/rq/MapServer/1',
-        popup: 'all',
-        pageSize: 3000
-      })
-      rqline_layer = new mars3d.layer.GeoJsonLayer({
-        enablePickFeatures: false,
-        symbol: {
-          type: 'polylineC',
-          styleOptions: {
-            color: '#eb6b0c',
-            width: 3,
-            hasShadows: true,
-            shadows: Cesium.ShadowMode.ENABLED
-          }
-        }
-      })
-      window.map.addLayer(rqline_layer)
-      queryLineserver.query({
-        success: (result) => {
-          rqline_layer.load({ data: result.geojson })
-        },
-        error: (error, msg) => {
-          console.log('服务访问错误', error)
-        }
-      })
-      const wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+      // 三维管线
+      let wfsLayer = new mars3d.layer.ArcGisWfsLayer({
         enablePickFeatures: false,
         name: '燃气管线',
-        url: 'http://111.198.10.15:13002/arcgis/rest/services/rq/MapServer/1',
-        // url: 'http://111.198.10.15:13002/arcgis/rest/services/gas/MapServer/1',
+        url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRq0812/MapServer/1',
         minimumLevel: 19,
         symbol: {
           type: 'polylineVolumeP',
           styleOptions: {
-            color: '#eb6b0c',
+            color: '#FF7FE9',
             shape: 'pipeline',
             radius: 0.1
           },
           callback: function(attr, styleOpt) {
-            return { setHeight: -3 }
+            var val = { attr }.attr
+            return { setHeight: [-val.起始埋深, -val.终止埋深] }
           }
-          // callback: function(attr, styleOpt) {
-          //   var val = { attr }.attr
-          //   return { addHeight: [-3, -3] }
-          // }
-        }
+        },
+        popup: 'all'
       })
       window.map.addLayer(wfsLayer)
-      window.map.on(mars3d.EventType.cameraChanged, this.changeLine, this)
+
+      // 二维管线
+      wfsLayer = new mars3d.layer.ArcGisWfsLayer({
+        enablePickFeatures: false,
+        name: '燃气管线',
+        url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRq0812/MapServer/1',
+        maximumLevel: 19,
+        symbol: {
+          type: 'polylineC',
+          styleOptions: {
+            color: '#FF7FE9',
+            width: 3,
+            hasShadows: true,
+            shadows: Cesium.ShadowMode.ENABLED
+          }
+        },
+        popup: 'all'
+      })
+      window.map.addLayer(wfsLayer)
     },
     initPoint(condition = '') {
       queryPointserver = new mars3d.query.QueryArcServer({
-        url: 'http://111.198.10.15:13002/arcgis/rest/services/rq/MapServer/0',
-        // url: 'http://111.198.10.15:13002/arcgis/rest/services/gas/MapServer/0',
+        url: 'http://111.198.10.15:13002/arcgis/rest/services/zqRq0812/MapServer/0',
         popup: 'all',
         pageSize: 5000
       })
@@ -427,7 +405,7 @@
         symbol: {
           type: 'billboard',
           styleOptions: {
-            image: '../static/images/marker.png',
+            image: '../static/images/燃气附属物.png',
             scale: 0.6,
             pixelOffsetY: -10,
             scaleByDistance: true,
@@ -446,12 +424,12 @@
         symbol: {
           type: 'modelP',
           styleOptions: {
-            url: '../static/model/yubi.gltf',
+            url: '../static/model/ys.gltf',
             scale: 1.5
           },
           callback: function(attr, styleOpt) {
-            // var val = { attr }.attr
-            return { setHeight: -3 }
+            var val = { attr }.attr
+            return { setHeight: -val.井深 }
           }
         },
         popup: 'all'
@@ -460,7 +438,6 @@
       if (condition === '') {
         queryPointserver.query({
           success: (result) => {
-            debugger
             if (result.count === 0) {
               this.$message.warning('未查询到相关记录！')
               rqpoint_layer.load({ data: { features: null }})
@@ -495,14 +472,14 @@
       }
     },
     // 控制二维线的显隐
-    changeLine() {
+    cameraChange() {
       console.log('map-level:' + window.map.level)
       console.log('alpha:' + this.alpha)
       if (window.map.level <= 19) {
-        rqline_layer.show = true
+        // rqline_layer.show = true
         rqpoint_layer.show = true
       } else if (this.alpha < 90) {
-        rqline_layer.show = false
+        // rqline_layer.show = false
         rqpoint_layer.show = false
       }
     },
@@ -566,25 +543,53 @@
     // 获取点位类型，显示点位类型下拉
     fetchWellType() {
       getWellType().then(response => {
-        this.wellTypeList = []
-        // 如果该用户支持的点位类型只有一个，则不显示该筛选框
-        const supportWellTypes = this.$store.getters.wellTypes
-        this.wellTypeList = response.data.filter(wellType => {
-          return supportWellTypes.findIndex(item => item == wellType.value) > -1
-        })
+        // this.wellTypeList = []
+        // // 如果该用户支持的点位类型只有一个，则不显示该筛选框
+        // const supportWellTypes = this.$store.getters.wellTypes
+        // this.wellTypeList = response.data.filter(wellType => {
+        //   return supportWellTypes.findIndex(item => item == wellType.value) > -1
+        // })
         const wellLayer = {
           id: 'well',
           name: '井图层',
-          children: this.wellTypeList.map(item => {
+          children: this.layerName.map(item => {
             return {
-              id: 'well-' + item.value,
-              name: item.name
+              id: 'line-' + item,
+              name: item
             }
-          })
+          }).splice(1, 2)
+        }
+        const lineLayer = {
+          id: 'line',
+          name: '管线图层',
+          children: this.layerName.map(item => {
+            return {
+              id: 'line-' + item,
+              name: item
+            }
+          }).splice(0, 1)
+        }
+        const devLayer = {
+          id: 'line',
+          name: '管线图层',
+          children: this.layerName.map(item => {
+            return {
+              id: 'line-' + item,
+              name: item
+            }
+          }).splice(2, 2)
         }
         this.layers.splice(0, 1, wellLayer)
-        if (this.baseConfig.showAllWell) {
-          this.checkedLayer = [...this.checkedLayer, 'well', this.wellTypeList.map(item => 'well-' + item.value)]
+        this.layers.splice(1, 1, lineLayer)
+        this.layers.splice(2, 1, devLayer)
+
+        if (this.baseConfig.showAllWells) {
+          this.checkedLayer = ['well', 'line', 'dev']
+          wellLayer.children.forEach(item => this.checkedLayer.push('well-' + item.value))
+          lineLayer.children.forEach(item => this.checkedLayer.push('line-' + item.value))
+          devLayer.children.forEach(item => this.checkedLayer.push('dev-' + item.value))
+
+          // this.checkedLayer = [...this.checkedLayer, 'well', this.wellTypeList.map(item => 'well-' + item.value)]
         } else {
           this.checkedLayer = [...this.checkedLayer]
         }
@@ -994,7 +999,7 @@
     font-weight: bold;
   }
   .el-icon-refresh:hover{
-    color: red;
+    color: #ff7fe9;
     font-weight: bold;
     cursor: pointer;
   }
@@ -1022,11 +1027,22 @@
 // 地图
 .overview-map-container{
   width: 100%;
-  height: 50%;
-  position: absolute;
-  top: 30px;
-  left: 0px;
-  overflow-x: hidden;
+  overflow-y: hidden;
+  padding: 0px;
+  .map-demo{
+    width: 100%;
+    .svg-icon{
+      width: 20px;
+      height: 20px;
+    }
+    .alarm-icon{
+      width: 29px;
+      height: 30px;
+    }
+    .nomal-info-window{
+      background-color: pink;
+    }
+  }
 }
 
 .search-marker{
@@ -1048,11 +1064,27 @@
 }
 .cover{
   position: absolute;
-  bottom: 0px;
-  left: 0px;
-  /*background-color: red;*/
-  background-color: #1a2126;
-  width: 100px;
-  height: 30px;
+  bottom: 8px;
+  left: 8px;
+  display: flex;
+  flex-wrap: wrap;
+  background-color: #fcfbe8;
+  border-radius: 5px;
+  width: 190px;
+  height: 100px;
+  padding: 10px;
+  box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+  border-color: rgba(0, 0, 0, .05);
+  .cover-item{
+    width: 100%;
+    font-size: 16px;
+    //font-weight: 600;
+    color: #505a5e;
+  }
+}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.no-head-scrollbar .el-scrollbar__wrap, has-head-scrollbar .el-scrollbar__wrap {
+  padding: 0px 10px;
 }
 </style>