Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-04-07 23cbd5155a69311bc5ac5bee3aa4d9b2612199bb

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop


 Conflicts:

	src/components/plugin/PathDashFlow.js

 src/components/LayerController/LayerController.vue

@@ -2,12 +2,12 @@
  <div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
    <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style="  position: absolute;top:0;left: 0;">
        <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
        <span class="icon-name">图层</span>
<!--        <span class="icon-name">图层</span>-->
    </div>
    <transition name="animationChange">
      <div :class="'legend-content map-background'" v-show="layerControllerVisible">
        <lc-service-layer></lc-service-layer>
        <buttom  @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></buttom>
        <button  @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></button>
      </div>
    </transition>
  </div>
@@ -247,7 +247,7 @@
    background:@background-color;
  }
  .legend-content{
    width:  1.79167rem;
    width: 2.2rem;
  }
}


 src/components/LayerController/modules/LcServiceLayerFilter.vue

@@ -77,9 +77,9 @@
    swSubFilter (url, item) {
      item.checked = !item.checked
      if (item.checked) {
        window.serviceLayerHelper.loadGeojsonLayer(url, item)
        window.layerFactory.show(item)
      } else {
        window.serviceLayerHelper.removeLayer(item)
        window.layerFactory.hide(item)
      }
      // window.serviceLayerHelper.loadLayers()
    }
@@ -99,12 +99,11 @@

<style scoped lang="less">
    .inner-panel {
        width: 500px;
        color: #90c8e0;
        font-size: 13px;

        position: absolute;
        left: 260px;
        left: 270px;
        z-index: 1000;
        height: 220px;
        top: 0;

 src/components/LayerController/service/WfsLayerService.js

@@ -29,7 +29,10 @@
  }

  loadData (wfsUrl) {
    AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => this.draw(res.data.features))
    AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => {
      console.log(res)
      this.draw(res.data.features)
    })
  }

  draw (features) {

 src/components/panel/LegendPanel.vue

@@ -23,17 +23,23 @@
  </div>
</template>
<script>
import { LayerWasteWater } from '../../conf/layers/LayerWasteWater'
import { LayerWasteGas } from '../../conf/layers/LayerWasteGas'
import { LayerWasteSolid } from '../../conf/layers/LayerWasteSolid'
import { LayerAirQuality } from '../../conf/layers/LayerAirQuality'
import { LayerEnvRisk } from '../../conf/layers/LayerEnvRisk'
import { LayerSoilGroundWater } from '../../conf/layers/LayerSoilGroundWater'
import { LayerPipeLines } from '../../conf/layers/LayerPipeLines'
import { LayerPk } from '../../conf/layers/LayerPk'
import { LayerArea } from '../../conf/layers/LayerArea'

export default {
  name: 'LegendPanel',
  data () {
    return {
      // 控制图例 内容的 显示/隐藏
      legendControl: false
    }
  },
  computed: {
    serviceLayers () {
      return this.$store.state.map.serviceLayers.LayerSewersLine
      legendControl: false,
      serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
    }
  },
  methods: {

 src/components/panel/RightSearchPanel.vue

@@ -7,7 +7,7 @@
      <div class="container">
          <ul>
              <li style="text-align: right">
                  <buttom type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></buttom>
                  <button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
              </li>
          </ul>
        <ul  v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >

 src/components/panel/ToolBoxPanel.vue

@@ -3,7 +3,7 @@
    <div class="specific-tools">
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"   @click.enter.native="changeSelectMouse">
          <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
          <span class="span-default">工具</span>
          <!--<span class="span-default">工具</span>-->
      </el-button>
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
@@ -20,8 +20,8 @@
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>
              <!--<span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>-->
            </el-button>
            <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
                       v-show="item.index!=='2'">

 src/conf/layers/LayerPipeLines.js

@@ -1,6 +1,9 @@
/**
 * 管网
 */
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'

const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'

@@ -8,6 +11,7 @@
  code: 'sewersPipeLines',
  name: '管线',
  checked: true,
  childLayer: [LayerFsss, LayerHbss],
  layers: [
    {
      code: 'rainline',
@@ -15,7 +19,7 @@
      sname: '雨水线',
      checked: true,
      wfs: WFS_URL + '?TYPENAME=管网',
      minZoom: 10 // 在指定级别显示
      minZoom: 10
    },
    {
      code: 'accidentline',

 src/conf/layers/LayerSewers.js

@@ -103,7 +103,7 @@

export const LayerSewersPoint = [
  {
    code: 'fsss',
    code: 'sewersFsss',
    name: '附属设施',
    checked: false, // 默认选中状态
    type: 'geojson',
@@ -171,7 +171,7 @@
    ]
  },
  {
    code: 'hbss',
    code: 'sewersHbss',
    name: '环保设施',
    checked: false, // 默认选中状态
    type: 'geojson',
@@ -233,7 +233,7 @@
    ]
  },
  {
    code: 'pk',
    code: 'sewersPk',
    name: '排口',
    checked: false, // 默认选中状态
    type: 'geojson',
@@ -249,7 +249,7 @@
    ]
  },
  {
    code: 'qyxx',
    code: 'sewersQyxx',
    name: '区域信息',
    checked: false, // 默认选中状态
    type: 'geojson',