|  | @@ -8,7 +8,9 @@
 | 
											
												
													
														|  |        </div>
 |  |        </div>
 | 
											
												
													
														|  |      </div>
 |  |      </div>
 | 
											
												
													
														|  |      <div style="flex: 1">
 |  |      <div style="flex: 1">
 | 
											
												
													
														|  | -      <div ref="basicMap" class="basicMap" id="basicMap" :style="{ height: height }">
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <!-- 原来的,F11不能自适应 -->
 | 
											
												
													
														|  | 
 |  | +<!--      <div ref="basicMap" class="basicMap" id="basicMap" :style="{ height: height }">-->
 | 
											
												
													
														|  | 
 |  | +      <div ref="basicMap" class="basicMap" id="basicMap" :style="{ height: '100%' }">
 | 
											
												
													
														|  |          <tool-bar v-model="isToolBar" ref="toolBar" :tools="mapTools" :v-if="toolsLoaded"></tool-bar>
 |  |          <tool-bar v-model="isToolBar" ref="toolBar" :tools="mapTools" :v-if="toolsLoaded"></tool-bar>
 | 
											
												
													
														|  |          <locate-by-geoinfo ref="locateByGeoinfo"></locate-by-geoinfo>
 |  |          <locate-by-geoinfo ref="locateByGeoinfo"></locate-by-geoinfo>
 | 
											
												
													
														|  |          <base-map v-if="enableTianditu" ref="baseMap" :wkid="this.wkid"></base-map>
 |  |          <base-map v-if="enableTianditu" ref="baseMap" :wkid="this.wkid"></base-map>
 | 
											
										
											
												
													
														|  | @@ -387,7 +389,7 @@ export default {
 | 
											
												
													
														|  |          // 定义一个范围变量
 |  |          // 定义一个范围变量
 | 
											
												
													
														|  |          let fullextent = null
 |  |          let fullextent = null
 | 
											
												
													
														|  |          // 设置鼠标滚轮事件
 |  |          // 设置鼠标滚轮事件
 | 
											
												
													
														|  | -        view.on('mouse-wheel', (e) => {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        /*view.on('mouse-wheel', (e) => { // 此处事件会导致地图抖动,于2024-6-19注释掉
 | 
											
												
													
														|  |            // 延迟获取范围的函数
 |  |            // 延迟获取范围的函数
 | 
											
												
													
														|  |            window.setTimeout(() => {
 |  |            window.setTimeout(() => {
 | 
											
												
													
														|  |              // 获取操作图层的范围
 |  |              // 获取操作图层的范围
 | 
											
										
											
												
													
														|  | @@ -397,7 +399,7 @@ export default {
 | 
											
												
													
														|  |                nview.extent = fullextent
 |  |                nview.extent = fullextent
 | 
											
												
													
														|  |              })
 |  |              })
 | 
											
												
													
														|  |            }, 1)
 |  |            }, 1)
 | 
											
												
													
														|  | -        })
 |  | 
 | 
											
												
													
														|  | 
 |  | +        })*/
 | 
											
												
													
														|  |          // 设置鼠标拖拽事件
 |  |          // 设置鼠标拖拽事件
 | 
											
												
													
														|  |          view.on('drag', (e) => {
 |  |          view.on('drag', (e) => {
 | 
											
												
													
														|  |            // 获取操作图层的范围
 |  |            // 获取操作图层的范围
 | 
											
										
											
												
													
														|  | @@ -431,6 +433,7 @@ export default {
 | 
											
												
													
														|  |      // 载入图层到layers
 |  |      // 载入图层到layers
 | 
											
												
													
														|  |      _loadLayer: function (layerItem, esriMap) {
 |  |      _loadLayer: function (layerItem, esriMap) {
 | 
											
												
													
														|  |        let layer = null
 |  |        let layer = null
 | 
											
												
													
														|  | 
 |  | +      let layer_opacity = null
 | 
											
												
													
														|  |        switch (layerItem.servicetype) {
 |  |        switch (layerItem.servicetype) {
 | 
											
												
													
														|  |          case 'DynamicLayer': {
 |  |          case 'DynamicLayer': {
 | 
											
												
													
														|  |            layer = new MapImageLayer({
 |  |            layer = new MapImageLayer({
 | 
											
										
											
												
													
														|  | @@ -499,12 +502,26 @@ export default {
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          /*sugb 20240530 wms服务*/
 |  |          /*sugb 20240530 wms服务*/
 | 
											
												
													
														|  |          case 'WFSLayer': {
 |  |          case 'WFSLayer': {
 | 
											
												
													
														|  | -          layer = new WFSLayer({
 |  | 
 | 
											
												
													
														|  | 
 |  | +          // 更新要素样式
 | 
											
												
													
														|  | 
 |  | +          layer = new WMSLayer({
 | 
											
												
													
														|  | 
 |  | +            id: layerItem.id,
 | 
											
												
													
														|  | 
 |  | +            url: layerItem.url,
 | 
											
												
													
														|  | 
 |  | +            title: layerItem.alias,
 | 
											
												
													
														|  | 
 |  | +            name: layerItem.name,
 | 
											
												
													
														|  | 
 |  | +            style: layerItem.style,
 | 
											
												
													
														|  | 
 |  | +            sublayers: [{
 | 
											
												
													
														|  | 
 |  | +              name: layerItem.name
 | 
											
												
													
														|  | 
 |  | +            }],
 | 
											
												
													
														|  | 
 |  | +            visible: layerItem.visible,
 | 
											
												
													
														|  | 
 |  | +          })
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +          layer_opacity = new WFSLayer({
 | 
											
												
													
														|  |              id: layerItem.id,
 |  |              id: layerItem.id,
 | 
											
												
													
														|  |              url: layerItem.url,
 |  |              url: layerItem.url,
 | 
											
												
													
														|  |              title: layerItem.alias,
 |  |              title: layerItem.alias,
 | 
											
												
													
														|  |              name: layerItem.name,
 |  |              name: layerItem.name,
 | 
											
												
													
														|  |              style: layerItem.style,
 |  |              style: layerItem.style,
 | 
											
												
													
														|  | 
 |  | +            opacity: 0,
 | 
											
												
													
														|  |              popupTemplate: {
 |  |              popupTemplate: {
 | 
											
												
													
														|  |                overwriteActions: true,
 |  |                overwriteActions: true,
 | 
											
												
													
														|  |                outFields: ['*'],
 |  |                outFields: ['*'],
 | 
											
										
											
												
													
														|  | @@ -543,13 +560,14 @@ export default {
 | 
											
												
													
														|  |          if (this.layerNum == this.layerCount) {
 |  |          if (this.layerNum == this.layerCount) {
 | 
											
												
													
														|  |            this.$emit('layer-loadAll', true)
 |  |            this.$emit('layer-loadAll', true)
 | 
											
												
													
														|  |            this.mapView.extent = this.initExtent
 |  |            this.mapView.extent = this.initExtent
 | 
											
												
													
														|  | -          this.initBaseLayer()
 |  | 
 | 
											
												
													
														|  | 
 |  | +          // this.initBaseLayer() // 此处会导致进入地图页面后影像消失,所以注释掉
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |        })
 |  |        })
 | 
											
												
													
														|  |        if (parseInt(layerItem.zIndex)) {
 |  |        if (parseInt(layerItem.zIndex)) {
 | 
											
												
													
														|  |          esriMap.add(layer, parseInt(layerItem.zIndex))
 |  |          esriMap.add(layer, parseInt(layerItem.zIndex))
 | 
											
												
													
														|  |        } else {
 |  |        } else {
 | 
											
												
													
														|  |          esriMap.add(layer)
 |  |          esriMap.add(layer)
 | 
											
												
													
														|  | 
 |  | +        esriMap.add(layer_opacity)
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  |  
 |  |  
 |