From 275ab635e9bb15e083462abf15070d601b577e62 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 13 五月 2021 14:15:21 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue |  206 +++++++++++++++++++++++++--------------------------
 1 files changed, 102 insertions(+), 104 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
index 018817d..17e97de 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -1,107 +1,107 @@
 <template>
-    <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" 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">
-                        <el-radio v-for="(item,index) in ruleForm.eventTypeList" :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">
-                            <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-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="浜嬪彂鏃堕棿" prop="region" class="search-panel-item">
-                            <el-date-picker
-                                    v-model="ruleForm.atTime"
-                                    type="datetime"
-                                    placeholder="閫夋嫨鏃ユ湡鏃堕棿">
-                            </el-date-picker>
-                        </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">
-                            <el-input v-model="ruleForm.name" class="report-input"></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>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="绠$嚎绫诲瀷" prop="name">
-                            <label for="">鑷姩甯﹀嚭涓嶅彲淇敼</label>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item>
-                    <el-upload
-                            class="upload-demo"
-                            action="https://jsonplaceholder.typicode.com/posts/"
-                            :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-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>
-                <div v-show="wayTo">
-                    <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
-                        <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+    <!--    <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-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">
+                        <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">
+                        <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-select>
                     </el-form-item>
-                    <el-form-item label="鎺ユ敹浜哄憳" prop="desc">
-                        <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="浜嬪彂鏃堕棿" prop="region" class="search-panel-item">
+                        <el-date-picker
+                                v-model="ruleForm.atTime"
+                                type="datetime"
+                                placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+                        </el-date-picker>
                     </el-form-item>
-                </div>
-                <el-form-item>
-                    <el-button type="primary" @click="submitForm('ruleForm')">纭</el-button>
-                    <el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
+                </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">
+                        <el-input v-model="ruleForm.name" class="report-input"></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>
+                </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"
+                        action="https://jsonplaceholder.typicode.com/posts/"
+                        :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-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>
+            <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>
-        </div>
+                <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>
+            </el-form-item>
+        </el-form>
     </div>
+    <!--    </div>-->
 </template>
 
 <script>
@@ -109,7 +109,6 @@
 
 export default {
   name: 'ReportPopup',
-  props: ['flags'],
   data () {
     return {
       flag: false,
@@ -232,12 +231,11 @@
 </script>
 
 <style lang="less" scoped>
-    .report-popup {
-        width: 35%;
-        z-index: 999;
+    .public-bounced {
+        z-index: 2000;
         position: absolute;
         top: 15%;
-        left: 35%;
+        left: 20%;
     }
 
     /deep/ input {

--
Gitblit v1.8.0