From 40110af52484266d765eab597099b746d1358b06 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 25 五月 2021 15:22:05 +0800
Subject: [PATCH] 企业应急事件上报页面修改
---
/dev/null | 14 -------
src/components/base-page/enterprise-emergency/PipelineFile.vue | 36 ++++++++++++++----
src/components/base-page/enterprise-emergency/PositionChange.vue | 28 +++++++++-----
src/components/base-page/enterprise-emergency/ReportIncident.vue | 10 +++-
public/assets/images/map/emergency/search.png | 0
5 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/public/assets/images/map/emergency/search.png b/public/assets/images/map/emergency/search.png
new file mode 100644
index 0000000..6d70a98
--- /dev/null
+++ b/public/assets/images/map/emergency/search.png
Binary files differ
diff --git a/src/components/base-page/enterprise-emergency/AsWhole.vue b/src/components/base-page/enterprise-emergency/AsWhole.vue
deleted file mode 100644
index bf3a8cf..0000000
--- a/src/components/base-page/enterprise-emergency/AsWhole.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
- <div class="as-whole">
- </div>
-</template>
-
-<script>
-export default {
- name: 'AsWhole'
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
diff --git a/src/components/base-page/enterprise-emergency/PipelineFile.vue b/src/components/base-page/enterprise-emergency/PipelineFile.vue
index 88f5d75..e9f2b17 100644
--- a/src/components/base-page/enterprise-emergency/PipelineFile.vue
+++ b/src/components/base-page/enterprise-emergency/PipelineFile.vue
@@ -1,18 +1,33 @@
<template>
<div class="pipeline-file map-background" v-show="pipelineFile">
- <el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="绠＄嚎鍚嶇О">
- <el-input v-model="form.pipeName" suffix-icon="el-icon-search"></el-input>
- </el-form-item>
- <el-form-item label="绠℃缂栫爜">
- <el-input v-model="form.pipeCode" suffix-icon="el-icon-search"></el-input>
- </el-form-item>
- </el-form>
+ <el-row>
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-col :span="12">
+ <el-form-item label="绠＄嚎鍚嶇О">
+ <el-input v-model="form.pipeName">
+ <el-button style="padding-right:10px;" slot="suffix" type="text">
+ <img src="../../../../public/assets/images/map/emergency/search.png" alt="">
+ </el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绠℃缂栫爜">
+ <el-input v-model="form.pipeCode">
+ <el-button style="padding-right:10px;" slot="suffix" type="text">
+ <img src="../../../../public/assets/images/map/emergency/search.png" alt="">
+ </el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
</div>
</template>
<script>
import eventBus from '../../../eventBus'
+
export default {
name: 'PipelineFile',
data () {
@@ -38,4 +53,9 @@
min-width: 1.94532rem;
max-height: 2.343213rem;
}
+
+ /*/deep/ .el-input {*/
+ /* width: 65%;*/
+ /* margin: 0 auto;*/
+ /*}*/
</style>
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index 3911ebb..ec7c6ee 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -7,17 +7,22 @@
<el-button type="primary" @click="confirm">纭</el-button>
</div>
</el-tab-pane>
- <el-tab-pane label="绠＄嚎瀹氫綅" name="second">
+ <el-tab-pane label="绠℃瀹氫綅" name="second">
<div class="line-pos">
- <el-form :model="linePos" label-width="90px">
- <el-form-item label="绠＄嚎鍚嶇О:">
- <el-input v-model="linePos.lineName"></el-input>
- </el-form-item>
- <el-form-item label="闄勫睘璁炬柦:">
- <el-input v-model="linePos.affFac"></el-input>
- </el-form-item>
- </el-form>
- <el-button type="primary" size="mini">鎼滅储</el-button>
+ <div class="line-pos-form">
+ <el-form :model="linePos" label-width="90px">
+ <el-form-item label="绠＄嚎鍚嶇О:">
+ <el-input v-model="linePos.lineName"></el-input>
+ </el-form-item>
+ <el-form-item label="闄勫睘璁炬柦:">
+ <el-select v-model="linePos.affFac" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
+ <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
+ <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-button type="primary" size="mini">鎼滅储</el-button>
+ </div>
<el-button type="primary" @click="confirm">纭</el-button>
</div>
</el-tab-pane>
@@ -119,6 +124,9 @@
.el-input {
width: 85%;
}
+ .line-pos-form {
+ display: flex;
+ }
}
.latlng-location {
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 9010bac..d2dd4c1 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -138,8 +138,12 @@
</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"-->
@@ -408,8 +412,8 @@
position: absolute;
top: 0.42979rem;
left: 3.14583rem;
+ z-index: 999;
display: flex;
- z-index: 9999;
.report-box {
.public-bounced-title {
--
Gitblit v1.8.0