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

徐旺旺

2021-05-13 e46c7f58112c13ed09b325bf164f0d2a440f1012

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

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -9,12 +9,12 @@
                    <div style="padding-left:25px;padding-top:10px;color:#fff;font-size: 16px;">
                        <input type="checkbox"  :class="item.type==1?'active':''" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
                    </div>
                    <div class="layerbox-item" v-show="item.isShow">
                    <div class="layerbox-item" v-show="item.isShow" >
                        <!-- 二级图层遍历 -->
                        <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2">
                        <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2" :class="!itm.layers?'felxs':''" >
                            <input type="checkbox" :class="itm.type==1?'active':''" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm)"/>{{ itm.name }}
                            <!-- 三级图层遍历 -->
                            <div class="layerbox-item-3">
                            <div class="layerbox-item-3" v-show="itm.layers">
                                <div class="basemap-layer-item" v-for="(layer,index3) in itm.layers" :key="index3">
                                    <input type="checkbox"
                                           :class="layer.type==1?'active':''"
@@ -93,7 +93,7 @@
          // console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
        }
      })
      // console.log(this.serviceLayers)
      console.log(this.serviceLayers)
    },
    swLayers (layers, checked) {
      if (layers) {
@@ -124,6 +124,11 @@
        .btn-filter {
            cursor: pointer;
            color: #ffffff;
        }
        .felxs{
            display: flex;
            flex-wrap:wrap;
            width: 50% !important;
        }

        .wms-panel {
@@ -156,9 +161,12 @@
                }
                .downUp:hover{font-size: 26px;font-weight: 900}
                .layerbox-item {
                    padding-left: 0.1rem;
                    padding-left: 25px;
                    padding-top: 5px;
                    display: flex;
                    flex-wrap:wrap;
                    .basemap-layer-item {margin-bottom: 5px;
                        width: 100%;
                      input[type="checkbox"]{width:10px;height:10px;display: inline-block;text-align: center;vertical-align: middle; line-height: 10px;position: relative;}
                      input[type="checkbox"]::before{content: "";position: absolute;top: 0;left: 0;background: #fff;width: 100%;height: 100%;border: 1px solid #d9d9d9}
                      input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;

 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue

@@ -62,9 +62,9 @@
</template>

<script>
import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
import { LayerResources } from '../../../../../conf/layers/LayerResources'
// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
// import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
// import { LayerResources } from '../../../../../conf/layers/LayerResources'

import ReportPopup from './ReportPopup'

@@ -79,8 +79,10 @@
      activeNum: -1,
      LayerEvent: {},
      LayerResources: {},
      items: [LayerEvent, LayerResources],
      subItems: LayerEntEmer.layers,
      // items: [LayerEvent, LayerResources],
      items: [],
      // subItems: LayerEntEmer.layers,
      subItems: [],
      form: {
        pipelineType: '',
        dataType: '',

 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue

@@ -30,7 +30,7 @@
                            v-for="item in subItems"
                            :key="item.code"
                            :label="item.name"
                            :value="item">
                            :value="item.name">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -42,12 +42,11 @@
        <el-scrollbar style="height:286.22px">
            <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                 :class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
                <!--                <i class="state"></i>-->
                <img class="state" :src="getImgSrc()" style="background: none"/>
                <h3>事件名称:XXX事件</h3>
                <h5>事件事件:2021年3月21日</h5>
                <p>事件状态：<span>审批阶段</span></p>
                <p>事件类型：<span>真实事件</span></p>
                <h3>资源类型:{{item.properties.adminzonename}}</h3>
                <h5>资源名称:{{item.properties.type}}</h5>
                <p>负责人:<span>{{item.properties.resperson}}</span></p>
                <p>电话:<span>{{item.properties.telephone}}</span></p>
            </div>
        </el-scrollbar>
    </div>
@@ -75,9 +74,10 @@
      activeNum: -1,
      list: [],
      // items: [LayerEntEmer],
      items: [],
      items: [{ name: '应急资源' }, { name: '周边环境' }],
      // subItems: LayerEntEmer.layers,
      subItems: [],
      subItems: [{ name: '全部资源' }, { name: '应急物资' }, { name: '应急车辆(船)' }, { name: '应急队伍(含消防单位)' }],
      subItemsT: [{ name: '全部环境' }, { name: '医院' }, { name: '学校' }, { name: '水体' }, { name: '自然保护区' }, { name: '敏感目标' }],
      WfsHelper: null
    }
  },
@@ -90,7 +90,13 @@
      return icon ? 'assets/images/map/' + icon : ''
    },
    handlePipelineType () {
      console.log('item')
      // console.log('item')
      if (this.form.pipelineType === '应急资源') {
        this.form.pipelineType = '资源类型'
      }
      if (this.form.pipelineType === '周边环境') {
        this.subItems = this.subItemsT
      }
    },
    handleDataType () {
      console.log('item')

 src/conf/LayerTopic.js

@@ -12,7 +12,6 @@
import { LayerArea } from './layers/LayerArea'
import { LayerVideo } from './layers/LayerVideo'
import { LayerPk } from './layers/LayerPk'
import { LayerEntEmer } from './layers/LayerEntEmer'

export const LayerTopic = {
  code: 'sewersTopic',
@@ -20,5 +19,5 @@
  checked: false,
  isShow: true,
  type: 0,
  layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea, LayerEntEmer]
  layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea]
}

 src/conf/Topic.js

@@ -66,7 +66,7 @@
  id: 8,
  checked: false,
  isShow: false,
  icon: 'iconguanxianyanghu',
  icon: 'iconqiye',
  comp: ''
}/* {
  name: '管道变更',

 src/conf/layers/LayerEntEmer.js

File was deleted

 src/conf/layers/LayerEvent.js

File was deleted

 src/conf/layers/LayerResources.js

File was deleted