派生自 wuyushui/SewerAndRainNetwork

陈泽平
2021-05-28 e79998e0764d6d00b050363bdeda48519a1f0c31
企业应急-事件上报-位置定位修改
1个文件已删除
4个文件已修改
194 ■■■■ 已修改文件
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/ReportFile.vue 139 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -329,7 +329,7 @@
    }
  },
  mounted () {
    eventBus.$on('section-search', (obj) => {
    eventBus.$on('location-setChange', (obj) => {
      if (obj) {
        this.dialogLocation = false
      }
@@ -338,7 +338,7 @@
  methods: {
    // 接收子组件传递的数据
    getlocaltionClick (val) {
      console.log(val)
      // console.log(val)
      this.ruleForm.positionOf = val.latPos + '-' + val.longPos
      this.dialogLocation = !this.dialogLocation
    },
@@ -368,11 +368,13 @@
          return false
        }
      })
      this.$refs[formName].resetFields()
      // this.$refs[formName].resetFields()
      eventBus.$emit('event-report-popup', false)
    },
    // form表单的取消按钮点击事件 重置信息
    resetForm (formName) {
      this.$refs[formName].resetFields()
      eventBus.$emit('event-report-popup', false)
    }
  }
}
src/components/base-page/enterprise-emergency/events-reported/ReportFile.vue
File was deleted
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -13,6 +13,7 @@
import { reportLocationSearch } from '../../../../api/request'
import { pulseEffect } from '../../../../utils/utils'
import eventBus from '../../../../eventBus'
export default {
  name: 'ReportLocationSearch',
  data () {
@@ -58,8 +59,9 @@
    // 点击确认按钮事件
    confirm () {
      // 通过子组件向父组件传递数据
      this.$emit('locationClick', this.LongLatPos)
      console.log('搜索定位')
      // this.$emit('locationClick', this.LongLatPos)
      eventBus.$emit('location-setChange', true)
      // console.log('搜索定位')
    }
  }
}
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -111,30 +111,28 @@
                        :data="tableDataAffFac"
                        border
                        @row-click="affFacName"
                        height="100"
                        max-height="100"
                        height="120"
                        max-height="140"
                        style="width: 100%">
                    <el-table-column
                            show-overflow-tooltip
                            width="150"
                            prop="properties.code"
                            label="附属设施编号">
                            label="编号">
                    </el-table-column>
                    <el-table-column
                            show-overflow-tooltip
                            width="150"
                            prop="properties.name"
                            label="附属设施名称">
                    </el-table-column>
                    <!--                    <el-table-column-->
                    <!--                            show-overflow-tooltip-->
                    <!--                            prop="properties.measattribute"-->
                    <!--                            label="附属设施名称">-->
                    <!--                    </el-table-column>-->
                    <el-table-column
                            width="150"
                            show-overflow-tooltip
                            prop="properties.type"
                            label="附属设施类型">
                            label="类型">
                    </el-table-column>
                    <el-table-column width="40" fixed="right" label="操作">
                    <el-table-column width="90" fixed="right" label="操作">
                        <template slot-scope="scope">
                            <el-button @click="localAdr(scope.row)" type="text" size="small">定位</el-button>
                        </template>
@@ -174,8 +172,7 @@
      // 附属设施查询列表数据
      tableDataAffFac: [],
      // 定义类型判断 if 是搜索到的数据可以进行管线选择 else 点击定位选择的管线不可以进行选择
      SectionAndAffFacTableJudge: false,
      locateJudgmentSearch: false
      SectionAndAffFacTableJudge: false
    }
  },
  mounted () {
@@ -232,7 +229,7 @@
    },
    // 定位功能
    localAdr (val) {
      console.log(val)
      // console.log(val)
      fitBounds(val)
      highlight(val)
    },
@@ -256,8 +253,8 @@
        const size = window.map.getSize()
        var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
        const wmsParams = Object.assign({
          LAYERS: 'sewer:pipeline',
          QUERY_LAYERS: 'sewer:pipeline',
          LAYERS: 'pipeline_group',
          QUERY_LAYERS: 'pipeline_group',
          WIDTH: size.x,
          HEIGHT: size.y,
          X: Math.round(point.x),
@@ -276,7 +273,7 @@
          EXCEPTIONS: 'application/vnd.ogc.se_inimage'
        })
        AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
          // console.log(res)
          console.log(res)
          for (let i = 0; i < res.data.features.length; i++) {
            // console.log(res.data.features[i])
            this.tableList.push(res.data.features[i])
@@ -334,6 +331,8 @@
      const wmsParams = Object.assign({
        LAYERS: 'sewer:view_pipeline',
        QUERY_LAYERS: 'sewer:view_pipeline',
        // LAYERS: 'pipeline_fs',
        // QUERY_LAYERS: 'pipeline_fs',
        WIDTH: size.x,
        HEIGHT: size.y,
        X: Math.round(point.x),
@@ -367,7 +366,7 @@
      this.wfsHelper.clearFilter()
      this.wfsHelper.setTypeName(['sewer:pipeline'])
      if (this.form.pipeName) {
        this.wfsHelper.addLike('pipename', this.form.pipeName)
        this.wfsHelper.addLike('subchaname', this.form.pipeName)
      }
      // this.wfsHelper.addEquals('pipename', '\'' + this.form.pipeName + '\'')
      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
@@ -378,14 +377,14 @@
        this.tableList = res.features
      }
      this.wfsHelper = new WfsHelper()
      // this.form.pipeName = ''
      this.form.pipeName = ''
      this.form.sectionName = ''
      this.form.affiliatedFacilities = ''
    },
    // 点击确认
    confirm () {
      // console.log('点击确定选择完成')
      eventBus.$emit('section-search', true)
      eventBus.$emit('location-setChange', true)
      this.form.pipeName = ''
      this.form.sectionName = ''
      this.form.affiliatedFacilities = ''
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -121,7 +121,6 @@
  data () {
    return {
      dialogVisible: false,
      reportIncident: false,
      list: [],
      total: 0,
      activeNum: -1,
@@ -148,6 +147,9 @@
  },
  mounted () {
    // this.wfsHelper = new WfsHelper()
    eventBus.$on('event-report-popup', (obj) => {
      this.dialogVisible = obj
    })
  },
  methods: {
    dialogVisibleChange () {