From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue | 300 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 214 insertions(+), 86 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
index 17e97de..bdbd49e 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
@@ -1,39 +1,52 @@
<template>
- <!-- <div class="public-bounced map-background">-->
- <!-- <div class="public-bounced-title panel-title">-->
- <!-- <span>涓婃姤浜嬩欢</span>-->
- <!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
- <!-- </div>-->
- <div class="public-bounced-content">
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
- <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent" class="input-event-name">
- <el-input v-model="ruleForm.nameEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
+<!-- <el-dialog-->
+<!-- custom-class="events-reported"-->
+<!-- title="涓婃姤浜嬩欢"-->
+<!-- :visible.sync="eventsReported"-->
+<!-- :append-to-body="true"-->
+<!-- :modal="false"-->
+<!-- v-dialogDrag-->
+<!-- >-->
+<!-- </el-dialog>-->
+ <div>
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="search-form">
+ <!-- 浜嬩欢鍚嶇О-->
+ <el-form-item class="input-event-name" label="浜嬩欢鍚嶇О" prop="nameOfEvent">
+ <el-input v-model="ruleForm.nameOfEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
</el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-radio-group v-model="ruleForm.eventType">
- <el-radio v-for="(item,index) in ruleForm.eventTypeList" :label="item.value" :key="index">
+ <!-- 浜嬩欢绫诲瀷-->
+ <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-radio-group>
</el-form-item>
- <el-form-item label="浜嬩欢绛夌骇" prop="eventLevel">
- <el-radio-group v-model="ruleForm.eventLevel">
- <el-radio v-for="(item,index) in ruleForm.eventLevelList" :label="item.value" :key="index">
+ <!-- 浜嬩欢绛夌骇-->
+ <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-group>
</el-form-item>
<el-row>
+ <!-- 浜嬪彂鍗曚綅-->
<el-col :span="12">
- <el-form-item label="浜嬪彂鍗曚綅" prop="region">
- <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍗曚綅浣嶇疆1" value="shanghai"></el-option>
- <el-option label="鍗曚綅浣嶇疆2" value="beijing"></el-option>
+ <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>
</el-form-item>
</el-col>
+ <!-- 浜嬪彂鏃堕棿-->
<el-col :span="12">
- <el-form-item label="浜嬪彂鏃堕棿" prop="region" class="search-panel-item">
+ <el-form-item class="search-panel-item" label="浜嬪彂鏃堕棿" prop="atTime">
<el-date-picker
v-model="ruleForm.atTime"
type="datetime"
@@ -43,30 +56,36 @@
</el-col>
</el-row>
<el-row>
+ <!-- 浜嬪彂浣嶇疆-->
<el-col :span="12">
- <el-form-item label="浜嬪彂浣嶇疆" prop="region" class="search-panel-item">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ <el-form-item label="浜嬪彂浣嶇疆" prop="positionOf">
+ <el-input v-model="ruleForm.positionOf"></el-input>
</el-form-item>
</el-col>
+ <!-- 浣嶇疆鎻忚堪-->
<el-col :span="12">
- <el-form-item label="浣嶇疆鎻忚堪" prop="name">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ <el-form-item label="浣嶇疆鎻忚堪" prop="positionDescription">
+ <el-input v-model="ruleForm.positionDescription"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <!-- 绠＄嚎鍚嶇О-->
<el-col :span="12">
- <el-form-item label="绠＄嚎鍚嶇О" prop="region" class="search-panel-item">
- <el-input v-model="ruleForm.name" class="report-input"></el-input>
+ <el-form-item label="绠＄嚎鍚嶇О" prop="lineName" class="search-panel-item">
+ <el-input disabled v-model="ruleForm.lineName" placeholder="鑷姩甯﹀嚭涓嶅彲淇敼"
+ class="report-input"></el-input>
</el-form-item>
</el-col>
+ <!-- 绠＄嚎绫诲瀷-->
<el-col :span="12">
- <el-form-item label="绠＄嚎绫诲瀷" prop="name">
- <label>鑷姩甯﹀嚭涓嶅彲淇敼</label>
+ <el-form-item label="绠＄嚎绫诲瀷" prop="lineType">
+ <label>{{ ruleForm.lineTypeText }}</label>
</el-form-item>
</el-col>
</el-row>
- <el-form-item>
+ <!-- 鐐瑰嚮涓婁紶-->
+ <el-form-item label="闄勪欢涓婁紶" prop="upload">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
@@ -80,42 +99,55 @@
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
+ <!-- 娑堟伅鎺ㄩ��-->
<el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
- <el-radio-group v-model="ruleForm.beingPush">
- <el-radio v-for="(item,index) in ruleForm.beingPushList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
+ <el-checkbox-group v-model="ruleForm.beingPushed" @change="infotsChange">
+ <el-checkbox v-for="item in ruleForm.beingPushList"
+ :key="item.name"
+ :label="item.name"
+ >
+ </el-checkbox>
+ </el-checkbox-group>
</el-form-item>
<div v-show="wayTo">
<el-form-item label="浜嬩欢鎻忚堪" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ <el-input type="textarea" resize="none" v-model="ruleForm.desc"
+ placeholder="甯﹀嚭浜嬩欢绫诲瀷锛屼簨浠朵綅缃紝浜嬩欢鍗曚綅锛屼簨浠舵椂闂寸瓑瀛楁鑷姩鐢熶骇涓�閮ㄥ垎鎻忚堪">
+ </el-input>
+ <el-button type="primary">涓�閿�<br/>鐢熸垚</el-button>
</el-form-item>
<el-form-item label="鎺ユ敹浜哄憳" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ <el-input type="textarea" resize="none" v-model="ruleForm.desc" placeholder="寮犱笁锛涙潕鍥涳紝"></el-input>
+ <el-button type="primary">+</el-button>
</el-form-item>
</div>
- <el-form-item>
+ <el-form-item class="confirmCancel">
<el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
<el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
</el-form-item>
</el-form>
</div>
- <!-- </div>-->
</template>
<script>
-import '@utils/dragBoxes'
+
+import eventBus from '../../../.././eventBus'
export default {
name: 'ReportPopup',
data () {
return {
- flag: false,
+ // eventsReported: true,
+ eventsReported: false,
+ saveSuccess: false,
+ // 琛ㄥ崟缁戝畾鏁版嵁
ruleForm: {
- nameEvent: '',
- eventType: '',
- eventTypeList: [
+ // 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
+ nameOfEvent: '',
+ // 浜嬩欢绫诲瀷 缁戝畾鏁版嵁鍊�
+ eventOfType: '',
+ // 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfTypeList: [
{
name: '寰呰ˉ鍏�',
value: 1
@@ -129,8 +161,10 @@
value: 3
}
],
- eventLevel: '',
- eventLevelList: [
+ // 浜嬩欢绛夌骇
+ eventOfLevel: '',
+ // 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfLevelList: [
{
name: '寰呰ˉ鍏�',
value: 1
@@ -144,63 +178,126 @@
value: 3
}
],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: '',
+ unitList: [
+ {
+ label: '鎵瓙',
+ value: '1'
+ },
+ {
+ label: '鍗椾含',
+ value: '2'
+ }
+ ],
+ // 浜嬪彂鏃堕棿 缁戝畾鏁版嵁
atTime: '',
- beingPush: '',
+ // 浜嬪彂浣嶇疆
+ positionOf: '',
+ // 浣嶇疆鎻忚堪
+ positionDescription: '',
+ // 绠＄嚎鍚嶇О
+ lineName: '',
+ // 绠＄嚎绫诲瀷
+ lineType: '',
+ lineTypeText: '鑷姩甯﹀嚭涓嶅彲淇敼',
+ // 娑堟伅鎺ㄩ��
+ beingPushed: [],
beingPushList: [
{
name: '鐭俊鎺ㄩ��',
- value: 1
+ value: false
},
{
name: '鎵嬫満搴旂敤鎺ㄩ��',
- value: 2
+ value: false
}
]
},
- fileList: [],
- wayTo: false,
+ // 琛ㄥ崟楠岃瘉
rules: {
- name: [
+ // 浜嬩欢鍚嶇О鏍￠獙
+ nameOfEvent: [
{
required: true,
message: '璇疯緭鍏ユ椿鍔ㄥ悕绉�',
trigger: 'blur'
- },
+ }
+ ],
+ // 浜嬩欢绫诲瀷鏍￠獙
+ eventOfType: [
{
- min: 3,
- max: 5,
- message: '闀垮害鍦� 3 鍒� 5 涓瓧绗�',
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绫诲瀷',
trigger: 'blur'
}
],
- region: [
+ // 浜嬩欢绛夌骇鏍￠獙
+ eventOfLevel: [
+ {
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绛夌骇',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: [
{
required: true,
message: '璇烽�夋嫨娲诲姩鍖哄煙',
trigger: 'change'
}
],
- resource: [
+ // 浜嬪彂鏃堕棿
+ atTime: [
{
required: true,
message: '璇烽�夋嫨娲诲姩璧勬簮',
trigger: 'change'
}
],
- desc: [
+ // 浜嬩欢浣嶇疆鏍￠獙
+ positionOf: [
{
required: true,
- message: '璇峰～鍐欐椿鍔ㄥ舰寮�',
+ message: '璇疯緭鍏ユ椿鍔ㄤ綅缃�',
trigger: 'blur'
}
- ]
- }
+ ],
+ // 浣嶇疆鎻忚堪鏍￠獙
+ positionDescription: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヤ綅缃弿杩�',
+ trigger: 'blur'
+ }
+ ],
+ // 绠＄嚎鍚嶇О
+ lineName: [],
+ // 绠＄嚎绫诲瀷
+ lineType: []
+ },
+ wayTo: false,
+ // 涓婁紶
+ fileList: []
}
},
methods: {
+ // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
+ infotsChange () {
+ if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
+ // console.log('鍖呭惈璇ュ厓绱�')
+ this.wayTo = true
+ } else {
+ // console.log('涓嶅寘鍚鍏冪礌')
+ this.wayTo = false
+ }
+ },
+ // 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
handleRemove (file, fileList) {
console.log(file, fileList)
},
+ // 鐐瑰嚮涓婁紶 鐨勪笂浼犱簨浠�
handlePreview (file) {
console.log(file)
},
@@ -210,19 +307,30 @@
beforeRemove (file, fileList) {
return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
},
- closePopup () {
- this.flags = false
- },
+ // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
submitForm (formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- alert('submit!')
- } else {
- console.log('error submit!!')
- return false
- }
- })
+ // this.$refs[formName].validate((valid) => {
+ // if (valid) {
+ // alert('submit!')
+ // } else {
+ // console.log('error submit!!')
+ // return false
+ // }
+ // })
+ // this.eventsReported = false
+ // this.saveSuccess = true
+
+ // temp涓存椂
+ window.mapManager.clickDialogSwitch = false
+ this.eventsReported = false
+ eventBus.$emit('events-reported', true)
},
+ // 澶勭疆鍒嗘瀽
+ disposalAnalysis () {
+ this.saveSuccess = false
+ eventBus.$emit('events-reported', true)
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
}
@@ -231,31 +339,45 @@
</script>
<style lang="less" scoped>
- .public-bounced {
- z-index: 2000;
- position: absolute;
- top: 15%;
- left: 20%;
+
+ /deep/ .el-form-item {
+ margin: 5px 0;
+ }
+
+ /deep/ .el-textarea__inner {
+ width: 2rem;
+ color: darkgrey;
+ border: solid 1px #00fff6;
+ background-color: rgba(0, 255, 246, 0.14);
+ outline: none;
+ font-size: 0.01rem;
+ }
+
+ /deep/ .el-checkbox__label {
+ color: #00fff6 !important;
}
/deep/ input {
+ /*width: 145px;*/
border-radius: 0;
background-color: rgba(0, 255, 246, 0.14);
border: solid 1px #00fff6;
color: #C0C4CC;
font-size: 0.01rem;
- padding: 0 15px;
}
- /deep/ .input-event-name {
- margin: 15px 0;
- width: 55%;
+ /deep/ .el-input.is-disabled .el-input__inner {
+ color: #C0C4CC;
+ font-size: 0.01rem;
+ border-radius: 4px;
+ background: @background-color;
+ border-color: @color;
+ }
- .el-input__inner {
- width: 100%;
- border-radius: 5px;
- background: rgba(0, 16, 30, 0.5);
- }
+ /deep/ .el-input__inner {
+ /*width: 145px;*/
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
}
/deep/ .el-form-item__label {
@@ -265,4 +387,10 @@
/deep/ .el-radio__label {
color: @color;
}
+
+ .confirmCancel {
+ text-align: right;
+ /*display: flex;*/
+ /*justify-content: flex-end;*/
+ }
</style>
--
Gitblit v1.8.0