From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 152 ++++++++++++++++++++++++--------------------------
1 files changed, 74 insertions(+), 78 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index a03f2b8..8df379d 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -1,49 +1,47 @@
<template>
<div class="search-panel">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢鐘舵�侊細" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" value-key="code"
- :popper-class="'select-down'" @change="handleDataType">
- <el-option
- v-for="item in subItems"
- :key="item.code"
- :label="item.name"
- :value="item">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷锛�">
- <el-radio-group v-model="form.transferData" class="levelOfRisk">
- <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"
- @change="redioChange(item.name)">
- <span class="levelOfRisk-type">{{ item.name }}</span>
- </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>
- </div>
- </el-form>
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鐘舵�侊細" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷锛�">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
+ <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"
+ @change="redioChange(item.name)">
+ <span class="levelOfRisk-type">{{ item.name }}</span>
+ </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>
+ </div>
</el-form>
<el-scrollbar style="height:286.22px">
<!-- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''" @click="accordPopup(item)">-->
@@ -92,12 +90,12 @@
</el-scrollbar>
<div class="event-report">
<el-dialog
- custom-class="event-report"
+ custom-class="event-report-dialog"
title="浜嬩欢涓婃姤"
:visible.sync="dialogVisible"
:append-to-body="true"
:modal="false"
- v-dialogDragBottom
+ v-dialogDrag
>
<EventsReported></EventsReported>
</el-dialog>
@@ -113,7 +111,7 @@
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 EventsReported from '../../../base-page/enterprise-emergency/events-reported/EventsReported'
export default {
name: 'EventQuery',
@@ -123,7 +121,6 @@
data () {
return {
dialogVisible: false,
- reportIncident: false,
list: [],
total: 0,
activeNum: -1,
@@ -150,6 +147,9 @@
},
mounted () {
// this.wfsHelper = new WfsHelper()
+ eventBus.$on('event-report-popup', (obj) => {
+ this.dialogVisible = obj
+ })
},
methods: {
dialogVisibleChange () {
@@ -158,6 +158,11 @@
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
// eventBus.$emit('disposal-analysis', true)
+
+ },
+ // 寮�濮嬪垎鏋�
+ startAnalysis () {
+ // eventBus.$emit('start-analysis', true)
window.$layer.open({
content: {
comp: EventHandling, // 缁勪欢
@@ -169,21 +174,17 @@
title: '浜嬩欢澶勭疆'
})
},
- // 寮�濮嬪垎鏋�
- startAnalysis () {
- eventBus.$emit('start-analysis', true)
- },
disposalfx () {
- window.$layer.open({
- content: {
- comp: DisposalEvent, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢澶勭疆'
- })
+ // window.$layer.open({
+ // content: {
+ // comp: DisposalEvent, // 缁勪欢
+ // parent: this, // 鐖剁粍浠�
+ // data: { // 浼犻�掔殑鍙傛暟
+ // // info: this.info
+ // }
+ // },
+ // title: '浜嬩欢澶勭疆'
+ // })
},
// radio鏁版嵁閫夋嫨
redioChange (item) {
@@ -222,25 +223,20 @@
</script>
<style lang="less" scoped>
+ /*/deep/ .event-report-dialog {*/
+ /* left: 3rem;*/
+ /* top: 1rem;*/
+ /*}*/
/*.event-report {*/
- /*/deep/ .el-dialog--center {*/
- /* !*left: 2rem !important;*!*/
- /* margin-left: 3rem !important;*/
- /* margin-top: 0.33979rem !important;*/
- /* !*bottom: 0 !important;*!*/
+ /deep/ .el-dialog {
+ width: 3.343545rem;
+ }
/*}*/
- /deep/ .event-report {
- /*margin-left: 3rem !important;*/
- /*margin-top: 0.33979rem !important;*/
+ /deep/ .event-report-dialog {
+ left: 3rem;
+ top: 1rem;
+ margin-top: 2rem;
+ margin-left: 2rem;
}
-
- //}
- /*.event-report {*/
- /deep/ .el-dialog {
- /*width: 30%;*/
- width: 550px;
- }
-
- /*}*/
</style>
--
Gitblit v1.8.0