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 | 147 ++++++++++++++++++++++++++----------------------
1 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
index 48f1e13..bdbd49e 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ReportPopup.vue
@@ -1,14 +1,15 @@
<template>
- <div class="public-bounced-content">
- <!-- <el-dialog-->
- <!-- custom-class="public-bounced-content_dialog"-->
- <!-- title="涓婃姤浜嬩欢"-->
- <!-- :visible.sync="dialogVisible"-->
- <!-- :append-to-body="true"-->
- <!-- :modal="false"-->
- <!-- v-dialogDragBottom-->
- <!-- >-->
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
+<!-- <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>
@@ -84,7 +85,7 @@
</el-col>
</el-row>
<!-- 鐐瑰嚮涓婁紶-->
- <el-form-item>
+ <el-form-item label="闄勪欢涓婁紶" prop="upload">
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
@@ -100,7 +101,7 @@
</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="infotsChange">
<el-checkbox v-for="item in ruleForm.beingPushList"
:key="item.name"
:label="item.name"
@@ -110,13 +111,17 @@
</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>
@@ -126,11 +131,15 @@
<script>
+import eventBus from '../../../.././eventBus'
+
export default {
name: 'ReportPopup',
data () {
return {
- dialogVisible: false,
+ // eventsReported: true,
+ eventsReported: false,
+ saveSuccess: false,
// 琛ㄥ崟缁戝畾鏁版嵁
ruleForm: {
// 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
@@ -274,26 +283,21 @@
}
},
methods: {
- // 娑堟伅鎺ㄩ�� 閫夋嫨
+ // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
infotsChange () {
- this.wayTo = !this.wayTo
- console.log(this.ruleForm.beingPushed)
- // for (let i = 0; i < this.ruleForm.beingPushed.length; i++) {
- // // console.log(this.ruleForm.beingPushed[i])
- // if (this.ruleForm.beingPushed[i] === '鐭俊鎺ㄩ��' || this.ruleForm.beingPushed[i] === '鎵嬫満搴旂敤鎺ㄩ��') {
- // this.wayTo = true
- // } else {
- // this.wayTo = !this.wayTo
- // }
- // }
- // if (this.ruleForm.beingPushed[0] === '鐭俊鎺ㄩ��') {
- // console.log('鐭俊鎺ㄩ��')
- // this.wayTo = true
- // }
+ 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)
},
@@ -303,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()
}
@@ -325,19 +340,17 @@
<style lang="less" scoped>
- /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
- display: none;
+ /deep/ .el-form-item {
+ margin: 5px 0;
}
- /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:after {
- content: '*';
- color: #F56C6C;
- margin-left: 4px;
- }
- /deep/ .el-checkbox__label ::after {
- content: '*' !important;
- color: #F56C6C !important;
- margin-left: 4px !important;
+ /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 {
@@ -345,32 +358,26 @@
}
/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/ .el-input.is-disabled .el-input__inner {
- border-radius: 0;
- background-color: rgba(0, 255, 246, 0.14);
- border: solid 1px #00fff6;
color: #C0C4CC;
font-size: 0.01rem;
- /*padding: 0 15px;*/
+ border-radius: 4px;
+ background: @background-color;
+ border-color: @color;
}
- /deep/ .input-event-name {
- margin: 15px 0;
- width: 75%;
-
- .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 {
@@ -380,4 +387,10 @@
/deep/ .el-radio__label {
color: @color;
}
+
+ .confirmCancel {
+ text-align: right;
+ /*display: flex;*/
+ /*justify-content: flex-end;*/
+ }
</style>
--
Gitblit v1.8.0