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/base-page/enterprise-emergency/ReportIncident.vue | 182 ++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 85 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 9010bac..c4437be 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">
@@ -17,25 +17,30 @@
<!-- 浜嬩欢绫诲瀷-->
<el-form-item label="浜嬩欢绫诲瀷" prop="eventOfType">
<el-radio-group v-model="ruleForm.eventOfType">
- <el-radio v-for="(item,index) in ruleForm.eventOfTypeList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfTypeList" :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-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 +56,7 @@
<el-date-picker
v-model="ruleForm.atTime"
type="datetime"
- placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ placeholder="骞�/鏈�/鏃�">
</el-date-picker>
</el-form-item>
</el-col>
@@ -97,19 +102,15 @@
<el-upload
class="upload-demo"
action="uploadAction"
- :on-preview="handlePreview"
- :on-remove="handleRemove"
- :before-remove="beforeRemove"
multiple
:limit="3"
- :on-exceed="handleExceed"
:file-list="fileList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
<!-- 娑堟伅鎺ㄩ��-->
<el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
- <el-checkbox-group v-model="ruleForm.beingPushed" @change="infotsChange">
+ <el-checkbox-group v-model="ruleForm.beingPushed" @change="infoChange">
<el-checkbox v-for="item in ruleForm.beingPushList"
:key="item.name"
:label="item.name"
@@ -118,7 +119,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 +139,18 @@
</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'
@@ -160,8 +164,6 @@
return {
// 鍒ゆ柇寮规鏄惁鑳藉睍绀� temp=>涓存椂true 寮�鍙�
eventsReported: false,
- // eventsReported: true,
- saveSuccess: false,
// 琛ㄥ崟缁戝畾鏁版嵁
ruleForm: {
// 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
@@ -171,16 +173,24 @@
// 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfTypeList: [
{
- name: '寰呰ˉ鍏�',
+ name: '娴�(姘�)涓婃孩娌规薄鏌�',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '娌规皵绠￠亾娉勬紡姹℃煋',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈愬皠姹℃煋',
value: 3
+ },
+ {
+ name: '鐢熸�佺幆澧冪牬鍧�',
+ value: 4
+ },
+ {
+ name: '鍏朵粬',
+ value: 5
}
],
// 浜嬩欢绛夌骇
@@ -188,16 +198,28 @@
// 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfLevelList: [
{
- name: '寰呰ˉ鍏�',
+ name: '鐗瑰埆閲嶅ぇ鐜浜嬩欢',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '閲嶅ぇ鐜浜嬩欢',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈冨ぇ鐜浜嬩欢',
value: 3
+ },
+ {
+ name: '涓�鑸珹绾�',
+ value: 4
+ },
+ {
+ name: '涓�鑸珺绾�',
+ value: 5
+ },
+ {
+ name: '涓�鑸珻绾�',
+ value: 6
}
],
// 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
@@ -240,6 +262,10 @@
// 鎺ユ敹浜哄憳
receiveOne: ''
},
+ // 涓婁紶鍒楄〃
+ fileList: [],
+ // 涓婁紶鍦板潃
+ uploadAction: '',
// 琛ㄥ崟楠岃瘉
rules: {
// 浜嬩欢鍚嶇О鏍￠獙
@@ -305,12 +331,8 @@
},
// 鎻忚堪 鎺ユ敹 => 灞曠ず/闅愯棌
wayTo: false,
- location: false,
- // 涓婁紶鍒楄〃
- fileList: [],
- // 涓婁紶鍦板潃
- uploadAction: '',
- getLocalInfo: ''
+ // 鎺у埗鏄剧ず瀹氫綅浜岀骇椤甸潰灞曠ず/闅愯棌
+ location: false
}
},
mounted () {
@@ -318,10 +340,13 @@
eventBus.$on('local-cation', (obj) => {
this.location = obj
})
+ eventBus.$on('start-analysis', (obj) => {
+ this.eventsReported = obj
+ })
},
methods: {
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
- infotsChange () {
+ infoChange () {
if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
this.wayTo = true
} else {
@@ -338,65 +363,35 @@
eventBus.$emit('tab-change', 'first')
},
// 鎺ユ敹瀛愮粍浠� 浼犻�� 鏁版嵁 杩涜 浜岀骇 闄勫睘妗嗙殑鏄剧ず/闅愯棌
- getlocalCation (value) {
+ getLocalCation (value) {
// console.log(value)
this.location = value
},
- // 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
- handleRemove (file, fileList) {
- console.log(file, fileList)
- },
- // 鐐瑰嚮涓婁紶 鐨勪笂浼犱簨浠�
- handlePreview (file) {
- console.log(file)
- },
- handleExceed (files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
- },
- 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: '浜嬩欢澶勭疆'
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ // alert('submit!')
+ this.$message({
+ message: '浜嬩欢涓婃姤鎻愪氦鎴愬姛',
+ type: 'success'
+ })
+ } else {
+ this.$message('浜嬩欢涓婃姤鎻愪氦澶辫触')
+ return false
+ }
})
+ this.circlePopup()
+ this.$refs[formName].resetFields()
},
- // 澶勭疆鍒嗘瀽
- // DisposalAnalysisContinued
- disposalAnalysis () {
- this.saveSuccess = false
- eventBus.$emit('events-reported', true)
+ // 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
+ circlePopup () {
+ this.eventsReported = false
},
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
- this.eventsReported = false
+ this.circlePopup()
}
}
}
@@ -404,14 +399,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 +458,10 @@
color: #00fff6 !important;
}
+ /deep/ .el-icon-time:before {
+ content: " ";
+ }
+
/deep/ input {
/*width: 145px;*/
border-radius: 0;
--
Gitblit v1.8.0