From a089095b088f14101d5ab4b9fe1d05098f576493 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期三, 12 五月 2021 17:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue | 94 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 23 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
index 2cabece..a2be7c7 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -1,13 +1,13 @@
<template>
- <div class="report-popup map-background" v-drag>
+ <div class="report-popup map-background" v-drag v-show="flags">
<div class="public-bounced-title panel-title">
<span>涓婃姤浜嬩欢</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="report-content">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
- <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent">
- <el-input v-model="ruleForm.nameEvent" class="report-input"></el-input>
+ <el-form-item label="浜嬩欢鍚嶇О" prop="nameEvent" class="input-event-name">
+ <el-input v-model="ruleForm.nameEvent" placeholder="灏嗕簨浠跺懡鍚�"></el-input>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-radio-group v-model="ruleForm.eventType">
@@ -54,6 +54,18 @@
</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>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎绫诲瀷" prop="name">
+ <label>鑷姩甯﹀嚭涓嶅彲淇敼</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item>
<el-upload
class="upload-demo"
@@ -68,18 +80,21 @@
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
- <el-form-item label="娑堟伅鎺ㄩ��" prop="resource">
- <el-radio-group v-model="ruleForm.resource">
- <el-radio label="鐭俊鎺ㄩ��"></el-radio>
- <el-radio label="鎵嬫満搴旂敤鎺ㄩ��"></el-radio>
+ <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-form-item>
- <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
+ <div v-show="wayTo">
+ <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </div>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
<el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
@@ -94,6 +109,7 @@
export default {
name: 'ReportPopup',
+ props: ['flags'],
data () {
return {
flag: false,
@@ -129,9 +145,21 @@
value: 3
}
],
- atTime: ''
+ atTime: '',
+ beingPush: '',
+ beingPushList: [
+ {
+ name: '鐭俊鎺ㄩ��',
+ value: 1
+ },
+ {
+ name: '鎵嬫満搴旂敤鎺ㄩ��',
+ value: 2
+ }
+ ]
},
fileList: [],
+ wayTo: false,
rules: {
name: [
{
@@ -184,7 +212,7 @@
return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
},
closePopup () {
- this.flag = false
+ this.flags = false
},
submitForm (formName) {
this.$refs[formName].validate((valid) => {
@@ -204,19 +232,39 @@
</script>
<style lang="less" scoped>
+ .report-popup {
+ width: 35%;
+ z-index: 999;
+ position: absolute;
+ top: 15%;
+ left: 35%;
+ }
+
+ /deep/ input {
+ 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%;
+
+ .el-input__inner {
+ width: 100%;
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+ }
+ }
+
/deep/ .el-form-item__label {
color: @color;
}
/deep/ .el-radio__label {
color: @color;
- }
-
- .report-popup {
- width: 35%;
- z-index: 999;
- position: absolute;
- top: 35%;
- left: 20%;
}
</style>
--
Gitblit v1.8.0