From 2d117e34a857890400ebfa00b338f5649c38b5cb Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期三, 26 五月 2021 15:13:09 +0800
Subject: [PATCH] 事件上报页面修改
---
src/components/base-page/enterprise-emergency/EventsReported.vue | 489 ++++++++++++++++++++++++++++++++++
public/assets/images/map/emergency/file.png | 0
src/components/base-page/enterprise-emergency/PipelineFile.vue | 87 +++++
src/views/MapTemplate.vue | 5
src/components/panel/topicSearch/sewers-select/SewersHistory.vue | 9
public/assets/images/map/emergency/fold.png | 0
src/components/base-page/enterprise-emergency/PositionChange.vue | 189 +++++++++++-
src/components/base-page/enterprise-emergency/ReportIncident.vue | 10
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 49 +++
9 files changed, 798 insertions(+), 40 deletions(-)
diff --git a/public/assets/images/map/emergency/file.png b/public/assets/images/map/emergency/file.png
new file mode 100644
index 0000000..8eeb2cd
--- /dev/null
+++ b/public/assets/images/map/emergency/file.png
Binary files differ
diff --git a/public/assets/images/map/emergency/fold.png b/public/assets/images/map/emergency/fold.png
new file mode 100644
index 0000000..28232e8
--- /dev/null
+++ b/public/assets/images/map/emergency/fold.png
Binary files differ
diff --git a/src/components/base-page/enterprise-emergency/EventsReported.vue b/src/components/base-page/enterprise-emergency/EventsReported.vue
new file mode 100644
index 0000000..66beb36
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/EventsReported.vue
@@ -0,0 +1,489 @@
+<template>
+ <!-- <div class="event-report">-->
+<!-- <el-dialog-->
+<!-- custom-class="event-report-dialog"-->
+<!-- title="浜嬩欢涓婃姤"-->
+<!-- :visible.sync="dialogVisible"-->
+<!-- :append-to-body="true"-->
+<!-- :modal="false"-->
+<!-- v-dialogDragBottom-->
+<!-- >-->
+ <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="eventOfType">
+ <el-radio-group v-model="ruleForm.eventOfType">
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfTypeList" :key="index"
+ :style="{margin:'5px 0'}">
+ <el-radio :label="item.value">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-col>
+ </el-radio-group>
+ </el-form-item>
+ <!-- 浜嬩欢绛夌骇-->
+ <el-form-item label="浜嬩欢鍒嗙骇" prop="eventOfLevel">
+ <el-radio-group v-model="ruleForm.eventOfLevel">
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfLevelList" :key="index"
+ :style="{margin:'5px 0'}">
+ <el-radio :label="item.value">
+ <span>{{ item.name }}</span>
+ </el-radio>
+ </el-col>
+ </el-radio-group>
+ </el-form-item>
+ <el-row>
+ <!-- 浜嬪彂鍗曚綅-->
+ <el-col :span="12">
+ <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 class="search-panel-item" label="浜嬪彂鏃堕棿" prop="atTime">
+ <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="positionOf">
+ <el-input v-model="ruleForm.positionOf">
+ <!-- <el-button slot="suffix" type="text" class="el-icon-location-information"-->
+ <!-- @click="locationInfo"></el-button>-->
+ <el-button style="padding-right:10px;" slot="suffix" type="text"
+ @click="locationInfo">
+ <img src="../../../../public/assets/images/map/loc.png" alt="">
+ </el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <!-- 浣嶇疆鎻忚堪-->
+ <el-col :span="12">
+ <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="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="lineType">
+ <label>{{ ruleForm.lineTypeText }}</label>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- 鐐瑰嚮涓婁紶-->
+ <el-form-item label="闄勪欢涓婁紶" prop="upload">
+ <el-upload
+ class="upload-demo"
+ action="uploadAction"
+ multiple
+ :limit="3"
+ :file-list="fileList">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ </el-upload>
+ </el-form-item>
+ <!-- 娑堟伅鎺ㄩ��-->
+ <el-form-item label="娑堟伅鎺ㄩ��" prop="beingPush">
+ <el-checkbox-group v-model="ruleForm.beingPushed" @change="infoChange">
+ <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" class="way-to">
+ <el-form-item label="浜嬩欢鎻忚堪" prop="desc">
+ <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="receiveOne">
+ <el-input type="textarea" resize="none" v-model="ruleForm.receiveOne"
+ placeholder="寮犱笁锛涙潕鍥涳紝"></el-input>
+ <el-button type="primary">+</el-button>
+ </el-form-item>
+ </div>
+ <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>
+<!-- </el-dialog>-->
+ <!-- </div>-->
+</template>
+
+<script>
+import eventBus from '../../../eventBus'
+
+export default {
+ name: 'EventsReported',
+ data () {
+ return {
+ // 鍒ゆ柇寮规鏄惁鑳藉睍绀� temp=>涓存椂true 寮�鍙�
+ dialogVisible: false,
+ // 琛ㄥ崟缁戝畾鏁版嵁
+ ruleForm: {
+ // 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
+ nameOfEvent: '',
+ // 浜嬩欢绫诲瀷 缁戝畾鏁版嵁鍊�
+ eventOfType: '',
+ // 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfTypeList: [
+ {
+ name: '娴�(姘�)涓婃孩娌规薄鏌�',
+ value: 1
+ },
+ {
+ name: '娌规皵绠￠亾娉勬紡姹℃煋',
+ value: 2
+ },
+ {
+ name: '杈愬皠姹℃煋',
+ value: 3
+ },
+ {
+ name: '鐢熸�佺幆澧冪牬鍧�',
+ value: 4
+ },
+ {
+ name: '鍏朵粬',
+ value: 5
+ }
+ ],
+ // 浜嬩欢绛夌骇
+ eventOfLevel: '',
+ // 浜嬩欢绛夌骇鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
+ eventOfLevelList: [
+ {
+ name: '鐗瑰埆閲嶅ぇ鐜浜嬩欢',
+ value: 1
+ },
+ {
+ name: '閲嶅ぇ鐜浜嬩欢',
+ value: 2
+ },
+ {
+ name: '杈冨ぇ鐜浜嬩欢',
+ value: 3
+ },
+ {
+ name: '涓�鑸珹绾�',
+ value: 4
+ },
+ {
+ name: '涓�鑸珺绾�',
+ value: 5
+ },
+ {
+ name: '涓�鑸珻绾�',
+ value: 6
+ }
+ ],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: '',
+ unitList: [
+ {
+ label: '鎵瓙',
+ value: '1'
+ },
+ {
+ label: '鍗椾含',
+ value: '2'
+ }
+ ],
+ // 浜嬪彂鏃堕棿 缁戝畾鏁版嵁
+ atTime: '',
+ // 浜嬪彂浣嶇疆
+ positionOf: '',
+ // 浣嶇疆鎻忚堪
+ positionDescription: '',
+ // 绠＄嚎鍚嶇О
+ lineName: '',
+ // 绠＄嚎绫诲瀷
+ lineType: '',
+ lineTypeText: '鑷姩甯﹀嚭涓嶅彲淇敼',
+ // 娑堟伅鎺ㄩ��
+ beingPushed: [],
+ beingPushList: [
+ {
+ name: '鐭俊鎺ㄩ��',
+ value: false
+ },
+ {
+ name: '鎵嬫満搴旂敤鎺ㄩ��',
+ value: false
+ }
+ ],
+ // 浜嬩欢鎻忚堪
+ desc: '',
+ // 鎺ユ敹浜哄憳
+ receiveOne: ''
+ },
+ // 涓婁紶鍒楄〃
+ fileList: [],
+ // 涓婁紶鍦板潃
+ uploadAction: '',
+ // 琛ㄥ崟楠岃瘉
+ rules: {
+ // 浜嬩欢鍚嶇О鏍￠獙
+ nameOfEvent: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ椿鍔ㄥ悕绉�',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬩欢绫诲瀷鏍￠獙
+ eventOfType: [
+ {
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绫诲瀷',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬩欢绛夌骇鏍￠獙
+ eventOfLevel: [
+ {
+ required: true,
+ message: '璇烽�夋嫨浜嬩欢绛夌骇',
+ trigger: 'blur'
+ }
+ ],
+ // 浜嬪彂鍗曚綅 缁戝畾鏁版嵁鍊�
+ unit: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩鍖哄煙',
+ trigger: 'change'
+ }
+ ],
+ // 浜嬪彂鏃堕棿
+ atTime: [
+ {
+ required: true,
+ message: '璇烽�夋嫨娲诲姩璧勬簮',
+ trigger: 'change'
+ }
+ ],
+ // 浜嬩欢浣嶇疆鏍￠獙
+ positionOf: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ椿鍔ㄤ綅缃�',
+ trigger: 'blur'
+ }
+ ],
+ // 浣嶇疆鎻忚堪鏍￠獙
+ positionDescription: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヤ綅缃弿杩�',
+ trigger: 'blur'
+ }
+ ],
+ // 绠＄嚎鍚嶇О
+ lineName: [],
+ // 绠＄嚎绫诲瀷
+ lineType: []
+ },
+ // 鎻忚堪 鎺ユ敹 => 灞曠ず/闅愯棌
+ wayTo: false,
+ // 鎺у埗鏄剧ず瀹氫綅浜岀骇椤甸潰灞曠ず/闅愯棌
+ location: false
+ }
+ },
+ methods: {
+ // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
+ infoChange () {
+ if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
+ this.wayTo = true
+ } else {
+ this.wayTo = false
+ }
+ },
+ // 鐐瑰嚮瀹氫綅 杩涜浣嶇疆閫夋嫨
+ locationInfo () {
+ // 鐖剁粍浠� 浼犻�掓暟鎹帶鍒朵簩绾ч檮灞炴鐨勬樉绀洪殣钘�
+ this.location = !this.location
+ // 浼犻�� 鏁版嵁 鎺у埗 涓夌骇闄勫睘妗嗙殑闅愯棌
+ eventBus.$emit('pipelineFile-choose', false)
+ // 閫氳繃 bus 鎺у埗tab 鏍� 鏄剧ず 鍝竴涓� 浼犻�掓暟鎹瀹� 姣忔閲嶆柊閫夋嫨瀹氫綅 閮芥寚瀹� 閫夋嫨绗竴涓紑濮�
+ eventBus.$emit('tab-change', 'first')
+ },
+ // 鎺ユ敹瀛愮粍浠� 浼犻�� 鏁版嵁 杩涜 浜岀骇 闄勫睘妗嗙殑鏄剧ず/闅愯棌
+ getLocalCation (value) {
+ // console.log(value)
+ this.location = value
+ },
+ // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
+ submitForm (formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ // alert('submit!')
+ this.$message({
+ message: '浜嬩欢涓婃姤鎻愪氦鎴愬姛',
+ type: 'success'
+ })
+ } else {
+ this.$message('浜嬩欢涓婃姤鎻愪氦澶辫触')
+ return false
+ }
+ })
+ this.circlePopup()
+ this.$refs[formName].resetFields()
+ },
+ // 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
+ circlePopup () {
+ this.eventsReported = false
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ this.circlePopup()
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ .event-report-dialog {
+
+ }
+
+ /deep/ .el-dialog {
+ width: 30%;
+ }
+
+ .way-to {
+ /deep/ .el-form-item__content {
+ display: flex;
+ }
+ }
+
+ /deep/ .form-popup {
+ margin: 0 15px;
+ }
+
+ .report-incident {
+ position: absolute;
+ top: 0.42979rem;
+ left: 3.14583rem;
+ z-index: 999;
+ display: flex;
+
+ .report-box {
+ min-width: 3.4674324rem;
+ max-width: 3.4674324rem;
+
+ .public-bounced-title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
+ }
+
+ i {
+ color: #C0C4CC;
+ margin: 0 15px;
+ font-size: 22px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+
+ /deep/ .el-form-item {
+ margin: 10px 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/ .el-icon-time:before {
+ content: " ";
+ }
+
+ /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;
+ }
+
+ /deep/ .el-input.is-disabled .el-input__inner {
+ color: #C0C4CC;
+ font-size: 0.01rem;
+ border-radius: 4px;
+ background: @background-color;
+ border-color: @color;
+ }
+
+ /deep/ .el-input__inner {
+ /*width: 145px;*/
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+ }
+
+ /deep/ .el-form-item__label {
+ color: @color;
+ }
+
+ /deep/ .el-radio__label {
+ color: @color;
+ }
+
+ .confirmCancel {
+ text-align: right;
+ margin: 15px;
+ /*display: flex;*/
+ /*justify-content: flex-end;*/
+ }
+</style>
diff --git a/src/components/base-page/enterprise-emergency/PipelineFile.vue b/src/components/base-page/enterprise-emergency/PipelineFile.vue
index f7e9f6c..dafd268 100644
--- a/src/components/base-page/enterprise-emergency/PipelineFile.vue
+++ b/src/components/base-page/enterprise-emergency/PipelineFile.vue
@@ -1,6 +1,6 @@
<template>
<div class="pipeline-file map-background" v-show="pipelineFile">
- <el-row style="margin: 0 15px">
+ <el-row style="margin: 5px 15px">
<el-form ref="form" :model="form" label-width="80px">
<el-col :span="12">
<el-form-item label="绠＄嚎鍚嶇О">
@@ -22,11 +22,32 @@
</el-col>
</el-form>
</el-row>
+ <div v-for="(item,index) in folderList" :key="index">
+ <div class="fold-box">
+ <img :src="item.fold" alt="" @click="fileAccord(item)"/>
+ <span @click="fileAccord(item)">{{ item.introduce }}</span>
+ </div>
+ <div v-for="(ite,ind) in item.items" :key="ind" v-show="item.fileCode" class="file">
+ <!-- <el-col :span="12">-->
+ <div class="file-left">
+ <img :src="ite.file" alt="" @click="codeAccord(ite)"/>
+ <span @click="codeAccord(ite)">{{ite.introduce}}</span>
+ </div>
+ <div class="file-right">
+ <span v-show="ite.fileCode">{{item.code}}</span>
+ </div>
+ <!-- </el-col>-->
+ <!-- <el-col :span="12">-->
+ <!-- </el-col>-->
+ </div>
+ </div>
</div>
</template>
<script>
import eventBus from '../../../eventBus'
+import foldPng from '../../../../public/assets/images/map/emergency/fold.png'
+import filePng from '../../../../public/assets/images/map/emergency/file.png'
export default {
name: 'PipelineFile',
@@ -36,7 +57,49 @@
form: {
pipeName: '',
pipeCode: ''
- }
+ },
+ folderList: [
+ {
+ fold: foldPng,
+ introduce: '鐢熶骇涓�鍖�',
+ code: '400001',
+ fileCode: false,
+ items: [
+ {
+ file: filePng,
+ introduce: '绠＄嚎A',
+ code: '1000001',
+ fileCode: false
+ },
+ {
+ file: filePng,
+ introduce: '绠＄嚎B',
+ code: '2000002',
+ fileCode: false
+ }
+ ]
+ },
+ {
+ fold: foldPng,
+ introduce: '鐢熶骇浜屽尯',
+ code: '400002',
+ fileCode: false,
+ items: [
+ {
+ file: filePng,
+ introduce: '绠＄嚎C',
+ code: '3000003',
+ fileCode: false
+ },
+ {
+ file: filePng,
+ introduce: '绠＄嚎D',
+ code: '4000004',
+ fileCode: false
+ }
+ ]
+ }
+ ]
}
},
mounted () {
@@ -44,17 +107,27 @@
// console.log(obj)
this.pipelineFile = obj
})
+ },
+ methods: {
+ fileAccord (item) {
+ item.fileCode = !item.fileCode
+ },
+ codeAccord (item) {
+ item.fileCode = !item.fileCode
+ }
}
}
</script>
<style lang="less" scoped>
.pipeline-file {
- min-width: 2.94532rem;
+ min-width: 1.94532rem;
+ max-width: 1.94532rem;
}
- /*/deep/ .el-input {*/
- /* width: 65%;*/
- /* margin: 0 auto;*/
- /*}*/
+ .file {
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ }
</style>
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index 0a48008..e45dd7d 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -1,6 +1,6 @@
<template>
<div class="side-box map-background" v-show="location">
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tabs v-model="activeName">
<el-tab-pane label="鐐瑰嚮瀹氫綅" name="first">
<div class="click-location">
<el-input v-model="clickLocation"></el-input>
@@ -10,26 +10,30 @@
<el-tab-pane label="绠℃瀹氫綅" name="second">
<div class="place">
<div class="place-top">
- <div class="place-left">
- <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">
- <el-option
- v-for="item in linePos.affFacList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
- </div>
- <div class="place-right">
- <el-button type="primary" size="small" @click="fileChoose">鎼滅储</el-button>
- </div>
+ <!-- <div class="place-left">-->
+ <el-form :model="linePos" label-width="90px">
+ <el-row class="elrow">
+ <el-col :span="16">
+ <el-form-item label="绠＄嚎鍚嶇О:">
+ <el-input v-model="linePos.lineName"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8" style="vertical-align: middle !important;">
+ <el-button type="primary" size="mini" @click="fileChoose">...</el-button>
+ <el-button type="primary" size="mini" @click="tableAccod">鎼滅储</el-button>
+ </el-col>
+ </el-row>
+ <el-form-item label="闄勫睘璁炬柦:">
+ <el-select v-model="linePos.affFac">
+ <el-option
+ v-for="item in linePos.affFacList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
</div>
<div class="place-bottom">
<el-button type="primary" @click="confirm">纭</el-button>
@@ -59,6 +63,38 @@
</div>
</el-tab-pane>
</el-tabs>
+ <div class="pipe-table" v-show="pipeTable">
+ <el-table
+ :data="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="number"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
+ prop="seares"
+ label="鎼滅储缁撴灉">
+ </el-table-column>
+ <el-table-column
+ prop="restype"
+ label="缁撴灉绫诲瀷">
+ </el-table-column>
+ </el-table>
+<!-- <el-card class="footer-page" v-if="total >= 0">-->
+ <el-pagination
+ mini
+ @size-change="handleSizeChange"
+ @current-change="handlePage"
+ :page-size=pageSize
+ :current-page="currentPage"
+ layout="prev, pager, next"
+ :total=total
+ class="warnPagination"
+ >
+ </el-pagination>
+<!-- </el-card>-->
+ </div>
</div>
</template>
@@ -70,8 +106,17 @@
props: ['location'],
data () {
return {
+ // 鎺ユ敹鏁版嵁 鎺у埗椤甸潰灞曠ず/闅愯棌
pipelineFile: false,
+ // active tab鍒囨崲
activeName: 'first',
+ // 绠℃鏌ヨtable
+ pipeTable: false,
+ // 鍒嗛〉鍔熻兘
+ pageSize: 3,
+ total: 0,
+ currentPage: 1,
+ // 鐐瑰嚮瀹氫綅缁戝畾鏁版嵁
clickLocation: '',
// 缁忕含搴﹀畾浣�
LongLatPos: {
@@ -93,7 +138,35 @@
}
]
},
- fileChoChange: false
+ fileChoChange: false,
+ tableData: [
+ {
+ number: 1,
+ seares: '20璺洦姘寸绾�',
+ restype: '绠＄嚎鍚嶇О'
+ }, {
+ number: 2,
+ seares: '20璺洦姘寸绾�',
+ restype: '绠＄嚎鍚嶇О'
+ }, {
+ number: 3,
+ seares: '100020',
+ restype: '绠℃缂栫爜'
+ },
+ {
+ number: 4,
+ seares: '20璺洦姘寸绾�',
+ restype: '绠＄嚎鍚嶇О'
+ }, {
+ number: 5,
+ seares: '20璺洦姘寸绾�',
+ restype: '绠＄嚎鍚嶇О'
+ }, {
+ number: 6,
+ seares: '100020',
+ restype: '绠℃缂栫爜'
+ }
+ ]
}
},
mounted () {
@@ -103,8 +176,16 @@
})
},
methods: {
- // tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
- handleClick (tab) {},
+ // 鍒嗛〉鍔熻兘 currentPage 鏀瑰彉鏃朵細瑙﹀彂
+ handlePage (val) {
+ // console.log(val)
+ this.currentPage = val
+ },
+ // 鍒嗛〉鍔熻兘 pageSize 鏀瑰彉鏃朵細瑙﹀彂
+ handleSizeChange (val) {
+ // console.log(val)
+ this.pageSize = val
+ },
// 鐐瑰嚮鏂囦欢閫夋嫨 鏄剧ず绗笁绾ч〉闈� 杩涜绠＄嚎/娈甸�夋嫨
fileChoose () {
this.fileChoChange = !this.fileChoChange
@@ -116,12 +197,70 @@
this.$emit('localCation', false)
// 閫氳繃bus 鎺у埗涓夌骇闄勫睘寮规鐨勯殣钘�
eventBus.$emit('pipelineFile-choose', false)
+ },
+ // 绠℃鏌ヨ琛ㄦ牸灞曠ず
+ tableAccod () {
+ this.pipeTable = !this.pipeTable
}
}
}
</script>
<style lang="less" scoped>
+ /deep/
+ .warnPagination {
+ .btn-quicknext, .btn-quickprev {
+ color: #e4e8f1 !important;
+ background-color: transparent;
+ // border: 1px solid #25AECD;
+ border-left: 1px solid #25AECD;
+ border-bottom: 1px solid #25AECD;
+ border-top: 1px solid #25AECD;
+ color: #e4e8f1;
+ }
+
+ .el-pager li {
+ color: #e4e8f1;
+ background: transparent;
+ // border: 1px solid #25AECD;
+ border-left: 1px solid #25AECD;
+ border-bottom: 1px solid #25AECD;
+ border-top: 1px solid #25AECD;
+ }
+
+ .el-pager li.active {
+ border-color: #25AECD;
+ background-color: rgba(38, 222, 253, 0.3);
+ color: #e4e8f1;
+ }
+
+ .el-pager li:hover {
+ border-color: #25AECD;
+ background-color: rgba(38, 222, 253, 0.3);
+ color: #34e0ff;
+ }
+
+ .btn-prev {
+ background-color: transparent;
+ // border: 1px solid #25AECD;
+ border-left: 1px solid #25AECD;
+ border-bottom: 1px solid #25AECD;
+ border-top: 1px solid #25AECD;
+ color: #e4e8f1;
+ }
+
+ .btn-next {
+ background-color: transparent;
+ border: 1px solid #25AECD;
+ color: #e4e8f1;
+ }
+ }
+
+ .elrow {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ }
.side-box {
min-width: 1.94532rem;
@@ -133,7 +272,7 @@
text-align: center;
.el-input {
- width: 90%;
+ width: 80%;
margin: 15px auto;
}
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 2e558db..c4437be 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -371,14 +371,18 @@
submitForm (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!')
+ // alert('submit!')
+ this.$message({
+ message: '浜嬩欢涓婃姤鎻愪氦鎴愬姛',
+ type: 'success'
+ })
} else {
- console.log('error submit!!')
+ this.$message('浜嬩欢涓婃姤鎻愪氦澶辫触')
return false
}
})
this.circlePopup()
- this.ruleForm.nameOfEvent = this.ruleForm.eventOfType = ''
+ this.$refs[formName].resetFields()
},
// 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
circlePopup () {
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 8934696..1d1c7a2 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -32,6 +32,9 @@
</el-radio>
</el-radio-group>
</el-form-item>
+ <el-row>
+ <el-button type="primary" small @click="dialogVisible = !dialogVisible">浜嬩欢涓婃姤</el-button>
+ </el-row>
<div class="page_total">
<p>鍏辫
<span>{{total}}</span>
@@ -88,6 +91,39 @@
</div>
</div>
</el-scrollbar>
+<!-- :show-close="false"-->
+ <div class="event-report">
+ <el-dialog
+ custom-class="event-report-dialog"
+ title="浜嬩欢涓婃姤"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <EventsReported></EventsReported>
+ </el-dialog>
+ <el-dialog
+ custom-class="event-report-dialog"
+ title="閫夋嫨椤哄簭"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <span>local閫夋嫨</span>
+ </el-dialog>
+ <el-dialog
+ custom-class="event-report-dialog"
+ title="鏂囦欢閫夋嫨"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <span>file</span>
+ </el-dialog>
+ </div>
</div>
</template>
@@ -99,13 +135,17 @@
import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
import eventBus from '../../../../eventBus'
+import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
+
export default {
name: 'EventQuery',
components: {
// DisposalEvent
+ EventsReported
},
data () {
return {
+ dialogVisible: false,
reportIncident: false,
list: [],
total: 0,
@@ -196,4 +236,13 @@
</script>
<style lang="less" scoped>
+ .event-report {
+ display: flex;
+ }
+ /*/deep/ .el-row {*/
+ /* text-align: right;*/
+ /*}*/
+ /deep/ .el-dialog {
+ width: 30%;
+ }
</style>
diff --git a/src/components/panel/topicSearch/sewers-select/SewersHistory.vue b/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
index 9d328f8..63c5e52 100644
--- a/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
+++ b/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
@@ -35,7 +35,7 @@
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
- <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <div class="environmental-risk-list hover">
<i class="state"></i>
<div>
<h3>###鐐煎寲閮�</h3>
@@ -43,7 +43,7 @@
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
- <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <div class="environmental-risk-list hover">
<i class="state"></i>
<div>
<h3>###鐐煎寲閮�</h3>
@@ -148,8 +148,9 @@
}
},
methods: {
- handlePage () {
-
+ // 鍒嗛〉
+ handlePage (val) {
+ console.log(val)
},
handlePipelineType (val) {
console.log(val)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e1f0749..d5d363d 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,6 +20,7 @@
<ReportIncident></ReportIncident>
<Emergency ref="Emergency"></Emergency>
<Message></Message>
+ <EventsReported></EventsReported>
</div>
</template>
@@ -43,6 +44,7 @@
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
+import EventsReported from '../components/base-page/enterprise-emergency/EventsReported'
export default {
name: 'MapTemplate',
@@ -59,7 +61,8 @@
// PublicBounced,
Emergency,
Message,
- ReportIncident
+ ReportIncident,
+ EventsReported
},
data () {
return {
--
Gitblit v1.8.0