From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期二, 06 四月 2021 18:21:27 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/LayerController/modules/LcServiceLayer.vue | 93 +++++++++++++++++++++++++++++----------------- 1 files changed, 59 insertions(+), 34 deletions(-) diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue index 09ec4c4..dc09cdb 100644 --- a/src/components/LayerController/modules/LcServiceLayer.vue +++ b/src/components/LayerController/modules/LcServiceLayer.vue @@ -1,38 +1,51 @@ <template> <div class="inner-panel"> + <div class="title"> + 鍥惧眰鎺у埗 + </div> <div class="wms-panel"> - <div v-for="item in serviceLayers" :key="item.code" class="layerbox"> - <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" - @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)" - class="btn-filter">杩囨护</span> - </div> - <div class="layerbox-item"> - <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox" - :name="'wmsSublayers_'+item.code+'_'+itm.code" - :checked="itm.checked" - :value="itm.code" - @change="swWmsLayer(itm)"/>{{ itm.name }} + <el-scrollbar class="wms-panel-scrollbar"> + <div v-for="item in serviceLayers" :key="item.code" class="layerbox"> + <!-- 涓�绾у浘灞傞亶鍘� --> + <div> + <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" + @change="swAllLayers(item)"/>{{ item.name }} + </div> + <div class="layerbox-item"> + <!-- 浜岀骇鍥惧眰閬嶅巻 --> + <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"> + <input type="checkbox" + :name="'wmsSublayers_'+item.code+'_'+itm.code" + :checked="itm.checked" + :value="itm.code" + @change="swWmsLayer(itm)"/>{{ itm.name }} + <!-- 涓夌骇鍥惧眰閬嶅巻 --> + <div style="width: 100%"> + <div class="basemap-layer-item" v-for="layer in itm.layers" :key="layer.code"> + <input type="checkbox" + :name="'wmsSublayers_'+item.code+'_'+layer.code" + :checked="layer.checked" + :value="layer.code" + @change="swWmsLayer(layer)"/>{{ layer.name }} + </div> + </div> + </div> </div> </div> - </div> + </el-scrollbar> </div> - <lc-service-layer-filter v-if="layerFilterVisible" ref="serviceLayerFilter"></lc-service-layer-filter> + <lc-service-layer-filter ref="serviceLayerFilter"></lc-service-layer-filter> </div> </template> <script> -import WmsHelper from '../../helpers/WmsHelper' -import AjaxUtils from '@/utils/AjaxUtils' +import WfsHelper from '../../helpers/WfsHelper' import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter' +import AjaxUtils from '../../../utils/AjaxUtils' export default { name: 'LcServiceLayer', components: { LcServiceLayerFilter }, - data () { - return { - layerFilterVisible: false - } - }, computed: { serviceLayers () { return this.$store.state.map.serviceLayers.LayerSewersLine @@ -52,23 +65,29 @@ this.updateWms() }, loadWfs () { - AjaxUtils.GetDataAsynByUrl('http://xearth.cn:6289/server/ogcserver/PipeLineTest/wfs?version=1.0.0&TYPENAME=pipeline&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000', {}, (res) => { - window.L.geoJSON(res).addTo(window.map) + var wfsHelper = new WfsHelper() + wfsHelper.addTypeName('绠$嚎鐐�') + wfsHelper.addEquals('pipename', '鐮旂┒闄�01璺痀S000001') + + AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => { + console.log(res) }) }, swWmsLayer (itm) { itm.checked = !itm.checked - this.updateWms() - }, - swFilter (item) { - this.layerFilterVisible = !this.layerFilterVisible + if (itm.checked) { + window.layerFactory.show(itm) + } else { + window.layerFactory.hide(itm) + } + // this.updateWms() }, updateServiceLayerList () { }, updateWms () { var mapConfig = this.mapConfig - var wmsHelper = new WmsHelper() + var wmsHelper = new WfsHelper() wmsHelper.initMapConfig(mapConfig) var wmsLayersMap = wmsHelper.getWmsLayersMap() for (var k in wmsLayersMap) { @@ -86,9 +105,13 @@ <style scoped lang="less"> .inner-panel { - display: flex; - justify-content: center; - align-items: center; + .title { + color: #ffffff; + font-size: 16px; + font-weight: 600; + margin: 10px; + text-align: center; + } .btn-filter { cursor: pointer; @@ -96,13 +119,15 @@ } .wms-panel { - display: flex; - flex-flow: column; + width: 1.79167rem; + + .wms-panel-scrollbar { + height: 50vh; + width: 100%; + } .layerbox { width: 100%; - display: flex; - flex-flow: column; .layerbox-item { display: flex; -- Gitblit v1.8.0