diff --git a/src/components/CMap/components/cmap.vue b/src/components/CMap/components/cmap.vue
index d0a8e00..9bfc2dd 100644
--- a/src/components/CMap/components/cmap.vue
+++ b/src/components/CMap/components/cmap.vue
@@ -73,11 +73,10 @@
         '': { size: [10, 10], anchor: [10, 10] }
       }, // 图标管理器
       layerId: 'yizhuang_poi', // 需要加载的图层id
-      queryString: 'ID<1000', // 地图筛选条件
+      queryString: '', // 地图筛选条件
       layerInfoManager: {
         yizhuang_poi: { pm: 'yizhuang', table: 'poi', spanzoom: 18, latfd: 'COORDINATE_Y', lngfd: 'COORDINATE_X', style: '', morecon: '', namefd: 'WELL_NAME', keyfd: 'ID', attrfds: 'POSITION', cache: true, showtype: 'auto' }
       }, // 图层信息管理器
-      // style: 'http://localhost:8080/static/images/map_images/alarm-well1.png',
       style: 'resource/images/sys/markers/未分类/dot',
       stylepos: 1,
       overlay: null,
@@ -119,12 +118,10 @@
       mapLayers.setMaxZoom(val)
     },
     alarmMarkers(val) {
-      console.log('alarmMarkers')
       this.renderMarkers()
     }
   },
   mounted() {
-    console.log('map mounted')
     this.reset()
   },
   activated() {
@@ -320,9 +317,9 @@
           stylepos: this.stylepos,
           stylefd: layerInfoManager[layerId].stylefd,
           morecon: this.queryString,
-          namefd: '',
+          namefd: layerInfoManager[layerId].namefd,
           keyfd: '',
-          attrfds: '' }
+          attrfds: layerInfoManager[layerId].attrfds }
         const tableinfostr = CEncodeSpecialChar(CJsonToStringify(tableinfo))
         opts.params.tableinfo = tableinfostr
       }
@@ -369,13 +366,11 @@
         queryList.push('DEPTID=' + deptid)
       }
       this.queryString = queryList.join(' and ')
-      console.log(this.queryString)
       this.cleanPoi()
       this.renderPoi(false)
     },
     // loadBigViewFeature
     loadBigViewFeature(id, callback) {
-      console.log('loadBigViewFeature')
       const { mapLayers, layerInfoManager } = this
       if (layerInfoManager[id].spanzoom > mapLayers.getZoom() && layerInfoManager[id].showtype !== 'client') { return }
       var bounds = getGlobalBounds()
@@ -455,7 +450,7 @@
       if (layerInfoManager[id].layerid) {
         transObj.params.layerid = CEncode(layerInfoManager[id].layerid)
       } else {
-        const tableinfo = { pm: layerInfoManager[id].pm, table: layerInfoManager[id].table, id: id, latfd: layerInfoManager[id].latfd, lngfd: layerInfoManager[id].lngfd, stylefd: layerInfoManager[id].stylefd, morecon: layerInfoManager[id].morecon, namefd: layerInfoManager[id].namefd, keyfd: layerInfoManager[id].keyfd, attrfds: layerInfoManager[id].attrfds }
+        const tableinfo = { pm: layerInfoManager[id].pm, table: layerInfoManager[id].table, id: id, latfd: layerInfoManager[id].latfd, lngfd: layerInfoManager[id].lngfd, stylefd: layerInfoManager[id].stylefd, morecon: this.queryString, namefd: layerInfoManager[id].namefd, keyfd: layerInfoManager[id].keyfd, attrfds: layerInfoManager[id].attrfds }
         transObj.params.tableinfo = CEncodeSpecialChar(CJsonToStringify(tableinfo))
       }
 
@@ -538,10 +533,8 @@
               mapLayers.setZoom(17)
               mapLayers.setCenter(overlay.getLatLng())
               // this.center = alarmInfo.position
-              console.log('before setPopupContent')
               overlay.setPopupContent(dom)
               // debugger
-              console.log('after setPopupContent')
               overlay.openPopup()
             }
           })