From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index f838087..e76118d 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -32,6 +32,13 @@
</el-radio>
</el-radio-group>
</el-form-item>
+ <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -62,7 +69,8 @@
<div>
<h3>
<span @click="disposalfx">浠跺悕绉�:XXX浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="startAnalysis">
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="startAnalysis">
<span>寮�濮嬪垎鏋�</span>
</el-button>
</h3>
@@ -76,12 +84,27 @@
<p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span>
<el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
@click="accordPopup()">
- <span>浜嬩欢澶勭疆</span>
+ <span>浜嬩欢绠＄悊</span>
</el-button>
</p>
</div>
</div>
</el-scrollbar>
+ <div class="event-report">
+ <el-dialog
+ custom-class="el-dialog--center"
+ title="浜嬩欢涓婃姤"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <EventsReported></EventsReported>
+ </el-dialog>
+ </div>
+<!-- <Dialog ref="EReported" title="浜嬩欢涓婃姤2">-->
+<!-- <EventsReported></EventsReported>-->
+<!-- </Dialog>-->
</div>
</template>
@@ -91,23 +114,24 @@
// import AjaxUtils from '@utils/AjaxUtils'
import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
-import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
import eventBus from '../../../../eventBus'
+import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
+
+// import Dialog from '../../../../views/popup/Dialog'
export default {
name: 'EventQuery',
components: {
- // DisposalEvent
+ // Dialog,
+ EventsReported
},
data () {
return {
+ dialogVisible: false,
reportIncident: false,
list: [],
+ total: 0,
activeNum: -1,
- LayerEvent: {},
- LayerResources: {},
- // items: [LayerEvent, LayerResources],
- // subItems: LayerEntEmer.layers,
items: [],
subItems: [],
form: {
@@ -133,19 +157,12 @@
// this.wfsHelper = new WfsHelper()
},
methods: {
- // 鐐瑰嚮浜嬩欢澶勭悊
+ dialogVisibleChange () {
+ this.dialogVisible = !this.dialogVisible
+ },
+ // 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
- // eventBus.$emit('disposal-analysis', true)
- window.$layer.open({
- content: {
- comp: EventHandling, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢澶勭疆'
- })
+ eventBus.$emit('disposal-analysis', true)
},
// 寮�濮嬪垎鏋�
startAnalysis () {
@@ -163,7 +180,6 @@
title: '浜嬩欢澶勭疆'
})
},
-
// radio鏁版嵁閫夋嫨
redioChange (item) {
console.log(item)
@@ -201,5 +217,18 @@
</script>
<style lang="less" scoped>
-
+ /*.event-report {*/
+ /deep/ .el-dialog--center {
+ /*left: 2rem !important;*/
+ margin-left: 2rem !important;
+ margin-top: 0.73979rem !important;
+ /*bottom: 0 !important;*/
+ }
+ //}
+ /*.event-report {*/
+ /deep/ .el-dialog {
+ /*width: 30%;*/
+ width: 550px;
+ }
+ /*}*/
</style>
--
Gitblit v1.8.0