From 6ebf06fa7ce4fccb3144a0c15773cb9e48276fd7 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 25 五月 2021 21:14:22 +0800
Subject: [PATCH] 事件上报页面修改
---
src/components/base-page/enterprise-emergency/ReportIncident.vue | 133 ++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 59 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 9010bac..85e6e8f 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -3,7 +3,7 @@
<div class="report-box map-background">
<div class="public-bounced-title panel-title">
<span>浜嬩欢涓婃姤</span>
- <i class="el-icon-close"></i>
+ <i class="el-icon-close" @click="circlePopup"></i>
</div>
<div class="form-popup">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="search-form">
@@ -23,19 +23,21 @@
</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-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-select v-model="ruleForm.unit" placeholder="鍗曚綅,瑁呯疆閫夋嫨">
<el-option
v-for="item in ruleForm.unitList"
:key="item.value"
@@ -51,7 +53,7 @@
<el-date-picker
v-model="ruleForm.atTime"
type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ placeholder="骞�/鏈�/鏃�">
</el-date-picker>
</el-form-item>
</el-col>
@@ -118,7 +120,7 @@
</el-checkbox-group>
</el-form-item>
<!-- // 鎻忚堪 鎺ユ敹 灞曠ず銆侀殣钘�-->
- <div v-show="wayTo">
+ <div v-show="wayTo" class="way-to">
<el-form-item label="浜嬩欢鎻忚堪" prop="desc">
<el-input type="textarea" resize="none" v-model="ruleForm.desc"
placeholder="甯﹀嚭浜嬩欢绫诲瀷锛屼簨浠朵綅缃紝浜嬩欢鍗曚綅锛屼簨浠舵椂闂寸瓑瀛楁鑷姩鐢熶骇涓�閮ㄥ垎鎻忚堪">
@@ -138,15 +140,17 @@
</el-form>
</div>
</div>
- <PositionChange :location="location" @localCation="getlocalCation"></PositionChange>
- <PipelineFile></PipelineFile>
+ <div class="local-box">
+ <PositionChange :location="location" @localCation="getlocalCation"></PositionChange>
+ </div>
+ <div class="file-box">
+ <PipelineFile></PipelineFile>
+ </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'
@@ -188,16 +192,28 @@
// 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfLevelList: [
{
- name: '寰呰ˉ鍏�',
+ name: '鐗瑰埆閲嶅ぇ鐜浜嬩欢',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '閲嶅ぇ鐜浜嬩欢',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈冨ぇ鐜浜嬩欢',
value: 3
+ },
+ {
+ name: '涓�鑸珹绾�',
+ value: 4
+ },
+ {
+ name: '涓�鑸珺绾�',
+ value: 5
+ },
+ {
+ name: '涓�鑸珻绾�',
+ value: 6
}
],
// 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
@@ -318,6 +334,9 @@
eventBus.$on('local-cation', (obj) => {
this.location = obj
})
+ eventBus.$on('start-analysis', (obj) => {
+ this.eventsReported = obj
+ })
},
methods: {
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
@@ -342,6 +361,27 @@
// 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
+ },
+ // 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
+ circlePopup () {
+ this.eventsReported = false
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ this.eventsReported = false
+ },
// 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
handleRemove (file, fileList) {
console.log(file, fileList)
@@ -355,48 +395,6 @@
},
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
}
}
}
@@ -404,14 +402,27 @@
<style lang="less" scoped>
+ .way-to {
+ /deep/ .el-form-item__content {
+ display: flex;
+ }
+ }
+
+ /deep/ .form-popup {
+ margin: 0 15px;
+ }
+
.report-incident {
position: absolute;
top: 0.42979rem;
left: 3.14583rem;
+ z-index: 999;
display: flex;
- z-index: 9999;
.report-box {
+ min-width: 3.4674324rem;
+ max-width: 3.4674324rem;
+
.public-bounced-title {
display: flex;
align-items: center;
@@ -450,6 +461,10 @@
color: #00fff6 !important;
}
+ /deep/ .el-icon-time:before {
+ content: " ";
+ }
+
/deep/ input {
/*width: 145px;*/
border-radius: 0;
--
Gitblit v1.8.0