派生自 wuyushui/SewerAndRainNetwork

陈泽平
2021-05-31 38bcd6306f20787e394347a34e50fcf80b265fc6
企业应急-事件上报-事发位置问题修改
5个文件已修改
238 ■■■■ 已修改文件
src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/MapTemplate.vue 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
@@ -1,28 +1,25 @@
<template>
  <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="分析" :modal="false" v-dialog-drag
             :before-close="handleClose">
  <div>
    <el-dialog :visible.sync="isShow" class="effect-vol-calc" title="分析" :modal="false" v-dialog-drag
               :before-close="handleClose">
      <!--&lt;!&ndash;    基本信息&ndash;&gt;-->
      <!--    <event-base-info>-->
<!--&lt;!&ndash;    基本信息&ndash;&gt;-->
<!--    <event-base-info>-->
<!--    </event-base-info>-->
<!--    建议处置-->
    <disposal-proposed>
    </disposal-proposed>
    <!--    有效容积计算-->
    <div class="footer">
      <el-button type="primary" size="mini" @click="toggleShowCalc">事故水计算</el-button>
      <el-button type="primary" size="mini" @click="toggleShowResInfo">周边资源</el-button>
      <el-button type="primary" size="mini" @click="toggleShowReportDoc">生成报告</el-button>
<!--      <el-button type="primary" size="mini" @click="close">返回</el-button>-->
    </div>
    <effective-volume-calc ref="effectVolCalc"></effective-volume-calc>
    <event-report-doc ref="eventReportDoc" :reportItemCon="reportItemCon"> </event-report-doc>
    <res-info ref="resInfo"></res-info>
  </el-dialog>
      <!--    </event-base-info>-->
      <!--    建议处置-->
      <disposal-proposed></disposal-proposed>
      <!--    有效容积计算-->
      <div class="footer">
        <el-button type="primary" size="mini" @click="toggleShowCalc">事故水计算</el-button>
        <el-button type="primary" size="mini" @click="toggleShowResInfo">周边资源</el-button>
        <el-button type="primary" size="mini" @click="toggleShowReportDoc">生成报告</el-button>
        <!--      <el-button type="primary" size="mini" @click="close">返回</el-button>-->
      </div>
      <effective-volume-calc ref="effectVolCalc"></effective-volume-calc>
      <event-report-doc ref="eventReportDoc" :reportItemCon="reportItemCon"></event-report-doc>
      <res-info ref="resInfo"></res-info>
    </el-dialog>
  </div>
</template>
<script>
@@ -32,9 +29,15 @@
import EventReportDoc from '@components/base-page/enterprise-emergency/event-handling/EventReportDoc'
import ResInfo from '@components/base-page/enterprise-emergency/event-handling/ResInfo'
import eventBus from '../../../../eventBus'
export default {
  name: 'EventHandling',
  components: { ResInfo, EventReportDoc, DisposalProposed, EffectiveVolumeCalc },
  components: {
    ResInfo,
    EventReportDoc,
    DisposalProposed,
    EffectiveVolumeCalc
  },
  data () {
    return {
      isShow: false,
@@ -65,7 +68,9 @@
    report () {
      console.log('生成报告')
    },
    close () { console.log('返回') },
    close () {
      console.log('返回')
    },
    handleClose () {
      this.isShow = false
@@ -76,7 +81,7 @@
</script>
<style lang="less" scoped>
.footer{
.footer {
  text-align: right;
  margin: 15px;
}
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -20,8 +20,8 @@
      <el-col :span="12">
        <div class=search-list>
          <!--                        <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">名称:<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
          <h3 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden" :class="activeNum===index?'hover':''"
              @click="handleLocation(index)">名称:{{ item.name }}</h3>
          <h3 style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden"
              :class="activeNum===index?'hover':''" @click="locationMapClick(1, item, index)">名称:{{ item.name }}</h3>
          <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">地址:<span>{{ item.address }}</span>
          <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">电话:<span>{{ item.phone }}</span></p>
        </div>
@@ -45,7 +45,7 @@
      <el-col :span="12">
        <div class=search-list>
          <!--                        <h4 :class="activeNum===index?'hover':''" @click="handleLocation(index)">名称:<h3 style="display: inline-block">{{ item.name }}</h3></h4>-->
          <h3 :class="activeNum===index?'hover':''" @click="handleLocation(index)">名称:{{ item.name }}</h3>
          <h3 @click="locationMapClick(2, item, index)" :class="activeNum===index?'hover':''">名称:{{ item.name }}</h3>
          <p style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden">行政代码:<span>{{ item.adminCode }}</span>
          <p></p>
        </div>
@@ -147,8 +147,16 @@
        }
      })
    },
    // getStyle (index) {
    //   console.log(index)
    //   if (this.activeNum === index) {
    //     return { color: 'red' }
    //   }
    // },
    // 点击定位
    locationMapClick (type, val, index) {
      // this.activeNum = index
      // this.getStyle(index)
      // console.log(val)
      if (type === 1) {
        this.activeNum = index
@@ -196,11 +204,9 @@
    },
    // 分页功能 当前页
    handlePage (currentPage) {
      console.log(currentPage)
      this.currentPage = currentPage
    },
    // 下标更改 事件
    handleLocation (index) {
      this.activeNum = index
      this.activeNum = -1
    },
    // 点击确认按钮事件
    confirm () {
@@ -256,6 +262,16 @@
  }
}
//.environmental-risk-list :hover {
//  h3 {
//    color: @color-highlight;
//  }
//}
//.search-list :hover {
//  color: @color-highlight;
//}
.hover {
  color: @color-highlight;
}
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -17,8 +17,8 @@
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="24">
          <el-form-item label="管段编码:">
        <el-col :span="18">
          <el-form-item label="管段编:">
            <el-input v-model="form.sectionName" disabled></el-input>
          </el-form-item>
        </el-col>
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -99,7 +99,7 @@
          :visible.sync="dialogVisible"
          :append-to-body="true"
          :modal="false"
          v-dialogDrag
          v-dialog-drag
      >
        <EventsReported></EventsReported>
      </el-dialog>
src/views/MapTemplate.vue
@@ -1,28 +1,20 @@
<template>
    <div class="full-screen">
        <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
        <div id="map" ref="rootmap">
        </div>
        <sgis-layer-controller></sgis-layer-controller>
        <monitor-panel></monitor-panel>
        <!--        <top-enterprise-panel></top-enterprise-panel>-->
        <tool-box-panel ref="toolBox"></tool-box-panel>
        <!--    <menu-special></menu-special>-->
        <legend-panel></legend-panel>
        <!--    <summary-sheets></summary-sheets>-->
        <SummarySheet></SummarySheet>
        <!-- <enterprise></enterprise> -->
        <!--    <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
        <!--    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>-->
        <!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">废水</el-button>-->
        <!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>-->
<!--        <PublicBounced ref="PublicBounced"></PublicBounced>-->
            <ReportIncident></ReportIncident>
        <Emergency ref="Emergency"></Emergency>
        <Message></Message>
        <EventsReported></EventsReported>
      <event-handling></event-handling>
  <div class="full-screen">
    <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
    <div id="map" ref="rootmap">
    </div>
    <sgis-layer-controller></sgis-layer-controller>
    <monitor-panel></monitor-panel>
    <!--        <top-enterprise-panel></top-enterprise-panel>-->
    <tool-box-panel ref="toolBox"></tool-box-panel>
    <!--    <menu-special></menu-special>-->
    <legend-panel></legend-panel>
    <!--    <summary-sheets></summary-sheets>-->
    <SummarySheet></SummarySheet>
    <Emergency ref="Emergency"></Emergency>
    <Message></Message>
    <event-handling></event-handling>
  </div>
</template>
<script>
@@ -35,18 +27,12 @@
// import summarySheets from '@components/table/summarySheets.vue'SummarySheet
import SummarySheet from '@components/table/summarySheets'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
// import Enterprise from '../components/table/enterprise'
// // 公共展示数据
// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
import ReportIncident from '../components/base-page/enterprise-emergency/discard/ReportIncident'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
import EventsReported from '../components/base-page/enterprise-emergency/events-reported/EventsReported'
import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
import EventHandling from '../components/base-page/enterprise-emergency/event-handling/EventHandling'
export default {
  name: 'MapTemplate',
@@ -61,11 +47,8 @@
    MonitorPanel,
    // summarySheets,
    SummarySheet,
    // PublicBounced,
    Emergency,
    Message,
    ReportIncident,
    EventsReported
    Message
  },
  data () {
    return {
@@ -134,59 +117,59 @@
</script>
<style lang="less">
    .flue-gas {
        position: fixed;
        top: 88px;
        left: 180px;
        z-index: 500;
    }
.flue-gas {
  position: fixed;
  top: 88px;
  left: 180px;
  z-index: 500;
}
    .solid-waste {
        position: absolute;
        top: 88px;
        left: 88px;
        z-index: 999;
    }
.solid-waste {
  position: absolute;
  top: 88px;
  left: 88px;
  z-index: 999;
}
    .full-screen {
        width: 100%;
        height: 100%;
        margin: 0;
        padding: 0;
        position: absolute;
.full-screen {
  width: 100%;
  height: 100%;
  margin: 0;
  padding: 0;
  position: absolute;
        #map {
            height: 100%;
            width: 100%;
        }
  #map {
    height: 100%;
    width: 100%;
  }
        .barline {
            //width: 100%;
            //height: 1px;
            //background-color: #0661AE;
            border-top: 1px solid #0661AE;
        }
  .barline {
    //width: 100%;
    //height: 1px;
    //background-color: #0661AE;
    border-top: 1px solid #0661AE;
  }
        #map-btn {
            position: fixed;
            top: 20px;
            left: 100px;
            z-index: 9999;
        }
  #map-btn {
    position: fixed;
    top: 20px;
    left: 100px;
    z-index: 9999;
  }
        .leaflet-custom-icon {
            background: white;
        }
  .leaflet-custom-icon {
    background: white;
  }
        .leaflet-marker-icon {
            background: none;
        }
  .leaflet-marker-icon {
    background: none;
  }
        #migic {
            width: 48px;
            height: 48px;
            margin: -18px -20px;
            z-index: 999;
        }
    }
  #migic {
    width: 48px;
    height: 48px;
    margin: -18px -20px;
    z-index: 999;
  }
}
</style>