From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/pipeInformationSearch.vue | 6
src/components/base-page/enterprise-emergency/EventsReported.vue | 467 +++++++++++++++
src/components/panel/topicSearch/GasWasteSearch.vue | 13
src/assets/css/map/map-panel-style.less | 7
src/views/MapTemplate.vue | 5
src/components/panel/topicSearch/sewers-select/SewersHistory.vue | 119 ++-
src/components/panel/topicSearch/DischargeSearch.vue | 10
src/components/panel/topicSearch/SolidWasteSearch.vue | 27
src/components/base-page/enterprise-emergency/ReportFile.vue | 139 ++++
src/components/panel/topicSearch/EnvRiskSearch.vue | 6
src/components/panel/topicSearch/pipeChangesSearch.vue | 6
src/components/panel/topicSearch/WaterWasteSearch.vue | 14
src/components/panel/topicSearch/enterprise-emergency/ResourcesQuery.vue | 32 +
src/components/table/summarySheets.vue | 170 ++--
public/assets/images/map/emergency/file.png | 0
src/components/base-page/enterprise-emergency/PipelineFile.vue | 87 ++
src/components/base-page/enterprise-emergency/ReportLocation.vue | 365 +++++++++++
src/components/panel/topicSearch/SewersSearch.vue | 6
public/assets/images/map/emergency/fold.png | 0
src/components/base-page/enterprise-emergency/PositionChange.vue | 188 +++++
src/components/base-page/enterprise-emergency/ReportIncident.vue | 77 +-
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 73 +
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 6
23 files changed, 1,597 insertions(+), 226 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/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 0afa10b..133719f 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -828,3 +828,10 @@
padding: 5px;
color: #f2f2f2;
}
+
+/************鎼滅储鏁版嵁鍒嗛〉鍔熻兘鎬绘暟閲忔牱寮忔坊鍔�************/
+.page_total {
+ text-align: right;
+ margin: 5px 0;
+ color: @color;
+}
\ No newline at end of file
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..fcc52d7
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/EventsReported.vue
@@ -0,0 +1,467 @@
+<template>
+ <div class="event-report">
+<!-- :rules="rules"-->
+<!-- :show-close="false"-->
+ <el-form :model="ruleForm" 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" clearable>
+ <!-- <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
+ custom-class="el-dialog--center"
+ :visible.sync="dialogLocation"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <ReportLocation @locationClick="getlocaltionClick"></ReportLocation>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+
+import ReportLocation from '../../../components/base-page/enterprise-emergency/ReportLocation'
+
+export default {
+ name: 'EventsReported',
+ components: {
+ ReportLocation
+ },
+ data () {
+ return {
+ // 琛ㄥ崟缁戝畾鏁版嵁
+ 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,
+ // 瀹氫綅浣嶇疆閫夋嫨寮规
+ dialogLocation: false
+ }
+ },
+ methods: {
+ // 鎺ユ敹瀛愮粍浠朵紶閫掔殑鏁版嵁
+ getlocaltionClick (val) {
+ console.log(val)
+ this.ruleForm.positionOf = val.latPos + '-' + val.longPos
+ this.dialogLocation = !this.dialogLocation
+ },
+ // 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
+ infoChange () {
+ if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
+ this.wayTo = true
+ } else {
+ this.wayTo = false
+ }
+ },
+ // 鐐瑰嚮瀹氫綅 杩涜浣嶇疆閫夋嫨
+ locationInfo () {
+ this.dialogLocation = !this.dialogLocation
+ },
+ // 琛ㄥ崟鐨勭‘璁ゆ寜閽偣鍑讳簨浠�
+ submitForm (formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ // alert('submit!')
+ this.$message({
+ message: '浜嬩欢涓婃姤鎻愪氦鎴愬姛',
+ type: 'success'
+ })
+ } else {
+ this.$message('浜嬩欢涓婃姤鎻愪氦澶辫触')
+ return false
+ }
+ })
+ this.$refs[formName].resetFields()
+ },
+ // form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
+ resetForm (formName) {
+ this.$refs[formName].resetFields()
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ .event-report {
+ margin: 0 10px !important;
+ }
+
+ /deep/ .el-dialog--center {
+ /*left: 5.3rem !important;*/
+ margin-top: 0.13979rem !important;
+ margin-left: 5.5rem !important;
+ }
+
+ /*.event-report-dialog {*/
+ /* left: 2rem !important;*/
+ /* top: 0.73979rem !important;*/
+ /*}*/
+
+ /deep/ .el-dialog {
+ width: 20%;
+ }
+ /deep/.el-dialog__header {
+ /*display: none;*/
+ /*max-height: 0.05rem !important;*/
+ border: none !important;
+ }
+
+ .way-to {
+ /deep/ .el-form-item__content {
+ display: flex;
+ /*.el-button {*/
+ /* margin-right: 30px;*/
+ /*}*/
+ }
+ }
+
+ /deep/ .el-form-item {
+ margin: 2px 0 !important;
+ color: #00fff6 !important;
+ }
+
+ /deep/ .el-textarea__inner {
+ height: 0.28rem !important;
+ max-height: 0.45rem !important;
+ 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 {
+ 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;*/
+ height: 0.2rem !important;
+ 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: 0.071234rem !important;
+ }
+</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 36af28a..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,15 @@
})
},
methods: {
- // tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
- handleClick (tab) {
+ // 鍒嗛〉鍔熻兘 currentPage 鏀瑰彉鏃朵細瑙﹀彂
+ handlePage (val) {
+ // console.log(val)
+ this.currentPage = val
+ },
+ // 鍒嗛〉鍔熻兘 pageSize 鏀瑰彉鏃朵細瑙﹀彂
+ handleSizeChange (val) {
+ // console.log(val)
+ this.pageSize = val
},
// 鐐瑰嚮鏂囦欢閫夋嫨 鏄剧ず绗笁绾ч〉闈� 杩涜绠＄嚎/娈甸�夋嫨
fileChoose () {
@@ -117,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;
@@ -134,7 +272,7 @@
text-align: center;
.el-input {
- width: 90%;
+ width: 80%;
margin: 15px auto;
}
diff --git a/src/components/base-page/enterprise-emergency/ReportFile.vue b/src/components/base-page/enterprise-emergency/ReportFile.vue
new file mode 100644
index 0000000..efa0e23
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/ReportFile.vue
@@ -0,0 +1,139 @@
+<template>
+ <div class="report-file-box">
+ <el-row style="margin: 5px 15px">
+ <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 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">
+ <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>
+ </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: 'ReportFile',
+ data () {
+ return {
+ pipelineFile: false,
+ 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 () {
+ eventBus.$on('pipelineFile-choose', (obj) => {
+ // console.log(obj)
+ this.pipelineFile = obj
+ })
+ },
+ methods: {
+ fileAccord (item) {
+ item.fileCode = !item.fileCode
+ },
+ codeAccord (item) {
+ item.fileCode = !item.fileCode
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ .file {
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ }
+
+ /deep/ .el-input__inner {
+ border-radius: 5px;
+ background: rgba(0, 16, 30, 0.5);
+ border-color: @color;
+ }
+
+ /deep/ .el-form-item__label {
+ color: @color;
+ }
+
+ /deep/ .el-radio__label {
+ color: @color;
+ }
+</style>
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 85e6e8f..c4437be 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -17,9 +17,12 @@
<!-- 浜嬩欢绫诲瀷-->
<el-form-item label="浜嬩欢绫诲瀷" prop="eventOfType">
<el-radio-group v-model="ruleForm.eventOfType">
- <el-radio v-for="(item,index) in ruleForm.eventOfTypeList" :label="item.value" :key="index">
- <span>{{ item.name }}</span>
- </el-radio>
+ <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>
<!-- 浜嬩欢绛夌骇-->
@@ -99,19 +102,15 @@
<el-upload
class="upload-demo"
action="uploadAction"
- :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-checkbox-group v-model="ruleForm.beingPushed" @change="infotsChange">
+ <el-checkbox-group v-model="ruleForm.beingPushed" @change="infoChange">
<el-checkbox v-for="item in ruleForm.beingPushList"
:key="item.name"
:label="item.name"
@@ -141,7 +140,7 @@
</div>
</div>
<div class="local-box">
- <PositionChange :location="location" @localCation="getlocalCation"></PositionChange>
+ <PositionChange :location="location" @localCation="getLocalCation"></PositionChange>
</div>
<div class="file-box">
<PipelineFile></PipelineFile>
@@ -151,6 +150,7 @@
<script>
import '../../../utils/dragBoxes'
import eventBus from '../../../eventBus'
+// 寮曞叆缁勪欢
import PositionChange from './PositionChange'
import PipelineFile from './PipelineFile'
@@ -164,8 +164,6 @@
return {
// 鍒ゆ柇寮规鏄惁鑳藉睍绀� temp=>涓存椂true 寮�鍙�
eventsReported: false,
- // eventsReported: true,
- saveSuccess: false,
// 琛ㄥ崟缁戝畾鏁版嵁
ruleForm: {
// 浜嬩欢鍚嶇О 缁戝畾鏁版嵁
@@ -175,16 +173,24 @@
// 浜嬩欢绫诲瀷鍙�夋嫨鏁版嵁radio 缁戝畾鏁版嵁
eventOfTypeList: [
{
- name: '寰呰ˉ鍏�',
+ name: '娴�(姘�)涓婃孩娌规薄鏌�',
value: 1
},
{
- name: '寰呰ˉ鍏�',
+ name: '娌规皵绠￠亾娉勬紡姹℃煋',
value: 2
},
{
- name: '寰呰ˉ鍏�',
+ name: '杈愬皠姹℃煋',
value: 3
+ },
+ {
+ name: '鐢熸�佺幆澧冪牬鍧�',
+ value: 4
+ },
+ {
+ name: '鍏朵粬',
+ value: 5
}
],
// 浜嬩欢绛夌骇
@@ -256,6 +262,10 @@
// 鎺ユ敹浜哄憳
receiveOne: ''
},
+ // 涓婁紶鍒楄〃
+ fileList: [],
+ // 涓婁紶鍦板潃
+ uploadAction: '',
// 琛ㄥ崟楠岃瘉
rules: {
// 浜嬩欢鍚嶇О鏍￠獙
@@ -321,12 +331,8 @@
},
// 鎻忚堪 鎺ユ敹 => 灞曠ず/闅愯棌
wayTo: false,
- location: false,
- // 涓婁紶鍒楄〃
- fileList: [],
- // 涓婁紶鍦板潃
- uploadAction: '',
- getLocalInfo: ''
+ // 鎺у埗鏄剧ず瀹氫綅浜岀骇椤甸潰灞曠ず/闅愯棌
+ location: false
}
},
mounted () {
@@ -340,7 +346,7 @@
},
methods: {
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
- infotsChange () {
+ infoChange () {
if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
this.wayTo = true
} else {
@@ -357,7 +363,7 @@
eventBus.$emit('tab-change', 'first')
},
// 鎺ユ敹瀛愮粍浠� 浼犻�� 鏁版嵁 杩涜 浜岀骇 闄勫睘妗嗙殑鏄剧ず/闅愯棌
- getlocalCation (value) {
+ getLocalCation (value) {
// console.log(value)
this.location = value
},
@@ -365,13 +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.eventsReported = false
+ this.circlePopup()
+ this.$refs[formName].resetFields()
},
// 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
circlePopup () {
@@ -380,21 +391,7 @@
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
- this.eventsReported = false
- },
- // 鐐瑰嚮涓婁紶 鐨勫彇娑堜笂浼犱簨浠�
- handleRemove (file, fileList) {
- console.log(file, fileList)
- },
- // 鐐瑰嚮涓婁紶 鐨勪笂浼犱簨浠�
- handlePreview (file) {
- console.log(file)
- },
- handleExceed (files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶)
- },
- beforeRemove (file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋)
+ this.circlePopup()
}
}
}
diff --git a/src/components/base-page/enterprise-emergency/ReportLocation.vue b/src/components/base-page/enterprise-emergency/ReportLocation.vue
new file mode 100644
index 0000000..cff83dc
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/ReportLocation.vue
@@ -0,0 +1,365 @@
+<template>
+ <div class="report-location-box">
+ <div class="report-location">
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="鐐瑰嚮瀹氫綅" name="first">
+ <div class="click-location">
+ <el-row>
+ <el-input type="text" v-model="clickLocation" clearable @focus="focusLocation"></el-input>
+ </el-row>
+ <el-row>
+ <el-button type="primary" @click="confirm">纭</el-button>
+ </el-row>
+ </div>
+ </el-tab-pane>
+ <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-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.code"
+ :label="item.name"
+ :value="item.code">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="place-bottom">
+ <el-button type="primary" @click="confirm">纭</el-button>
+ </div>
+ </div>
+ <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>
+ </el-tab-pane>
+ <el-tab-pane label="缁忕含搴﹀畾浣�" name="third">
+ <el-row class="place-box">
+ <div class="place-left">
+ <el-form :model="LongLatPos" label-width="90px">
+ <el-form-item label="缁忓害:">
+ <el-input v-model="LongLatPos.longPos"></el-input>
+ </el-form-item>
+ <el-form-item label="绾害:">
+ <el-input v-model="LongLatPos.latPos"></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="place-right">
+ <el-button type="primary" @click="mapPoints">瀹氫綅</el-button>
+ </div>
+ </el-row>
+ <div class="place-bottom">
+ <el-button type="primary" @click="confirm">纭</el-button>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+ <el-dialog
+ custom-class="el-dialog--center"
+ :visible.sync="dialogFile"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <ReportFile></ReportFile>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import eventBus from '../../../eventBus'
+import ReportFile from '../../../components/base-page/enterprise-emergency/ReportFile'
+
+import { LayerFsss } from '../../../conf/layers/LayerFsss'
+
+export default {
+ name: 'ReportLocation',
+ components: {
+ ReportFile
+ },
+ data () {
+ return {
+ dialogFile: false,
+ pipelineFile: false,
+ // active tab鍒囨崲
+ activeName: 'first',
+ // 绠℃鏌ヨtable
+ pipeTable: false,
+ // 鍒嗛〉鍔熻兘
+ pageSize: 3,
+ total: 0,
+ currentPage: 1,
+ // 鐐瑰嚮瀹氫綅缁戝畾鏁版嵁
+ clickLocation: '',
+ // 缁忕含搴﹀畾浣�
+ LongLatPos: {
+ longPos: '',
+ latPos: ''
+ },
+ // 绠℃瀹氫綅
+ linePos: {
+ lineName: '',
+ affFac: '',
+ affFacList: LayerFsss.layers
+ },
+ 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 () {
+ // 鎺ユ敹瑙勫畾 姣忔閲嶆柊閫夋嫨瀹氫綅 閮芥寚瀹� 閫夋嫨绗竴涓紑濮�
+ eventBus.$on('tab-change', (obj) => {
+ this.activeName = obj
+ })
+ },
+ methods: {
+ // 鍦板浘涓婄偣鍑�
+ selectPipeLine () {
+ window.map.on('click', this.selectClick)
+ // window.mapManager.clickDialogSwitch = false
+ },
+ // 鍦板浘涓婄偣鍑诲洖璋�
+ selectClick (e) {
+ window.map.off('click', this.selectClick)
+ // const point = [e.latlng.lng, e.latlng.lat]
+ const pointX = e.latlng.lng
+ const pointY = e.latlng.lat
+ this.clickLocation = '\'' + pointX + '\'' + pointY + ''
+ this.mapPointResult(e)
+ },
+ mapPointResult (e) {
+ console.log(e)
+ this.LongLatPos.longPos = e.latlng.lng
+ this.LongLatPos.latPos = e.latlng.lat
+ },
+ // 鑾峰緱鐒︾偣 杩涜瀹氫綅
+ focusLocation () {
+ this.selectPipeLine()
+ },
+ // 缁忕含搴﹀畾浣�
+ mapPoints () {
+ this.selectPipeLine()
+ },
+ // 鍒嗛〉鍔熻兘 currentPage 鏀瑰彉鏃朵細瑙﹀彂
+ handlePage (val) {
+ // console.log(val)
+ this.currentPage = val
+ },
+ // 鍒嗛〉鍔熻兘 pageSize 鏀瑰彉鏃朵細瑙﹀彂
+ handleSizeChange (val) {
+ // console.log(val)
+ this.pageSize = val
+ },
+ // 鐐瑰嚮鏂囦欢閫夋嫨 鏄剧ず绗笁绾ч〉闈� 杩涜绠＄嚎/娈甸�夋嫨
+ fileChoose () {
+ this.dialogFile = !this.dialogFile
+ },
+ // 鐐瑰嚮纭鎸夐挳浜嬩欢
+ confirm () {
+ // 閫氳繃瀛愮粍浠跺悜鐖剁粍浠朵紶閫掓暟鎹�
+ this.$emit('locationClick', this.LongLatPos)
+ this.clickLocation = ''
+ this.LongLatPos.longPos = ''
+ this.LongLatPos.latPos = ''
+ },
+ // 绠℃鏌ヨ琛ㄦ牸灞曠ず
+ tableAccod () {
+ this.pipeTable = !this.pipeTable
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+ /deep/ .el-dialog--center {
+ /*left: 2rem !important;*/
+ margin-left: 8rem !important;
+ margin-top: 0.13979rem !important;
+ }
+
+ /deep/ .el-dialog {
+ width: 20%;
+ }
+
+ .place-box {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ }
+
+ #pane-third {
+ text-align: center;
+ }
+
+ /*/deep/ .el-dialog .el-dialog__header {*/
+ /* display: none;*/
+ /*}*/
+ /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;
+ }
+
+ .event-report-dialog {
+ min-width: 1.94532rem;
+ max-width: 1.94532rem;
+ }
+
+ .click-location {
+ margin: 0 auto;
+ text-align: center;
+
+ .el-input {
+ width: 80%;
+ margin: 15px auto;
+ }
+
+ .el-button {
+ margin: 15px auto;
+ }
+ }
+
+ .place {
+ text-align: center;
+
+ .place-top {
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+
+ .place-right {
+ .el-button {
+ margin: 15px;
+ }
+ }
+ }
+
+ .place-bottom {
+ .el-button {
+ margin: 15px;
+ }
+ }
+ }
+</style>
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index f29036a..a1e7bc8 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -39,6 +39,12 @@
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
</el-radio-group> -->
<!-- <el-form-item >-->
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -128,6 +134,7 @@
gdVisible: true,
list: [],
total: 0,
+ pageSize: 10,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
enterpriseSubunitsTypeOptions: [],
@@ -168,6 +175,9 @@
},
props: ['title'],
methods: {
+ handlePage () {
+
+ },
flyto () {
const pos = [39.90751504898071, 116.38927817344666]
window.map.setView(pos, 15)
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 5a3aaac..a452a64 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -37,6 +37,12 @@
<el-radio-group v-model="form.type" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
</el-radio-group>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
</el-input>
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 5dff64a..57b7faa 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -48,6 +48,12 @@
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
</el-radio-group>
<!-- <el-form-item >-->
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
<!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
@@ -109,6 +115,8 @@
gdVisible: true,
list: [],
total: 0,
+ // 鍒嗛〉
+ pageSize: 10,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
enterpriseSubunitsTypeOptions: [],
@@ -130,6 +138,11 @@
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// 鍖哄煙绛涢��
areaType (val) {
this.pipelineTypeOptions.forEach((itm) => {
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b77c2be..7eedeb7 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -27,6 +27,12 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index 6060961..4ab7211 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -38,6 +38,12 @@
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
</el-radio-group> -->
<!-- <el-form-item >-->
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
<!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 1948cfd..d1b639c 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -30,6 +30,12 @@
<span class="levelOfRisk-type">{{ item.name }}</span>
</el-radio>
</el-radio-group>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -47,6 +53,17 @@
</div>
</div>
</el-scrollbar>
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
</div>
</template>
@@ -87,10 +104,18 @@
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
items: [LayerWasteSolid],
subItems: LayerWasteSolid.layers,
- list: []
+ list: [],
+ total: 0,
+ // 鍒嗛〉
+ pageSize: 10
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// select鐨刼ption鐨勬暟鎹�夋嫨
handlePipelineType (val) {
this.list = []
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 5e65031..cb3343d 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -53,6 +53,12 @@
class="levelOfRisk-type">{{item.name}}</span></el-radio>
</el-radio-group>
<!-- <el-form-item >-->
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
<!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
@@ -114,7 +120,10 @@
return {
gdVisible: true,
list: [],
+ // 鎼滅储鍒扮殑鏁版嵁鏁伴噺
total: 0,
+ // 鍒嗛〉
+ pageSize: 10,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
enterpriseSubunitsTypeOptions: [],
@@ -153,6 +162,11 @@
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// 鍖哄煙绛涢��
areaType (val) {
this.pipelineTypeOptions.forEach((itm) => {
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index f838087..e76118d 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -32,6 +32,13 @@
</el-radio>
</el-radio-group>
</el-form-item>
+ <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -62,7 +69,8 @@
<div>
<h3>
<span @click="disposalfx">浠跺悕绉�:XXX浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="startAnalysis">
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="startAnalysis">
<span>寮�濮嬪垎鏋�</span>
</el-button>
</h3>
@@ -76,12 +84,27 @@
<p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span>
<el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
@click="accordPopup()">
- <span>浜嬩欢澶勭疆</span>
+ <span>浜嬩欢绠＄悊</span>
</el-button>
</p>
</div>
</div>
</el-scrollbar>
+ <div class="event-report">
+ <el-dialog
+ custom-class="el-dialog--center"
+ title="浜嬩欢涓婃姤"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <EventsReported></EventsReported>
+ </el-dialog>
+ </div>
+<!-- <Dialog ref="EReported" title="浜嬩欢涓婃姤2">-->
+<!-- <EventsReported></EventsReported>-->
+<!-- </Dialog>-->
</div>
</template>
@@ -91,23 +114,24 @@
// import AjaxUtils from '@utils/AjaxUtils'
import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
-import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
import eventBus from '../../../../eventBus'
+import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
+
+// import Dialog from '../../../../views/popup/Dialog'
export default {
name: 'EventQuery',
components: {
- // DisposalEvent
+ // Dialog,
+ EventsReported
},
data () {
return {
+ dialogVisible: false,
reportIncident: false,
list: [],
+ total: 0,
activeNum: -1,
- LayerEvent: {},
- LayerResources: {},
- // items: [LayerEvent, LayerResources],
- // subItems: LayerEntEmer.layers,
items: [],
subItems: [],
form: {
@@ -133,19 +157,12 @@
// this.wfsHelper = new WfsHelper()
},
methods: {
- // 鐐瑰嚮浜嬩欢澶勭悊
+ dialogVisibleChange () {
+ this.dialogVisible = !this.dialogVisible
+ },
+ // 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
- // eventBus.$emit('disposal-analysis', true)
- window.$layer.open({
- content: {
- comp: EventHandling, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢澶勭疆'
- })
+ eventBus.$emit('disposal-analysis', true)
},
// 寮�濮嬪垎鏋�
startAnalysis () {
@@ -163,7 +180,6 @@
title: '浜嬩欢澶勭疆'
})
},
-
// radio鏁版嵁閫夋嫨
redioChange (item) {
console.log(item)
@@ -201,5 +217,18 @@
</script>
<style lang="less" scoped>
-
+ /*.event-report {*/
+ /deep/ .el-dialog--center {
+ /*left: 2rem !important;*/
+ margin-left: 2rem !important;
+ margin-top: 0.73979rem !important;
+ /*bottom: 0 !important;*/
+ }
+ //}
+ /*.event-report {*/
+ /deep/ .el-dialog {
+ /*width: 30%;*/
+ width: 550px;
+ }
+ /*}*/
</style>
diff --git a/src/components/panel/topicSearch/enterprise-emergency/ResourcesQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/ResourcesQuery.vue
index 5ec3213..7b269dc 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/ResourcesQuery.vue
@@ -34,6 +34,12 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -51,6 +57,17 @@
<p v-else>鍦板潃:<span>{{item.properties.adminzonename}}</span></p>
</div>
</el-scrollbar>
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
</div>
</template>
@@ -84,6 +101,10 @@
activeNum: -1,
// 鎼滅储鍒扮殑鏁版嵁杩涜瀛樺偍鐨刲ist
list: [],
+ // 鎼滅储鍒扮殑鏁版嵁鏁伴噺
+ total: 0,
+ // 鍒嗛〉
+ pageSize: 10,
// form琛ㄥ崟缁戝畾鐨勫浘灞傛暟鎹�
items: [LayerEmergencySource, LayerSurroundings],
subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
@@ -97,6 +118,11 @@
this.wfsHelper = new WfsHelper()
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// 鎼滅储灞曠ず鍥剧墖鏍规嵁杩斿洖鍊煎睍绀�
getImgSrc (type) {
// console.log(type)
@@ -107,6 +133,7 @@
handlePipelineType (val) {
// console.log(val)
this.list = []
+ this.total = 0
for (let i = 0; i < this.items.length; i++) {
const item = this.items[i].name
if (val === item.name) {
@@ -126,10 +153,12 @@
handleDataType (val) {
// console.log(val)
this.list = []
+ this.total = 0
},
// 鐐瑰嚮鎼滅储浜嬩欢
async handleSearch () {
this.list = []
+ this.total = 0
this.wfsHelper.clearFilter()
this.wfsHelper.setTypeName(['sewer:view_emergency'])
this.wfsHelper.setMaxFeatures(100)
@@ -143,9 +172,10 @@
this.wfsHelper.addLike('name', this.form.keyword)
}
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
- // console.log(res)
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
+ this.total = res.numberReturned
}
},
// 鏌ヨ瀹氫綅鍔熻兘
diff --git a/src/components/panel/topicSearch/pipeChangesSearch.vue b/src/components/panel/topicSearch/pipeChangesSearch.vue
index e433b29..49a5311 100644
--- a/src/components/panel/topicSearch/pipeChangesSearch.vue
+++ b/src/components/panel/topicSearch/pipeChangesSearch.vue
@@ -21,6 +21,12 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
diff --git a/src/components/panel/topicSearch/pipeInformationSearch.vue b/src/components/panel/topicSearch/pipeInformationSearch.vue
index 19b638f..b594913 100644
--- a/src/components/panel/topicSearch/pipeInformationSearch.vue
+++ b/src/components/panel/topicSearch/pipeInformationSearch.vue
@@ -15,6 +15,12 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
diff --git a/src/components/panel/topicSearch/sewers-select/SewersHistory.vue b/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
index c4abfe5..63c5e52 100644
--- a/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
+++ b/src/components/panel/topicSearch/sewers-select/SewersHistory.vue
@@ -1,52 +1,69 @@
<template>
- <div class="sewers-search" v-if="judgeVisible">
- <div class="search-panel ">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item v-for="(item,index) in Options" :key="index" :label="item.label+'锛�'" size="mini"
- class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="(ite,index) in item.options"
- :key="index"
- :label="ite.label"
- :value="ite.value">
- </el-option>
- </el-select>
- </el-form-item>
- <div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item v-for="(item,index) in Options" :key="index" :label="item.label+'锛�'" size="mini"
+ class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="(ite,index) in item.options"
+ :key="index"
+ :label="ite.label"
+ :value="ite.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
</div>
- </el-form>
+ <el-scrollbar style="height:377px">
+ <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list hover">
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list hover">
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
</div>
- <el-scrollbar style="height:377px">
- <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- </el-scrollbar>
- </div>
</template>
<script>
@@ -123,10 +140,18 @@
key: 'length'
}]
}
- ]
+ ],
+ list: [],
+ total: 0,
+ // 鍒嗛〉
+ pageSize: 10
}
},
methods: {
+ // 鍒嗛〉
+ handlePage (val) {
+ console.log(val)
+ },
handlePipelineType (val) {
console.log(val)
},
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 007ffcc..f8a9396 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,43 +1,43 @@
<template>
- <div class="summary-sheets">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
- <div :class='["iconBtn",selectGroup ? "active-button" : ""]' @click="subtopicBtn" >
- <i class="el-icon-tickets icon"></i>
- </div>
- </el-tooltip>
- <transition name="animationChange">
- <div class="subtopic" v-show="selectGroup">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
- <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
- <!-- -->
- <i class="icon iconfont iconbiaoge2"></i>
- <!--<span class="icon-name">缁熻琛�</span>-->
- </div>
- </el-tooltip>
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom">
- <div :class='["iconBtn",companyVisible ? "active-button" : ""]' @click="showStatisDialog()" >
- <!-- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon"> -->
- <i class="el-icon-office-building icon"></i>
- </div>
- </el-tooltip>
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom">
- <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()" >
- <i class="icon iconfont iconbaojing01"></i>
- <!--<span class="icon-name">棰勬姤璀�</span>-->
- </div>
- </el-tooltip>
- </div>
- </transition>
- <Dialog ref="summarySheets" title="鎶ヨ〃" class="baoBiao" >
- <tab-handover></tab-handover>
- </Dialog>
- <Dialog ref="warnDialog" title="棰勬姤璀�" >
- <warn></warn>
- </Dialog>
- <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻" >
- <index-statistics></index-statistics>
- </Dialog>
- </div>
+ <div class="summary-sheets">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
+ <div :class='["iconBtn",selectGroup ? "active-button" : ""]' @click="subtopicBtn">
+ <i class="el-icon-tickets icon"></i>
+ </div>
+ </el-tooltip>
+ <transition name="animationChange">
+ <div class="subtopic" v-show="selectGroup">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
+ <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
+ <!-- -->
+ <i class="icon iconfont iconbiaoge2"></i>
+ <!--<span class="icon-name">缁熻琛�</span>-->
+ </div>
+ </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom">
+ <div :class='["iconBtn",companyVisible ? "active-button" : ""]' @click="showStatisDialog()">
+ <!-- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon"> -->
+ <i class="el-icon-office-building icon"></i>
+ </div>
+ </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom">
+ <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()">
+ <i class="icon iconfont iconbaojing01"></i>
+ <!--<span class="icon-name">棰勬姤璀�</span>-->
+ </div>
+ </el-tooltip>
+ </div>
+ </transition>
+ <Dialog ref="summarySheets" title="鎶ヨ〃" class="baoBiao">
+ <tab-handover></tab-handover>
+ </Dialog>
+ <Dialog ref="warnDialog" title="棰勬姤璀�">
+ <warn></warn>
+ </Dialog>
+ <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻">
+ <index-statistics></index-statistics>
+ </Dialog>
+ </div>
</template>
<script>
@@ -51,6 +51,7 @@
// import '@/components/plugin/DialogDrag'
import bus from '@/eventBus'
+
export default {
name: 'summary-sheet.vue',
components: {
@@ -121,55 +122,60 @@
</script>
<style lang="less">
-.summary-sheets {
- position: absolute;
- display: inline-flex;
- overflow: hidden;
- top: 0.42979rem;
- left: 0.14583rem;
- /*width: 850px;*/
- /*height: 265px;*/
- z-index: 500;
- .subtopic{
- display: inline-flex;
- .iconBtn{
- margin-left: 0.03rem;
- border-color:#00fff6;
- color:#00fff6;
- }
- .iconBtn.active-button{
- //border-color:#00fff6 !important;
- //color:#00fff6 !important;
- }
- }
+ .summary-sheets {
+ position: absolute;
+ display: inline-flex;
+ overflow: hidden;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ /*width: 850px;*/
+ /*height: 265px;*/
+ z-index: 500;
- .dialog {
- //width: 800px;
- //height: 300px;
- position: absolute;
- top: 15%;
- left: 3rem;
- }
- .animationChange-enter-active, .animationChange-leave-active {
- transition: all 0.5s;
- }
+ .subtopic {
+ display: inline-flex;
- .animationChange-enter, .animationChange-leave-to {
- opacity: 0;
- transform: translateX(-100px);
- }
- /*color: #fff;*/
+ .iconBtn {
+ margin-left: 0.03rem;
+ border-color: #00fff6;
+ color: #00fff6;
+ }
- .el-icon-c-scale-to-original {
- width: 30px;
- height: 30px;
- font-size: 30px;
- }
+ .iconBtn.active-button {
+ //border-color:#00fff6 !important;
+ //color:#00fff6 !important;
+ }
+ }
- .el-dialog.el-dialog--center{
+ .dialog {
+ //width: 800px;
+ //height: 300px;
+ position: absolute;
+ top: 15%;
+ left: 3rem;
+ }
+
+ .animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+ }
+
+ .animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+ }
+
+ /*color: #fff;*/
+
+ .el-icon-c-scale-to-original {
+ width: 30px;
+ height: 30px;
+ font-size: 30px;
+ }
+
+ .el-dialog.el-dialog--center {
left: 0.5rem;
top: 0.73979rem;
}
-}
+ }
</style>
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