From 38bcd6306f20787e394347a34e50fcf80b265fc6 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期一, 31 五月 2021 14:53:35 +0800
Subject: [PATCH] 企业应急-事件上报-事发位置问题修改
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 30 +++++-
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 4
src/views/MapTemplate.vue | 145 ++++++++++++++++--------------------
src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue | 57 +++++++------
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 2
5 files changed, 121 insertions(+), 117 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue b/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
index b0d39c3..9f35490 100644
--- a/src/components/base-page/enterprise-emergency/event-handling/EventHandling.vue
+++ b/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">
+ <!--<!– 鍩烘湰淇℃伅–>-->
+ <!-- <event-base-info>-->
-<!--<!– 鍩烘湰淇℃伅–>-->
-<!-- <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;
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index 8255959..ff69e83 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/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;
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
index 4e9f17c..b1fe66d 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/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>
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 30102e4..dd8bdac 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/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>
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 33cb9b6..56d30b8 100644
--- a/src/views/MapTemplate.vue
+++ b/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>
--
Gitblit v1.8.0