From bbd56115ec1a65833eca6fa091f1c837f6b8e9dd Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 25 五月 2021 17:15:01 +0800
Subject: [PATCH] 企业应急事件查询相关修改
---
src/components/base-page/enterprise-emergency/PipelineFile.vue | 3
src/components/base-page/enterprise-emergency/PositionChange.vue | 2
src/components/base-page/enterprise-emergency/ReportIncident.vue | 119 +++++++++++++++++++--------------------
src/components/emergency/index.vue | 2
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 29 +++++++--
5 files changed, 83 insertions(+), 72 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/PipelineFile.vue b/src/components/base-page/enterprise-emergency/PipelineFile.vue
index e9f2b17..6b81d24 100644
--- a/src/components/base-page/enterprise-emergency/PipelineFile.vue
+++ b/src/components/base-page/enterprise-emergency/PipelineFile.vue
@@ -50,8 +50,7 @@
<style lang="less" scoped>
.pipeline-file {
- min-width: 1.94532rem;
- max-height: 2.343213rem;
+ min-width: 2.94532rem;
}
/*/deep/ .el-input {*/
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index ec7c6ee..87943b0 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -80,7 +80,7 @@
// tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
handleClick (tab) {
// 鎺у埗绗笁灞傞〉闈� 绠＄嚎鍚嶇О/绠℃浠ｇ爜閫夋嫨椤甸潰
- if (tab.label === '绠＄嚎瀹氫綅') {
+ if (tab.label === '绠℃瀹氫綅') {
// 濡傛灉 鏄绾垮畾浣� 鏄剧ず涓夌骇闄勫睘妗� 杩涜閫夋嫨鏂囦欢鎿嶄綔
eventBus.$emit('pipelineFile-choose', true)
} else {
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index d2dd4c1..1263a4c 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -23,25 +23,30 @@
</el-radio-group>
</el-form-item>
<!-- 浜嬩欢绛夌骇-->
- <el-form-item label="浜嬩欢绛夌骇" prop="eventOfLevel">
+ <el-form-item label="浜嬩欢鍒嗙骇" prop="eventOfLevel">
<el-radio-group v-model="ruleForm.eventOfLevel">
- <el-radio v-for="(item,index) in ruleForm.eventOfLevelList" :label="item.value"
- :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
+<!-- <el-radio v-for="(item,index) in ruleForm.eventOfLevelList" :label="item.value"-->
+<!-- :key="index">-->
+<!-- <span>{{ item.name }}</span>-->
+<!-- </el-radio>-->
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfLevelList" :key="index" :style="{margin:'5px 0'}">
+ <el-radio :label="item.value">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-col>
</el-radio-group>
</el-form-item>
<el-row>
<!-- 浜嬪彂鍗曚綅-->
<el-col :span="12">
<el-form-item label="浜嬪彂鍗曚綅" prop="unit">
- <el-select v-model="ruleForm.unit" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option
- v-for="item in ruleForm.unitList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-select v-model="ruleForm.unit" placeholder="鍗曚綅,瑁呯疆閫夋嫨">
+ <el-option
+ v-for="item in ruleForm.unitList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -51,7 +56,7 @@
<el-date-picker
v-model="ruleForm.atTime"
type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ placeholder="骞�/鏈�/鏃�">
</el-date-picker>
</el-form-item>
</el-col>
@@ -146,11 +151,9 @@
</div>
</div>
</template>
-<!--v-drag v-show="eventsReported"-->
<script>
import '../../../utils/dragBoxes'
import eventBus from '../../../eventBus'
-import DisposalEvent from './DisposalEvent'
import PositionChange from './PositionChange'
import PipelineFile from './PipelineFile'
@@ -192,16 +195,28 @@
// 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfLevelList: [
{
- name: '寰呰ˉ鍏�',
+ name: '鐗瑰埆閲嶅ぇ鐜浜嬩欢',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '閲嶅ぇ鐜浜嬩欢',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈冨ぇ鐜浜嬩欢',
value: 3
+ },
+ {
+ name: '涓�鑸珹绾�',
+ value: 4
+ },
+ {
+ name: '涓�鑸珺绾�',
+ value: 5
+ },
+ {
+ name: '涓�鑸珻绾�',
+ value: 6
}
],
// 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
@@ -322,6 +337,9 @@
eventBus.$on('local-cation', (obj) => {
this.location = obj
})
+ eventBus.$on('start-analysis', (obj) => {
+ this.eventsReported = obj
+ })
},
methods: {
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
@@ -346,6 +364,23 @@
// console.log(value)
this.location = value
},
+ // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
+ submitForm (formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!')
+ } else {
+ console.log('error submit!!')
+ return false
+ }
+ })
+ this.eventsReported = false
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ this.eventsReported = false
+ },
// 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
handleRemove (file, fileList) {
console.log(file, fileList)
@@ -359,54 +394,16 @@
},
beforeRemove (file, fileList) {
return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
- },
- // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
- submitForm (formName) {
- // this.$refs[formName].validate((valid) => {
- // if (valid) {
- // alert('submit!')
- // } else {
- // console.log('error submit!!')
- // return false
- // }
- // })
-
- // temp涓存椂
- // window.mapManager.clickDialogSwitch = false
- // this.eventsReported = false
- // eventBus.$emit('events-reported', true)
-
- // this.eventsReported = false
- // this.saveSuccess = true
-
- // temp 涓存椂鏂规硶2
- window.$layer.open({
- content: {
- comp: DisposalEvent,
- parent: this,
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢澶勭疆'
- })
- },
- // 澶勭疆鍒嗘瀽
- // DisposalAnalysisContinued
- disposalAnalysis () {
- this.saveSuccess = false
- eventBus.$emit('events-reported', true)
- },
- // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
- resetForm (formName) {
- this.$refs[formName].resetFields()
- this.eventsReported = false
}
}
}
</script>
<style lang="less" scoped>
+
+ /deep/ .form-popup {
+ margin: 0 15px;
+ }
.report-incident {
position: absolute;
@@ -416,6 +413,8 @@
display: flex;
.report-box {
+ min-width: 3.4674324rem;
+ max-width: 3.4674324rem;
.public-bounced-title {
display: flex;
align-items: center;
diff --git a/src/components/emergency/index.vue b/src/components/emergency/index.vue
index 457fff1..913378c 100644
--- a/src/components/emergency/index.vue
+++ b/src/components/emergency/index.vue
@@ -282,7 +282,7 @@
},
methods: {},
mounted () {
- eventBus.$on('events-reported', (obj) => {
+ eventBus.$on('disposal-analysis', (obj) => {
// console.log(obj)
this.showSchedule = obj
})
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 87ed204..871474e 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -58,12 +58,17 @@
<!-- </div>-->
<!-- </div>-->
<div class="environmental-risk-list">
- <!-- <i class="state"></i>-->
+ <i class="state"></i>
<div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h3>
+ <span @click="disposalfx">浠跺悕绉�:XXX浜嬩欢</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="startAnalysis">
+ <span>寮�濮嬪垎鏋�</span>
+ </el-button>
+ </h3>
<h5>
- 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button>
+ <span>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin: 0.04rem 0.1rem;">鍒犻櫎</el-button>
</h5>
<p>
浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>
@@ -77,7 +82,7 @@
</div>
</div>
</el-scrollbar>
-<!-- <reportPopup></reportPopup>-->
+ <!-- <reportPopup></reportPopup>-->
</div>
</template>
@@ -86,7 +91,8 @@
// import WfsHelper from '@components/helpers/WfsHelper'
// import AjaxUtils from '@utils/AjaxUtils'
-import ReportIncident from '../../../base-page/enterprise-emergency/ReportIncident'
+import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
+import eventBus from '../../../../eventBus'
export default {
name: 'EventQuery',
@@ -129,15 +135,22 @@
methods: {
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
+ eventBus.$emit('disposal-analysis', true)
+ },
+ // 寮�濮嬪垎鏋�
+ startAnalysis () {
+ eventBus.$emit('start-analysis', true)
+ },
+ disposalfx () {
window.$layer.open({
content: {
- comp: ReportIncident, // 缁勪欢
+ comp: DisposalEvent, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// info: this.info
}
},
- title: '涓婃姤浜嬩欢'
+ title: '澶勭疆浜嬩欢'
})
},
// radio鏁版嵁閫夋嫨
--
Gitblit v1.8.0