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

chenyabin

2021-04-19 c7a549da66df42d4ec5c78ddf2cc138772616941

 src/components/panel/topicSearch/SewersSearch.vue

@@ -36,11 +36,11 @@
        </div>
        <el-scrollbar style="height:380.44px;">
          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index">
            <img class="state" :src="getImgSrc()" />
            <img class="state" :src="getImgSrc()" style="background: none"/>
            <div>
              <h3 @click="handleLocation(item)">{{ item.properties.pipename }}</h3>
              <p>所属企业：<span>{{ item.properties.orgcode }}</span>
              <p>设施类型：<span>{{ item.properties.teetype }}</span></p>
              <p>设施类型：<span>{{ item.properties.teetype }}</span> <el-button class="rt" size="mini" style="margin-right: 0.04rem" @click="btnAffiliatedFacilities(item)" >附属设施</el-button></p>
            </div>
          </div>
        </el-scrollbar>
@@ -64,6 +64,8 @@
        <SewersHistory></SewersHistory>
      </el-tab-pane>
    </el-tabs>
    <!-- 附属设施面板 -->
    <affiliated-facilities></affiliated-facilities>
  </div>
</template>

@@ -77,6 +79,8 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'

import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'

// 引入组件内容
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
@@ -85,7 +89,8 @@
  name: 'SewersSearch',
  components: {
    SewersAnalysis,
    SewersHistory
    SewersHistory,
    AffiliatedFacilities
  },
  data () {
    return {
@@ -127,7 +132,7 @@
    async handleSearch () {
      var wfsHelper = new WfsHelper()
      // todo 现在管网还没区分开类型，后面改
      wfsHelper.addTypeName(this.form.dataType.name)
      wfsHelper.addTypeName(this.form.dataType.sname)
      wfsHelper.addLike('name', this.form.keyword)
      // const _this = this
      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
@@ -137,10 +142,11 @@
      }
    },
    handleLocation (val) {
      const bound = this.L.geoJSON([val], {}).getBounds()
      window.map.flyToBounds(bound)
      window.layerFactory.flyByLayerId(this.form.dataType.code, val.id)
      window.layerFactory.flyByFeature(val, this.form.dataType.code)
      // layer && layer.openPopup()
    },
    btnAffiliatedFacilities (item) {
      console.log(item)
    }
  }
}