Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-14 faadb3a39e89b2cb7a00e81e3778f480f1f09998

 src/components/panel/topicSearch/SewersSearch.vue

@@ -6,22 +6,24 @@
        <div class="search-panel ">
          <el-form ref="form" :model="form" label-width="90px" class="search-form">
            <el-form-item label="设施类型：" size="mini" class="search-panel-item">
              <el-select style="width: 100%"  v-model="form.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
              <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                         :popper-class="'select-down'">
                <el-option
                        v-for="item in items"
                        :key="item.code"
                        :label="item.name"
                        :value="item.name">
                    v-for="item in items"
                    :key="item.code"
                    :label="item.name"
                    :value="item.name">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item :label="form.pipelineType+'：'" size="mini">
              <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
              <el-select style="width: 100%" v-model="form.dataType" value-key="code" :popper-class="'select-down'">
                <!--  @change="handleDataType"-->
                <el-option
                        v-for="item in subItems"
                        :key="item.code"
                        :label="item.name"
                        :value="item.name">
                    v-for="item in subItems"
                    :key="item.code"
                    :label="item.name"
                    :value="item">
                </el-option>
              </el-select>
            </el-form-item>
@@ -35,13 +37,12 @@
        <el-scrollbar style="height:380.44px;">
          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index">
            <div @click="handleLocation(item)">
              <h3 class="B-TMD-table-list-title-y"
                  :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
              <h3 class="B-TMD-table-list-title-y">
                {{ item.properties.pipename }}</h3>
              <p v-for="itm in labelList" :key="itm.label">
              <!--<p v-for="itm in labelList" :key="itm.label">
                <span>{{ itm.label }}：</span>
                <span :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
              </p>
              </p>-->
            </div>
          </div>
        </el-scrollbar>
@@ -78,7 +79,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'

// 引入分析组件内容
// 引入组件内容
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'

@@ -124,7 +125,7 @@
    async handleSearch () {
      var wfsHelper = new WfsHelper()
      // todo 现在管网还没区分开类型，后面改
      wfsHelper.addTypeName('管网')
      wfsHelper.addTypeName(this.form.dataType.name)
      wfsHelper.addLike('name', this.form.keyword)
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
@@ -134,10 +135,9 @@
      }
    },
    handleLocation (val) {
      console.log(val)
      const bound = this.L.geoJSON([val], {}).getBounds()
      // var layer = window.layerFactory.flyByLayerId(val.id, bound)
      window.map.flyToBounds(bound)
      window.layerFactory.flyByLayerId(this.form.dataType.code, val.id)
      // layer && layer.openPopup()
    }
  }